diff -Nru gimageview-0.2.27/acconfig.h gimageview-0.3.0-0.20101117/acconfig.h --- gimageview-0.2.27/acconfig.h 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/acconfig.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#undef ENABLE_NLS -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef LOCALEDIR - -#undef PACKAGE -#undef VERSION diff -Nru gimageview-0.2.27/aclocal.m4 gimageview-0.3.0-0.20101117/aclocal.m4 --- gimageview-0.2.27/aclocal.m4 2004-12-28 04:01:05.000000000 +0000 +++ gimageview-0.3.0-0.20101117/aclocal.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,1804 +0,0 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# 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. - -# 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 -]) - -# 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-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" -]) - -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# 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.8"]) - -# 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.8.3])]) - -# AM_AUX_DIR_EXPAND - -# Copyright (C) 2001, 2003 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 -# 02111-1307, USA. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 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 -# 02111-1307, USA. - -# serial 6 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) - -# serial 7 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -# 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 -# 02111-1307, USA. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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 -# 02111-1307, USA. - -#serial 2 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 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 -# 02111-1307, USA. - -# serial 7 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# 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. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# 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 -# 02111-1307, USA. - -# serial 11 - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# 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 - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright (C) 2001, 2003 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 -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# -*- Autoconf -*- -# Copyright (C) 2003 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 -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 -# 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 -# 02111-1307, USA. - -# serial 3 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 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 -# 02111-1307, USA. - -# serial 2 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 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 -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 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 -# 02111-1307, USA. - -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 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 -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 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 -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # 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]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 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 -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -m4_include([m4/codeset.m4]) -m4_include([m4/gdk-pixbuf.m4]) -m4_include([m4/gettext.m4]) -m4_include([m4/glibc21.m4]) -m4_include([m4/gnome.m4]) -m4_include([m4/gtk.m4]) -m4_include([m4/iconv.m4]) -m4_include([m4/imlib.m4]) -m4_include([m4/intltool.m4]) -m4_include([m4/lcmessage.m4]) -m4_include([m4/libcharset.m4]) -m4_include([m4/libtool.m4]) -m4_include([m4/libwmf.m4]) -m4_include([m4/pkg.m4]) -m4_include([m4/progtest.m4]) -m4_include([m4/xine.m4]) diff -Nru gimageview-0.2.27/autogen.sh gimageview-0.3.0-0.20101117/autogen.sh --- gimageview-0.2.27/autogen.sh 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/autogen.sh 2010-11-17 06:10:11.000000000 +0000 @@ -3,19 +3,9 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -m4dir="m4" - -#if test -d $srcdir/$m4dir; then -# rm -f $srcdir/acinclude.m4 -# for m4f in $srcdir/$m4dir/*.m4; do -# cat $m4f >> acinclude.m4 -# done -#else -# echo "Directory '$m4dir' is missing." -# exit 1 -#fi - libtoolize --copy --force \ + && glib-gettextize --copy --force \ + && intltoolize --copy --force \ && aclocal -I m4 \ && autoheader \ && automake --add-missing --foreign --copy \ diff -Nru gimageview-0.2.27/ChangeLog gimageview-0.3.0-0.20101117/ChangeLog --- gimageview-0.2.27/ChangeLog 2004-12-28 04:28:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/ChangeLog 2010-11-17 06:10:11.000000000 +0000 @@ -1,3 +1,610 @@ +2010-11-17 Takuro Ashie + + * src/gimv_scrolled.c: Fix broken scrolling with recent gtk+. + +2009-02-08 Takuro Ashie + + * src/utils_autocomp.c: Remove needless #include. + +2009-01-14 Takuro Ashie + + * src/utils_dnd.c, src/gimv_thumb_view_album.c, src/gimv_thumb_win.[ch], + src/gimv_dir_view.c, src/gimv_thumb_view.c: + Avoid some crash bugs caused by GtkNotebook's drag feature. + Remove needless codes. + +2009-01-13 Takuro Ashie + + * configure.ac, plugins/image_loader/Makefile.am, + plugins/image_loader/svg.[ch]: Removed needless code. + +2009-01-13 Takuro Ashie + + * plugins/image_loader/svg.c: Don't use GError. + +2009-01-13 Takuro Ashie + + * HACKING: Removed. Obsolete. + +2009-01-13 Takuro Ashie + + * src/gimv_image_win.c: Fix a compile error (without libexif). + +2009-01-13 Takuro Ashie + + * src/jpeg-data.[ch], src/jpeg-marker.[ch]: Moved from lib/libexif/. + * configure.ac, lib/Makefile.am, src/Makefile.am, src/gimv_image_view.c, + src/gimv_exif_view.[ch]: + Remove included libexif. Use distributor's libexif instead. + * lib/libexif: Removed. + +2009-01-13 Takuro Ashie + + * configure.ac, plugins/image_loader/Makefile.am: + Remove GIMV_IMAGELIB_*. They are obsolete. + +2009-01-13 Takuro Ashie + + * src/prefs.c, src/gimv_thumb_win.c: Remove walllpaper settings because + they are obsolete. + +2009-01-08 Takuro Ashie + + * src/utils_auto_comp.c: Fix a crash bug on selecting an auto completion + item. + +2009-01-08 Takuro Ashie + + * src/gimv_image_win.c: Fix a crash bug wich occurs on pressing the + "fit" button without a image. + +2009-01-08 Takuro Ashie + + * src/gimv_dir_view.c, src/gimv_thumb_win.c: Fix some bugs of widgets + dragging feature on latest gtk-2.10 or later. + +2009-01-07 Takuro Ashie + + * src/fileload.c: + - Fix a bug that the cancel button on the file selection dialog is + removed when an user press it. + - Remove needless code. + * m4/Makefile.m4: Remove needless files. + +2009-01-07 Takuro Ashie + + * src/gimv_image_win.c, src/gimv_thumb_win.c: Use GTK's stock items + for toolbar buttons. + +2008-12-02 Takuro Ashie + + * src/gimv_prefs_win.c: Fix a crash bug. + +2007-10-28 Takuro Ashie + + * configure.ac: Use AC_CONFIG_FILES. + +2007-10-23 Takuro Ashie + + * src/gimv_file_prop_win.[ch]: Rename from gtk_prop.[ch] + * src/Makefile.am, src/gimv_dir_view.c, src/gimv_thumb_view.c: + Follow the change. + +2007-10-23 Takuro Ashie + + * src/gtk_prop.[ch]: Rename a functions. + * src/gimv_dir_view.c, src/gimv_thumb_view.c: Follow the change. + +2007-10-23 Takuro Ashie + + * plugins/image_view/gimv_mplayer.c, + plugins/image_view/gimv_xine_priv.h: + Remove needless codes. + +2007-10-23 Takuro Ashie + + * intltool-*.in, po/Makefile.in.in: Removed from svn. + * autogen.sh: Add intltoolize. + +2007-10-23 Takuro Ashie + + * src/prefs_ui/prefs_ui_movie.c: Fix compile error. + * src/utils_md5.[ch]: Renamed from md5.[ch] + * src/Makefile.am, src/compare_md5.c: Follow the change. + * intltool-*.in: Updated to 0.36. + +2007-10-22 Takuro Ashie + + * src/utils_auto_comp.[ch]: Renamed from auto_completion.[ch] + * src/utils_char_code.[ch]: Renamed from charset.[ch] + * src/utils_file.[ch]: Renamed from fileutil.[ch] + * src/utils_file_gtk.[ch]: Renamed from gfileutils.[ch] + * src/utils_gtk.[ch]: Renamed from gtkutils.[ch] + * src/utils_japanese.[ch]: Renamed from japanese.[ch] + * src/utils_menu.[ch]: Renamed from menu.[ch] + * src/Makefile.am, *.[ch]: Follow the change. + +2007-10-22 Takuro Ashie + + * src/uitls_auto_comp.[ch]: Renamed from src/auto_completion.[ch] + * src/dnd.[ch]: Renamed from src/utils_dnd.[ch] + * plugins/thumbnail_view/detailview.c, src/gimv_comment_view.c, + src/gimv_image_view.c, src/gtkutils.c, src/gimv_thumb_view_album.c, + src/gimv_thumb_win.c, src/Makefile.am, src/gimv_dir_view.c, + src/gimv_thumb_view.c: + Follow the change. + +2007-10-21 Takuro Ashie + + * src/gimv_dir_view.[ch]: GObjectize. + * src/gimv_thumb_win.[ch]: Follow the change. + +2007-10-21 Takuro Ashie + + * src/fr-archive.[ch]: Remove fr_archive_ref() and fr_archive_unref(). + * src/gimv_image_info.c, src/gimv_thumb_view.c: Follow the change. + +2007-10-21 Takuro Ashie + + * src/gimv_dir_view.[ch]: Remove parent_win arg from + gimv_dir_view_create(). * src/gimv_thumb_win.c: Follow the + change. + +2007-10-21 Takuro Ashie + + * src/gimv_text_win.[ch]: GObjectize. + * src/help.c: Follow the change. + +2007-10-21 Takuro Ashie + + * src/cursors.[ch]: Removed. + * src/gimv_icon_stock.[ch]: Moved codes in src/cursors.[ch] to here. + * src/Makefile.am, src/gimv_image_view.c, src/gimv_image_view_draw.c, + src/gimv_image_win.c: Follow the change. + * configure.ac: Remove src/cursors/Makefile.in. + +2007-10-21 Takuro Ashie + + * src/cursors/*: Moved to src/pixmaps/ + * src/Makefile.am. src/cursors.[ch], src/pixmaps/Makefile.am: + Follow the change. + * src/cursors: Removed. + +2007-10-21 Takuro Ashie + + * plugins/image_saver/Makefile.am, plugins/io_stream/Makefile.am, + plugins/thumbnail/Makefile.am, plugins/image_loader/Makefile.am, + plugins/image_view/Makefile.am, plugins/thumbnail_view/Makefile.am, + src/Makefile.am, src/prefs_ui/Makefile.am, Makefile.am: + Remove .deps/* from CLEANFILES. + +2007-10-21 Takuro Ashie + + * src/gimv_slideshow.[ch]: GObjectize. + * src/gimageview.c: Move GimvSlideshow declaration to gimv_slideshow.h + +2007-10-21 Takuro Ashie + + * src/gimageview.c, src/gimv_slideshow.[ch]: + Declare givm_slideshow_open_window() and gimv_slideshow_delete() as + private. + +2007-10-21 Takuro Ashie + + * src/gimv_comment.[ch], src/gimv_comment_view.c: + Remove gimv_comment_ref() and gimv_comment_unref(). + +2007-10-21 Takuro Ashie + + * plugins/image_loader/pixbuf_anim.c, plugins/image_loader/mng.c, + plugins/image_loader/pixbuf_loader.c, + plugins/image_view/image_view_xine.c, + plugins/image_view/image_view_mplayer.c, + src/gimv_thumb.c, src/gimv_image_view.c, src/gimv_image_loader.c, + src/gimv_image.c, src/gimv_image.h, src/gimv_image_saver.c, + src/compare_similar.c, src/gimv_image_view_draw.c: + Remove gimv_image_ref() and gimv_image_unref(). + +2007-10-20 Takuro Ashie + + * etc/Makefile.am: Change install path of desktop file. + * src/gimageview.desktop: Add Categories and MIMEType field. + * plugins/thumbnail/gimv_thumb.c, plugins/thumbnail/xvpics.c, + src/gimv_image.c, src/gimv_image_saver.c, src/gimv_image_saver.h: + Remove gimv_image_saver_ref() and gimv_image_saver_unref(). + +2007-10-19 Takuro Ashie + + * src/gimv_slideshow.[ch], src/gimv_image_win.[ch], src/gimageview.[ch], + src/gimv_thumb_win.c: + SlideShow -> Slideshow + +2007-10-18 Takuro Ashie + + * src/gimv_dir_view.[ch]: DirView -> GimvDirView + * src/gimageview.[ch], src/gimv_thumb_win.[ch], src/gimv_thumb_view.c: + Follow the change. + +2007-10-18 Takuro Ashie + + * src/pixbuf_utils.[ch]: Removed. + * src/gimv_image.c: Move codes in pixbuf_utils.c to this file. + +2007-10-18 Takuro Ashie + + * src/gimv_exif_view.[ch]: ExifView -> GimvExifView + * src/gimv_image_win.c, src/gimv_thumb_view.c: Follow the change. + +2007-10-18 Takuro Ashie + + * src/gimv_text_win.[ch]: TextViewer -> GimvTextWin + * src/help.c: Follow the change. + +2007-10-17 Takuro Ashie + + * plugins/image_saver/dither.[ch]: Moved from src/ + * src/Makefile.am, plugins/image_saver/Makefile.am: Follow the change. + +2007-10-17 Takuro Ashie + + * src/gimv_image_view_draw.c: Rename from image_view_draw.c + * src/gimv_thumb_view_album.c: Rename from thumbnail_view_album.c + * src/Makefile.am: Follow tha change. + +2007-10-17 Takuro Ashie + + * src/gimv_exif_view.[ch]: Rename from src/exif_view.[ch] + * src/Makefile.am, src/gimv_image_win.c. src/gimv_thumb_view.c: + Follow the change. + +2007-10-17 Takuro Ashie + + * src/gimv_dir_view.[ch]: Renamed from src/dirview.[ch] + * src/Makefile.am, src/gimageview.c src/gimv_thumb_view.c, + src/gimv_thumb_win.c, src/prefs_ui/prefs_ui_thumbwin.c: + Follow the change. + +2007-10-17 Takuro Ashie + + * src/gimv_text_win.[ch]: Renamed from src/text_viewer.[ch] + * src/Makefile.am, src/help.c: Follow the change. + +2007-10-17 Takuro Ashie + + * src/gimv_nav_win.[ch]: Use private struct. + +2007-10-16 Takuro Ashie + + * plugins/thumbnail/gimv_thumb.c, plugins/image_loader/prefs_spi.c, + plugins/image_view/prefs_xine.c, plugins/image_view/prefs_mplayer.c, + src/gimv_elist.c, src/gimv_image_win.c, src/auto_completion.c, + src/gtkutils.c, src/gimv_prefs_win.c, src/gimv_thumb_win.c, + src/prefs_ui/prefs_ui_etc.c, src/prefs_ui/prefs_ui_common.c, + src/prefs_ui/prefs_ui_progs.c, src/prefs_ui/prefs_ui_thumbwin.c, + src/prefs_ui/prefs_ui_plugin.c, src/prefs_ui/prefs_ui_imagewin.c: + gtk_widget_set_usize -> gtk_widget_set_size_request. + +2007-10-16 Takuro Ashie + + * src/gimv_image_win.c. src/gimv_thumb_win.c: Don't offset help menu. + +2007-10-16 Takuro Ashie + + * src/gimv_image_win.c: Don't show resize grip of status bar. + * src/gimv_thumb_win.c: Don't bind accel keys to summary mode menu. + +2007-10-16 Takuro Ashie + + * src/gimv_elist.h, src/gimv_cell_pixmap.c, src/gimv_cell_pixmap.h, + src/gimv_nav_win.h, src/gimv_image_view.h, src/gimv_image_win.h, + src/gimv_dlist.c, src/gimv_dlist.h, src/gimv_scrolled.c, + src/gimv_zlist.h, src/gimv_scrolled.h, src/gimv_dupl_win.h, + src/gimv_zalbum.h, src/gimv_thumb_win.h: + GTK_CHECK_* -> G_TYPE_CHECK_* + +2007-10-16 Takuro Ashie + + * plugins/image_view/gimv_mplayer.h, plugins/image_view/gimv_xine.c, + plugins/image_view/gimv_xine.h, plugins/image_view/gimv_mplayer.c, + src/gimv_thumb_view.h, src/gimv_elist.c, src/gimv_elist.h, + src/gimv_nav_win.c, src/gimv_cell_pixmap.h, src/gimv_nav_win.h, + src/gimv_image_view.c, src/gimv_image_view.h, src/gimv_image_win.c, + src/gimv_image_win.h, src/gimv_dlist.c, src/gimv_dlist.h, + src/gimv_zlist.c, src/gimv_scrolled.c, src/gimv_zlist.h, + src/gimv_scrolled.h, src/gimv_dupl_win.c, src/gimv_dupl_win.h, + src/gimv_zalbum.c, src/gimv_thumb_win.c, src/gimv_zalbum.h, + src/gimv_thumb_win.h: + GtkObject -> GObject. + destroy -> dispose. + GtkType -> GType. + +2007-10-16 Takuro Ashie + + * plugins/archiver/zip-ext.c, plugins/archiver/lha-ext.c, + plugins/archiver/rar-ext.c, plugins/archiver/tar-ext.c, + plugins/archiver/zip-ext.h, plugins/archiver/lha-ext.h, + plugins/archiver/rar-ext.h, plugins/archiver/tar-ext.h, + plugins/image_view/gimv_mplayer.h, plugins/image_view/gimv_xine.c, + plugins/image_view/gimv_xine.h, plugins/image_view/gimv_mplayer.c, + src/gimv_thumb_view.h, src/gimv_thumb.c, src/gimv_thumb.h, + src/gimv_dupl_finder.c, src/gimv_dupl_finder.h, src/fr-archive.c, + src/fr-archive.h, src/gimv_image_view.c, src/gimv_anim.c, + src/gimv_anim.h, src/gimv_image_win.c, src/gimv_comment.c, + src/gimv_comment.h, src/gimv_image_loader.h, src/gimv_image.c, + src/gimv_image.h, src/fr-command.c, src/fr-command.h, + src/gimv_dupl_win.c, src/gimv_image_saver.c, src/gimv_image_saver.h, + src/gimv_thumb_win.c, src/fr-process.c, src/fr-process.h, + src/gimv_thumb_view.c: + - GtkObject -> GObject. + - gtk_type_new -> g_object_new. + +2007-10-16 Takuro Ashie + + * plugins/thumbnail/gqview.c, plugins/image_view/image_view_xine.c, + src/gimv_thumb.c, src/gimv_dupl_finder.c, src/gimv_comment_view.c, + src/gimv_nav_win.c, src/gimv_slideshow.c, src/fr-archive.c, + src/gimv_image_view.c, src/menu.c, src/gimv_image_win.c, + src/gimv_comment.c, src/thumbnail_view_album.c, src/gimv_image.c, + src/dnd.c, src/gtkutils.c, src/gimv_image_info.c, + src/fr-command.c, src/gimv_scrolled.c, src/gimv_dupl_win.c, + src/gimv_image_saver.c, src/gimv_prefs_ui_utils.c, + src/gimv_thumb_win.c, src/fileload.c, src/fr-process.c, + src/gimv_thumb_view.c, src/prefs_ui/prefs_ui_etc.c, + src/prefs_ui/prefs_ui_movie.c, src/prefs_ui/prefs_ui_common.c, + src/prefs_ui/prefs_ui_thumbwin.c, src/prefs_ui/prefs_ui_imagewin.c: + gtk_object -> g_object. + +2007-10-15 Takuro Ashie + + * src/prefs_ui/prefs_ui_etc.c: Fix typo. + +2007-10-14 Takuro Ashie + + * plugins/thumbnail/gqview.c, plugins/image_view/gimv_mplayer.c, + plugins/image_view/image_view_mplayer.c, + plugins/image_view/image_view_mplayer.c, + plugins/image_view/prefs_mplayer.c, + plugins/image_view/prefs_xine.c: + gtk_signal -> g_signal. +2007-10-14 Takuro Ashie + + * src/gimv_scrolled.c, src/gimv_slideshow.c, src/gimv_thumb_view.c, + src/gimv_thumb_win.c, src/gimv_zlist.c, src/gtk_prop.c, + src/gtkutils.c, src/help.c, src/image_view_draw.c, src/menu.c, + src/thumbnail_view_album.c, src/text_viewer.c, + src/prefs_ui/prefs_ui_common.c, src/prefs_ui/prefs_ui_etc.c, + src/prefs_ui/prefs_ui_imagewin.c, src/prefs_ui/prefs_ui_progs.c, + src/prefs_ui/prefs_ui_thumbwin.c, src/prefs_ui/prefs_ui_thumbalbum.c: + gtk_signal -> g_signal. + +2007-10-14 Takuro Ashie + + * src/gimv_prefs.[ch]: Temporary remove. I'll reimplement it by using GKeyFile. + * src/Makefile.am: Follow the change. + * src/gimv_nav_win.c, src/gimv_prefs_ui_utils.c, src/gimv_prefs_win.c: + gtk_signal -> g_signal. + +2007-10-14 Takuro Ashie + + * src/gimv_image_saver.c, src/gimv_image_view.c, src/gimv_image_win.c: + gtk_signal -> g_signal + +2007-10-14 Takuro Ashie + + * src/gimv_comment.c, src/gimv_comment_view.c, src/gimv_dlist.c, + src/gimv_dupl_finder.c, src/gimv_dupl_win.c, src/gimv_image_loader.c, + srg/gimv_elist.c: gtk_signal -> g_signal + +2007-10-14 Takuro Ashie + + * src/auto_completion.c, src/exif_view.c, src/fr-archive.c, + src/fr-command.c, src/fr-process.c, src/fileload.c: + gtk_signal -> g_signal + +2007-10-13 Takuro Ashie + + * src/gimv_thumb_win.c: Don't show resize grip of status bar. + +2007-10-13 Takuro Ashie + + * src/gimv_image_loader.[ch]: GtkObject -> GObject + * src/gimv_image.c, src/gimv_image_view.c, src/exif_view.c: + Follow the change. + +2007-10-13 Takuro Ashie + + * plugins/thumbnail/konqueror-old.c, plugins/thumbnail/nautilus-2.0.c, + plugins/thumbnail/nautilus.c, plugins/thumbnail/konqueror.c, + plugins/thumbnail/ee.c: Removed obsolete cache types support. + * plugins/thumbnail/Makefile.am: Follow the change. + * src/pixmaps/gimageview.xpm: Changed to develop version. + +2007-10-13 Takuro Ashie + + * m4/libwmf.m4: quot. + * m4/xine.m4: update. + +2007-10-13 Takuro Ashie + + * acconfig.h: Remove. + +2007-10-13 Takuro Ashie + + * Makefile.am, autogen.sh, configure.ac, po/Makefile.in.in, + src/Makefile.am, src/gimageview.c: + glib-gettextize. + +2007-10-13 Takuro Ashie + + * intl: Removed. + * m4/lcmessage.m4, m4/glibc21.m4, m4/gettext.m4, m4/codeset.m4, + m4/progtest.m4, m4isc-posix.m4, m4/intltool.m4: Removed. + +2007-10-13 Takuro Ashie + + * src/intl.h: Removed. + * plugins/io_stream/gimv_gzip_io.c, plugins/io_stream/gimv_bz_io.c, + plugins/thumbnail/konqueror-old.c, plugins/thumbnail/nautilus-2.0.c, + plugins/thumbnail/nautilus.c, plugins/thumbnail/ee.c, + plugins/thumbnail/xvpics.c, plugins/image_loader/tga.c, + plugins/image_view/gimv_xine_priv.h, + plugins/thumbnail_view/detailview_prefs.c, src/gimv_elist.c, + src/gtk_prop.c, src/menu.c, src/gimv_dlist.c, src/gtkutils.c, + src/gfileutil.c, src/gimv_prefs_ui_utils.c, src/Makefile.am, + src/prefs_ui/prefs_ui_thumbalbum.c, src/gimv_cell_pixmap.c, + src/charset.c, src/gimageview.h: + intl.h -> glib/gi18n.h + +2007-10-13 Takuro Ashie + + * configure.ac: Fix some warnings. + * autogen.sh: Remove needless code. + * m4/libcharset.m4, m4/iconv.m4: Remove. + +2007-10-12 Takuro Ashie + + * configure.ac: Renamed from configure.in. + * m4/gdk-pixbuf.m4, m4/gnome.m4, m4/pkg.m4, m4/gtk.m4, m4/imlib.m4, + m4/libtool.m4: Removed needless files. + +2007-10-12 Takuro Ashie + + * plugins/archiver/zip-ext.c, plugins/archiver/lha-ext.c, + plugins/archiver/rar-ext.c, plugins/archiver/tar-ext.c, + plugins/image_view/gimv_xine.c, plugins/image_view/gimv_xine_priv.h, + plugins/image_view/gimv_mplayer.c: + Use G_DEFINE_TYPE. + +2007-10-12 Takuro Ashie + + * src/gimv_thumb.c, src/gimv_elist.c, src/gimv_image_win.c, + src/gimv_comment.c, src/gimv_image_loader.c, src/gimv_dlist.c, + src/gimv_image.c, src/fr-command.c, src/gimv_dupl_win.c, + src/gimv_thumb_win.c, src/gimv_thumb_view.c, src/gimv_dupl_finder.c, + src/gimv_cell_pixmap.c, src/gimv_nav_win.c, src/fr-archive.c, + src/gimv_image_view.c, src/gimv_anim.c, src/gimv_zlist.c, + src/gimv_scrolled.c, src/gimv_prefs.c, src/gimv_image_saver.c, + src/gimv_zalbum.c, src/fr-process.c: + Use G_DEFINE_TYPE. + +2007-10-12 Takuro Ashie + + * plugins/thumbnail_view/detailview2.c: Removed. + * plugins/thumbnail_view/Makefile.am: Follow the change + * plugins/thumbnail_view/detailview.c: Move codes to this file. + +2007-10-12 Takuro Ashie + + * src/gtk2-compat.[ch]: Removed. + * src/Makefile.am, *.[ch]: Follow the change. + +2007-10-12 Takuro Ashie + + * src/gimv_paned.h, src/gimv_hpaned.h, src/gimv_vpaned.h: Removed. + * src/Makefile.am, src/gtkutil.[ch], src/gimv_prefs_win.c, + src/gimv_thumb_win.c, src/gtk2-compat.c: + Follow the change. + +2007-10-12 Takuro Ashie + + * configure.in, src/gimv_dupl_win.c, src/gimv_prefs_win.c, + src/prefs_ui/prefs_ui_thumbwin.c, plugins/image_loader/prefs_spi.c: + Remove ENABLE_TREEVIEW. + +2007-10-12 Takuro Ashie + + * configure.in: Remove USE_GTK2 and USE_NORMAL_PANED. + +2007-10-12 Takuro Ashie + + * src/gimv_thumb.[ch], src/gimv_image_win.c, src/gimv_image_loader.c, + src/gimv_image_saver.c, src/gtkutils.c, src/gimv_prefs_win.c, + src/gimv_plugin.c, src/gimv_thumb_win.[ch], src/gimv_thumb_view.c, + src/gimv_nav_win.c, src/gimv_icon_stock.[ch], src/gimv_zlist.c, + src/gtk2-compat.c, src/gimv_scrolled.c, src/gimv_zalbum.c: + Remove USE_GTK2. + +2007-10-12 Takuro Ashie + + * src/gimv_paned.c. src/gimv_hpaned.c, src/gimv_vpaned.c: Removed.d + * src/Makefile.am: Ditto. + * src/gimv_paned.h, src/gimv_hpaned.h, src/gimv_vpaned.h, + src/japanese.c, src/gtk2-compat.[ch]: + Remove USE_GTK2. + +2007-10-12 Takuro Ashie + + * src/gimv_dlist.c, src/gimv_dupl_win.c, src/gimv_dupl_finder.c, + src/menu.[ch], src/prefs.c, src/text_viewer.c, src/help.c, + prefs_ui/prefs_ui_common.c, prefs_ui/prefs_ui_plugin.c, + src/gimv_elist.c: + Remove USE_GTK2. + +2007-10-12 Takuro Ashie + + * src/dnd.c, src/exif_view.c, src/fr-archive.c, src/fr-command.c, + src/fr-process.c, src/gimv_comment.c, src/gimv_comment_view.c: + Remove USE_GTK2. + +2007-10-12 Takuro Ashie + + * src/dirview_priv.h: Removed. + * src/Makefile.am: Ditto + * src/dirview.c: Moved codes in dirview_priv.h to this file. + +2007-10-12 Takuro Ashie + + * src/charset.[ch], src/auto_completion.c: Remove USE_GTK2. + * src/Makefile.am, src/dirview.c, src/dirview2.c: + Move dirview2.c to dirview.c. + +2007-10-12 Takuro Ashie + + * plugins/thumbnail/gimv_thumb.c + plugins/plugins/image_view/mplayer_image_loader.c + plugins/image_view/prefs_mplayer.c + plugins/image_view/gimv_xine.c + plugins/image_view/gimv_mplayer.c + plugins/thumbnail_view/detailview2.c + plugins/thumbnail_view/detailview.c: + Remove USE_GTK2. + +2007-10-12 Takuro Ashie + + * configure.in + plugins/image_loader/pixbuf_anim.c + plugins/image_loader/pixbuf_anim.h + plugins/image_loader/pixbuf_loader.c + plugins/image_loader/pixbuf_loader.h + plugins/image_loader/svg.c + plugins/image_loader/Makefile.am + src/pixbuf_utils.c + src/pixbuf_utils.h + src/prefs_ui/prefs_ui_common.c + src/help.c: + Remove ENABLE_GDK_PIXBUF and HAVE_GDK_PIXBUF + +2007-10-12 Takuro Ashie + + * src/gimv_anim.c, src/gimv_image.c: Remove imlib related code. + +2007-10-12 Takuro Ashie + + * configure.in: Remove --with-gtk2 option. + +2005-01-28 Takuro Ashie + + * plugins/image_view/gimv_xine.c, plugins/image_view/gimv_xine.h, + plugins/image_view/gimv_xine_priv.c, + plugins/image_view/gimv_xine_priv.h, + plugins/image_view/prefs_xine.c: + Enabled to choose audio & video drivers for Xine view. + +2005-01-07 Takuro Ashie + + * src/gimv_thumb_win.c: Fixed compile error on Gtk+-1.2. + Thanks reporting > shippo-san + 2004-12-29 Takuro Ashie * Version-0.2.27 diff -Nru gimageview-0.2.27/config.guess gimageview-0.3.0-0.20101117/config.guess --- gimageview-0.2.27/config.guess 2004-12-28 04:00:52.000000000 +0000 +++ gimageview-0.3.0-0.20101117/config.guess 1970-01-01 00:00:00.000000000 +0000 @@ -1,1438 +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 Free Software Foundation, Inc. - -timestamp='2004-02-02' - -# 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 -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 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-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 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-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 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # 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 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/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - 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 nv1-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:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - 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 ;; - 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[567]*:*) - 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) - 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:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) 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 ;; -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 -Nru gimageview-0.2.27/config.h.in gimageview-0.3.0-0.20101117/config.h.in --- gimageview-0.2.27/config.h.in 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/config.h.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,415 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ -#undef ENABLE_NLS -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef LOCALEDIR - -#undef PACKAGE -#undef VERSION - -/* Define if your bzlib needs BZ2_ prefix. */ -#undef BZAPI_NEEDS_PREFIX - -/* 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 if you want to enable EXIF feature. */ -#undef ENABLE_EXIF - -/* Define if you want to compile JPEG plugin. */ -#undef ENABLE_JPEG - -/* Define if you want to compile mng plugin. */ -#undef ENABLE_MNG - -/* Define if you use movie support */ -#undef ENABLE_MOVIE - -/* Define if you want to compile MPlayer plugin. */ -#undef ENABLE_MPLAYER - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* Define if you want to enable Susie plugin support feature. */ -#undef ENABLE_SPI - -/* Define if you want to enable splash feature. */ -#undef ENABLE_SPLASH - -/* Define if you want to compile svg plugin. */ -#undef ENABLE_SVG - -/* Define if you want to use GtkTreeView. */ -#undef ENABLE_TREEVIEW - -/* Define if you want to compile wmf plugin. */ -#undef ENABLE_WMF - -/* Define if you want to compile xine plugin. */ -#undef ENABLE_XINE - -/* 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 header file. */ -#undef HAVE_ARGZ_H - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define if you have bzlib. */ -#undef HAVE_BZLIB - -/* Define to 1 if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* 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 `dup2' function. */ -#undef HAVE_DUP2 - -/* Define to 1 if you have the `endgrent' function. */ -#undef HAVE_ENDGRENT - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `feof_unlocked' function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define to 1 if you have the `fgets_unlocked' function. */ -#undef HAVE_FGETS_UNLOCKED - -/* Define to 1 if you have the `floor' function. */ -#undef HAVE_FLOOR - -/* Define if you have Imlib1. */ -#undef HAVE_GDK_IMLIB - -/* Define if you have GdkPixbuf. */ -#undef HAVE_GDK_PIXBUF - -/* Define to 1 if you have the `getcwd' function. */ -#undef HAVE_GETCWD - -/* Define to 1 if you have the `getegid' function. */ -#undef HAVE_GETEGID - -/* Define to 1 if you have the `geteuid' function. */ -#undef HAVE_GETEUID - -/* Define to 1 if you have the `getgid' function. */ -#undef HAVE_GETGID - -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID - -/* Define to 1 if you have the `getwd' function. */ -#undef HAVE_GETWD - -/* Define if you have the GNU C Library 2.1 or newer. */ -#undef HAVE_GLIBC21 - -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - -/* Define to 1 if you have the header file. */ -#undef HAVE_LANGINFO_H - -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define if you have the locale_charset() function. */ -#undef HAVE_LIBCHARSET - -/* Define to 1 if you have the `intl' library (-lintl). */ -#undef HAVE_LIBINTL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBINTL_H - -/* Define if you have librsvg. */ -#undef HAVE_LIBRSVG - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `mempcpy' function. */ -#undef HAVE_MEMPCPY - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the `mkdir' function. */ -#undef HAVE_MKDIR - -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define to 1 if you have the `munmap' function. */ -#undef HAVE_MUNMAP - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the `nl_langinfo' function. */ -#undef HAVE_NL_LANGINFO - -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define to 1 if you have the `pow' function. */ -#undef HAVE_POW - -/* Define if your JPEG library supports progressive saving. */ -#undef HAVE_PROGRESSIVE_JPEG - -/* Define to 1 if you have the `putenv' function. */ -#undef HAVE_PUTENV - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if you have the `setlocale' function. */ -#undef HAVE_SETLOCALE - -/* Define to 1 if you have the `sqrt' function. */ -#undef HAVE_SQRT - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* 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 `stpcpy' function. */ -#undef HAVE_STPCPY - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strcspn' function. */ -#undef HAVE_STRCSPN - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* 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 `strpbrk' function. */ -#undef HAVE_STRPBRK - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL - -/* Define to 1 if the system has the type `struct user_desc'. */ -#undef HAVE_STRUCT_USER_DESC - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_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 `tsearch' function. */ -#undef HAVE_TSEARCH - -/* Define to 1 if you have the `uname' function. */ -#undef HAVE_UNAME - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `utime' function. */ -#undef HAVE_UTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_UTIME_H - -/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ -#undef HAVE_UTIME_NULL - -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_XINERAMA_H - -/* Define to 1 if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT - -/* Define to 1 if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT - -/* Define to 1 if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - -/* 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 - -/* 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 - -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - -/* Define if you want to compile against Gtk+2. */ -#undef USE_GTK2 - -/* Define if you use included gettext. */ -#undef USE_INCLUDED_LIBINTL - -/* Define if you want to use Gtk's normal paned widget. */ -#undef USE_NORMAL_PANED - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to `int' if does not define. */ -#undef mode_t - -/* Define to `long' if does not define. */ -#undef off_t - -/* Define to `int' if does not define. */ -#undef pid_t - -/* Define to `unsigned' if does not define. */ -#undef size_t - -/* Define to `int' if doesn't define. */ -#undef uid_t diff -Nru gimageview-0.2.27/config.sub gimageview-0.3.0-0.20101117/config.sub --- gimageview-0.2.27/config.sub 2004-12-28 04:00:52.000000000 +0000 +++ gimageview-0.3.0-0.20101117/config.sub 1970-01-01 00:00:00.000000000 +0000 @@ -1,1544 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -timestamp='2004-02-11' - -# 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 -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) - 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 | 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 | 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-* | 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-* \ - | 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-* \ - | msp430-* \ - | none-* | np1-* | nv1-* | 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-* \ - | 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 - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - 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 - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; - 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 - ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; - 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 - ;; - 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 | 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* | -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 - ;; - *-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 -Nru gimageview-0.2.27/configure gimageview-0.3.0-0.20101117/configure --- gimageview-0.2.27/configure 2004-12-28 04:01:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/configure 1970-01-01 00:00:00.000000000 +0000 @@ -1,22416 +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 - - -# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac -fi - - -# 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. - - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH /usr/ucb; do - 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="$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 - - - -# 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/gimageview.c" -# 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 CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S YACC CPP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE WINDRES OS_WIN32_TRUE OS_WIN32_FALSE ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL GLIB_REQUIRED GTK_REQUIRED IMLIB_REQUIRED GDK_PIXBUF_REQUIRED LIBRSVG_REQUIRED LIBWMF_REQUIRED XINE_REQUIRED GLIB2_REQUIRED GMODULE2_REQUIRED GTK2_REQUIRED GDK_PIXBUF2_REQUIRED PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG IMLIB_CONFIG GDK_IMLIB_CFLAGS GDK_IMLIB_LIBS GDK_PIXBUF_CONFIG GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS ENABLE_GDK_PIXBUF_TRUE ENABLE_GDK_PIXBUF_FALSE ENABLE_GDK_IMLIB_TRUE ENABLE_GDK_IMLIB_FALSE GIMV_IMAGELIB_CFLAGS GIMV_IMAGELIB_LIBS ZLIB_CFLAGS ZLIB_LIBS HAVE_BZLIB_TRUE HAVE_BZLIB_FALSE BZLIB_CFLAGS BZLIB_LIBS PNG_CFLAGS PNG_LIBS HAVE_PNG_TRUE HAVE_PNG_FALSE ENABLE_JPEG_TRUE ENABLE_JPEG_FALSE JPEG_CFLAGS JPEG_LIBS ENABLE_MNG_TRUE ENABLE_MNG_FALSE MNG_CFLAGS MNG_LIBS LIBRSVG_CFLAGS LIBRSVG_LIBS GNOME_CONFIG GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS ZVT_LIBS GLIB_CFLAGS GLIB_LIBS OAF_CFLAGS OAF_LIBS GNORBA_CFLAGS GNORBA_LIBS ENABLE_LIBRSVG_TRUE ENABLE_LIBRSVG_FALSE XML_CFLAGS XML_LIBS LIBWMF_CONFIG LIBWMF_CFLAGS LIBWMF_LIBS ENABLE_WMF_TRUE ENABLE_WMF_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS XINE_CONFIG XINE_CFLAGS XINE_LIBS XINE_ACFLAGS ENABLE_XINE_TRUE ENABLE_XINE_FALSE ALLOCA GLIBC21 LIBICONV LTLIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX localedir LIBCHARSET INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ENABLE_EXIF_TRUE ENABLE_EXIF_FALSE EXIF_CFLAGS EXIF_LIBS ENABLE_SPI_TRUE ENABLE_SPI_FALSE DLLLOADER_CFLAGS DLLLOADER_LIBS ENABLE_MPLAYER_TRUE ENABLE_MPLAYER_FALSE LIBOBJS docdir gimv_datadir gimv_docdir gimv_icondir plugindir ARCHIVER_PLUGIN_DIR IMAGE_LOADER_PLUGIN_DIR IMAGE_SAVER_PLUGIN_DIR IO_STREAM_PLUGIN_DIR IMAGE_VIEW_PLUGIN_DIR THUMBNAIL_VIEW_PLUGIN_DIR THUMBNAIL_PLUGIN_DIR 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_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_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP - -# -# 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] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-shared=PKGS build shared libraries default=yes - --enable-static=PKGS build static libraries default=no - --enable-fast-install=PKGS optimize for fast installation default=yes - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-gtktest Do not try to compile and run a test GTK program - --disable-imlib Do not use imlib - --disable-gdk-pixbuf Do not use gdk-pixbuf - --disable-imlibtest Do not try to compile and run a test IMLIB program - --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program - --disable-libwmftest Do not try to compile and run a test libwmf program - --disable-xinetest Do not try to compile and run a test XINE program - --disable-rpath do not hardcode runtime library paths - --disable-nls do not use Native Language Support - --enable-exif enable EXIF support default=yes - --enable-spi susie plugin support (broken) default=no - --enable-splash enable splash logo - --enable-mplayer enable MPlyer support (experimental) default=no - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-x use the X Window System - --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-gtk2 Use Gtk+-2.0 (experimental) default=no - --with-gtk-prefix=PFX Prefix where GTK is installed (optional) - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) - --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional) - --with-imlib-exec-prefix=PFX Exec prefix where IMLIB is installed (optional) - --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional) - --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional) - --with-libmng Use libmng for MNG image default=yes - --with-librsvg Use librsvg for SVG image default=yes - --with-gnome-prefix=PFX Prefix where GNOME is installed (optional) - --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional) - --with-libwmf Use libwmf library for Windows Meta File default=yes - --with-libwmf-prefix=PFX Prefix where libwmf is installed (optional) - --with-libwmf-exec-prefix=PFX Exec prefix where libwmf is installed (optional) - --with-xine Use Xine library for movie (experimental) default=no - --with-xine-prefix=PFX Prefix where XINE is installed (optional) - --with-xine-exec-prefix=PFX Exec prefix where XINE is installed (optional) - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-included-gettext use the GNU gettext library included here - --with-libcharset-prefix=DIR search for libcharset in DIR/include and DIR/lib - -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 - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor - -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 - - - - - - - - - - - - - - - - - - - -PACKAGE=gimageview - -MAJOR_VERSION=0 -MINOR_VERSION=2 -MICRO_VERSION=27 -EXTRA_VERSION= -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION - -am__api_version="1.8" -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 > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # 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" = conftest.file - ) -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 -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 - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - -for ac_prog in gawk mawk nawk awk -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_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - -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 - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# test to see if srcdir already configured -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 - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE=$PACKAGE - VERSION=$VERSION - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -install_sh=${install_sh-"$am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - 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 - -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. - - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - - - ac_config_headers="$ac_config_headers config.h" - - - - - -for ac_prog in gawk mawk nawk awk -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_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - -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 -DEPDIR="${am__leading_dot}deps" - - ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 -rm -f confinc confmf - -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - - -depcc="$CC" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -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 -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=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 - -depcc="$CXX" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -# 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 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 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 - -for ac_prog in 'bison -y' byacc -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_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - echo "$as_me:$LINENO: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - - -echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 -if test "${ac_cv_search_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_strerror=no -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_search_strerror="none required" -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 "$ac_cv_search_strerror" = no; then - for ac_lib in cposix; do - LIBS="-l$ac_lib $ac_func_search_save_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_search_strerror="-l$ac_lib" -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_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6 -if test "$ac_cv_search_strerror" != no; then - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" - -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 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 X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# 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 Intrinsic.h. - # 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" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi; - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 - - -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - - -# 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/'` - - - -echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 -case "$host" in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; -esac -echo "$as_me:$LINENO: result: $platform_win32" >&5 -echo "${ECHO_T}$platform_win32" >&6 - - -if test x"$platform_win32" = x"yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' -else - PLATFORM_WIN32_TRUE='#' - PLATFORM_WIN32_FALSE= -fi - - -if test x"$platform_win32" = x"yes"; then - WINDRES=windres - -fi - -echo "$as_me:$LINENO: checking for native Win32" >&5 -echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 -case "$host" in - *-*-mingw*) - os_win32=yes - ;; - *) - os_win32=no - ;; -esac -echo "$as_me:$LINENO: result: $os_win32" >&5 -echo "${ECHO_T}$os_win32" >&6 - - -if test x"$os_win32" = x"yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' -else - OS_WIN32_TRUE='#' - OS_WIN32_FALSE= -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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_static=no -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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_fast_install=yes -fi; - -# 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 GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $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. - [\\/]* | [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 - 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 - 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 - 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. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$lt_cv_path_LD" -if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&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. -if $LD -v 2>&1 &5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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 -test -n "$reload_flag" && reload_flag=" $reload_flag" - -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 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - 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 - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - 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 - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi -fi - -NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: result: $NM" >&5 -echo "${ECHO_T}$NM" >&6 - -echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 -echo $ECHO_N "checking how to recognise dependant 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 egrep 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* | mingw* | pw32*) - 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='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd*) - 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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' - 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 - ;; - -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*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv5uw[78]* | sysv4*uw2*) - 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 - ;; - esac - ;; -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 - - - - - - - -# 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" >&5 -echo $ECHO_N "checking command to parse $NM output... $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_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_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 - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix*) - symcode='[BCDEGRST]' - ;; -solaris* | sysv5*) - symcode='[BDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $host_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. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTW]' -fi - -# 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 egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' 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_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#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[] = -{ -EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$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; then - pipe_works=yes - fi - LIBS="$save_LIBS" - CFLAGS="$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 - -global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -if test -z "$lt_cv_sys_global_symbol_pipe"; then - global_symbol_to_cdecl= - global_symbol_to_c_name_address= -else - global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" - global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -fi -if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; -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 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 - - -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 - - - - - -# 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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - 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="$ac_save_ifs" - MAGIC_CMD="$ac_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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - 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="$ac_save_ifs" - MAGIC_CMD="$ac_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 - -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 - - -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 - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 5780 "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 - 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 - 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 - -# 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' - -# 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" -need_locks="$enable_libtool_lock" - -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 "$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 "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -if test x"$host" != x"$build"; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case $host_os in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -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 - -# 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 - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="$2" - -## FIXME: this should be a separate macro -## -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -echo "$as_me:$LINENO: result: $objdir" >&5 -echo "${ECHO_T}$objdir" >&6 -## -## END FIXME - - -## FIXME: this should be a separate macro -## - -# 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 - -# We assume here that the value for lt_cv_prog_cc_pic will not be cached -# in isolation, and that seeing it set (from the cache) indicates that -# the associated values are set (in the cache) correctly too. -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 "${lt_cv_prog_cc_pic+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_cc_pic= - lt_cv_prog_cc_shlib= - lt_cv_prog_cc_wl= - lt_cv_prog_cc_static= - lt_cv_prog_cc_no_builtin= - lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-static' - - case $host_os in - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # not sure about C++ programs. - lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" - ;; - 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_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_cv_prog_cc_pic='-fno-common' - ;; - cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_cv_prog_cc_pic=-Kconform_pic - fi - ;; - *) - lt_cv_prog_cc_pic='-fPIC' - ;; - esac - else - # PORTME Check for PIC flags for the system compiler. - case $host_os in - aix3* | aix4* | aix5*) - lt_cv_prog_cc_wl='-Wl,' - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - - newsos6) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - - solaris*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - ;; - - sunos4*) - lt_cv_prog_cc_pic='-PIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi - ;; - - uts4*) - lt_cv_prog_cc_pic='-pic' - lt_cv_prog_cc_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_cv_prog_cc_pic='-Kconform_pic' - lt_cv_prog_cc_static='-Bstatic' - fi - ;; - - *) - lt_cv_prog_cc_can_build_shared=no - ;; - esac - fi - -fi - -if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 -else - echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 - - # Check to make sure the pic_flag actually works. - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 - if test "${lt_cv_prog_cc_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - 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 - case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; - *) - lt_cv_prog_cc_pic_works=yes - ;; - esac - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_prog_cc_pic_works=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - -fi - - - if test "X$lt_cv_prog_cc_pic_works" = Xno; then - lt_cv_prog_cc_pic= - lt_cv_prog_cc_can_build_shared=no - else - lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" - fi - - echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 -fi -## -## END FIXME - -# Check for any special shared library compilation flags. -if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - -## FIXME: this should be a separate macro -## -echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 -if test "${lt_cv_prog_cc_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_cc_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - 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_prog_cc_static_works=yes -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 - LDFLAGS="$save_LDFLAGS" - -fi - - -# Belt *and* braces to stop my trousers falling down: -test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 - -pic_flag="$lt_cv_prog_cc_pic" -special_shlib_compile_flags="$lt_cv_prog_cc_shlib" -wl="$lt_cv_prog_cc_wl" -link_static_flag="$lt_cv_prog_cc_static" -no_builtin_flag="$lt_cv_prog_cc_no_builtin" -can_build_shared="$lt_cv_prog_cc_can_build_shared" -## -## END FIXME - - -## FIXME: this should be a separate macro -## -# Check to see if options -o and -c are simultaneously supported by compiler -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_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -echo "int some_variable = 0;" > conftest.$ac_ext -mkdir out -# According to Tom Tromey, Ian Lance Taylor reported there are C compilers -# that will create temporary files in the current directory regardless of -# the output directory. Thus, making CWD read-only will cause this test -# to fail, enabling locking or at least warning the user not to do parallel -# builds. -chmod -w . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" -compiler_c_o=no -if { (eval echo configure:6356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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_compiler_c_o=no - else - lt_cv_compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&5 - lt_cv_compiler_c_o=no -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null - -fi - -compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:$LINENO: result: $compiler_c_o" >&5 -echo "${ECHO_T}$compiler_c_o" >&6 - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 - if test "${lt_cv_compiler_o_lo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - lt_cv_compiler_o_lo=no - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - save_objext="$ac_objext" - ac_objext=lo - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -int some_variable = 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 - # 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_compiler_o_lo=no - else - lt_cv_compiler_o_lo=yes - 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_objext="$save_objext" - CFLAGS="$save_CFLAGS" - -fi - - compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 -echo "${ECHO_T}$compiler_o_lo" >&6 -else - compiler_o_lo=no -fi -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Check to see if we can do hard links to lock some files if needed -hard_links="nottested" -if test "$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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - 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 - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -int some_variable = 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 - # 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 - compiler_rtti_exceptions=no - else - compiler_rtti_exceptions=yes - 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 - CFLAGS="$save_CFLAGS" - echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$compiler_rtti_exceptions" >&6 - - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi -fi -## -## END FIXME - -## FIXME: this should be a separate macro -## -# See if the linker supports building shared libraries. -echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -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_into_libs=no -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -link_all_deplibs=unknown -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 egrep regular expression 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, the GNU linker is very broken - # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. - 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 - ;; - - 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 use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': 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*) - # 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=yes - - extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ - sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ - test -f $output_objdir/impgen.exe || (cd $output_objdir && \ - if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ - else $CC -o impgen impgen.c ; fi)~ - $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' - - # cygwin and mingw dlls have different entry points and sets of symbols - # to exclude. - # FIXME: what about values for MSVC? - dll_entry=__cygwin_dll_entry@12 - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ - case $host_os in - mingw*) - # mingw values - dll_entry=_DllMainCRTStartup@12 - dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; - esac - - # mingw and cygwin differ, and it's simplest to just exclude the union - # of the two symbol sets. - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one (in ltdll.c) - if test "x$lt_cv_need_dllmain" = "xyes"; then - ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ - test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' - else - ltdll_obj= - ltdll_cmds= - fi - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - # Be careful not to strip the DATA tag left be newer dlltools. - export_symbols_cmds="$ltdll_cmds"' - $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' - - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \$# in - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; - fi~ - '"$ltdll_cmds"' - $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ - $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ - $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' - ;; - - netbsd*) - 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 -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared -nodefaultlibs $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 | egrep '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 | egrep ': 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 - ;; - - *) - if $LD --help 2>&1 | egrep ': 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' - case $host_os in - cygwin* | mingw* | pw32*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - 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 - 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. - - hardcode_direct=yes - archive_cmds='' - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - 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 - shared_flag='${wl}-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 can do strange things, 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' - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - 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 ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but 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 ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $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 - ;; - - 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 - # 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"`' - ;; - - darwin* | rhapsody*) - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' - # We need to add '_' to the symbols in $export_symbols first - #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes - hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' - ;; - - 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*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - 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' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - 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 $linker_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 $linker_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 "-exported_symbol " >> $lib.exp; echo "\$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 - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - - solaris*) - no_undefined_flag=' -z defs' - # $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='-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) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - 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 - fi - 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' - ;; - - 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 - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - 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 - ;; - - sysv5uw7* | 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 - ;; - - *) - 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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Check hardcoding attributes. -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"; 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 "$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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -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 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -## -## END FIXME - -reload_cmds='$LD$reload_flag -o $output$reload_objs' -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -## FIXME: this should be a separate macro -## -# PORTME Fill in your ld.so characteristics -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= -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" -sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' - ;; - -aix4* | aix5*) - version_type=linux - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' - 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}.so$versuffix ${libname}${release}.so$major $libname.so' - 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}.so$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}.so' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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" - export_dynamic_flag_spec=-rdynamic - # 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 - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin*) - library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog .libs/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - ;; - yes,mingw*) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' - ;; - *) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $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 - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' - soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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}.so$versuffix ${libname}${release}.so $libname.so' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - *) - 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}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$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. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") 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}" - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # We 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' - ;; - -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}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$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}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - 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 - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - 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}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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}.so$versuffix ${libname}.so$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}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=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 - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -*) - 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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Report the final consequences. -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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -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*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 -## -## END FIXME - -## FIXME: this should be a separate macro -## -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 -## -## END FIXME - -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 - -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 - -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 - ;; - - cygwin* | mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - *) - 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 - - -## FIXME: this should be a separate macro -## -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 - if test "${lt_cv_archive_cmds_need_lc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - $rm conftest* - echo 'static int dummy;' > 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 - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_cv_prog_cc_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - 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 - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi -fi - - echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 -echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 - ;; - esac -fi -need_lc=${lt_cv_archive_cmds_need_lc-yes} -## -## END FIXME - -## FIXME: this should be a separate macro -## -# The second 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 - : -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. - test -f Makefile && make "$ltmain" -fi - -if test -f "$ltmain"; then - trap "$rm \"${ofile}T\"; exit 1" 1 2 15 - $rm -f "${ofile}T" - - echo creating $ofile - - # 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 CC LD LN_S NM SHELL \ - reload_flag reload_cmds wl \ - pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ - thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ - RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ - postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ - old_striplib striplib file_magic_cmd export_symbols_cmds \ - deplibs_check_method allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ - global_symbol_to_c_name_address \ - hardcode_libdir_flag_spec hardcode_libdir_separator \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - - case $var in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ - extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - finish_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 - - cat <<__EOF__ > "${ofile}T" -#! $SHELL - -# `$echo "$ofile" | 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-2000 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. - -# 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 - -# ### 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=$need_lc - -# 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 - -# The default C compiler. -CC=$lt_CC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# 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=$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_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_pic_flag -pic_mode=$pic_mode - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_compiler_c_o - -# Can we write directly to a .lo ? -compiler_o_lo=$lt_compiler_o_lo - -# 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_link_static_flag - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_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 to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# 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_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_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 - -# 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.so 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 - -# 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 >> "${ofile}T" - -# 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 - - case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments -# /* 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 */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# 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 /* for printf() */ -# #include /* for open(), lseek(), read() */ -# #include /* for O_RDONLY, O_BINARY */ -# #include /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); -# -# printf ("EXPORTS\n"); -# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - - mv -f "${ofile}T" "$ofile" || \ - (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") - chmod +x "$ofile" -fi -## -## END FIXME - - - - - -# 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 - - - - -GLIB_REQUIRED=1.2.6 -GTK_REQUIRED=1.2.6 -IMLIB_REQUIRED=1.9 -GDK_PIXBUF_REQUIRED=0.8.0 -LIBRSVG_REQUIRED=1.0.0 -LIBWMF_REQUIRED=0.2.8 -XINE_REQUIRED=1.0.0 - - - - - - - - - -# Gtk+-2.0 -GLIB2_REQUIRED=2.0.0 -GMODULE2_REQUIRED=2.0.0 -GDK_PIXBUF2_REQUIRED=2.0.0 -GTK2_REQUIRED=2.0.0 - - - - - - -GTK2_TARGET=gtk+-2.0 - - - -# Check whether --with-gtk2 or --without-gtk2 was given. -if test "${with_gtk2+set}" = set; then - withval="$with_gtk2" - enable_gtk2="${withval}" -else - enable_gtk2=no -fi; -if test x"$enable_gtk2" != xno; then - if test x"$enable_gtk2" != xyes; then - GTK2_TARGET=$enable_gtk2 - fi - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # 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_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED" >&5 -echo $ECHO_N "checking for glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 - GTK_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 - GTK_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 - else - GTK_CFLAGS="" - GTK_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - : - else - { { echo "$as_me:$LINENO: error: Test for GTK+-2.0 failed. See the file 'INSTALL' for help" >&5 -echo "$as_me: error: Test for GTK+-2.0 failed. See the file 'INSTALL' for help" >&2;} - { (exit 1); exit 1; }; } - fi - - - - -cat >>confdefs.h <<\_ACEOF -#define USE_GTK2 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define USE_NORMAL_PANED 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_TREEVIEW 1 -_ACEOF - -else - -# Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi; - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi; -# Check whether --enable-gtktest or --disable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval="$enable_gtktest" - -else - enable_gtktest=yes -fi; - - for module in . - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-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_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTK_CONFIG="$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_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG - -if test -n "$GTK_CONFIG"; then - echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_gtk_version=$GTK_REQUIRED - echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -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 () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_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 ) -no_gtk=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - 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 - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { { echo "$as_me:$LINENO: error: Test for GTK failed. See the file 'INSTALL' for help" >&5 -echo "$as_me: error: Test for GTK failed. See the file 'INSTALL' for help" >&2;} - { (exit 1); exit 1; }; } - fi - - - rm -f conf.gtktest - -fi - - -# Check whether --enable-imlib or --disable-imlib was given. -if test "${enable_imlib+set}" = set; then - enableval="$enable_imlib" - disable_imlib=yes -else - disable_imlib=no -fi; -# Check whether --enable-gdk-pixbuf or --disable-gdk-pixbuf was given. -if test "${enable_gdk_pixbuf+set}" = set; then - enableval="$enable_gdk_pixbuf" - disable_gdk_pixbuf=yes -else - disable_gdk_pixbuf=no -fi; - -if test x"$disable_imlib" = xyes -a x"$disable_gdk_pixbuf" = xyes; then - { { echo "$as_me:$LINENO: error: *** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***" >&5 -echo "$as_me: error: *** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***" >&2;} - { (exit 1); exit 1; }; } -fi - -if test x"$enable_gtk2" != xno; then - disable_imlib=yes - disable_gdk_pixbuf=no -fi - -if test x"$enable_gtk2" != xno; then - have_gdk_pixbuf=yes -else - -# Check whether --with-imlib-prefix or --without-imlib-prefix was given. -if test "${with_imlib_prefix+set}" = set; then - withval="$with_imlib_prefix" - imlib_prefix="$withval" -else - imlib_prefix="" -fi; - -# Check whether --with-imlib-exec-prefix or --without-imlib-exec-prefix was given. -if test "${with_imlib_exec_prefix+set}" = set; then - withval="$with_imlib_exec_prefix" - imlib_exec_prefix="$withval" -else - imlib_exec_prefix="" -fi; -# Check whether --enable-imlibtest or --disable-imlibtest was given. -if test "${enable_imlibtest+set}" = set; then - enableval="$enable_imlibtest" - -else - enable_imlibtest=yes -fi; - - if test x$imlib_exec_prefix != x ; then - imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_exec_prefix/bin/imlib-config - fi - fi - if test x$imlib_prefix != x ; then - imlib_args="$imlib_args --prefix=$imlib_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_prefix/bin/imlib-config - fi - fi - - # Extract the first word of "imlib-config", so it can be a program name with args. -set dummy imlib-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_path_IMLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $IMLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_IMLIB_CONFIG="$IMLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_IMLIB_CONFIG="$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_IMLIB_CONFIG" && ac_cv_path_IMLIB_CONFIG="no" - ;; -esac -fi -IMLIB_CONFIG=$ac_cv_path_IMLIB_CONFIG - -if test -n "$IMLIB_CONFIG"; then - echo "$as_me:$LINENO: result: $IMLIB_CONFIG" >&5 -echo "${ECHO_T}$IMLIB_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_imlib_version=$IMLIB_REQUIRED - echo "$as_me:$LINENO: checking for IMLIB - version >= $min_imlib_version" >&5 -echo $ECHO_N "checking for IMLIB - version >= $min_imlib_version... $ECHO_C" >&6 - no_imlib="" - if test "$IMLIB_CONFIG" = "no" ; then - no_imlib=yes - else - GDK_IMLIB_CFLAGS=`$IMLIB_CONFIG $imlibconf_args --cflags-gdk` - GDK_IMLIB_LIBS=`$IMLIB_CONFIG $imlibconf_args --libs-gdk` - - imlib_major_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - imlib_minor_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - if test "x$enable_imlibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" - rm -f conf.imlibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -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 () -{ - int major, minor; - char *tmp_version; - - system ("touch conf.gdkimlibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_imlib_version"); - if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) { - printf("%s, bad version string\n", "$min_imlib_version"); - exit(1); - } - - if (($imlib_major_version > major) || - (($imlib_major_version == major) && ($imlib_minor_version >= minor))) - { - return 0; - } - else - { - printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version); - printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor); - printf("*** best to upgrade to the required version.\n"); - printf("*** If imlib-config was wrong, set the environment variable IMLIB_CONFIG\n"); - printf("*** to point to the correct copy of imlib-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_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 ) -no_imlib=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_imlib" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_imlib=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$IMLIB_CONFIG" = "no" ; then - echo "*** The imlib-config script installed by IMLIB could not be found" - echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the IMLIB_CONFIG environment variable to the" - echo "*** full path to imlib-config." - else - if test -f conf.gdkimlibtest ; then - : - else - echo "*** Could not run IMLIB test program, checking why..." - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding IMLIB or finding the wrong" - echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" - echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" - echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - IMLIB_CFLAGS="" - IMLIB_LIBS="" - have_imlib=no - fi - - - rm -f conf.gdkimlibtest - - -# Check whether --with-gdk-pixbuf-prefix or --without-gdk-pixbuf-prefix was given. -if test "${with_gdk_pixbuf_prefix+set}" = set; then - withval="$with_gdk_pixbuf_prefix" - gdk_pixbuf_prefix="$withval" -else - gdk_pixbuf_prefix="" -fi; - -# Check whether --with-gdk-pixbuf-exec-prefix or --without-gdk-pixbuf-exec-prefix was given. -if test "${with_gdk_pixbuf_exec_prefix+set}" = set; then - withval="$with_gdk_pixbuf_exec_prefix" - gdk_pixbuf_exec_prefix="$withval" -else - gdk_pixbuf_exec_prefix="" -fi; -# Check whether --enable-gdk_pixbuftest or --disable-gdk_pixbuftest was given. -if test "${enable_gdk_pixbuftest+set}" = set; then - enableval="$enable_gdk_pixbuftest" - -else - enable_gdk_pixbuftest=yes -fi; - - if test x$gdk_pixbuf_exec_prefix != x ; then - gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" - if test x${GDK_PIXBUF_CONFIG+set} = xset ; then - GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config - fi - fi - if test x$gdk_pixbuf_prefix != x ; then - gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" - if test x${GDK_PIXBUF_CONFIG+set} = xset ; then - GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config - fi - fi - - # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args. -set dummy gdk-pixbuf-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_path_GDK_PIXBUF_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GDK_PIXBUF_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GDK_PIXBUF_CONFIG="$GDK_PIXBUF_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GDK_PIXBUF_CONFIG="$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_GDK_PIXBUF_CONFIG" && ac_cv_path_GDK_PIXBUF_CONFIG="no" - ;; -esac -fi -GDK_PIXBUF_CONFIG=$ac_cv_path_GDK_PIXBUF_CONFIG - -if test -n "$GDK_PIXBUF_CONFIG"; then - echo "$as_me:$LINENO: result: $GDK_PIXBUF_CONFIG" >&5 -echo "${ECHO_T}$GDK_PIXBUF_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_gdk_pixbuf_version=$GDK_PIXBUF_REQUIRED - echo "$as_me:$LINENO: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5 -echo $ECHO_N "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version... $ECHO_C" >&6 - no_gdk_pixbuf="" - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - no_gdk_pixbuf=yes - else - GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` - GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` - - gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gdk_pixbuftest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - LIBS="$LIBS $GDK_PIXBUF_LIBS" - rm -f conf.gdk_pixbuftest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -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 - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gdk_pixbuftest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_gdk_pixbuf_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); - exit(1); - } - - if (($gdk_pixbuf_major_version > major) || - (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || - (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); - printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); - printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_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 ) -no_gdk_pixbuf=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gdk_pixbuf" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_gdk_pixbuf=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" - echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" - echo "*** full path to gdk-pixbuf-config." - else - if test -f conf.gdk_pixbuftest ; then - : - else - echo "*** Could not run GDK_PIXBUF test program, checking why..." - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - LIBS="$LIBS $GDK_PIXBUF_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" - echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" - echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" - echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GDK_PIXBUF_CFLAGS="" - GDK_PIXBUF_LIBS="" - have_gdk_pixbuf=no - fi - - - rm -f conf.gdk_pixbuftest - -fi - -GIMV_IMAGELIB_CFLAGS="" -GIMV_IMAGELIB_LIBS="" - -if test x"$disable_gdk_pixbuf" = xno -a x"$have_gdk_pixbuf" = xyes; then - image_library="gdk-pixbuf" - if test x"$enable_gtk2" != xno; then - GIMV_IMAGELIB_CFLAGS="" - GIMV_IMAGELIB_LIBS="" - else - GIMV_IMAGELIB_CFLAGS=${GDK_PIXBUF_CFLAGS} - GIMV_IMAGELIB_LIBS=${GDK_PIXBUF_LIBS} - fi - disable_imlib=yes - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GDK_PIXBUF 1 -_ACEOF - -else - disable_gdk_pixbuf=yes - have_gdk_pixbuf=no - if test x"$disable_imlib" = xno -a x"$have_imlib" = xyes; then - image_library="Imlib" - GIMV_IMAGELIB_CFLAGS=${GDK_IMLIB_CFLAGS} - GIMV_IMAGELIB_LIBS=${GDK_IMLIB_LIBS} - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GDK_IMLIB 1 -_ACEOF - - else - { { echo "$as_me:$LINENO: error: *** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***" >&5 -echo "$as_me: error: *** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***" >&2;} - { (exit 1); exit 1; }; } - fi -fi - - - -if test "x$disable_gdk_pixbuf" = xno -a "x$have_gdk_pixbuf" = xyes; then - ENABLE_GDK_PIXBUF_TRUE= - ENABLE_GDK_PIXBUF_FALSE='#' -else - ENABLE_GDK_PIXBUF_TRUE='#' - ENABLE_GDK_PIXBUF_FALSE= -fi - - - -if test "x$disable_imlib" = xno -a "x$have_imlib" = xyes; then - ENABLE_GDK_IMLIB_TRUE= - ENABLE_GDK_IMLIB_FALSE='#' -else - ENABLE_GDK_IMLIB_TRUE='#' - ENABLE_GDK_IMLIB_FALSE= -fi - - - - - -ZLIB_CFLAGS="" -ZLIB_LIBS="-lz" - - - - -BZLIB_CFLAGS="" -BZLIB_LIBS="" -if test "${ac_cv_header_bzlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for bzlib.h" >&5 -echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 -if test "${ac_cv_header_bzlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking bzlib.h usability" >&5 -echo $ECHO_N "checking bzlib.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 bzlib.h presence" >&5 -echo $ECHO_N "checking bzlib.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: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: bzlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: bzlib.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 bzlib.h" >&5 -echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 -if test "${ac_cv_header_bzlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_bzlib_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 - -fi -if test $ac_cv_header_bzlib_h = yes; then - - echo "$as_me:$LINENO: checking for BZ2_bzlibVersion in -lbz2" >&5 -echo $ECHO_N "checking for BZ2_bzlibVersion in -lbz2... $ECHO_C" >&6 -if test "${ac_cv_lib_bz2_BZ2_bzlibVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbz2 $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 BZ2_bzlibVersion (); -int -main () -{ -BZ2_bzlibVersion (); - ; - 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_bz2_BZ2_bzlibVersion=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bz2_BZ2_bzlibVersion=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_bz2_BZ2_bzlibVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6 -if test $ac_cv_lib_bz2_BZ2_bzlibVersion = yes; then - - available_bzlib=yes; - BZLIB_LIBS="-lbz2"; - -cat >>confdefs.h <<\_ACEOF -#define BZAPI_NEEDS_PREFIX 1 -_ACEOF - - -else - - echo "$as_me:$LINENO: checking for bzlibVersion in -lbz2" >&5 -echo $ECHO_N "checking for bzlibVersion in -lbz2... $ECHO_C" >&6 -if test "${ac_cv_lib_bz2_bzlibVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbz2 $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 bzlibVersion (); -int -main () -{ -bzlibVersion (); - ; - 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_bz2_bzlibVersion=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bz2_bzlibVersion=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_bz2_bzlibVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_bz2_bzlibVersion" >&6 -if test $ac_cv_lib_bz2_bzlibVersion = yes; then - - available_bzlib=yes; BZLIB_LIBS="-lbz2"; - -fi - - -fi - - -fi - - - -if test x"$available_bzlib" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BZLIB 1 -_ACEOF - -fi - - -if test x"$available_bzlib" = x"yes"; then - HAVE_BZLIB_TRUE= - HAVE_BZLIB_FALSE='#' -else - HAVE_BZLIB_TRUE='#' - HAVE_BZLIB_FALSE= -fi - - - - - -PNG_CFLAGS="" -PNG_LIBS="" -echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6 -if test "${ac_cv_lib_png_png_read_info+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_read_info (); -int -main () -{ -png_read_info (); - ; - 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_read_info=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_png_png_read_info=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_read_info" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6 -if test $ac_cv_lib_png_png_read_info = yes; then - - 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 -if test $ac_cv_header_png_h = yes; then - png_ok=yes -else - png_ok=no -fi - - - -else - - { { echo "$as_me:$LINENO: error: *** (PNG library is not found) ***" >&5 -echo "$as_me: error: *** (PNG library is not found) ***" >&2;} - { (exit 1); exit 1; }; } - -fi - - -if test x"$png_ok" = xyes; then - echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -echo $ECHO_N "checking for png_structp in png.h... $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 -int -main () -{ - png_structp pp; - png_infop info; - png_colorp cmap; - png_get_header_ver(NULL); - png_create_read_struct; - ; - 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 - png_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - png_ok=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $png_ok" >&5 -echo "${ECHO_T}$png_ok" >&6 - if test x"$png_ok" = xyes; then - PNG_LIBS="-lpng -lz" - else - { { echo "$as_me:$LINENO: error: *** PNG library (libpng) is too old ***" >&5 -echo "$as_me: error: *** PNG library (libpng) is too old ***" >&2;} - { (exit 1); exit 1; }; } - fi -else - { { echo "$as_me:$LINENO: error: *** PNG library (libpng) required ***" >&5 -echo "$as_me: error: *** PNG library (libpng) required ***" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - -if test "x$PNG_LIBS" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' -else - HAVE_PNG_TRUE='#' - HAVE_PNG_FALSE= -fi - - - -JPEG_CFLAGS="" -JPEG_LIBS="" -available_jpeg=no -echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+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_decompress (); -int -main () -{ -jpeg_destroy_decompress (); - ; - 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_decompress=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_jpeg_jpeg_destroy_decompress=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_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6 -if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then - available_jpeg=yes -else - available_jpeg=no -fi - - -if test x"$available_jpeg" = xyes; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $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 -#undef PACKAGE -#undef VERSION -#undef HAVE_STDLIB_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 - available_jpeg=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - available_jpeg=no -fi -rm -f conftest.err conftest.$ac_ext - echo "$as_me:$LINENO: result: $available_jpeg" >&5 -echo "${ECHO_T}$available_jpeg" >&6 - if test x"$available_jpeg" = xyes; then - JPEG_LIBS='-ljpeg' - echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_simple_progression+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_simple_progression (); -int -main () -{ -jpeg_simple_progression (); - ; - 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_simple_progression=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_jpeg_jpeg_simple_progression=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_simple_progression" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6 -if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PROGRESSIVE_JPEG 1 -_ACEOF - -else - { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 -echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} -fi - - fi -fi - -if test x"$available_jpeg" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_JPEG 1 -_ACEOF - -else - { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built ***" >&5 -echo "$as_me: WARNING: *** JPEG loader will not be built ***" >&2;} -fi - - - -if test x"$available_jpeg" = x"yes"; then - ENABLE_JPEG_TRUE= - ENABLE_JPEG_FALSE='#' -else - ENABLE_JPEG_TRUE='#' - ENABLE_JPEG_FALSE= -fi - - - - -enable_jpeg=$available_jpeg - - - -# Check whether --with-libmng or --without-libmng was given. -if test "${with_libmng+set}" = set; then - withval="$with_libmng" - enable_mng="${withval}" -else - enable_mng=yes -fi; - -MNG_CFLAGS="" -MNG_LIBS="" -if test x"$enable_mng" = x"yes"; then - if test x"$available_jpeg" = x"yes"; then - if test "${ac_cv_header_libmng_h+set}" = set; then - echo "$as_me:$LINENO: checking for libmng.h" >&5 -echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 -if test "${ac_cv_header_libmng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking libmng.h usability" >&5 -echo $ECHO_N "checking libmng.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 libmng.h presence" >&5 -echo $ECHO_N "checking libmng.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: libmng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libmng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libmng.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libmng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libmng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libmng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libmng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libmng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libmng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libmng.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 libmng.h" >&5 -echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 -if test "${ac_cv_header_libmng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libmng_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 - -fi -if test $ac_cv_header_libmng_h = yes; then - - echo "$as_me:$LINENO: checking for mng_initialize in -lmng" >&5 -echo $ECHO_N "checking for mng_initialize in -lmng... $ECHO_C" >&6 -if test "${ac_cv_lib_mng_mng_initialize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmng $MNG_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 mng_initialize (); -int -main () -{ -mng_initialize (); - ; - 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_mng_mng_initialize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_mng_mng_initialize=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_mng_mng_initialize" >&5 -echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6 -if test $ac_cv_lib_mng_mng_initialize = yes; then - - echo "$as_me:$LINENO: checking for libmng functions" >&5 -echo $ECHO_N "checking for libmng functions... $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 -int -main () -{ - mng_handle handle; - mng_version_text(); - handle = mng_initialize(NULL, NULL, NULL, MNG_NULL); - mng_setcb_errorproc(handle, NULL); - mng_setcb_openstream(handle, NULL); - mng_setcb_closestream(handle, NULL); - mng_setcb_readdata(handle, NULL); - mng_setcb_gettickcount(handle, NULL); - mng_setcb_settimer(handle, NULL); - mng_setcb_processheader(handle, NULL); - mng_setcb_getcanvasline(handle, NULL); - mng_setcb_refresh(handle, NULL); - mng_get_userdata(handle); - mng_set_canvasstyle(handle, MNG_CANVAS_RGB8); - mng_set_bgcolor(handle, 0, 0, 0); - mng_readdisplay(handle); - mng_readdisplay_resume(handle); - ; - 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 - MNG_LIBS="$JPEG_LIBS -lz -lmng"; - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_MNG 1 -_ACEOF - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - enable_mng=no; - { echo "$as_me:$LINENO: WARNING: *** MNG library (libmng) is found but it is too old ***" >&5 -echo "$as_me: WARNING: *** MNG library (libmng) is found but it is too old ***" >&2;} -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $enable_mng" >&5 -echo "${ECHO_T}$enable_mng" >&6 - -else - - enable_mng=no - -fi - - -else - - enable_mng=no: - -fi - - - else - { echo "$as_me:$LINENO: WARNING: *** libmng requires libjpeg. MNG plugin will not be compiled." >&5 -echo "$as_me: WARNING: *** libmng requires libjpeg. MNG plugin will not be compiled." >&2;} - enable_mng=no - fi -fi - - - -if test x"$enable_mng" = xyes; then - ENABLE_MNG_TRUE= - ENABLE_MNG_FALSE='#' -else - ENABLE_MNG_TRUE='#' - ENABLE_MNG_FALSE= -fi - - - - - - -# Check whether --with-librsvg or --without-librsvg was given. -if test "${with_librsvg+set}" = set; then - withval="$with_librsvg" - enable_librsvg="${withval}" -else - enable_librsvg=yes -fi; - -if test x"$enable_librsvg" = xyes; then - if test x"$enable_gtk2" != xno; then - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # 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_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for librsvg-2.0" >&5 -echo $ECHO_N "checking for librsvg-2.0... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "librsvg-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking LIBRSVG_CFLAGS" >&5 -echo $ECHO_N "checking LIBRSVG_CFLAGS... $ECHO_C" >&6 - LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0"` - echo "$as_me:$LINENO: result: $LIBRSVG_CFLAGS" >&5 -echo "${ECHO_T}$LIBRSVG_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking LIBRSVG_LIBS" >&5 -echo $ECHO_N "checking LIBRSVG_LIBS... $ECHO_C" >&6 - LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0"` - echo "$as_me:$LINENO: result: $LIBRSVG_LIBS" >&5 -echo "${ECHO_T}$LIBRSVG_LIBS" >&6 - else - LIBRSVG_CFLAGS="" - LIBRSVG_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - : - else - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg-2.0 installed" >&5 -echo "$as_me: WARNING: Did not find librsvg-2.0 installed" >&2;} - - fi - - else - if test x"$disable_gdk_pixbuf" = xno -a x"$have_gdk_pixbuf" = xyes; then - -# Check whether --with-gnome-prefix or --without-gnome-prefix was given. -if test "${with_gnome_prefix+set}" = set; then - withval="$with_gnome_prefix" - gnome_config_prefix="$withval" -else - gnome_config_prefix="" -fi; - -# Check whether --with-gnome-exec-prefix or --without-gnome-exec-prefix was given. -if test "${with_gnome_exec_prefix+set}" = set; then - withval="$with_gnome_exec_prefix" - gnome_config_exec_prefix="$withval" -else - gnome_config_exec_prefix="" -fi; - - if test x$gnome_config_exec_prefix != x ; then - gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config - fi - fi - if test x$gnome_config_prefix != x ; then - gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config - fi - fi - - # Extract the first word of "gnome-config", so it can be a program name with args. -set dummy gnome-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_path_GNOME_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GNOME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GNOME_CONFIG="$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_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" - ;; -esac -fi -GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG - -if test -n "$GNOME_CONFIG"; then - echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 -echo "${ECHO_T}$GNOME_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_gnome_version=1.2.8 - - echo "$as_me:$LINENO: checking for GNOME - version >= $min_gnome_version" >&5 -echo $ECHO_N "checking for GNOME - version >= $min_gnome_version... $ECHO_C" >&6 - no_gnome="" - if test "$GNOME_CONFIG" = "no" ; then - no_gnome=yes - else - GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`" - GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`" - GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`" - GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`" - - gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - needed_major_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - needed_minor_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - needed_micro_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - - if test "$gnome_config_major_version" -lt "$needed_major_version"; then - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -echo "$as_me: WARNING: Did not find librsvg installed" >&2;} - - no_gnome=yes - elif test "$gnome_config_major_version" = "$needed_major_version"; then - if test -n "$needed_minor_version" -a "$gnome_config_minor_version" -lt "$needed_minor_version"; then - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -echo "$as_me: WARNING: Did not find librsvg installed" >&2;} - - no_gnome=yes - elif test -n "$needed_minor_version" -a "$gnome_config_minor_version" = "$needed_minor_version"; then - if test -n "$needed_micro_version" -a "$gnome_config_micro_version" -lt "$needed_micro_version"; then - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -echo "$as_me: WARNING: Did not find librsvg installed" >&2;} - - no_gnome=yes - fi - fi - fi - fi - - - - - - if test "x$no_gnome" = x ; then - 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 - if test "$GNOME_CONFIG" = "no" ; then - echo "*** The gnome-config script could not be found." - else - : - fi - GNOME_CFLAGS="" - GNOME_LIBS="" - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -echo "$as_me: WARNING: Did not find librsvg installed" >&2;} - - fi - - tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir` - if test -n "xml librsvg"; then - echo "$as_me:$LINENO: checking for additional GNOME modules" >&5 -echo $ECHO_N "checking for additional GNOME modules... $ECHO_C" >&6 - fi - for module in xml librsvg ""; do - gnome_m4_notfound=no - if test "$module" = zvt; then - ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`" - - elif test "$module" = gtk; then - GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`" - GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`" - - - elif test "$module" = "glib"; then - GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`" - GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`" - - - elif test "$module" = "oaf"; then - OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`" - OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`" - - - elif test "$module" = "gnorba"; then - GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`" - GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`" - - - elif test -n "$module"; then - if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then - tmp_bsnom=`echo $module | tr a-z A-Z` - eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\" - eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\" - else - echo "$as_me:$LINENO: result: *** $module library is not installed" >&5 -echo "${ECHO_T}*** $module library is not installed" >&6 - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -echo "$as_me: WARNING: Did not find librsvg installed" >&2;} - - gnome_m4_notfound=yes - fi - fi - if test "$gnome_m4_notfound" = no; then - echo $ac_n " $module" 1>&6 - fi - done - if test -n "xml librsvg"; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 - fi - - else - enable_librsvg=no; - fi - fi -fi - - - -if test x"$enable_librsvg" = xyes; then - ENABLE_LIBRSVG_TRUE= - ENABLE_LIBRSVG_FALSE='#' -else - ENABLE_LIBRSVG_TRUE='#' - ENABLE_LIBRSVG_FALSE= -fi - - -if test x"$enable_librsvg" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBRSVG 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_SVG 1 -_ACEOF - -fi - - - - - - - - -# Check whether --with-libwmf or --without-libwmf was given. -if test "${with_libwmf+set}" = set; then - withval="$with_libwmf" - enable_libwmf="${withval}" -else - enable_libwmf=yes -fi; - -if test "x$enable_libwmf" = xyes; then - have_libwmf=no - -# Check whether --with-libwmf-prefix or --without-libwmf-prefix was given. -if test "${with_libwmf_prefix+set}" = set; then - withval="$with_libwmf_prefix" - libwmf_prefix="$withval" -else - libwmf_prefix="" -fi; - -# Check whether --with-libwmf-exec-prefix or --without-libwmf-exec-prefix was given. -if test "${with_libwmf_exec_prefix+set}" = set; then - withval="$with_libwmf_exec_prefix" - libwmf_exec_prefix="$withval" -else - libwmf_exec_prefix="" -fi; -# Check whether --enable-libwmftest or --disable-libwmftest was given. -if test "${enable_libwmftest+set}" = set; then - enableval="$enable_libwmftest" - -else - enable_libwmftest=yes -fi; - - if test x$libwmf_exec_prefix != x ; then - libwmf_args="$libwmf_args --exec-prefix=$libwmf_exec_prefix" - if test x${LIBWMF_CONFIG+set} = xset ; then - LIBWMF_CONFIG=$libwmf_exec_prefix/libwmf-config - fi - fi - if test x$libwmf_prefix != x ; then - libwmf_args="$libwmf_args --prefix=$libwmf_prefix" - if test x${LIBWMF_CONFIG+set} = xset ; then - LIBWMF_CONFIG=$libwmf_prefix/bin/libwmf-config - fi - fi - - # Extract the first word of "libwmf-config", so it can be a program name with args. -set dummy libwmf-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_path_LIBWMF_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $LIBWMF_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBWMF_CONFIG="$LIBWMF_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LIBWMF_CONFIG="$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_LIBWMF_CONFIG" && ac_cv_path_LIBWMF_CONFIG="no" - ;; -esac -fi -LIBWMF_CONFIG=$ac_cv_path_LIBWMF_CONFIG - -if test -n "$LIBWMF_CONFIG"; then - echo "$as_me:$LINENO: result: $LIBWMF_CONFIG" >&5 -echo "${ECHO_T}$LIBWMF_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_libwmf_version=$LIBWMF_REQUIRED - echo "$as_me:$LINENO: checking for libwmf - version >= $min_libwmf_version" >&5 -echo $ECHO_N "checking for libwmf - version >= $min_libwmf_version... $ECHO_C" >&6 - no_libwmf="" - if test "$LIBWMF_CONFIG" = "no" ; then - no_libwmf=yes - else - LIBWMF_CFLAGS=`$LIBWMF_CONFIG $libwmfconf_args --cflags` - LIBWMF_LIBS=`$LIBWMF_CONFIG $libwmfconf_args --libs` - - libwmf_major_version=`$LIBWMF_CONFIG $libwmf_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - libwmf_minor_version=`$LIBWMF_CONFIG $libwmf_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - libwmf_micro_version=`$LIBWMF_CONFIG $libwmf_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_libwmftest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBWMF_CFLAGS" - LIBS="$LIBS $LIBWMF_LIBS" - rm -f conf.libwmftest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -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 - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.libwmftest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_libwmf_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_libwmf_version"); - exit(1); - } - return 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 ) -no_libwmf=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_libwmf" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_libwmf=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$LIBWMF_CONFIG" = "no" ; then - echo "*** The libwmf-config script installed by LIBWMF could not be found" - echo "*** If LIBWMF was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the LIBWMF_CONFIG environment variable to the" - echo "*** full path to libwmf-config." - else - if test -f conf.libwmftest ; then - : - else - echo "*** Could not run LIBWMF test program, checking why..." - CFLAGS="$CFLAGS $LIBWMF_CFLAGS" - LIBS="$LIBS $LIBWMF_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBWMF or finding the wrong" - echo "*** version of LIBWMF. If it is not finding LIBWMF, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LIBWMF was incorrectly installed" - echo "*** or that you have moved LIBWMF since it was installed. In the latter case, you" - echo "*** may want to edit the libwmf-config script: $LIBWMF_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - LIBWMF_CFLAGS="" - LIBWMF_LIBS="" - have_libwmf=no - fi - - - rm -f conf.libwmftest - - - if test "x$have_libwmf" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_WMF 1 -_ACEOF - - else - { echo "$as_me:$LINENO: WARNING: Did not find libwmf installed" >&5 -echo "$as_me: WARNING: Did not find libwmf installed" >&2;} - enable_libwmf=no; - fi -fi - - - -if test x"$enable_libwmf" = xyes; then - ENABLE_WMF_TRUE= - ENABLE_WMF_FALSE='#' -else - ENABLE_WMF_TRUE='#' - ENABLE_WMF_FALSE= -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 - -XINERAMA_LIBS="" -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 $X_LIBS -lX11 -lXext $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 - XINERAMA_LIBS="-lXinerama" - -for ac_header in X11/extensions/Xinerama.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 - - - - - -movie_support="" - - -# Check whether --with-xine or --without-xine was given. -if test "${with_xine+set}" = set; then - withval="$with_xine" - enable_xine="${withval}" -else - enable_xine=no -fi; - -if test x"$enable_xine" = xyes; then - have_xine=no - -# Check whether --with-xine-prefix or --without-xine-prefix was given. -if test "${with_xine_prefix+set}" = set; then - withval="$with_xine_prefix" - xine_config_prefix="$withval" -else - xine_config_prefix="" -fi; - -# Check whether --with-xine-exec-prefix or --without-xine-exec-prefix was given. -if test "${with_xine_exec_prefix+set}" = set; then - withval="$with_xine_exec_prefix" - xine_config_exec_prefix="$withval" -else - xine_config_exec_prefix="" -fi; -# Check whether --enable-xinetest or --disable-xinetest was given. -if test "${enable_xinetest+set}" = set; then - enableval="$enable_xinetest" - -else - enable_xinetest=yes -fi; - - if test x$xine_config_exec_prefix != x ; then - xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix" - if test x${XINE_CONFIG+set} != xset ; then - XINE_CONFIG=$xine_config_exec_prefix/bin/xine-config - fi - fi - if test x$xine_config_prefix != x ; then - xine_config_args="$xine_config_args --prefix=$xine_config_prefix" - if test x${XINE_CONFIG+set} != xset ; then - XINE_CONFIG=$xine_config_prefix/bin/xine-config - fi - fi - - min_xine_version=$XINE_REQUIRED - if test "x$enable_xinetest" != "xyes" ; then - echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 -echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6 - else - # Extract the first word of "xine-config", so it can be a program name with args. -set dummy xine-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_path_XINE_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $XINE_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_XINE_CONFIG="$XINE_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XINE_CONFIG="$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_XINE_CONFIG" && ac_cv_path_XINE_CONFIG="no" - ;; -esac -fi -XINE_CONFIG=$ac_cv_path_XINE_CONFIG - -if test -n "$XINE_CONFIG"; then - echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5 -echo "${ECHO_T}$XINE_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 -echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6 - no_xine="" - if test "$XINE_CONFIG" = "no" ; then - no_xine=yes - else - XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags` - XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs` - XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags` - xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir` - xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir` - xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir` - xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $XINE_CFLAGS" - LIBS="$XINE_LIBS $LIBS" - - - 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 - - rm -f conf.xinetest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -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 () -{ - int major, minor, sub; - char *tmp_version; - - system ("touch conf.xinetest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = (char *) strdup("$min_xine_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &sub) != 3) { - printf("%s, bad version string\n", "$min_xine_version"); - exit(1); - } - - if ((XINE_MAJOR_VERSION != $xine_config_major_version) || - (XINE_MINOR_VERSION != $xine_config_minor_version) || - (XINE_SUB_VERSION != $xine_config_sub_version)) - { - printf("\n*** 'xine-config --version' returned %d.%d.%d, but XINE (%d.%d.%d)\n", - $xine_config_major_version, $xine_config_minor_version, $xine_config_sub_version, - XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION); - printf ("*** was found! If xine-config was correct, then it is best\n"); - printf ("*** to remove the old version of XINE. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If xine-config was wrong, set the environment variable XINE_CONFIG\n"); - printf("*** to point to the correct copy of xine-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else - { - if ((XINE_MAJOR_VERSION > major) || - ((XINE_MAJOR_VERSION == major) && (XINE_MINOR_VERSION > minor)) || - ((XINE_MAJOR_VERSION == major) && (XINE_MINOR_VERSION == minor) && (XINE_SUB_VERSION >= sub))) - { - return 0; - } - else - { - printf("\n*** An old version of XINE (%d.%d.%d) was found.\n", - XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION); - printf("*** You need a version of XINE newer than %d.%d.%d. The latest version of\n", - major, minor, sub); - printf("*** XINE is always available from:\n"); - printf("*** http://xine.sourceforge.net\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the xine-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of XINE, but you can also set the XINE_CONFIG environment to point to the\n"); - printf("*** correct copy of xine-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_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 ) -no_xine=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_xine" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_xine=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$XINE_CONFIG" = "no" ; then - echo "*** The xine-config script installed by XINE could not be found" - echo "*** If XINE was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XINE_CONFIG environment variable to the" - echo "*** full path to xine-config." - else - if test -f conf.xinetest ; then - : - else - echo "*** Could not run XINE test program, checking why..." - CFLAGS="$CFLAGS $XINE_CFLAGS" - LIBS="$LIBS $XINE_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((XINE_MAJOR_VERSION) || (XINE_MINOR_VERSION) || (XINE_SUB_VERSION)); - ; - 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding XINE or finding the wrong" - echo "*** version of XINE. If it is not finding XINE, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means XINE was incorrectly installed" - echo "*** or that you have moved XINE since it was installed. In the latter case, you" - echo "*** may want to edit the xine-config script: $XINE_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - XINE_CFLAGS="" - XINE_LIBS="" - have_xine=no - 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 - - rm -f conf.xinetest - - - - -for ac_func in strsep strpbrk setenv -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 - - - - if test x"$have_xine" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_XINE 1 -_ACEOF - - movie_support="Xine ${movie_support}" - else - { echo "$as_me:$LINENO: WARNING: Did not find xine-lib installed" >&5 -echo "$as_me: WARNING: Did not find xine-lib installed" >&2;} - enable_xine=no; - fi -fi - - - -if test x"$enable_xine" = xyes; then - ENABLE_XINE_TRUE= - ENABLE_XINE_FALSE='#' -else - ENABLE_XINE_TRUE='#' - ENABLE_XINE_FALSE= -fi - - - -ALL_LINGUAS="fr ja" -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 - -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 - -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#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 - ac_cv_c_inline=$ac_kw; 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 - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+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 -int -main () -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - 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_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_off_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define off_t long -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+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 -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - 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_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - -# 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_header in stdlib.h unistd.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 - - -for ac_func in getpagesize -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 working mmap" >&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -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 -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc - -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif - -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - exit (1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - exit (1); - if (write (fd, data, pagesize) != pagesize) - exit (1); - close (fd); - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - exit (1); - data2 = (char *) malloc (2 * pagesize); - if (!data2) - exit (1); - data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit (1); - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - exit (1); - if (read (fd, data3, pagesize) != pagesize) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit (1); - close (fd); - 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 - ac_cv_func_mmap_fixed_mapped=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 ) -ac_cv_func_mmap_fixed_mapped=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: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP 1 -_ACEOF - -fi -rm -f conftest.mmap - - - echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 -if test "${ac_cv_gnu_library_2_1+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 -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - - -fi -echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GLIBC21 1 -_ACEOF - - - GLIBC21="$ac_cv_gnu_library_2_1" - - - - 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" - - -# 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; -# Prepare PATH_SEPARATOR. -# 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 -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 GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $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. - [\\/]* | [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 - 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 "${acl_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 -fi - -LD="$acl_cv_path_LD" -if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&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 "${acl_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}$acl_cv_prog_gnu_ld" >&6 -with_gnu_ld=$acl_cv_prog_gnu_ld - - - - echo "$as_me:$LINENO: checking for shared library run path origin" >&5 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 -if test "${acl_cv_rpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - 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 - -fi -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 -echo "${ECHO_T}$acl_cv_rpath" >&6 - 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" - # Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - : -else - enable_rpath=yes -fi; - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then - withval="$with_libiconv_prefix" - - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi - -fi; - LIBICONV= - LTLIBICONV= - INCICONV= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - 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" - 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" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - 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 $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - 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 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - 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 - if test "$hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - 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 - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - 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 - 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 $INCICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - 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 - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - 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 $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - 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 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - 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 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - 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 - 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*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done - fi - - - - - - - - - - - - - -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.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 - - - - - - - - - - - - - - - - - - - - - - -for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next -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 - - - - - - - - am_save_CPPFLAGS="$CPPFLAGS" - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - - echo "$as_me:$LINENO: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -if test "${am_cv_func_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - 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 - am_cv_func_iconv=yes -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 "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - 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 - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -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 - LIBS="$am_save_LIBS" - fi - -fi -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6 - if test "$am_cv_func_iconv" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF - - fi - if test "$am_cv_lib_iconv" = yes; then - echo "$as_me:$LINENO: checking how to link with libiconv" >&5 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $LIBICONV" >&5 -echo "${ECHO_T}$LIBICONV" >&6 - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - - - - if test "$am_cv_func_iconv" = yes; then - echo "$as_me:$LINENO: checking for iconv declaration" >&5 -echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 - if test "${am_cv_proto_iconv+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 -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - -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 - am_cv_proto_iconv_arg1="" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -am_cv_proto_iconv_arg1="const" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$as_me:$LINENO: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -echo "${ECHO_T}${ac_t:- - }$am_cv_proto_iconv" >&6 - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - - fi - - - echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 -if test "${am_cv_langinfo_codeset+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* cs = nl_langinfo(CODESET); - ; - 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 - am_cv_langinfo_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -am_cv_langinfo_codeset=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LANGINFO_CODESET 1 -_ACEOF - - fi - - if test $ac_cv_header_locale_h = yes; then - echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -if test "${am_cv_val_LC_MESSAGES+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 () -{ -return LC_MESSAGES - ; - 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 - am_cv_val_LC_MESSAGES=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -am_cv_val_LC_MESSAGES=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test $am_cv_val_LC_MESSAGES = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF - - fi - fi - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval -else - USE_NLS=yes -fi; - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - - - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - - if test "$USE_NLS" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF - - echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 -echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 - -# Check whether --with-included-gettext or --without-included-gettext was given. -if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" - nls_cv_force_use_gnu_gettext=$withval -else - nls_cv_force_use_gnu_gettext=no -fi; - echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 -echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE - - - - - if test "${ac_cv_header_libintl_h+set}" = set; then - echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.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 libintl.h presence" >&5 -echo $ECHO_N "checking libintl.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: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.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 libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 - -fi -if test $ac_cv_header_libintl_h = yes; then - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libc+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 -extern int _nl_msg_cat_cntr; -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr - ; - 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 - gt_cv_func_gnugettext1_libc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -gt_cv_func_gnugettext1_libc=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 - - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr - ; - 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 - gt_cv_func_gnugettext1_libintl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -gt_cv_func_gnugettext1_libintl=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF - - - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -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 - - LIBS="$gt_save_LIBS" - - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; 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_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -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_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$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 - - - CATOBJEXT=.gmo - fi - -fi - - - - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - INTLOBJS="\$(GETTOBJS)" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; 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_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -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_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$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 - - - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - -cat >>confdefs.h <<\_ACEOF -#define USE_INCLUDED_LIBINTL 1 -_ACEOF - - CATOBJEXT=.gmo - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 - GMSGFMT=":" - fi - fi - - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 - XGETTEXT=":" - fi - fi - - POSUB=po - fi - ac_config_commands="$ac_config_commands default-1" - - - - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - for ac_prog in bison -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_INTLBISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # 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_INTLBISON="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -INTLBISON=$ac_cv_prog_INTLBISON -if test -n "$INTLBISON"; then - echo "$as_me:$LINENO: result: $INTLBISON" >&5 -echo "${ECHO_T}$INTLBISON" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$INTLBISON" && break -done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - echo "$as_me:$LINENO: checking version of bison" >&5 -echo $ECHO_N "checking version of bison... $ECHO_C" >&6 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -echo "${ECHO_T}$ac_prog_version" >&6 - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - - - - - - - - - - - nls_cv_header_intl= - nls_cv_header_libgt= - - DATADIRNAME=share - - - INSTOBJEXT=.mo - - - GENCAT=gencat - - - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6 - fi - - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - - - INTL_LIBTOOL_SUFFIX_PREFIX= - - -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 - : -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 - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL 1 -_ACEOF - - LIBS="-lintl $LIBS" - -fi - -fi - -localedir="\${datadir}/locale" - - - -gimv_save_LIBS=$LIBS -LIBS="$LIBS $GTK_LIBS" - -for ac_func in bind_textdomain_codeset -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 - -LIBS=$gimv_save_LIBS - - - - -# Check whether --with-libcharset-prefix or --without-libcharset-prefix was given. -if test "${with_libcharset_prefix+set}" = set; then - withval="$with_libcharset_prefix" - - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - -fi; - - echo "$as_me:$LINENO: checking for libcharset" >&5 -echo $ECHO_N "checking for libcharset... $ECHO_C" >&6 -if test "${am_cv_libcharset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - am_cv_libcharset=no - am_save_LIBS="$LIBS" - LIBS="$LIBS -lcharset" - 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 () -{ -const char *charset = locale_charset (); - ; - 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 - am_cv_libcharset=yes -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 - LIBS="$am_save_LIBS" - -fi -echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5 -echo "${ECHO_T}$am_cv_libcharset" >&6 - - LIBCHARSET= - if test "$am_cv_libcharset" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBCHARSET 1 -_ACEOF - - LIBCHARSET="-lcharset" - fi - - - - - - -if test -n ""; then - echo "$as_me:$LINENO: checking for intltool >= " >&5 -echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6 - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ printf "%d", $1 * 100 + $2; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }' < ${srcdir}/intltool-update.in` - - INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}/intltool-update.in` - - - if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then - echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6 - else - echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&6 - exit 1 - fi -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - - - - - - - - - - - - - - - - -# Use the tools built into the package, not the ones that are installed. - -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' -INTLTOOL_MERGE='$(top_builddir)/intltool-merge' -INTLTOOL_UPDATE='$(top_builddir)/intltool-update' - - - - - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; 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_INTLTOOL_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$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 - - ;; -esac -fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL - -if test -n "$INTLTOOL_PERL"; then - echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -echo "$as_me: error: perl not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi - -# Remove file type tags (using []) from po/POTFILES. - - - - - - - -# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. - - ac_config_commands="$ac_config_commands default-2" - - - - - -# Check whether --enable-exif or --disable-exif was given. -if test "${enable_exif+set}" = set; then - enableval="$enable_exif" - enable_exif="${enableval}" -else - enable_exif=yes -fi; - - -if test x"$enable_exif" = xyes; then - ENABLE_EXIF_TRUE= - ENABLE_EXIF_FALSE='#' -else - ENABLE_EXIF_TRUE='#' - ENABLE_EXIF_FALSE= -fi - -if test x"$enable_exif" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_EXIF 1 -_ACEOF - - EXIF_CFLAGS="-I\$(top_srcdir)/lib" - EXIF_LIBS="\$(top_builddir)/lib/libexif/libexif.la" - - -fi - - -# Check whether --enable-spi or --disable-spi was given. -if test "${enable_spi+set}" = set; then - enableval="$enable_spi" - enable_spi="${enableval}" -else - enable_spi=no -fi; - - -if test x"$enable_spi" = xyes; then - ENABLE_SPI_TRUE= - ENABLE_SPI_FALSE='#' -else - ENABLE_SPI_TRUE='#' - ENABLE_SPI_FALSE= -fi - - -if test x"$enable_spi" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_SPI 1 -_ACEOF - - if test x"$platform_win32" = xno; then - DLLLOADER_CFLAGS="-I\$(top_srcdir)/lib -I\$(top_srcdir)/lib/dllloader" - DLLLOADER_LIBS="\$(top_builddir)/lib/dllloader/libdllloader.la" - - - fi -fi - - -# Check whether --enable-splash or --disable-splash was given. -if test "${enable_splash+set}" = set; then - enableval="$enable_splash" - enable_splash="${enableval}" -else - enable_splash=yes -fi; -if test x"$enable_splash" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_SPLASH 1 -_ACEOF - -fi - - -# Check whether --enable-mplayer or --disable-mplayer was given. -if test "${enable_mplayer+set}" = set; then - enableval="$enable_mplayer" - enable_mplayer="${enableval}" -else - enable_mplayer=no -fi; -if test x"$enable_mplayer" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_MPLAYER 1 -_ACEOF - - movie_support="MPlayer ${movie_support}" -fi - - - -if test x"$enable_mplayer" = x"yes"; then - ENABLE_MPLAYER_TRUE= - ENABLE_MPLAYER_FALSE='#' -else - ENABLE_MPLAYER_TRUE='#' - ENABLE_MPLAYER_FALSE= -fi - - - -if test x"$movie_support" = x; then - movie_support=no -else - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_MOVIE 1 -_ACEOF - -fi - - - - - - - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $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. */ -#include -#include <$ac_hdr> - -int -main () -{ -if ((DIR *) 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 - 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_hdr" | $as_tr_cpp` 1 -_ACEOF - -ac_header_dirent=$ac_hdr; break -fi - -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="none required" -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 "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="-l$ac_lib" -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_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="none required" -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 "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="-l$ac_lib" -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_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -fi - -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 - -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 - - - - - - - - - - - - - - - - - - - - - -for ac_header in \ - alloca.h argz.h \ - errno.h \ - fcntl.h \ - langinfo.h libintl.h limits.h locale.h \ - malloc.h memory.h \ - netinet/in.h nl_types.h \ - stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h \ - unistd.h utime.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 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 - -echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_t+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 - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#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 - ac_cv_c_inline=$ac_kw; 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 - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -if test "${ac_cv_type_mode_t+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 -int -main () -{ -if ((mode_t *) 0) - return 0; -if (sizeof (mode_t)) - 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_type_mode_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_mode_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -if test $ac_cv_type_mode_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+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 -int -main () -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - 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_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_off_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define off_t long -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+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 -int -main () -{ -if ((pid_t *) 0) - return 0; -if (sizeof (pid_t)) - 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_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_pid_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+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 -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - 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_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 -if test "${ac_cv_struct_tm+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 - -int -main () -{ -struct tm *tp; tp->tm_sec; - ; - 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_struct_tm=time.h -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_struct_tm=sys/time.h -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6 -if test $ac_cv_struct_tm = sys/time.h; then - -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for struct user_desc" >&5 -echo $ECHO_N "checking for struct user_desc... $ECHO_C" >&6 -if test "${ac_cv_type_struct_user_desc+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 () -{ -if ((struct user_desc *) 0) - return 0; -if (sizeof (struct user_desc)) - 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_type_struct_user_desc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_struct_user_desc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_struct_user_desc" >&5 -echo "${ECHO_T}$ac_cv_type_struct_user_desc" >&6 -if test $ac_cv_type_struct_user_desc = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_USER_DESC 1 -_ACEOF - - -fi - -if test x$CC = xgcc; then - CFLAGS="$CFLAGS -Wall" -fi -if test x"$platform_win32" = xyes; then - LDFLAGS="$LDFLAGS -mwindows" -fi - -# 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 - -echo "$as_me:$LINENO: checking for working memcmp" >&5 -echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 -if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_working=no -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 -int -main () -{ - - /* Some versions of memcmp are not 8-bit clean. */ - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) - exit (1); - - /* The Next x86 OpenStep bug shows up only when comparing 16 bytes - or more and with at least one buffer not starting on a 4-byte boundary. - William Lewis provided this test program. */ - { - char foo[21]; - char bar[21]; - int i; - for (i = 0; i < 4; i++) - { - char *a = foo + i; - char *b = bar + i; - strcpy (a, "--------01111111"); - strcpy (b, "--------10000000"); - if (memcmp (a, b, 16) >= 0) - exit (1); - } - exit (0); - } - - ; - return 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_func_memcmp_working=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 ) -ac_cv_func_memcmp_working=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: $ac_cv_func_memcmp_working" >&5 -echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 -test $ac_cv_func_memcmp_working = no && case $LIBOBJS in - "memcmp.$ac_objext" | \ - *" memcmp.$ac_objext" | \ - "memcmp.$ac_objext "* | \ - *" memcmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; -esac - - - - -for ac_header in stdlib.h unistd.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 - - -for ac_func in getpagesize -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 working mmap" >&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -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 -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc - -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif - -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - exit (1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - exit (1); - if (write (fd, data, pagesize) != pagesize) - exit (1); - close (fd); - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - exit (1); - data2 = (char *) malloc (2 * pagesize); - if (!data2) - exit (1); - data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit (1); - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - exit (1); - if (read (fd, data3, pagesize) != pagesize) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit (1); - close (fd); - 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 - ac_cv_func_mmap_fixed_mapped=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 ) -ac_cv_func_mmap_fixed_mapped=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: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP 1 -_ACEOF - -fi -rm -f conftest.mmap - - -for ac_func in strftime -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 - -else - # strftime is in -lintl on SCO UNIX. -echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 -if test "${ac_cv_lib_intl_strftime+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 strftime (); -int -main () -{ -strftime (); - ; - 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_strftime=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_intl_strftime=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_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 -if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF - -LIBS="-lintl $LIBS" -fi - -fi -done - -echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 -echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 -if test "${ac_cv_func_utime_null+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f conftest.data; >conftest.data -# Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. -if test "$cross_compiling" = yes; then - ac_cv_func_utime_null=no -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 -int -main () -{ -struct stat s, t; - exit (!(stat ("conftest.data", &s) == 0 - && utime ("conftest.data", (long *)0) == 0 - && stat ("conftest.data", &t) == 0 - && t.st_mtime >= s.st_mtime - && t.st_mtime - s.st_mtime < 120)); - ; - return 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_func_utime_null=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 ) -ac_cv_func_utime_null=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f core *.core -fi -echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 -echo "${ECHO_T}$ac_cv_func_utime_null" >&6 -if test $ac_cv_func_utime_null = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_UTIME_NULL 1 -_ACEOF - -fi -rm -f conftest.data - - -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -for ac_func in \ - __argz_count __argz_next __argz_stringify \ - dcgettext dup2 \ - endgrent endpwent \ - floor \ - getcwd getpagesize getwd \ - memmove mempcpy memset mkdir munmap \ - nl_langinfo \ - pow putenv setenv \ - setlocale sqrt stpcpy strcasecmp strchr strcspn \ - strdup strrchr strstr strtoul \ - uname utime \ - -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 - - - -gimv_datadir="\${datadir}/\${PACKAGE}" -docdir="\${datadir}/doc" -gimv_docdir="\${docdir}/\${PACKAGE}" -gimv_icondir="\${datadir}/\${PACKAGE}/pixmaps" - - - - - -plugindir="\${libdir}/\${PACKAGE}" -ARCHIVER_PLUGIN_DIR="archiver" -IMAGE_LOADER_PLUGIN_DIR="image_loader" -IMAGE_SAVER_PLUGIN_DIR="image_saver" -IO_STREAM_PLUGIN_DIR="io_stream" -IMAGE_VIEW_PLUGIN_DIR="image_view" -THUMBNAIL_VIEW_PLUGIN_DIR="thumbnail_view" -THUMBNAIL_PLUGIN_DIR="thumbnail" - - - - - - - - - - - - ac_config_files="$ac_config_files Makefile doc/Makefile doc/ja/Makefile etc/Makefile m4/Makefile intl/Makefile po/Makefile.in lib/Makefile lib/dllloader/Makefile lib/libexif/Makefile plugins/Makefile plugins/archiver/Makefile plugins/image_loader/Makefile plugins/image_saver/Makefile plugins/image_view/Makefile plugins/io_stream/Makefile plugins/thumbnail/Makefile plugins/thumbnail_view/Makefile src/Makefile src/cursors/Makefile src/pixmaps/Makefile src/prefs_ui/Makefile gimageview.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 - - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OS_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_GDK_PIXBUF_TRUE}" && test -z "${ENABLE_GDK_PIXBUF_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GDK_PIXBUF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_GDK_PIXBUF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_GDK_IMLIB_TRUE}" && test -z "${ENABLE_GDK_IMLIB_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GDK_IMLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_GDK_IMLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_BZLIB_TRUE}" && test -z "${HAVE_BZLIB_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_BZLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_BZLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_JPEG_TRUE}" && test -z "${ENABLE_JPEG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_JPEG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_JPEG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_MNG_TRUE}" && test -z "${ENABLE_MNG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_MNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_LIBRSVG_TRUE}" && test -z "${ENABLE_LIBRSVG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LIBRSVG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_LIBRSVG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_WMF_TRUE}" && test -z "${ENABLE_WMF_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_WMF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_WMF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_XINE_TRUE}" && test -z "${ENABLE_XINE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_XINE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_XINE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - - - mv -f po/POTFILES po/POTFILES.tmp - sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES - rm -f po/POTFILES.tmp - - -if test -z "${ENABLE_EXIF_TRUE}" && test -z "${ENABLE_EXIF_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_EXIF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_EXIF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_SPI_TRUE}" && test -z "${ENABLE_SPI_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SPI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_SPI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${ENABLE_MPLAYER_TRUE}" && test -z "${ENABLE_MPLAYER_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MPLAYER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_MPLAYER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - -: ${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. -# - -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - -INTLTOOL_PERL=${INTLTOOL_PERL} - -_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" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;; - "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; - "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "lib/dllloader/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dllloader/Makefile" ;; - "lib/libexif/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libexif/Makefile" ;; - "plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; - "plugins/archiver/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/archiver/Makefile" ;; - "plugins/image_loader/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_loader/Makefile" ;; - "plugins/image_saver/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_saver/Makefile" ;; - "plugins/image_view/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_view/Makefile" ;; - "plugins/io_stream/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/io_stream/Makefile" ;; - "plugins/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/thumbnail/Makefile" ;; - "plugins/thumbnail_view/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/thumbnail_view/Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/cursors/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cursors/Makefile" ;; - "src/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;; - "src/prefs_ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/prefs_ui/Makefile" ;; - "gimageview.spec" ) CONFIG_FILES="$CONFIG_FILES gimageview.spec" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS 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,@CYGPATH_W@,$CYGPATH_W,;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,@AMTAR@,$AMTAR,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;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,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@LN_S@,$LN_S,;t t -s,@YACC@,$YACC,;t t -s,@CPP@,$CPP,;t t -s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t -s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t -s,@MAINT@,$MAINT,;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,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t -s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t -s,@WINDRES@,$WINDRES,;t t -s,@OS_WIN32_TRUE@,$OS_WIN32_TRUE,;t t -s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t -s,@ECHO@,$ECHO,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@EGREP@,$EGREP,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@GLIB_REQUIRED@,$GLIB_REQUIRED,;t t -s,@GTK_REQUIRED@,$GTK_REQUIRED,;t t -s,@IMLIB_REQUIRED@,$IMLIB_REQUIRED,;t t -s,@GDK_PIXBUF_REQUIRED@,$GDK_PIXBUF_REQUIRED,;t t -s,@LIBRSVG_REQUIRED@,$LIBRSVG_REQUIRED,;t t -s,@LIBWMF_REQUIRED@,$LIBWMF_REQUIRED,;t t -s,@XINE_REQUIRED@,$XINE_REQUIRED,;t t -s,@GLIB2_REQUIRED@,$GLIB2_REQUIRED,;t t -s,@GMODULE2_REQUIRED@,$GMODULE2_REQUIRED,;t t -s,@GTK2_REQUIRED@,$GTK2_REQUIRED,;t t -s,@GDK_PIXBUF2_REQUIRED@,$GDK_PIXBUF2_REQUIRED,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;t t -s,@IMLIB_CONFIG@,$IMLIB_CONFIG,;t t -s,@GDK_IMLIB_CFLAGS@,$GDK_IMLIB_CFLAGS,;t t -s,@GDK_IMLIB_LIBS@,$GDK_IMLIB_LIBS,;t t -s,@GDK_PIXBUF_CONFIG@,$GDK_PIXBUF_CONFIG,;t t -s,@GDK_PIXBUF_CFLAGS@,$GDK_PIXBUF_CFLAGS,;t t -s,@GDK_PIXBUF_LIBS@,$GDK_PIXBUF_LIBS,;t t -s,@ENABLE_GDK_PIXBUF_TRUE@,$ENABLE_GDK_PIXBUF_TRUE,;t t -s,@ENABLE_GDK_PIXBUF_FALSE@,$ENABLE_GDK_PIXBUF_FALSE,;t t -s,@ENABLE_GDK_IMLIB_TRUE@,$ENABLE_GDK_IMLIB_TRUE,;t t -s,@ENABLE_GDK_IMLIB_FALSE@,$ENABLE_GDK_IMLIB_FALSE,;t t -s,@GIMV_IMAGELIB_CFLAGS@,$GIMV_IMAGELIB_CFLAGS,;t t -s,@GIMV_IMAGELIB_LIBS@,$GIMV_IMAGELIB_LIBS,;t t -s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t -s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t -s,@HAVE_BZLIB_TRUE@,$HAVE_BZLIB_TRUE,;t t -s,@HAVE_BZLIB_FALSE@,$HAVE_BZLIB_FALSE,;t t -s,@BZLIB_CFLAGS@,$BZLIB_CFLAGS,;t t -s,@BZLIB_LIBS@,$BZLIB_LIBS,;t t -s,@PNG_CFLAGS@,$PNG_CFLAGS,;t t -s,@PNG_LIBS@,$PNG_LIBS,;t t -s,@HAVE_PNG_TRUE@,$HAVE_PNG_TRUE,;t t -s,@HAVE_PNG_FALSE@,$HAVE_PNG_FALSE,;t t -s,@ENABLE_JPEG_TRUE@,$ENABLE_JPEG_TRUE,;t t -s,@ENABLE_JPEG_FALSE@,$ENABLE_JPEG_FALSE,;t t -s,@JPEG_CFLAGS@,$JPEG_CFLAGS,;t t -s,@JPEG_LIBS@,$JPEG_LIBS,;t t -s,@ENABLE_MNG_TRUE@,$ENABLE_MNG_TRUE,;t t -s,@ENABLE_MNG_FALSE@,$ENABLE_MNG_FALSE,;t t -s,@MNG_CFLAGS@,$MNG_CFLAGS,;t t -s,@MNG_LIBS@,$MNG_LIBS,;t t -s,@LIBRSVG_CFLAGS@,$LIBRSVG_CFLAGS,;t t -s,@LIBRSVG_LIBS@,$LIBRSVG_LIBS,;t t -s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t -s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t -s,@GNOME_LIBS@,$GNOME_LIBS,;t t -s,@GNOMEUI_CFLAGS@,$GNOMEUI_CFLAGS,;t t -s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t -s,@ZVT_LIBS@,$ZVT_LIBS,;t t -s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t -s,@GLIB_LIBS@,$GLIB_LIBS,;t t -s,@OAF_CFLAGS@,$OAF_CFLAGS,;t t -s,@OAF_LIBS@,$OAF_LIBS,;t t -s,@GNORBA_CFLAGS@,$GNORBA_CFLAGS,;t t -s,@GNORBA_LIBS@,$GNORBA_LIBS,;t t -s,@ENABLE_LIBRSVG_TRUE@,$ENABLE_LIBRSVG_TRUE,;t t -s,@ENABLE_LIBRSVG_FALSE@,$ENABLE_LIBRSVG_FALSE,;t t -s,@XML_CFLAGS@,$XML_CFLAGS,;t t -s,@XML_LIBS@,$XML_LIBS,;t t -s,@LIBWMF_CONFIG@,$LIBWMF_CONFIG,;t t -s,@LIBWMF_CFLAGS@,$LIBWMF_CFLAGS,;t t -s,@LIBWMF_LIBS@,$LIBWMF_LIBS,;t t -s,@ENABLE_WMF_TRUE@,$ENABLE_WMF_TRUE,;t t -s,@ENABLE_WMF_FALSE@,$ENABLE_WMF_FALSE,;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,@XINERAMA_LIBS@,$XINERAMA_LIBS,;t t -s,@XINE_CONFIG@,$XINE_CONFIG,;t t -s,@XINE_CFLAGS@,$XINE_CFLAGS,;t t -s,@XINE_LIBS@,$XINE_LIBS,;t t -s,@XINE_ACFLAGS@,$XINE_ACFLAGS,;t t -s,@ENABLE_XINE_TRUE@,$ENABLE_XINE_TRUE,;t t -s,@ENABLE_XINE_FALSE@,$ENABLE_XINE_FALSE,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@GLIBC21@,$GLIBC21,;t t -s,@LIBICONV@,$LIBICONV,;t t -s,@LTLIBICONV@,$LTLIBICONV,;t t -s,@USE_NLS@,$USE_NLS,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@GMSGFMT@,$GMSGFMT,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@INTLBISON@,$INTLBISON,;t t -s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t -s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t -s,@CATALOGS@,$CATALOGS,;t t -s,@CATOBJEXT@,$CATOBJEXT,;t t -s,@GMOFILES@,$GMOFILES,;t t -s,@INTLLIBS@,$INTLLIBS,;t t -s,@INTLOBJS@,$INTLOBJS,;t t -s,@POFILES@,$POFILES,;t t -s,@POSUB@,$POSUB,;t t -s,@DATADIRNAME@,$DATADIRNAME,;t t -s,@INSTOBJEXT@,$INSTOBJEXT,;t t -s,@GENCAT@,$GENCAT,;t t -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t -s,@localedir@,$localedir,;t t -s,@LIBCHARSET@,$LIBCHARSET,;t t -s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t -s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t -s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t -s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t -s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t -s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t -s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t -s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t -s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t -s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t -s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t -s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t -s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t -s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t -s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t -s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t -s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t -s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t -s,@ENABLE_EXIF_TRUE@,$ENABLE_EXIF_TRUE,;t t -s,@ENABLE_EXIF_FALSE@,$ENABLE_EXIF_FALSE,;t t -s,@EXIF_CFLAGS@,$EXIF_CFLAGS,;t t -s,@EXIF_LIBS@,$EXIF_LIBS,;t t -s,@ENABLE_SPI_TRUE@,$ENABLE_SPI_TRUE,;t t -s,@ENABLE_SPI_FALSE@,$ENABLE_SPI_FALSE,;t t -s,@DLLLOADER_CFLAGS@,$DLLLOADER_CFLAGS,;t t -s,@DLLLOADER_LIBS@,$DLLLOADER_LIBS,;t t -s,@ENABLE_MPLAYER_TRUE@,$ENABLE_MPLAYER_TRUE,;t t -s,@ENABLE_MPLAYER_FALSE@,$ENABLE_MPLAYER_FALSE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@docdir@,$docdir,;t t -s,@gimv_datadir@,$gimv_datadir,;t t -s,@gimv_docdir@,$gimv_docdir,;t t -s,@gimv_icondir@,$gimv_icondir,;t t -s,@plugindir@,$plugindir,;t t -s,@ARCHIVER_PLUGIN_DIR@,$ARCHIVER_PLUGIN_DIR,;t t -s,@IMAGE_LOADER_PLUGIN_DIR@,$IMAGE_LOADER_PLUGIN_DIR,;t t -s,@IMAGE_SAVER_PLUGIN_DIR@,$IMAGE_SAVER_PLUGIN_DIR,;t t -s,@IO_STREAM_PLUGIN_DIR@,$IO_STREAM_PLUGIN_DIR,;t t -s,@IMAGE_VIEW_PLUGIN_DIR@,$IMAGE_VIEW_PLUGIN_DIR,;t t -s,@THUMBNAIL_VIEW_PLUGIN_DIR@,$THUMBNAIL_VIEW_PLUGIN_DIR,;t t -s,@THUMBNAIL_PLUGIN_DIR@,$THUMBNAIL_PLUGIN_DIR,;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 - - 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 - # 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; } -_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 -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`(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'`/stamp-h$_am_stamp_count -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 - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - else - continue - fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$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 $dirpart/$fdir - else - as_dir=$dirpart/$fdir - 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 $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - default-1 ) for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done ;; - default-2 ) - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out -if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then - rm -f intltool-extract.out -else - mv -f intltool-extract.out intltool-extract -fi -chmod ugo+x intltool-extract -chmod u+w intltool-extract - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.in > intltool-merge.out -if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then - rm -f intltool-merge.out -else - mv -f intltool-merge.out intltool-merge -fi -chmod ugo+x intltool-merge -chmod u+w intltool-merge - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.in > intltool-update.out -if cmp -s intltool-update intltool-update.out 2>/dev/null; then - rm -f intltool-update.out -else - mv -f intltool-update.out intltool-update -fi -chmod ugo+x intltool-update -chmod u+w intltool-update - - ;; - 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 - - - - -echo "$as_me:$LINENO: result: -Configure Result : - - C Compiler : ${CC} ${CFLAGS} - Install path : ${prefix} - Gtk+-2.0 : ${enable_gtk2} - Image library : ${image_library} - JPEG (libjpg) : ${enable_jpeg} - MNG (libmng) : ${enable_mng} - SVG (librsvg): ${enable_librsvg} - WMF (libwmf) : ${enable_libwmf} - Movie Support : ${movie_support} - EXIF : ${enable_exif} - Susie plugin : ${enable_spi} - Show splash : ${enable_splash} -" >&5 -echo "${ECHO_T} -Configure Result : - - C Compiler : ${CC} ${CFLAGS} - Install path : ${prefix} - Gtk+-2.0 : ${enable_gtk2} - Image library : ${image_library} - JPEG (libjpg) : ${enable_jpeg} - MNG (libmng) : ${enable_mng} - SVG (librsvg): ${enable_librsvg} - WMF (libwmf) : ${enable_libwmf} - Movie Support : ${movie_support} - EXIF : ${enable_exif} - Susie plugin : ${enable_spi} - Show splash : ${enable_splash} -" >&6 diff -Nru gimageview-0.2.27/configure.ac gimageview-0.3.0-0.20101117/configure.ac --- gimageview-0.2.27/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/configure.ac 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,605 @@ +dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil; -*- +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT(gimageview, 0.3.0) +AM_INIT_AUTOMAKE(1.6) +AM_CONFIG_HEADER(config.h) + + +dnl ****************************** +dnl Checks for programs. +dnl ****************************** +AC_PROG_AWK +AC_PROG_CC +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_YACC +AC_ISC_POSIX +AM_MAINTAINER_MODE + + +dnl ****************************** +dnl libtool +dnl ****************************** +AC_ENABLE_SHARED(yes) +AC_ENABLE_STATIC(no) +AC_LIBTOOL_WIN32_DLL +AM_PROG_LIBTOOL + + +dnl ****************************** +dnl Checks for host +dnl ****************************** +AC_CANONICAL_HOST + +dnl Used for enabling the "-no-undefined" flag while generating DLLs +dnl Copied from the official gtk+-2 configure.in +AC_MSG_CHECKING([for some Win32 platform]) +case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; +esac +AC_MSG_RESULT([$platform_win32]) +AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes") + +if test x"$platform_win32" = x"yes"; then + WINDRES=windres + AC_SUBST(WINDRES) +fi + +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) +AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes") + + +dnl ****************************** +dnl required library version +dnl ****************************** +# Gtk+-2.0 +GLIB2_REQUIRED=2.10.0 +GMODULE2_REQUIRED=2.10.0 +GDK_PIXBUF2_REQUIRED=2.10.0 +GTK2_REQUIRED=2.10.0 +AC_SUBST(GLIB2_REQUIRED) +AC_SUBST(GMODULE2_REQUIRED) +AC_SUBST(GTK2_REQUIRED) +AC_SUBST(GDK_PIXBUF2_REQUIRED) + +# Backends +EXIF_REQUIRED=0.6.0 +LIBRSVG_REQUIRED=1.0.0 +LIBWMF_REQUIRED=0.2.8 +XINE_REQUIRED=1.0.0 +AC_SUBST(EXIF_REQUIRED) +AC_SUBST(LIBRSVG_REQUIRED) +AC_SUBST(LIBWMF_REQUIRED) +AC_SUBST(XINE_REQUIRED) + + +dnl ****************************** +dnl Check for GTK +dnl ****************************** +enable_gtk2=yes +PKG_CHECK_MODULES(GTK, + [glib-2.0 >= $GLIB2_REQUIRED + gmodule-2.0 >= $GMODULE2_REQUIRED + gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED + gtk+-2.0 >= $GTK2_REQUIRED], , + [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help) ]) + + +dnl ******************** +dnl Test for GZIP +dnl ******************** +ZLIB_CFLAGS="" +ZLIB_LIBS="-lz" +AC_SUBST(ZLIB_CFLAGS) +AC_SUBST(ZLIB_LIBS) + + +dnl ******************** +dnl Test for bzlib +dnl ******************** +BZLIB_CFLAGS="" +BZLIB_LIBS="" +AC_CHECK_HEADER(bzlib.h, [ + AC_CHECK_LIB(bz2, BZ2_bzlibVersion, [ + available_bzlib=yes; + BZLIB_LIBS="-lbz2"; + AC_DEFINE(BZAPI_NEEDS_PREFIX, 1, [Define if your bzlib needs BZ2_ prefix.]) + ], [ + AC_CHECK_LIB(bz2, bzlibVersion, [ + available_bzlib=yes; BZLIB_LIBS="-lbz2"; + ]) + ]) +]) + +if test x"$available_bzlib" = xyes; then + AC_DEFINE(HAVE_BZLIB, 1, [Define if you have bzlib.]) +fi +AM_CONDITIONAL(HAVE_BZLIB, test x"$available_bzlib" = x"yes") +AC_SUBST(BZLIB_CFLAGS) +AC_SUBST(BZLIB_LIBS) + + +dnl ******************** +dnl Test for libpng +dnl ******************** +PNG_CFLAGS="" +PNG_LIBS="" +AC_CHECK_LIB(png, png_read_info, [ + AC_CHECK_HEADER(png.h, + [ png_ok=yes ], + [ png_ok=no ]) +], [ + AC_MSG_ERROR(*** (PNG library is not found) ***) +], -lz -lm) + +if test x"$png_ok" = xyes; then + AC_MSG_CHECKING([for png_structp in png.h]) + AC_TRY_COMPILE([ #include ], + [ png_structp pp; + png_infop info; + png_colorp cmap; + png_get_header_ver(NULL); + png_create_read_struct; ], + [ png_ok=yes ], + [ png_ok=no ]) + AC_MSG_RESULT($png_ok) + if test x"$png_ok" = xyes; then + PNG_LIBS="-lpng -lz" + else + AC_MSG_ERROR(*** PNG library (libpng) is too old ***) + fi +else + AC_MSG_ERROR(*** PNG library (libpng) required ***) +fi + +AC_SUBST(PNG_CFLAGS) +AC_SUBST(PNG_LIBS) +AM_CONDITIONAL(HAVE_PNG, test "x$PNG_LIBS" != x) + + +dnl ******************** +dnl Test for libjpeg +dnl ******************** +JPEG_CFLAGS="" +JPEG_LIBS="" +available_jpeg=no +AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + available_jpeg=yes, + available_jpeg=no) + +if test x"$available_jpeg" = xyes; then + AC_MSG_CHECKING([for jpeglib.h]) + AC_TRY_CPP( +[#include +#undef PACKAGE +#undef VERSION +#undef HAVE_STDLIB_H +#include ], + available_jpeg=yes, + available_jpeg=no) + AC_MSG_RESULT($available_jpeg) + if test x"$available_jpeg" = xyes; then + JPEG_LIBS='-ljpeg' + AC_CHECK_LIB(jpeg, jpeg_simple_progression, + AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, + [Define if your JPEG library supports progressive saving.]), + AC_MSG_WARN([JPEG library does not support progressive saving.])) + fi +fi + +if test x"$available_jpeg" = xyes; then + AC_DEFINE(ENABLE_JPEG, 1, + [Define if you want to compile JPEG plugin.]) +else + AC_MSG_WARN([*** JPEG loader will not be built ***]) +fi + +AM_CONDITIONAL(ENABLE_JPEG, test x"$available_jpeg" = x"yes") +AC_SUBST(JPEG_CFLAGS) +AC_SUBST(JPEG_LIBS) + +enable_jpeg=$available_jpeg + + +dnl ******************** +dnl Test for libexif +dnl ******************** +AC_ARG_WITH(libexif, + [ --with-libexif Use libexif for showing EXIF data [default=yes]], + enable_exif="${withval}", + enable_exif=yes) + +if test x"$enable_exif" = xyes; then + PKG_CHECK_MODULES(EXIF, libexif >= $EXIF_REQUIRED, , [ + enable_exif=no; + AC_MSG_WARN(Did not find libexif installed) + ]) +fi + +AM_CONDITIONAL(ENABLE_EXIF, test x"$enable_exif" = xyes) + +if test x"$enable_exif" = xyes; then + AC_DEFINE(ENABLE_EXIF, 1, [Define if you want to compile EXIF features.]) +fi + + +dnl ******************** +dnl Test for libmng +dnl ******************** +AC_ARG_WITH(libmng, + [ --with-libmng Use libmng for MNG image [default=yes]], + [enable_mng="${withval}"], [enable_mng=yes]) + +MNG_CFLAGS="" +MNG_LIBS="" +if test x"$enable_mng" = x"yes"; then + if test x"$available_jpeg" = x"yes"; then + AC_CHECK_HEADER(libmng.h, [ + AC_CHECK_LIB(mng, mng_initialize, [ + AC_MSG_CHECKING([for libmng functions]) + AC_TRY_COMPILE([ #include ], + [ mng_handle handle; + mng_version_text(); + handle = mng_initialize(NULL, NULL, NULL, MNG_NULL); + mng_setcb_errorproc(handle, NULL); + mng_setcb_openstream(handle, NULL); + mng_setcb_closestream(handle, NULL); + mng_setcb_readdata(handle, NULL); + mng_setcb_gettickcount(handle, NULL); + mng_setcb_settimer(handle, NULL); + mng_setcb_processheader(handle, NULL); + mng_setcb_getcanvasline(handle, NULL); + mng_setcb_refresh(handle, NULL); + mng_get_userdata(handle); + mng_set_canvasstyle(handle, MNG_CANVAS_RGB8); + mng_set_bgcolor(handle, 0, 0, 0); + mng_readdisplay(handle); + mng_readdisplay_resume(handle); ], + [ MNG_LIBS="$JPEG_LIBS -lz -lmng"; + AC_DEFINE(ENABLE_MNG, 1, [Define if you want to compile mng plugin.])], + [ enable_mng=no; + AC_MSG_WARN(*** MNG library (libmng) is found but it is too old ***) ]) + AC_MSG_RESULT($enable_mng) + ], [ + enable_mng=no + ], $MNG_LIBS ) + ], [ + enable_mng=no: + ]) + else + AC_MSG_WARN([*** libmng requires libjpeg. MNG plugin will not be compiled.]) + enable_mng=no + fi +fi + +AM_CONDITIONAL(ENABLE_MNG, test x"$enable_mng" = xyes) +AC_SUBST(MNG_CFLAGS) +AC_SUBST(MNG_LIBS) + + +dnl ******************** +dnl Test for librsvg +dnl ******************** +AC_ARG_WITH(librsvg, + [ --with-librsvg Use librsvg for SVG image [default=yes]], + enable_librsvg="${withval}", + enable_librsvg=yes) + +if test x"$enable_librsvg" = xyes; then + PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0, , [ + enable_librsvg=no; + AC_MSG_WARN(Did not find librsvg-2.0 installed) + ]) +fi + +AM_CONDITIONAL(ENABLE_LIBRSVG, test x"$enable_librsvg" = xyes) + + +dnl **************************** +dnl Check for libwmf +dnl **************************** +AC_ARG_WITH(libwmf, + [ --with-libwmf Use libwmf library for Windows Meta File [default=yes]], + [enable_libwmf="${withval}"], + [enable_libwmf=yes]) + +if test "x$enable_libwmf" = xyes; then + have_libwmf=no + AM_PATH_LIBWMF($LIBWMF_REQUIRED, + [have_libwmf=yes], [have_libwmf=no]) + + if test "x$have_libwmf" = xyes; then + AC_DEFINE(ENABLE_WMF, 1, [Define if you want to compile wmf plugin.]) + else + AC_MSG_WARN(Did not find libwmf installed) + enable_libwmf=no; + fi +fi + +AM_CONDITIONAL(ENABLE_WMF, test x"$enable_libwmf" = xyes) + + +dnl **************************** +dnl check for Xinerama +dnl **************************** +AC_PATH_XTRA +XINERAMA_LIBS="" +AC_CHECK_LIB(Xinerama, XineramaQueryScreens, + [XINERAMA_LIBS="-lXinerama" + AC_CHECK_HEADERS(X11/extensions/Xinerama.h)], + [],[$X_LIBS -lX11 -lXext]) +AC_SUBST(XINERAMA_LIBS) +AC_SUBST(X_LIBS) + + +movie_support="" + +dnl **************************** +dnl Check for Xine library +dnl **************************** +AC_ARG_WITH(xine, + [ --with-xine Use Xine library for movie (experimental) [default=no]], + [enable_xine="${withval}"], + [enable_xine=no]) + +if test x"$enable_xine" = xyes; then + have_xine=no + AM_PATH_XINE($XINE_REQUIRED, + [have_xine=yes], [have_xine=no]) + + if test x"$have_xine" = xyes; then + AC_DEFINE(ENABLE_XINE, 1, [Define if you want to compile xine plugin.]) + movie_support="Xine ${movie_support}" + else + AC_MSG_WARN(Did not find xine-lib installed) + enable_xine=no; + fi +fi + +AM_CONDITIONAL(ENABLE_XINE, test x"$enable_xine" = xyes) + + +dnl ****************************** +dnl for gettext +dnl ****************************** +GETTEXT_PACKAGE=gimv +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) + +ALL_LINGUAS="fr ja" +AM_GLIB_GNU_GETTEXT +AM_GLIB_DEFINE_LOCALEDIR(GIMV_LOCALEDIR) + +dnl *************************************************************************** +dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. +dnl *************************************************************************** +gimv_save_LIBS=$LIBS +LIBS="$LIBS $GTK_LIBS" +AC_CHECK_FUNCS(bind_textdomain_codeset) +LIBS=$gimv_save_LIBS + + +dnl ******************* +dnl for intltool +dnl ******************* +AC_PROG_INTLTOOL + + +dnl ************************************** +dnl enable/disable susie plugin support +dnl ************************************** +AC_ARG_ENABLE(spi, + [ --enable-spi susie plugin support (broken) [default=no]], + [enable_spi="${enableval}"], [enable_spi=no]) +AM_CONDITIONAL(ENABLE_SPI, test x"$enable_spi" = xyes) + +if test x"$enable_spi" = xyes; then + AC_DEFINE(ENABLE_SPI, 1, [Define if you want to enable Susie plugin support feature.]) + if test x"$platform_win32" = xno; then + DLLLOADER_CFLAGS="-I\$(top_srcdir)/lib -I\$(top_srcdir)/lib/dllloader" + DLLLOADER_LIBS="\$(top_builddir)/lib/dllloader/libdllloader.la" + AC_SUBST(DLLLOADER_CFLAGS) + AC_SUBST(DLLLOADER_LIBS) + fi +fi + + +dnl ****************************** +dnl disable/enable splash logo +dnl ****************************** +AC_ARG_ENABLE(splash, + [ --enable-splash enable splash logo], + [enable_splash="${enableval}"], [enable_splash=yes]) +if test x"$enable_splash" = xyes; then + AC_DEFINE(ENABLE_SPLASH, 1, [Define if you want to enable splash feature.]) +fi + + +dnl ********************************* +dnl disable/enable MPlayer Support +dnl ********************************* +AC_ARG_ENABLE(mplayer, + [ --enable-mplayer enable MPlyer support (experimental) [default=no]], + [enable_mplayer="${enableval}"], [enable_mplayer=no]) +if test x"$enable_mplayer" = xyes; then + AC_DEFINE(ENABLE_MPLAYER, 1, [Define if you want to compile MPlayer plugin.]) + movie_support="MPlayer ${movie_support}" +fi + +AM_CONDITIONAL(ENABLE_MPLAYER, test x"$enable_mplayer" = x"yes") + + +dnl ********************************* +dnl Check Movie Support +dnl ********************************* +if test x"$movie_support" = x; then + movie_support=no +else + AC_DEFINE(ENABLE_MOVIE, 1, [Define if you use movie support]) +fi + + +dnl ****************************** +dnl Checks for header files. +dnl ****************************** +AC_PATH_X +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_HEADER_SYS_WAIT +AC_CHECK_HEADERS([ \ + alloca.h argz.h \ + errno.h \ + fcntl.h \ + langinfo.h libintl.h limits.h locale.h \ + malloc.h memory.h \ + netinet/in.h nl_types.h \ + stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h \ + unistd.h utime.h \ +]) + + +dnl ************************************************************** +dnl Checks for typedefs, structures, and compiler characteristics. +dnl ************************************************************** +AC_C_CONST +AC_TYPE_UID_T +AC_C_INLINE +AC_TYPE_MODE_T +AC_TYPE_OFF_T +AC_TYPE_PID_T +AC_TYPE_SIZE_T +AC_STRUCT_TM +AC_CHECK_TYPES([struct user_desc],,, [#include ]) +if test x$CC = xgcc; then + CFLAGS="$CFLAGS -Wall" +fi +if test x"$platform_win32" = xyes; then + LDFLAGS="$LDFLAGS -mwindows" +fi + +dnl ********************************** +dnl Checks for library functions. +dnl ********************************** +AC_FUNC_ALLOCA +dnl AC_FUNC_CHOWN +dnl AC_FUNC_FORK +dnl AC_FUNC_LSTAT +dnl AC_FUNC_MALLOC +AC_FUNC_MEMCMP +AC_FUNC_MMAP +dnl AC_FUNC_MKTIME +dnl AC_FUNC_STAT +AC_FUNC_STRFTIME +AC_FUNC_UTIME_NULL +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([ \ + __argz_count __argz_next __argz_stringify \ + dcgettext dup2 \ + endgrent endpwent \ + floor \ + getcwd getpagesize getwd \ + memmove mempcpy memset mkdir munmap \ + nl_langinfo \ + pow putenv setenv \ + setlocale sqrt stpcpy strcasecmp strchr strcspn \ + strdup strrchr strstr strtoul \ + uname utime \ +]) + + +dnl ****************************** +dnl set data dir definition +dnl ****************************** +gimv_datadir="\${datadir}/\${PACKAGE}" +docdir="\${datadir}/doc" +gimv_docdir="\${docdir}/\${PACKAGE}" +gimv_icondir="\${datadir}/\${PACKAGE}/pixmaps" +AC_SUBST(docdir) +AC_SUBST(gimv_datadir) +AC_SUBST(gimv_docdir) +AC_SUBST(gimv_icondir) + +dnl Plugin directory +plugindir="\${libdir}/\${PACKAGE}" +ARCHIVER_PLUGIN_DIR="archiver" +IMAGE_LOADER_PLUGIN_DIR="image_loader" +IMAGE_SAVER_PLUGIN_DIR="image_saver" +IO_STREAM_PLUGIN_DIR="io_stream" +IMAGE_VIEW_PLUGIN_DIR="image_view" +THUMBNAIL_VIEW_PLUGIN_DIR="thumbnail_view" +THUMBNAIL_PLUGIN_DIR="thumbnail" + +AC_SUBST(plugindir) +AC_SUBST(ARCHIVER_PLUGIN_DIR) +AC_SUBST(IMAGE_LOADER_PLUGIN_DIR) +AC_SUBST(IMAGE_SAVER_PLUGIN_DIR) +AC_SUBST(IO_STREAM_PLUGIN_DIR) +AC_SUBST(IMAGE_VIEW_PLUGIN_DIR) +AC_SUBST(THUMBNAIL_VIEW_PLUGIN_DIR) +AC_SUBST(THUMBNAIL_PLUGIN_DIR) + + +AC_CONFIG_FILES([ +Makefile +doc/Makefile +doc/ja/Makefile +etc/Makefile +m4/Makefile +po/Makefile.in +lib/Makefile +lib/dllloader/Makefile +plugins/Makefile +plugins/archiver/Makefile +plugins/image_loader/Makefile +plugins/image_saver/Makefile +plugins/image_view/Makefile +plugins/io_stream/Makefile +plugins/thumbnail/Makefile +plugins/thumbnail_view/Makefile +src/Makefile +src/pixmaps/Makefile +src/prefs_ui/Makefile +gimageview.spec +]) + +AC_OUTPUT + + +dnl +dnl Show some info: +dnl + +AC_MSG_RESULT([ +Configure Result : + + C Compiler : ${CC} + CFLAGS : ${CFLAGS} + Install path : ${prefix} + JPEG (libjpg) : ${enable_jpeg} + MNG (libmng) : ${enable_mng} + SVG (librsvg): ${enable_librsvg} + WMF (libwmf) : ${enable_libwmf} + Movie Support : ${movie_support} + EXIF : ${enable_exif} + Susie plugin : ${enable_spi} + Show splash : ${enable_splash} +]) diff -Nru gimageview-0.2.27/configure.in gimageview-0.3.0-0.20101117/configure.in --- gimageview-0.2.27/configure.in 2004-12-22 02:45:30.000000000 +0000 +++ gimageview-0.3.0-0.20101117/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,729 +0,0 @@ -dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil; -*- -dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/gimageview.c) -PACKAGE=gimageview - -dnl version number -MAJOR_VERSION=0 -MINOR_VERSION=2 -MICRO_VERSION=27 -EXTRA_VERSION= -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION - -dnl -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") - -dnl Specify a header configuration file -AM_CONFIG_HEADER(config.h) - - - -dnl ****************************** -dnl Checks for programs. -dnl ****************************** -AC_ARG_PROGRAM -AC_PROG_AWK -AC_PROG_CC -AC_PROG_CXX -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_YACC -AC_ISC_POSIX -AC_PATH_X -AM_MAINTAINER_MODE - - -dnl ****************************** -dnl Checks for host -dnl ****************************** -AC_CANONICAL_HOST - -dnl Used for enabling the "-no-undefined" flag while generating DLLs -dnl Copied from the official gtk+-2 configure.in -AC_MSG_CHECKING([for some Win32 platform]) -case "$host" in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; -esac -AC_MSG_RESULT([$platform_win32]) -AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes") - -if test x"$platform_win32" = x"yes"; then - WINDRES=windres - AC_SUBST(WINDRES) -fi - -AC_MSG_CHECKING([for native Win32]) -case "$host" in - *-*-mingw*) - os_win32=yes - ;; - *) - os_win32=no - ;; -esac -AC_MSG_RESULT([$os_win32]) -AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes") - - -dnl ****************************** -dnl libtool -dnl ****************************** -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL - - -dnl ****************************** -dnl required library version -dnl ****************************** -GLIB_REQUIRED=1.2.6 -GTK_REQUIRED=1.2.6 -IMLIB_REQUIRED=1.9 -GDK_PIXBUF_REQUIRED=0.8.0 -LIBRSVG_REQUIRED=1.0.0 -LIBWMF_REQUIRED=0.2.8 -XINE_REQUIRED=1.0.0 - -AC_SUBST(GLIB_REQUIRED) -AC_SUBST(GTK_REQUIRED) -AC_SUBST(IMLIB_REQUIRED) -AC_SUBST(GDK_PIXBUF_REQUIRED) -AC_SUBST(LIBRSVG_REQUIRED) -AC_SUBST(LIBWMF_REQUIRED) -AC_SUBST(XINE_REQUIRED) - -# Gtk+-2.0 -GLIB2_REQUIRED=2.0.0 -GMODULE2_REQUIRED=2.0.0 -GDK_PIXBUF2_REQUIRED=2.0.0 -GTK2_REQUIRED=2.0.0 - -AC_SUBST(GLIB2_REQUIRED) -AC_SUBST(GMODULE2_REQUIRED) -AC_SUBST(GTK2_REQUIRED) -AC_SUBST(GDK_PIXBUF2_REQUIRED) - -GTK2_TARGET=gtk+-2.0 - - -dnl ****************************** -dnl Check for GTK -dnl ****************************** -AC_ARG_WITH(gtk2, - [ --with-gtk2 Use Gtk+-2.0 (experimental) [default=no]], - [enable_gtk2="${withval}"], [enable_gtk2=no]) -if test x"$enable_gtk2" != xno; then - if test x"$enable_gtk2" != xyes; then - GTK2_TARGET=$enable_gtk2 - fi - PKG_CHECK_MODULES(GTK, - glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED, , - [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help) ]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - AC_DEFINE(USE_GTK2, 1, [Define if you want to compile against Gtk+2.]) - AC_DEFINE(USE_NORMAL_PANED, 1, [Define if you want to use Gtk's normal paned widget.]) - AC_DEFINE(ENABLE_TREEVIEW, 1, [Define if you want to use GtkTreeView.]) -else - AM_PATH_GTK($GTK_REQUIRED, , - AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help)) -fi - - -dnl ****************************** -dnl Check for image libraries -dnl ****************************** -AC_ARG_ENABLE(imlib, - [ --disable-imlib Do not use imlib], - [disable_imlib=yes], [disable_imlib=no]) -AC_ARG_ENABLE(gdk-pixbuf, - [ --disable-gdk-pixbuf Do not use gdk-pixbuf], - [disable_gdk_pixbuf=yes], [disable_gdk_pixbuf=no]) - -if test x"$disable_imlib" = xyes -a x"$disable_gdk_pixbuf" = xyes; then - AC_MSG_ERROR(*** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***) -fi - -dnl force use gdk-pixbuf if compile against Gtk+-2.0 -if test x"$enable_gtk2" != xno; then - disable_imlib=yes - disable_gdk_pixbuf=no -fi - -if test x"$enable_gtk2" != xno; then - have_gdk_pixbuf=yes -else - AM_PATH_GDK_IMLIB($IMLIB_REQUIRED, - [have_imlib=yes], - [have_imlib=no]) - AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED, - [have_gdk_pixbuf=yes], - [have_gdk_pixbuf=no]) -fi - -GIMV_IMAGELIB_CFLAGS="" -GIMV_IMAGELIB_LIBS="" - -if test x"$disable_gdk_pixbuf" = xno -a x"$have_gdk_pixbuf" = xyes; then - image_library="gdk-pixbuf" - if test x"$enable_gtk2" != xno; then -dnl already checked with gtk+-2.0 - GIMV_IMAGELIB_CFLAGS="" - GIMV_IMAGELIB_LIBS="" - else - GIMV_IMAGELIB_CFLAGS=${GDK_PIXBUF_CFLAGS} - GIMV_IMAGELIB_LIBS=${GDK_PIXBUF_LIBS} - fi - disable_imlib=yes - AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Define if you have GdkPixbuf.]) -else - disable_gdk_pixbuf=yes - have_gdk_pixbuf=no - if test x"$disable_imlib" = xno -a x"$have_imlib" = xyes; then - image_library="Imlib" - GIMV_IMAGELIB_CFLAGS=${GDK_IMLIB_CFLAGS} - GIMV_IMAGELIB_LIBS=${GDK_IMLIB_LIBS} - AC_DEFINE(HAVE_GDK_IMLIB, 1, [Define if you have Imlib1.]) - else - AC_MSG_ERROR(*** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***) - fi -fi - -AM_CONDITIONAL(ENABLE_GDK_PIXBUF, test "x$disable_gdk_pixbuf" = xno -a "x$have_gdk_pixbuf" = xyes) -AM_CONDITIONAL(ENABLE_GDK_IMLIB, test "x$disable_imlib" = xno -a "x$have_imlib" = xyes) -AC_SUBST(GIMV_IMAGELIB_CFLAGS) -AC_SUBST(GIMV_IMAGELIB_LIBS) - - -dnl ******************** -dnl Test for GZIP -dnl ******************** -ZLIB_CFLAGS="" -ZLIB_LIBS="-lz" -AC_SUBST(ZLIB_CFLAGS) -AC_SUBST(ZLIB_LIBS) - - -dnl ******************** -dnl Test for bzlib -dnl ******************** -BZLIB_CFLAGS="" -BZLIB_LIBS="" -AC_CHECK_HEADER(bzlib.h, [ - AC_CHECK_LIB(bz2, BZ2_bzlibVersion, [ - available_bzlib=yes; - BZLIB_LIBS="-lbz2"; - AC_DEFINE(BZAPI_NEEDS_PREFIX, 1, [Define if your bzlib needs BZ2_ prefix.]) - ], [ - AC_CHECK_LIB(bz2, bzlibVersion, [ - available_bzlib=yes; BZLIB_LIBS="-lbz2"; - ]) - ]) -]) - -if test x"$available_bzlib" = xyes; then - AC_DEFINE(HAVE_BZLIB, 1, [Define if you have bzlib.]) -fi -AM_CONDITIONAL(HAVE_BZLIB, test x"$available_bzlib" = x"yes") -AC_SUBST(BZLIB_CFLAGS) -AC_SUBST(BZLIB_LIBS) - - -dnl ******************** -dnl Test for libpng -dnl ******************** -PNG_CFLAGS="" -PNG_LIBS="" -AC_CHECK_LIB(png, png_read_info, [ - AC_CHECK_HEADER(png.h, - [ png_ok=yes ], - [ png_ok=no ]) -], [ - AC_MSG_ERROR(*** (PNG library is not found) ***) -], -lz -lm) - -if test x"$png_ok" = xyes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([ #include ], - [ png_structp pp; - png_infop info; - png_colorp cmap; - png_get_header_ver(NULL); - png_create_read_struct; ], - [ png_ok=yes ], - [ png_ok=no ]) - AC_MSG_RESULT($png_ok) - if test x"$png_ok" = xyes; then - PNG_LIBS="-lpng -lz" - else - AC_MSG_ERROR(*** PNG library (libpng) is too old ***) - fi -else - AC_MSG_ERROR(*** PNG library (libpng) required ***) -fi - -AC_SUBST(PNG_CFLAGS) -AC_SUBST(PNG_LIBS) -AM_CONDITIONAL(HAVE_PNG, test "x$PNG_LIBS" != x) - - -dnl ******************** -dnl Test for libjpeg -dnl ******************** -JPEG_CFLAGS="" -JPEG_LIBS="" -available_jpeg=no -AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - available_jpeg=yes, - available_jpeg=no) - -if test x"$available_jpeg" = xyes; then - AC_MSG_CHECKING([for jpeglib.h]) - AC_TRY_CPP( -[#include -#undef PACKAGE -#undef VERSION -#undef HAVE_STDLIB_H -#include ], - available_jpeg=yes, - available_jpeg=no) - AC_MSG_RESULT($available_jpeg) - if test x"$available_jpeg" = xyes; then - JPEG_LIBS='-ljpeg' - AC_CHECK_LIB(jpeg, jpeg_simple_progression, - AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, - [Define if your JPEG library supports progressive saving.]), - AC_MSG_WARN([JPEG library does not support progressive saving.])) - fi -fi - -if test x"$available_jpeg" = xyes; then - AC_DEFINE(ENABLE_JPEG, 1, - [Define if you want to compile JPEG plugin.]) -else - AC_MSG_WARN([*** JPEG loader will not be built ***]) -fi - -AM_CONDITIONAL(ENABLE_JPEG, test x"$available_jpeg" = x"yes") -AC_SUBST(JPEG_CFLAGS) -AC_SUBST(JPEG_LIBS) - -enable_jpeg=$available_jpeg - - -dnl ******************** -dnl Test for libmng -dnl ******************** -AC_ARG_WITH(libmng, - [ --with-libmng Use libmng for MNG image [default=yes]], - [enable_mng="${withval}"], [enable_mng=yes]) - -MNG_CFLAGS="" -MNG_LIBS="" -if test x"$enable_mng" = x"yes"; then - if test x"$available_jpeg" = x"yes"; then - AC_CHECK_HEADER(libmng.h, [ - AC_CHECK_LIB(mng, mng_initialize, [ - AC_MSG_CHECKING([for libmng functions]) - AC_TRY_COMPILE([ #include ], - [ mng_handle handle; - mng_version_text(); - handle = mng_initialize(NULL, NULL, NULL, MNG_NULL); - mng_setcb_errorproc(handle, NULL); - mng_setcb_openstream(handle, NULL); - mng_setcb_closestream(handle, NULL); - mng_setcb_readdata(handle, NULL); - mng_setcb_gettickcount(handle, NULL); - mng_setcb_settimer(handle, NULL); - mng_setcb_processheader(handle, NULL); - mng_setcb_getcanvasline(handle, NULL); - mng_setcb_refresh(handle, NULL); - mng_get_userdata(handle); - mng_set_canvasstyle(handle, MNG_CANVAS_RGB8); - mng_set_bgcolor(handle, 0, 0, 0); - mng_readdisplay(handle); - mng_readdisplay_resume(handle); ], - [ MNG_LIBS="$JPEG_LIBS -lz -lmng"; - AC_DEFINE(ENABLE_MNG, 1, [Define if you want to compile mng plugin.])], - [ enable_mng=no; - AC_MSG_WARN(*** MNG library (libmng) is found but it is too old ***) ]) - AC_MSG_RESULT($enable_mng) - ], [ - enable_mng=no - ], $MNG_LIBS ) - ], [ - enable_mng=no: - ]) - else - AC_MSG_WARN([*** libmng requires libjpeg. MNG plugin will not be compiled.]) - enable_mng=no - fi -fi - -AM_CONDITIONAL(ENABLE_MNG, test x"$enable_mng" = xyes) -AC_SUBST(MNG_CFLAGS) -AC_SUBST(MNG_LIBS) - - -dnl ******************** -dnl Test for librsvg -dnl ******************** -AC_ARG_WITH(librsvg, - [ --with-librsvg Use librsvg for SVG image [default=yes]], - enable_librsvg="${withval}", - enable_librsvg=yes) - -if test x"$enable_librsvg" = xyes; then - if test x"$enable_gtk2" != xno; then - PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0, , [ - enable_librsvg=no; - AC_MSG_WARN(Did not find librsvg-2.0 installed) - ]) - else - if test x"$disable_gdk_pixbuf" = xno -a x"$have_gdk_pixbuf" = xyes; then - AM_PATH_GNOME(1.2.8, [], [ - enable_librsvg=no; - AC_MSG_WARN(Did not find librsvg installed) - ], xml librsvg) - else - enable_librsvg=no; - fi - fi -fi - -AM_CONDITIONAL(ENABLE_LIBRSVG, test x"$enable_librsvg" = xyes) - -if test x"$enable_librsvg" = xyes; then - AC_DEFINE(HAVE_LIBRSVG, 1, [Define if you have librsvg.]) - AC_DEFINE(ENABLE_SVG, 1, [Define if you want to compile svg plugin.]) -fi - -AC_SUBST(XML_CFLAGS) -AC_SUBST(XML_LIBS) -AC_SUBST(LIBRSVG_CFLAGS) -AC_SUBST(LIBRSVG_LIBS) - - -dnl **************************** -dnl Check for libwmf -dnl **************************** -AC_ARG_WITH(libwmf, - [ --with-libwmf Use libwmf library for Windows Meta File [default=yes]], - [enable_libwmf="${withval}"], - [enable_libwmf=yes]) - -if test "x$enable_libwmf" = xyes; then - have_libwmf=no - AM_PATH_LIBWMF($LIBWMF_REQUIRED, - [have_libwmf=yes], [have_libwmf=no]) - - if test "x$have_libwmf" = xyes; then - AC_DEFINE(ENABLE_WMF, 1, [Define if you want to compile wmf plugin.]) - else - AC_MSG_WARN(Did not find libwmf installed) - enable_libwmf=no; - fi -fi - -AM_CONDITIONAL(ENABLE_WMF, test x"$enable_libwmf" = xyes) - - -dnl **************************** -dnl check for Xinerama -dnl **************************** -AC_PATH_XTRA -XINERAMA_LIBS="" -AC_CHECK_LIB(Xinerama, XineramaQueryScreens, - [XINERAMA_LIBS="-lXinerama" - AC_CHECK_HEADERS(X11/extensions/Xinerama.h)], - [],[$X_LIBS -lX11 -lXext]) -AC_SUBST(XINERAMA_LIBS) -AC_SUBST(X_LIBS) - - -movie_support="" - -dnl **************************** -dnl Check for Xine library -dnl **************************** -AC_ARG_WITH(xine, - [ --with-xine Use Xine library for movie (experimental) [default=no]], - [enable_xine="${withval}"], - [enable_xine=no]) - -if test x"$enable_xine" = xyes; then - have_xine=no - AM_PATH_XINE($XINE_REQUIRED, - [have_xine=yes], [have_xine=no]) - - if test x"$have_xine" = xyes; then - AC_DEFINE(ENABLE_XINE, 1, [Define if you want to compile xine plugin.]) - movie_support="Xine ${movie_support}" - else - AC_MSG_WARN(Did not find xine-lib installed) - enable_xine=no; - fi -fi - -AM_CONDITIONAL(ENABLE_XINE, test x"$enable_xine" = xyes) - - -dnl ****************************** -dnl for gettext -dnl ****************************** -ALL_LINGUAS="fr ja" -AM_GNU_GETTEXT -AC_CHECK_FUNC(gettext,,AC_CHECK_LIB(intl, gettext)) -localedir="\${datadir}/locale" -AC_SUBST(localedir) - - -dnl *************************************************************************** -dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. -dnl *************************************************************************** -gimv_save_LIBS=$LIBS -LIBS="$LIBS $GTK_LIBS" -AC_CHECK_FUNCS(bind_textdomain_codeset) -LIBS=$gimv_save_LIBS - - -dnl ******************* -dnl for libcharset -dnl ******************* -AM_LIBCHARSET - - -dnl ******************* -dnl for intltool -dnl ******************* -AC_PROG_INTLTOOL - - -dnl ****************************** -dnl enable/disable EXIF support -dnl ****************************** -AC_ARG_ENABLE(exif, - [ --enable-exif enable EXIF support [default=yes]], - [enable_exif="${enableval}"], [enable_exif=yes]) -AM_CONDITIONAL(ENABLE_EXIF, test x"$enable_exif" = xyes) -if test x"$enable_exif" = xyes; then - AC_DEFINE(ENABLE_EXIF, 1, [Define if you want to enable EXIF feature.]) - EXIF_CFLAGS="-I\$(top_srcdir)/lib" - EXIF_LIBS="\$(top_builddir)/lib/libexif/libexif.la" - AC_SUBST(EXIF_CFLAGS) - AC_SUBST(EXIF_LIBS) -fi - - -dnl ************************************** -dnl enable/disable susie plugin support -dnl ************************************** -AC_ARG_ENABLE(spi, - [ --enable-spi susie plugin support (broken) [default=no]], - [enable_spi="${enableval}"], [enable_spi=no]) -AM_CONDITIONAL(ENABLE_SPI, test x"$enable_spi" = xyes) - -if test x"$enable_spi" = xyes; then - AC_DEFINE(ENABLE_SPI, 1, [Define if you want to enable Susie plugin support feature.]) - if test x"$platform_win32" = xno; then - DLLLOADER_CFLAGS="-I\$(top_srcdir)/lib -I\$(top_srcdir)/lib/dllloader" - DLLLOADER_LIBS="\$(top_builddir)/lib/dllloader/libdllloader.la" - AC_SUBST(DLLLOADER_CFLAGS) - AC_SUBST(DLLLOADER_LIBS) - fi -fi - - -dnl ****************************** -dnl disable/enable splash logo -dnl ****************************** -AC_ARG_ENABLE(splash, - [ --enable-splash enable splash logo], - [enable_splash="${enableval}"], [enable_splash=yes]) -if test x"$enable_splash" = xyes; then - AC_DEFINE(ENABLE_SPLASH, 1, [Define if you want to enable splash feature.]) -fi - - -dnl ********************************* -dnl disable/enable MPlayer Support -dnl ********************************* -AC_ARG_ENABLE(mplayer, - [ --enable-mplayer enable MPlyer support (experimental) [default=no]], - [enable_mplayer="${enableval}"], [enable_mplayer=no]) -if test x"$enable_mplayer" = xyes; then - AC_DEFINE(ENABLE_MPLAYER, 1, [Define if you want to compile MPlayer plugin.]) - movie_support="MPlayer ${movie_support}" -fi - -AM_CONDITIONAL(ENABLE_MPLAYER, test x"$enable_mplayer" = x"yes") - - -dnl ********************************* -dnl Check Movie Support -dnl ********************************* -if test x"$movie_support" = x; then - movie_support=no -else - AC_DEFINE(ENABLE_MOVIE, 1, [Define if you use movie support]) -fi - - -dnl ****************************** -dnl Checks for header files. -dnl ****************************** -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([ \ - alloca.h argz.h \ - errno.h \ - fcntl.h \ - langinfo.h libintl.h limits.h locale.h \ - malloc.h memory.h \ - netinet/in.h nl_types.h \ - stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h \ - unistd.h utime.h \ -]) - - -dnl ************************************************************** -dnl Checks for typedefs, structures, and compiler characteristics. -dnl ************************************************************** -AC_C_CONST -AC_TYPE_UID_T -AC_C_INLINE -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_CHECK_TYPES([struct user_desc],,, [#include ]) -if test x$CC = xgcc; then - CFLAGS="$CFLAGS -Wall" -fi -if test x"$platform_win32" = xyes; then - LDFLAGS="$LDFLAGS -mwindows" -fi - -dnl ********************************** -dnl Checks for library functions. -dnl ********************************** -AC_FUNC_ALLOCA -dnl AC_FUNC_CHOWN -dnl AC_FUNC_FORK -dnl AC_FUNC_LSTAT -dnl AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_FUNC_MMAP -dnl AC_FUNC_MKTIME -dnl AC_FUNC_STAT -AC_FUNC_STRFTIME -AC_FUNC_UTIME_NULL -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([ \ - __argz_count __argz_next __argz_stringify \ - dcgettext dup2 \ - endgrent endpwent \ - floor \ - getcwd getpagesize getwd \ - memmove mempcpy memset mkdir munmap \ - nl_langinfo \ - pow putenv setenv \ - setlocale sqrt stpcpy strcasecmp strchr strcspn \ - strdup strrchr strstr strtoul \ - uname utime \ -]) - - -dnl ****************************** -dnl set data dir definition -dnl ****************************** -gimv_datadir="\${datadir}/\${PACKAGE}" -docdir="\${datadir}/doc" -gimv_docdir="\${docdir}/\${PACKAGE}" -gimv_icondir="\${datadir}/\${PACKAGE}/pixmaps" -AC_SUBST(docdir) -AC_SUBST(gimv_datadir) -AC_SUBST(gimv_docdir) -AC_SUBST(gimv_icondir) - -dnl Plugin directory -plugindir="\${libdir}/\${PACKAGE}" -ARCHIVER_PLUGIN_DIR="archiver" -IMAGE_LOADER_PLUGIN_DIR="image_loader" -IMAGE_SAVER_PLUGIN_DIR="image_saver" -IO_STREAM_PLUGIN_DIR="io_stream" -IMAGE_VIEW_PLUGIN_DIR="image_view" -THUMBNAIL_VIEW_PLUGIN_DIR="thumbnail_view" -THUMBNAIL_PLUGIN_DIR="thumbnail" - -AC_SUBST(plugindir) -AC_SUBST(ARCHIVER_PLUGIN_DIR) -AC_SUBST(IMAGE_LOADER_PLUGIN_DIR) -AC_SUBST(IMAGE_SAVER_PLUGIN_DIR) -AC_SUBST(IO_STREAM_PLUGIN_DIR) -AC_SUBST(IMAGE_VIEW_PLUGIN_DIR) -AC_SUBST(THUMBNAIL_VIEW_PLUGIN_DIR) -AC_SUBST(THUMBNAIL_PLUGIN_DIR) - - -AC_OUTPUT([ -Makefile -doc/Makefile -doc/ja/Makefile -etc/Makefile -m4/Makefile -intl/Makefile -po/Makefile.in -lib/Makefile -lib/dllloader/Makefile -lib/libexif/Makefile -plugins/Makefile -plugins/archiver/Makefile -plugins/image_loader/Makefile -plugins/image_saver/Makefile -plugins/image_view/Makefile -plugins/io_stream/Makefile -plugins/thumbnail/Makefile -plugins/thumbnail_view/Makefile -src/Makefile -src/cursors/Makefile -src/pixmaps/Makefile -src/prefs_ui/Makefile -gimageview.spec -]) - - -dnl -dnl Show some info: -dnl - -AC_MSG_RESULT([ -Configure Result : - - C Compiler : ${CC} ${CFLAGS} - Install path : ${prefix} - Gtk+-2.0 : ${enable_gtk2} - Image library : ${image_library} - JPEG (libjpg) : ${enable_jpeg} - MNG (libmng) : ${enable_mng} - SVG (librsvg): ${enable_librsvg} - WMF (libwmf) : ${enable_libwmf} - Movie Support : ${movie_support} - EXIF : ${enable_exif} - Susie plugin : ${enable_spi} - Show splash : ${enable_splash} -]) diff -Nru gimageview-0.2.27/debian/changelog gimageview-0.3.0-0.20101117/debian/changelog --- gimageview-0.2.27/debian/changelog 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/changelog 2011-04-30 13:00:00.000000000 +0000 @@ -1,116 +1,21 @@ -gimageview (0.2.27-3ubuntu1) karmic; urgency=low +gimageview (0.3.0-0.20101117-2) natty; urgency=low - * Merge from debian unstable, remaining changes: - - Update dependencies for xine-lib transition (LP: #159338) - - Closes LP: #393237 - - -- Charlie Smotherman Mon, 29 Jun 2009 00:45:54 -0500 - -gimageview (0.2.27-3) unstable; urgency=low - - * QA upload. - * Fix quilt/dpatch typo in README.source (Closes: #500713) - * debian/patches/60_test.dpatch: remove, dummy patch - * debian/patches/60_bts527692_gtk_headers.dpatch: include gtk.h alone - instead of single headers (Closes: #527692) - - -- Filippo Giunchedi Sat, 27 Jun 2009 12:32:30 +0200 - -gimageview (0.2.27-2ubuntu1) intrepid; urgency=low - - * Merge from debian unstable (LP: #281383), remaining changes: - - Update dependencies for xine-lib transition (LP: #159338) - * debian/patches/70_fix_ftbfs_with_gtk+2.13.x.dpatch - - See GNOME Bug #536767: - http://bugzilla.gnome.org/show_bug.cgi?id=536767 - - -- Andrew Starr-Bochicchio Sat, 16 Aug 2008 15:47:55 +0100 - -gimageview (0.2.27-2) unstable; urgency=low - - * QA upload. - * debian/control - - set QA group as maintainer - - added dpatch build-dep - - bump versioned depends on debhelper to >= 5 - - bump Standards-Version to 3.8.0 - - added Homepage field - - reformatted long and short descriptions - * debian/rules - - added patch stuff - - added other files to cleanup - - removed DH_COMPAT - - don't ignore error on clean - - removed 'rm' to move to dh_clean - - added removal of additional license files - - added dh_desktop call - - fixed installation of desktop file in the right directory - - added etc/gimageview.desktop cleanup, it's regenerated (needed after - German localization) - - added '--enable-mplayer' option to configure call; thanks to Jonny for - the report; Closes: #397075 - * debian/patches/01_previous_changes.dpatch - - added to remove direct upstream code modification - * debian/compat - - created with value 5 - * debian/README.source - - added due to Policy 3.8.0 - * debian/watch - - added - * debian/dirs - - removed since unneeded - * debian/copyright - - indented upstream authors with 4 spaces - - fixed reference on local GPLv2 file - - left only the first paragraph of GPLv2 in this file - - clearly separated license and copyright notices - - added all the missing file with alternative copyright notices - * debian/menu - - updated section to Applications/Viewers - * debian/patches/20_bts440648_sort_fix.dpatch - - patch added; thanks to Shitamo for the report; Closes: #440648 - * debian/patches/30_bts494304_relibtoolize.dpatch - - relibtoolize patch to support GNU/kFreeBSD; thanks to Petr Salinger for - the instruction; Closes: #494304 - * debian/patches/40_bts389071_german_translation.dpatch - - added German translation; thanks to Holger Wansing for the patch; - Closes: #389071 - * debian/mime - - added '-e' option; thanks to Vincent Lefevre for the report; - Closes: #243583 - * debian/patches/10_bts459288_edit-options_fix.dpatch - - added to fix the Edit > Options segfault; thanks to Nick Gasson for the - patch; Closes: #459288 - * debian/patches/50_bts243584_returncode_on_exit.dpatch - - added to use correctly the return code in case of error at opening; - thanks to Vincent Lefevre for the report; Closes: #243584 - - -- Sandro Tosi Fri, 15 Aug 2008 14:54:45 +0200 - -gimageview (0.2.27-1ubuntu1) hardy; urgency=low - - * Update dependencies for xine-lib transition (LP: #159338) - * Set Ubuntu Maintainer - - -- Emmet Hikory Sat, 03 Nov 2007 11:08:29 +0000 - -gimageview (0.2.27-1build3) gutsy; urgency=low - - * Rebuild against new libxine1. - - -- Lionel Le Folgoc Sun, 05 Aug 2007 17:26:34 +0200 - -gimageview (0.2.27-1build2) dapper; urgency=low - - * Rebuild against new libxine-main1 + * Rebuild for Natty - -- Sebastian Dröge Sun, 5 Feb 2006 16:29:23 +0100 + -- kakurasan Sat, 30 Apr 2011 22:00:00 +0900 -gimageview (0.2.27-1build1) breezy; urgency=low +gimageview (0.3.0-0.20101117-1.1) maverick; urgency=low - * rebuild + * Build-Depends: libtool, intltool - -- Stephan Hermann Tue, 12 Jul 2005 22:35:54 +0200 + -- kakurasan Sun, 17 Apr 2011 22:10:00 +0900 + +gimageview (0.3.0-0.20101117-1) maverick; urgency=low + + * New development snapshot + * Enable MPlayer support + + -- kakurasan Sun, 17 Apr 2011 21:30:00 +0900 gimageview (0.2.27-1) unstable; urgency=low diff -Nru gimageview-0.2.27/debian/compat gimageview-0.3.0-0.20101117/debian/compat --- gimageview-0.2.27/debian/compat 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/compat 2011-04-17 12:30:00.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru gimageview-0.2.27/debian/control gimageview-0.3.0-0.20101117/debian/control --- gimageview-0.2.27/debian/control 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/control 2011-04-17 13:10:00.000000000 +0000 @@ -1,28 +1,23 @@ Source: gimageview Section: graphics Priority: optional -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Debian QA Group -Build-Depends: debhelper (>= 5), libpng3-dev, gettext, docbook-to-man, libexif-gtk-dev, libxine-dev (>= 1-beta2), libgtk2.0-dev (>= 2.2.0), librsvg2-dev (>= 2.2.0), libmng-dev, autotools-dev, dpatch -Standards-Version: 3.8.0 -Homepage: http://www.homa.ne.jp/~ashie/gimageview/ +Maintainer: kakurasan +Build-Depends: debhelper (>> 7.0.0), libpng3-dev, gettext, docbook-to-man, libexif-dev (>= 0.6.0), libxine-dev (>= 1.0.0), libgtk2.0-dev (>= 2.10.0), librsvg2-dev (>= 2.2.0), libmng-dev, autotools-dev, libtool, intltool +Standards-Version: 3.5.8 Package: gimageview Architecture: any -Depends: ${shlibs:Depends}, libxine1-x | libxine1 (<< 1.1.8-2) -Description: image viewer using GTK+ - GImageView is image viewer. It has some useful features such as: - . - * simple GUI - * tabbed thumbnail viewer for directories - * low memory use - * image file management tool - * slide show - * read/write many image cache formats of thumbnail - * read : Konqueror, GQview, Electric Eyes (Picview) - * write : Nautilus, .xvpics - . - Supported image formats are: - * JPEG, PNG, PNM, GIF, TIFF, XBM, XPM, XWD, BMP and PCX. - . - You can drop image and drop it into Gimp window from GImageView one. +Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer +Description: Image Viewer using GTK+ + GImageView is image viewer. It has some useful features such as, + Simple GUI. + Tabbed thumbnail viewer for directories. + Low memory use. + Image file management tool. + Slide show. + read/write many image cache formats of thumbnail. + read : Konqueror, GQview, Electric Eyes (Picview) + write : Nautilus, .xvpics + Supported image formats are: + JPEG, PNG, PNM, GIF, TIFF, XBM, XPM, XWD, BMP and PCX. + Drag and Drop. You can drop image into like a Gimp from GImageView window. diff -Nru gimageview-0.2.27/debian/copyright gimageview-0.3.0-0.20101117/debian/copyright --- gimageview-0.2.27/debian/copyright 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/copyright 2011-04-17 12:30:00.000000000 +0000 @@ -1,101 +1,27 @@ This package was debianized by Takuo KITAME on Fri, 25 Jan 2002 15:28:01 +0900. -It was downloaded from: http://www.homa.ne.jp/~ashie/gimageview/ +It was downloaded from + http://www.homa.ne.jp/~ashie/gimageview/ Upstream Authors: - - Takuro Ashie - Nyan2 + Takuro Ashie + Nyan2 Copyright: - Copyright (C) 2001-2004 Takuro Ashie - -License: + This package 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; version 2 dated June, 1991. + + This package 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 package 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; version 2 dated June, 1991. + You should have received a copy of the GNU General Public License + along with this package; if not, see . On Debian GNU/Linux systems, the complete text of the GNU General -Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. - -These files have different copyright/license information: - -intl/* - Copyright (C) 1984, 1989, 1990, 1995-2001 Free Software Foundation, Inc. - -/lib/dllloader/*: - (C)Copyright 1998-2002 by Hiroshi Takekawa - -lib/libexif/*: - Copyright © 2001-2003 Lutz Müller - -plugins/archiver/*: - Copyright (C) 2001 The Free Software Foundation, Inc. - -plugins/image_loader/bmp.c: - GTK See Copyright (C) 1998 Hotaru Lee - -plugins/image_loader/bmp.h: - Copyright (C) 1998 Hotaru Lee - -plugins/image_loader/jpeg_loader.c: - Copyright (C) 2002 Red Hat, Inc. - -plugins/image_loader/mag.c: - Enfle Copyright (C) 1998 Hiroshi Takekawa - -plugins/image_view/gimv_mplayer.{c.h}: - Copyright (C) 2002 Colin Leroy - -plugins/image_view/gimv_xine.{c,h},gimv_xine_post.{c,h},gimv_xine_priv.h: - Copyright (C) 2001-2002 the xine project - -plugins/image_view/gimv_xine_priv.c - Copyright (C) 2001-2002 the xine project - Copyright 2001 (c) Andrew Meredith - Copyright (C) Thomas ï¾–streich - June 2001 - -plugins/image_loader/tga.c: - Gimp Copyright (C) 1995 Spencer Kimball and Peter Mattis - Copyright (C) 1997 Raphael FRANCOIS and Gordon Matzigkeit - -plugins/image_loader/wmf.c: - Copyright (C) 2002 Dom Lachowicz - Copyright (C) 2002 Francis James Franklin - -plugins/image_loader/xbm.c: - XBM code Copyright (C) 1998 Gordon Matzigkeit - - -src/{auto_completion.c,auto_completion.h,compare_md5.c,cursors.c, \ - cursors.h,fr-archive.c,fr-archive.h,fr-command.c, \ - fr-command.h,fr-process.c,fr-process.h,gimv_hpaned.c, \ - gimv_hpaned.h,gimv_nav_win.c,gimv_nav_win.h,gimv_paned.c, \ - gimv_paned.h,gimv_vpaned.c,gimv_vpaned.h,md5.c,md5.h, \ - pixbuf_utils.c,pixbuf_utils.h}: - Copyright (C) 1995-2002 Free Software Foundation, Inc. - -src/compare_similar.c: - Copyright (C) 2001 Takuro Ashie - Copyright (C) 2001 John Ellis - -src/dirview.c: - Copyright (C) 2001 Takuro Ashie - Copyright (C) 1999-2000 MIZUNO Takehiko - -src/_cell_pixmap.{c,h}: - Copyright (C) 2002 Takuro Ashie - Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford - -src/gimv_image_view.c: - Copyright (C) 2001-2003 Takuro Ashie - Copyright (C) 2003 Frank Fischer - -src/gimv_prefs.{c,h}: - copyright (c) 2002-2003 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org +Public License can be found in `/usr/share/common-licenses/GPL-2'. -src/gtk_prop.{c,h}: - Copyright (C) 1999 Rasca, Berlin diff -Nru gimageview-0.2.27/debian/dirs gimageview-0.3.0-0.20101117/debian/dirs --- gimageview-0.2.27/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/dirs 2011-04-17 12:30:00.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff -Nru gimageview-0.2.27/debian/mime gimageview-0.3.0-0.20101117/debian/mime --- gimageview-0.2.27/debian/mime 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/mime 2011-04-17 12:30:00.000000000 +0000 @@ -1,16 +1,16 @@ -image/jpeg; gimv -e '%s'; test=test -n "$DISPLAY" -image/gif; gimv -e '%s'; test=test -n "$DISPLAY" -image/png; gimv -e '%s'; test=test -n "$DISPLAY" -image/tiff; gimv -e '%s'; test=test -n "$DISPLAY" -image/x-xbitmap; gimv -e '%s'; test=test -n "$DISPLAY" -image/x-xpixmap; gimv -e '%s'; test=test -n "$DISPLAY" -image/x-xwindowdump; gimv -e '%s'; test=test -n "$DISPLAY" -image/pcx; gimv -e '%s'; test=test -n "$DISPLAY" -image/tga; gimv -e '%s'; test=test -n "$DISPLAY" -image/xcf; gimv -e '%s'; test=test -n "$DISPLAY" -image/mag; gimv -e '%s'; test=test -n "$DISPLAY" -image/svg; gimv -e '%s'; test=test -n "$DISPLAY" -image/mng; gimv -e '%s'; test=test -n "$DISPLAY" -image/wmf; gimv -e '%s'; test=test -n "$DISPLAY" -image/ani; gimv -e '%s'; test=test -n "$DISPLAY" -image/ras; gimv -e '%s'; test=test -n "$DISPLAY" +image/jpeg; gimv '%s'; test=test -n "$DISPLAY" +image/gif; gimv '%s'; test=test -n "$DISPLAY" +image/png; gimv '%s'; test=test -n "$DISPLAY" +image/tiff; gimv '%s'; test=test -n "$DISPLAY" +image/x-xbitmap; gimv '%s'; test=test -n "$DISPLAY" +image/x-xpixmap; gimv '%s'; test=test -n "$DISPLAY" +image/x-xwindowdump; gimv '%s'; test=test -n "$DISPLAY" +image/pcx; gimv '%s'; test=test -n "$DISPLAY" +image/tga; gimv '%s'; test=test -n "$DISPLAY" +image/xcf; gimv '%s'; test=test -n "$DISPLAY" +image/mag; gimv '%s'; test=test -n "$DISPLAY" +image/svg; gimv '%s'; test=test -n "$DISPLAY" +image/mng; gimv '%s'; test=test -n "$DISPLAY" +image/wmf; gimv '%s'; test=test -n "$DISPLAY" +image/ani; gimv '%s'; test=test -n "$DISPLAY" +image/ras; gimv '%s'; test=test -n "$DISPLAY" diff -Nru gimageview-0.2.27/debian/patches/00list gimageview-0.3.0-0.20101117/debian/patches/00list --- gimageview-0.2.27/debian/patches/00list 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -01_previous_changes -10_bts459288_edit-options_fix -20_bts440648_sort_fix -30_bts494304_relibtoolize -40_bts389071_german_translation -50_bts243584_returncode_on_exit -60_bts527692_gtk_headers.dpatch - diff -Nru gimageview-0.2.27/debian/patches/01_previous_changes.dpatch gimageview-0.3.0-0.20101117/debian/patches/01_previous_changes.dpatch --- gimageview-0.2.27/debian/patches/01_previous_changes.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/01_previous_changes.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,567 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_previous_changes.dpatch by Sandro Tosi -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: New patch generated from gimageview 0.2.27-2 diff.gz - -@DPATCH@ - ---- gimageview-0.2.27.orig/po/stamp-cat-id -+++ gimageview-0.2.27/po/stamp-cat-id -@@ -0,0 +1 @@ -+timestamp ---- gimageview-0.2.27.orig/po/cat-id-tbl.c -+++ gimageview-0.2.27/po/cat-id-tbl.c -@@ -0,0 +1,500 @@ -+/* Automatically generated by po2tbl.sed from gimageview.pot. */ -+ -+#if HAVE_CONFIG_H -+# include -+#endif -+ -+#include "libgettext.h" -+ -+const struct _msg_ent _msg_tbl[] = { -+ {"", 1}, -+ {"Scan directory at start up", 2}, -+ {"Scan directory recursively (use with \"-d\")", 3}, -+ {"Read dotfile when scanning directory (use with \"-d\")", 4}, -+ {"Ignore file name extension", 5}, -+ {"Specify image scale in imageview window(%)", 6}, -+ {"Keep original image on memory or not", 7}, -+ {"Show menu bar on image view window", 8}, -+ {"Show tool bar on image view window", 9}, -+ {"Open thumbnail window at start up", 10}, -+ {"Open all images in imageview widnow", 11}, -+ {"Open all images in thumbnail widnow", 12}, -+ {"Open images files in slide show(ignore directory)", 13}, -+ {"Print version infomation", 14}, -+ {"Show this message", 15}, -+ {"Unknown option: \"-%s\"\n", 16}, -+ {"\ -+Copyright (C) 2001 Takuro Ashie\n\ -+This is free software; see the source for copying conditions. There is NO\n\ -+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 17}, -+ {"\ -+Copyright (C) 2001 Takuro Ashie\n\ -+\n\ -+Usage: %s [OPTION...] [Image Files...]\n\ -+\n", 18}, -+ {"Unknown option: \"-%c\"\n", 19}, -+ {"/Load Thumbnail", 20}, -+ {"/Load Thumbnail recursively", 21}, -+ {"/---", 22}, -+ {"/Go to here", 23}, -+ {"/Refresh Tree", 24}, -+ {"/Make Directory", 25}, -+ {"/Rename Directory", 26}, -+ {"/Delete Directory", 27}, -+ {"Permission denied : %s", 28}, -+ {"Error!!", 29}, -+ {"Make directory", 30}, -+ {"New directory name: ", 31}, -+ {"Directory exist : %s", 32}, -+ {"File exist : %s", 33}, -+ {"Faild to create directory : %s", 34}, -+ {"Directory not exist :%s", 35}, -+ {"Rename directory", 36}, -+ {"Faild to rename directory : %s", 37}, -+ {"Directory not exist : %s", 38}, -+ {"\ -+%s is symbolic link.\n\ -+Remove link ?", 39}, -+ {"Confirm Deleting Directory", 40}, -+ {"\ -+Delete %s\n\ -+OK?", 41}, -+ {"\ -+%s is not empty\n\ -+Delete all files under %s ?", 42}, -+ {"Deleting %s ...", 43}, -+ {"\ -+Faild to remove directory :\n\ -+%s is not empty.", 44}, -+ {"Faild to remove directory : %s", 45}, -+ {"Home", 46}, -+ {"Up", 47}, -+ {"Refresh", 48}, -+ {"Dotfile", 49}, -+ {"Show/Hide dotfile", 50}, -+ {"/Open in new tab", 51}, -+ {"/Move", 52}, -+ {"/Copy", 53}, -+ {"/Symbolic Link", 54}, -+ {"/Cancel", 55}, -+ {"Moving %s ...", 56}, -+ {"Moving files", 57}, -+ {"Copying %s ...", 58}, -+ {"Copying files", 59}, -+ {"Creating Link %s ...", 60}, -+ {"Creating Links", 61}, -+ {"*Loading Image Files* - GImageView - ", 62}, -+ {"Now Opening Image Files...", 63}, -+ {"Skip", 64}, -+ {"Stop", 65}, -+ {"No image files specified!!\n", 66}, -+ {"filename = %s\n", 67}, -+ {"No image files in this directory: %s\n", 68}, -+ {"File name not specified!!\n", 69}, -+ {"Not an image (or unsupported) file!!\n", 70}, -+ {"Load file(s)", 71}, -+ {"Open selected files", 72}, -+ {"Thumbnail for selected files", 73}, -+ {"Close", 74}, -+ {"scandir = %s\n", 75}, -+ {"dirname = %s\n", 76}, -+ {"\ -+Can't find source file :\n\ -+%s", 77}, -+ {"\ -+Can't move file : %s\n\ -+Permission denied: %s\n", 78}, -+ {"\ -+Same file :\n\ -+%s", 79}, -+ {"ERROR!!", 80}, -+ {"\ -+File exist : %s\n\ -+\n\ -+Overwrite?", 81}, -+ {"File exist!!", 82}, -+ {"\ -+Faild to remove file :\n\ -+%s", 83}, -+ {"\ -+Faild to move file :\n\ -+From : %s\n\ -+To : %s", 84}, -+ {"%s is link!!.\n", 85}, -+ {"%s is not directory!!.\n", 86}, -+ {"\ -+Can't copy directory : %s\n\ -+Permission denied: %s\n", 87}, -+ {"File exists!! : %s\n", 88}, -+ {"Copy directory", 89}, -+ {"Copying directory", 90}, -+ {"\ -+Can't open file for read :\n\ -+%s", 91}, -+ {"\ -+Can't open file for write :\n\ -+%s", 92}, -+ {"\ -+An error occured while copying file :\n\ -+%s", 93}, -+ {"\ -+Can't copy file : %s\n\ -+Permission denied: %s\n", 94}, -+ {"\ -+Can't create link : %s\n\ -+Permission denied: %s\n", 95}, -+ {"\ -+Faild to create link :\n\ -+From : %s\n\ -+To : %s", 96}, -+ {"No image files specified!!", 97}, -+ {"If you want to scan directory, use \"-d\" option.", 98}, -+ {"No window opened!! Quiting...", 99}, -+ {"Yes", 100}, -+ {"Yes to All", 101}, -+ {"No", 102}, -+ {"Cancel", 103}, -+ {"OK", 104}, -+ {"/_Manual", 105}, -+ {"/_Document", 106}, -+ {"/_Document/_HTML", 107}, -+ {"/_Document/Plain _Text", 108}, -+ {"/_About", 109}, -+ {"About %s", 110}, -+ {"\ -+%s\n\ -+\n\ -+Copyright (C) 2001 %s <%s>\n\ -+\n\ -+Web: %s", 111}, -+ {"\ -+This program is free software; you can redistribute it and/or modify\n\ -+it under the terms of the GNU General Public License as published by\n\ -+the Free Software Foundation; either version 2, or (at your option)\n\ -+any later version.\n\ -+\n\ -+This program is distributed in the hope that it will be useful,\n\ -+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -+See the GNU General Public License for more details.\n\ -+\n\ -+You should have received a copy of the GNU General Public License\n\ -+along with this program; if not, write to the Free Software\n\ -+Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n\ -+MA 02111-1307, USA.", 112}, -+ {"/tear", 113}, -+ {"/Zoom", 114}, -+ {"/Rotate", 115}, -+ {"/Memory Buffer", 116}, -+ {"/Zoom In", 117}, -+ {"/Zoom Out", 118}, -+ {"/Fit to Widnow", 119}, -+ {"/Keep aspect ratio", 120}, -+ {"/10%", 121}, -+ {"/25%", 122}, -+ {"/50%", 123}, -+ {"/75%", 124}, -+ {"/100%", 125}, -+ {"/125%", 126}, -+ {"/150%", 127}, -+ {"/175%", 128}, -+ {"/200%", 129}, -+ {"/Rotate 90 deg", 130}, -+ {"/Rotate -90 deg", 131}, -+ {"/Rotate 180 deg", 132}, -+ {"Not an image (or unsupported) file: %s\n", 133}, -+ {"/_File", 134}, -+ {"/_File/_Open", 135}, -+ {"/_File/_Open Thumbnail Window", 136}, -+ {"/_File/---", 137}, -+ {"/_File/Memory _Buffer", 138}, -+ {"/_File/Close", 139}, -+ {"/_File/Quit", 140}, -+ {"/_Edit", 141}, -+ {"/_Edit/Options", 142}, -+ {"/_View", 143}, -+ {"/_Help", 144}, -+ {"/Menu Bar", 145}, -+ {"/Tool Bar", 146}, -+ {"/Status Bar", 147}, -+ {"/Full Screen", 148}, -+ {"/Fit to Image", 149}, -+ {"Open", 150}, -+ {"File Open", 151}, -+ {"Prefs", 152}, -+ {"Preference", 153}, -+ {"No Zoom", 154}, -+ {"Zoom in", 155}, -+ {"Zoom out", 156}, -+ {"Zoom fit", 157}, -+ {"X Scale", 158}, -+ {"Y Scale", 159}, -+ {"Zoom", 160}, -+ {"Rotate", 161}, -+ {"Rotate CW", 162}, -+ {"Resize", 163}, -+ {"Fit Window Size to Image", 164}, -+ {"Full", 165}, -+ {"Fullscreen", 166}, -+ {"\ -+Can't open rc file: %s\n\ -+Use default setting ...", 167}, -+ {"Directory \"%s\" not found. Created it ...", 168}, -+ {"\"%s\" found, but it's not directory. Abort creating ...", 169}, -+ {"Can't open rc file for write.", 170}, -+ {"Image View", 171}, -+ {"Thumbnail View", 172}, -+ {"Nearest", 173}, -+ {"Tiles", 174}, -+ {"Bilinear", 175}, -+ {"Hyperbolic", 176}, -+ {"Layout0", 177}, -+ {"Layout1", 178}, -+ {"Layout2", 179}, -+ {"Layout3", 180}, -+ {"Layout4", 181}, -+ {"Custom", 182}, -+ {"Icon", 183}, -+ {"Text", 184}, -+ {"Both", 185}, -+ {"Left", 186}, -+ {"Right", 187}, -+ {"Top", 188}, -+ {"Bottom", 189}, -+ {"None", 190}, -+ {"Solid", 191}, -+ {"Dotted", 192}, -+ {"Tabbed", 193}, -+ {"Square", 194}, -+ {"Triangle", 195}, -+ {"Circular", 196}, -+ {"Default Open Window", 197}, -+ {"File Open Window", 198}, -+ {"Directory Open Window", 199}, -+ {"Directory scan", 200}, -+ {"Scan directories recursively", 201}, -+ {"Follow symbolic link", 202}, -+ {"Do not follow symbolic link", 203}, -+ {"Do not follow link to parent directory", 204}, -+ {"Read dotfiles", 205}, -+ {"Image", 206}, -+ {"Interpolation type for scaling", 207}, -+ {"Start up", 208}, -+ {"Open thumbnail window", 209}, -+ {"Ignore directory", 210}, -+ {"No warning", 211}, -+ {"Window", 212}, -+ {"Initial window size: ", 213}, -+ {"width", 214}, -+ {"height", 215}, -+ {"Auto resize to image size", 216}, -+ {"Open each file in separate window", 217}, -+ {"Raise window when open image in shared window", 218}, -+ {"Show/Hide", 219}, -+ {"Show menubar", 220}, -+ {"Show toolbar", 221}, -+ {"Show statusbar", 222}, -+ {"Auto resize to window size when opening", 223}, -+ {"Keep aspect rario", 224}, -+ {"Default Image Scale", 225}, -+ {"%", 226}, -+ {"Keep original image on memory", 227}, -+ {"Save window state on exit", 228}, -+ {"Default Layout", 229}, -+ {"Directory view", 230}, -+ {"Preview", 231}, -+ {"Menubar", 232}, -+ {"Toolbar", 233}, -+ {"Statusbar", 234}, -+ {"Tab", 235}, -+ {"Raise window when opening thumbnails", 236}, -+ {"Toolbar Style", 237}, -+ {"Default display mode", 238}, -+ {"Tab Position", 239}, -+ {"Move to new tab automatically", 240}, -+ {"Show close button", 241}, -+ {"Show full path", 242}, -+ {"Open new tab whether image is exist or not in the directory", 243}, -+ {"Thumnail Size", 244}, -+ {"GUI redraw interval while loading: Every", 245}, -+ {"files", 246}, -+ {"Thumbnail Table", 247}, -+ {"Minimum Columns", 248}, -+ {"Maximum Columns", 249}, -+ {"Row Spacing", 250}, -+ {"Column Spacing", 251}, -+ {"Thumbnail Button", 252}, -+ {"Minimum Border Width", 253}, -+ {"Show dot file", 254}, -+ {"Show \".\" directory whether hide dotfile or not.", 255}, -+ {"Show \"..\" directory whether hide dotfile or not.", 256}, -+ {"Style", 257}, -+ {"Tree line style", 258}, -+ {"Tree expander style", 259}, -+ {"Drag and Drop", 260}, -+ {"Enable auto scroll.", 261}, -+ {"Auto scroll interval", 262}, -+ {"[ms]", 263}, -+ {"Enable auto expand directory tree.", 264}, -+ {"Lag time for auto expand", 265}, -+ {"Cache reading", 266}, -+ {"Use GImageView cache.", 267}, -+ {"Use Nautilus cache.", 268}, -+ {"Use Konqueror cache (Large)", 269}, -+ {"Use Konqueror cache (Medium)", 270}, -+ {"Use Konqueror cache (Small)", 271}, -+ {"Enable KDE-2.2 (or later) fix", 272}, -+ {"Use GQview cache", 273}, -+ {"Use Electric Eyes cache (Preview)", 274}, -+ {"Use Electric Eyes cache (Icon)", 275}, -+ {"Use Electric Eyes cache (Mini)", 276}, -+ {"Enable Picview fix", 277}, -+ {"Use XV thumbnail", 278}, -+ {"Cache writing", 279}, -+ {"Cache type for save", 280}, -+ {"GImageVIew thumbnail size", 281}, -+ {"GQview thumbnail size", 282}, -+ {"Image change interval", 283}, -+ {"[sec]", 284}, -+ {"Repeat slide show", 285}, -+ {"Auto resize to window size", 286}, -+ {"File operation", 287}, -+ {"Enable DnD to external proccess (Experimental)", 288}, -+ {"Enable DnD from extenal proccess (Experimental)", 289}, -+ {"Always refresh list when DnD end", 290}, -+ {"Program Name", 291}, -+ {"Command", 292}, -+ {"Graphic Viewer/Editor", 293}, -+ {"Down", 294}, -+ {"Program Name: ", 295}, -+ {"Command: ", 296}, -+ {"New", 297}, -+ {"Add", 298}, -+ {"Change", 299}, -+ {"Delete", 300}, -+ {"Web Browser (Not implemented yet)", 301}, -+ {"Text Viewer", 302}, -+ {"Use internal viewer", 303}, -+ {"Common", 304}, -+ {"Directory View", 305}, -+ {"Thumbnail Cache", 306}, -+ {"Slide Show", 307}, -+ {"External Program", 308}, -+ {"Apply", 309}, -+ {"Can't open text file: %s\n", 310}, -+ {"File Name: ", 311}, -+ {"GImageView", 312}, -+ {"Nautilus", 313}, -+ {"Konqueror (Large)", 314}, -+ {"Konqueror (Medium)", 315}, -+ {"Konqueror (Small)", 316}, -+ {"GQview", 317}, -+ {"Electric Eyes (Preview)", 318}, -+ {"Electric Eyes (Icon)", 319}, -+ {"Electric Eyes (Mini)", 320}, -+ {"XV thumbnail", 321}, -+ {"Thumbnail", 322}, -+ {"List (Icon)", 323}, -+ {"List (Thumbnail)", 324}, -+ {"Detail", 325}, -+ {"Detail + Icon", 326}, -+ {"Detail + Thumbnail", 327}, -+ {"/Open in New Window", 328}, -+ {"/Open in Shared Window", 329}, -+ {"/Open in External Program", 330}, -+ {"/Update Thumbnail", 331}, -+ {"/Remove from List", 332}, -+ {"/Rename", 333}, -+ {"/Remove file", 334}, -+ {"Rename a file", 335}, -+ {"New file name: ", 336}, -+ {"\ -+Faild to rename file :\n\ -+%s", 337}, -+ {"Faild to rename cache file :%s\n", 338}, -+ {"\ -+Delete these %d files.\n\ -+OK?", 339}, -+ {"Confirm Deleting Files", 340}, -+ {"Delete File", 341}, -+ {"Deleting Files", 342}, -+ {"\ -+Faild to delete file :\n\ -+%s", 343}, -+ {"No files specified!!", 344}, -+ {"Collection %d", 345}, -+ {"/_File/New Window", 346}, -+ {"/_File/New Tab", 347}, -+ {"/_File/New Collection", 348}, -+ {"/_File/Close Tab", 349}, -+ {"/_File/Close Window", 350}, -+ {"/_Edit/Select All", 351}, -+ {"/_Edit/Unselect All", 352}, -+ {"/_Edit/---", 353}, -+ {"/_Edit/Refresh List", 354}, -+ {"/_Edit/Reload Cache", 355}, -+ {"/_Edit/Update All Thumbnail", 356}, -+ {"/_Tab", 357}, -+ {"/_Tab/Tab Position", 358}, -+ {"/_Tab/Tab Position/Top", 359}, -+ {"/_Tab/Tab Position/Bottom", 360}, -+ {"/_Tab/Tab Position/Left", 361}, -+ {"/_Tab/Tab Position/Right", 362}, -+ {"/_Tab/---", 363}, -+ {"/_Tab/First Page", 364}, -+ {"/_Tab/Last Page", 365}, -+ {"/_Tab/Next Page", 366}, -+ {"/_Tab/Previous Page", 367}, -+ {"/_Tab/Move tab forward", 368}, -+ {"/_Tab/Move tab backward", 369}, -+ {"/_Tab/Detach tab", 370}, -+ {"/Sort File List", 371}, -+ {"/Layout", 372}, -+ {"/Layout/Layout0", 373}, -+ {"/Layout/Layout1", 374}, -+ {"/Layout/Layout2", 375}, -+ {"/Layout/Layout3", 376}, -+ {"/Layout/Layout4", 377}, -+ {"/Layout/Custom", 378}, -+ {"/Slideshow", 379}, -+ {"/Directory View", 380}, -+ {"/Preview", 381}, -+ {"/DirView Tool Bar", 382}, -+ {"/Tab", 383}, -+ {"/by Name", 384}, -+ {"/by Access Time", 385}, -+ {"/by Modification Time", 386}, -+ {"/by Change Time", 387}, -+ {"/by Size", 388}, -+ {"/by Type", 389}, -+ {"/Reverse Order", 390}, -+ {"Prev", 391}, -+ {"Go to previous page", 392}, -+ {"Next", 393}, -+ {"Go to next page", 394}, -+ {"Reload", 395}, -+ {"Reload Cache", 396}, -+ {"Skip creating current thumbnail table", 397}, -+ {"Stop creating thumbnails", 398}, -+ {"Thumbnail Size", 399}, -+ {"Quit", 400}, -+ {"Exit this program", 401}, -+ {"Empty", 402}, -+ {"%d/%d files", 403}, -+ {"DIR View: %s", 404}, -+ {"Collection View", 405}, -+ {"Loading in another tab...", 406}, -+ {"%d/%d page %d/%d files %d/%d kB", 407}, -+ {"New Tab", 408}, -+ {"NewTab %d", 409}, -+ {"Name", 410}, -+ {"Size (byte)", 411}, -+ {"Type", 412}, -+ {"Cache type", 413}, -+ {"Date Modified", 414}, -+ {"User", 415}, -+ {"Group", 416}, -+ {"Mode", 417}, -+}; -+ -+int _msg_tbl_length = 417; ---- gimageview-0.2.27.orig/lib/libexif/jpeg-data.c -+++ gimageview-0.2.27/lib/libexif/jpeg-data.c -@@ -1,6 +1,6 @@ - /* jpeg-data.c - * -- * Copyright -A© 2001 Lutz Müller $)B -+ * Copyright .AŽ© 2001 Lutz MŽüller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -204,6 +204,7 @@ - jpeg_data_append_section (data); - s = &data->sections[data->count - 1]; - s->marker = marker; -+ s->content.generic.data = NULL; - o += i + 1; - - switch (s->marker) { -@@ -214,7 +215,9 @@ - - /* Read the length of the section */ - len = ((d[o] << 8) | d[o + 1]) - 2; -+ if (len > size) { o = size; break; } - o += 2; -+ if (o + len > size) { o = size; break; } - - switch (s->marker) { - case JPEG_MARKER_APP1: ---- gimageview-0.2.27.orig/src/gimv_image.c -+++ gimageview-0.2.27/src/gimv_image.c -@@ -35,7 +35,7 @@ - #include "gimv_io.h" - #include "gimv_image_saver.h" - --#if defined (HAVE_GDK_PIXBUF) -+#if defined (HAVE_GDK_PIXBUF) || defined (USE_GTK2) - # include - # include "pixbuf_utils.h" - typedef GdkPixbuf GimvRawImage; ---- gimageview-0.2.27.orig/src/gimv_cell_pixmap.c -+++ gimageview-0.2.27/src/gimv_cell_pixmap.c -@@ -25,10 +25,6 @@ - * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford - */ - --#ifndef GTK_DISABLE_DEPRECATED --# define GTK_DISABLE_DEPRECATED --#endif /* GTK_DISABLE_DEPRECATED */ -- - #include "gimv_cell_pixmap.h" - - #if (GTK_MAJOR_VERSION >= 2) diff -Nru gimageview-0.2.27/debian/patches/10_bts459288_edit-options_fix.dpatch gimageview-0.3.0-0.20101117/debian/patches/10_bts459288_edit-options_fix.dpatch --- gimageview-0.2.27/debian/patches/10_bts459288_edit-options_fix.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/10_bts459288_edit-options_fix.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_bts459288_edit-options_fix.dpatch by Nick Gasson -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix Edit > Options segfault - -@DPATCH@ -diff -urNad gimageview-0.2.27~/src/gimv_prefs_win.c gimageview-0.2.27/src/gimv_prefs_win.c ---- gimageview-0.2.27~/src/gimv_prefs_win.c 2008-08-14 22:56:53.000000000 +0200 -+++ gimageview-0.2.27/src/gimv_prefs_win.c 2008-08-14 23:03:30.406557955 +0200 -@@ -433,11 +433,15 @@ - GtkTreeModel *model; - GtkTreeIter iter; - GimvPrefsWinPagePrivate *priv; -- -+ gboolean has_selected; -+ - g_return_if_fail (treeview); - - selection = gtk_tree_view_get_selection (treeview); -- gtk_tree_selection_get_selected (selection, &model, &iter); -+ has_selected = gtk_tree_selection_get_selected (selection, &model, &iter); -+ if (!has_selected) -+ return; -+ - gtk_tree_model_get (model, &iter, - COLUMN_PRIV_DATA, &priv, - COLUMN_TERMINATOR); diff -Nru gimageview-0.2.27/debian/patches/20_bts440648_sort_fix.dpatch gimageview-0.3.0-0.20101117/debian/patches/20_bts440648_sort_fix.dpatch --- gimageview-0.2.27/debian/patches/20_bts440648_sort_fix.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/20_bts440648_sort_fix.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_bts440648_sort_fix.dpatch -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch from upstream - -@DPATCH@ - -diff -Nur gimageview-0.2.27-bak/src/gimv_thumb_view.c gimageview-0.2.27/src/gimv_thumb_view.c ---- gimageview-0.2.27-bak/src/gimv_thumb_view.c 2004-12-20 20:07:31.000000000 +0900 -+++ gimageview-0.2.27/src/gimv_thumb_view.c 2005-01-11 20:00:00.039241976 +0900 -@@ -1533,9 +1533,13 @@ - - gimv_thumb_view_sort_data (tv); - -+#if 0 - for (node = new_thumb_list; node; node = g_list_next (node)) - tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode); - g_list_free(new_thumb_list); -+#endif -+ -+ gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode); - } - - -@@ -1577,9 +1581,13 @@ - - gimv_thumb_view_sort_data (tv); - -+#if 0 - for (node = new_thumb_list; node; node = g_list_next (node)) - tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode); - g_list_free(new_thumb_list); -+#endif -+ -+ gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode); - } - - diff -Nru gimageview-0.2.27/debian/patches/30_bts494304_relibtoolize.dpatch gimageview-0.3.0-0.20101117/debian/patches/30_bts494304_relibtoolize.dpatch --- gimageview-0.2.27/debian/patches/30_bts494304_relibtoolize.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/30_bts494304_relibtoolize.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50886 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_bts494304_relibtoolize.dpatch by Petr Salinger -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Relibtoolize to support GNU/kFreeBSD - -@DPATCH@ -diff -urNad gimageview-0.2.27~/aclocal.m4 gimageview-0.2.27/aclocal.m4 ---- gimageview-0.2.27~/aclocal.m4 2004-12-28 05:01:05.000000000 +0100 -+++ gimageview-0.2.27/aclocal.m4 2008-08-14 00:26:57.216224373 +0200 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.8.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,13 +11,19 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) -+ - # 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 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 Subroutines of libtool.m4, - dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -@@ -124,20 +130,22 @@ - AC_LIB_PROG_LD_GNU - ]) - --# 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. -+# lib-link.m4 serial 13 (gettext-0.17) -+dnl Copyright (C) 2001-2007 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 From Bruno Haible. - -+AC_PREREQ(2.54) -+ - 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. -+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. - AC_DEFUN([AC_LIB_LINKFLAGS], - [ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -@@ -150,13 +158,16 @@ - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" -+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" -+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) -+ AC_SUBST([LIB]NAME[_PREFIX]) - 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 -@@ -172,6 +183,8 @@ - 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. -+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. - AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], - [ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -@@ -208,19 +221,27 @@ - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= -+ LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) -+ AC_SUBST([LIB]NAME[_PREFIX]) - 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. -+dnl acl_libext, -+dnl acl_shlibext, -+dnl acl_hardcode_libdir_flag_spec, -+dnl acl_hardcode_libdir_separator, -+dnl acl_hardcode_direct, -+dnl acl_hardcode_minus_L. - AC_DEFUN([AC_LIB_RPATH], - [ -+ dnl Tell automake >= 1.10 to complain if config.rpath is missing. -+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.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 -@@ -233,12 +254,14 @@ - 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" -+ acl_libext="$acl_cv_libext" -+ acl_shlibext="$acl_cv_shlibext" -+ acl_libname_spec="$acl_cv_libname_spec" -+ acl_library_names_spec="$acl_cv_library_names_spec" -+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -+ acl_hardcode_direct="$acl_cv_hardcode_direct" -+ acl_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], -@@ -248,19 +271,24 @@ - 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. -+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. - AC_DEFUN([AC_LIB_LINKFLAGS_BODY], - [ -+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ dnl Autoconf >= 2.61 supports dots in --with options. -+ define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) - 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], -+ AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], -+[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib -+ --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], - [ - if test "X$withval" = "Xno"; then - use_additional=no -@@ -272,7 +300,7 @@ - ]) - else - additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -+ additional_libdir="$withval/$acl_libdirstem" - fi - fi - ]) -@@ -281,6 +309,7 @@ - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= -+ LIB[]NAME[]_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= -@@ -320,22 +349,55 @@ - found_la= - found_so= - found_a= -+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name -+ if test -n "$acl_shlibext"; then -+ shrext=".$acl_shlibext" # typically: shrext=.so -+ else -+ shrext= -+ fi - 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" -+ dir="$additional_libdir" -+ dnl The same code as in the loop below: -+ dnl First look for a shared library. -+ if test -n "$acl_shlibext"; then -+ if test -f "$dir/$libname$shrext"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext" -+ else -+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then -+ ver=`(cd "$dir" && \ -+ for f in "$libname$shrext".*; do echo "$f"; done \ -+ | sed -e "s,^$libname$shrext\\\\.,," \ -+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ -+ | sed 1q ) 2>/dev/null` -+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext.$ver" -+ fi -+ else -+ eval library_names=\"$acl_library_names_spec\" -+ for f in $library_names; do -+ if test -f "$dir/$f"; then -+ found_dir="$dir" -+ found_so="$dir/$f" -+ break -+ fi -+ done - fi - fi - fi -+ dnl Then look for a static library. -+ if test "X$found_dir" = "X"; then -+ if test -f "$dir/$libname.$acl_libext"; then -+ found_dir="$dir" -+ found_a="$dir/$libname.$acl_libext" -+ fi -+ fi -+ if test "X$found_dir" != "X"; then -+ if test -f "$dir/$libname.la"; then -+ found_la="$dir/$libname.la" -+ fi -+ fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do -@@ -343,21 +405,46 @@ - 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 -+ dnl First look for a shared library. -+ if test -n "$acl_shlibext"; then -+ if test -f "$dir/$libname$shrext"; then - found_dir="$dir" -- found_a="$dir/lib$name.$libext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -+ found_so="$dir/$libname$shrext" -+ else -+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then -+ ver=`(cd "$dir" && \ -+ for f in "$libname$shrext".*; do echo "$f"; done \ -+ | sed -e "s,^$libname$shrext\\\\.,," \ -+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ -+ | sed 1q ) 2>/dev/null` -+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext.$ver" -+ fi -+ else -+ eval library_names=\"$acl_library_names_spec\" -+ for f in $library_names; do -+ if test -f "$dir/$f"; then -+ found_dir="$dir" -+ found_so="$dir/$f" -+ break -+ fi -+ done - fi - fi - fi -+ dnl Then look for a static library. -+ if test "X$found_dir" = "X"; then -+ if test -f "$dir/$libname.$acl_libext"; then -+ found_dir="$dir" -+ found_a="$dir/$libname.$acl_libext" -+ fi -+ fi -+ if test "X$found_dir" != "X"; then -+ if test -f "$dir/$libname.la"; then -+ found_la="$dir/$libname.la" -+ fi -+ fi - ;; - esac - if test "X$found_dir" != "X"; then -@@ -372,7 +459,7 @@ - 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 -+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else -@@ -391,12 +478,12 @@ - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. -- if test "$hardcode_direct" = yes; then -+ if test "$acl_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 -+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_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" -@@ -427,13 +514,13 @@ - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi -- if test "$hardcode_minus_L" != no; then -+ if test "$acl_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 We cannot use $acl_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. -@@ -458,8 +545,9 @@ - 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/*$,,'` -+ */$acl_libdirstem | */$acl_libdirstem/) -+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` -+ LIB[]NAME[]_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac -@@ -476,7 +564,7 @@ - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi -@@ -520,12 +608,12 @@ - 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 -+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= -- if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi -@@ -621,18 +709,18 @@ - done - done - if test "X$rpathdirs" != "X"; then -- if test -n "$hardcode_libdir_separator"; then -+ if test -n "$acl_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" -+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done -- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. -+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" -- eval flag=\"$hardcode_libdir_flag_spec\" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else -@@ -640,7 +728,7 @@ - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" -- eval flag=\"$hardcode_libdir_flag_spec\" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done -@@ -676,13 +764,87 @@ - done - ]) - --# 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 For those cases where a variable contains several -L and -l options -+dnl referring to unknown libraries and directories, this macro determines the -+dnl necessary additional linker options for the runtime path. -+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -+dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -+dnl otherwise linking without libtool is assumed. -+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -+[ -+ AC_REQUIRE([AC_LIB_RPATH]) -+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) -+ $1= -+ if test "$enable_rpath" != no; then -+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then -+ dnl Use an explicit option to hardcode directories into the resulting -+ dnl binary. -+ rpathdirs= -+ next= -+ for opt in $2; do -+ if test -n "$next"; then -+ dir="$next" -+ dnl No need to hardcode the standard /usr/lib. -+ if test "X$dir" != "X/usr/$acl_libdirstem"; then -+ rpathdirs="$rpathdirs $dir" -+ fi -+ next= -+ else -+ case $opt in -+ -L) next=yes ;; -+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` -+ dnl No need to hardcode the standard /usr/lib. -+ if test "X$dir" != "X/usr/$acl_libdirstem"; then -+ rpathdirs="$rpathdirs $dir" -+ fi -+ next= ;; -+ *) next= ;; -+ esac -+ fi -+ done -+ if test "X$rpathdirs" != "X"; then -+ if test -n ""$3""; then -+ dnl libtool is used for linking. Use -R options. -+ for dir in $rpathdirs; do -+ $1="${$1}${$1:+ }-R$dir" -+ done -+ else -+ dnl The linker is used for linking directly. -+ if test -n "$acl_hardcode_libdir_separator"; then -+ dnl Weird platform: only the last -rpath option counts, the user -+ dnl must pass all path elements in one option. -+ alldirs= -+ for dir in $rpathdirs; do -+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" -+ done -+ acl_save_libdir="$libdir" -+ libdir="$alldirs" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ $1="$flag" -+ else -+ dnl The -rpath options are cumulative. -+ for dir in $rpathdirs; do -+ acl_save_libdir="$libdir" -+ libdir="$dir" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ $1="${$1}${$1:+ }$flag" -+ done -+ fi -+ fi -+ fi -+ fi -+ fi -+ AC_SUBST([$1]) -+]) -+ -+# lib-prefix.m4 serial 5 (gettext-0.15) -+dnl Copyright (C) 2001-2005 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 From Bruno Haible. - -@@ -704,6 +866,7 @@ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes -@@ -725,7 +888,7 @@ - ]) - else - additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -+ additional_libdir="$withval/$acl_libdirstem" - fi - fi - ]) -@@ -749,7 +912,7 @@ - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi -@@ -767,7 +930,7 @@ - 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 -+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -@@ -777,7 +940,7 @@ - fi - done - if test -z "$haveit"; then -- if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; -@@ -832,55 +995,80 @@ - prefix="$acl_save_prefix" - ]) - --# -*- Autoconf -*- --# Copyright (C) 2002, 2003 Free Software Foundation, Inc. --# Generated from amversion.in; do not edit by hand. -- --# 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. -+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -+dnl the basename of the libdir, either "lib" or "lib64". -+AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -+[ -+ dnl There is no formal standard regarding lib and lib64. The current -+ dnl practice is that on a system supporting 32-bit and 64-bit instruction -+ dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit -+ dnl libraries go under $prefix/lib. We determine the compiler's default -+ dnl mode by looking at the compiler's library search path. If at least -+ dnl of its elements ends in /lib64 or points to a directory whose absolute -+ dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the -+ dnl default, namely "lib". -+ acl_libdirstem=lib -+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -+ if test -n "$searchpath"; then -+ acl_save_IFS="${IFS= }"; IFS=":" -+ for searchdir in $searchpath; do -+ if test -d "$searchdir"; then -+ case "$searchdir" in -+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -+ *) searchdir=`cd "$searchdir" && pwd` -+ case "$searchdir" in -+ */lib64 ) acl_libdirstem=lib64 ;; -+ esac ;; -+ esac -+ fi -+ done -+ IFS="$acl_save_IFS" -+ fi -+]) - --# 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 -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - - # AM_AUTOMAKE_VERSION(VERSION) - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been - # generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.10.1], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) -+ -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) - - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.8.3])]) -- --# AM_AUX_DIR_EXPAND -- --# Copyright (C) 2001, 2003 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. -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_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. -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# 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. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets - # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -@@ -927,26 +1115,16 @@ - am_aux_dir=`cd $ac_aux_dir && pwd` - ]) - --# AM_CONDITIONAL -*- Autoconf -*- -- --# Copyright (C) 1997, 2000, 2001, 2003 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. -+# AM_CONDITIONAL -*- Autoconf -*- - --# 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. -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 6 -+# serial 8 - - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- -@@ -955,8 +1133,10 @@ - [AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -966,30 +1146,18 @@ - fi - AC_CONFIG_COMMANDS_PRE( - [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]) -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# serial 7 -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - # Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# 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 --# 02111-1307, USA. -- -+# serial 9 - - # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, -@@ -998,7 +1166,6 @@ - # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -- - # _AM_DEPENDENCIES(NAME) - # ---------------------- - # See how the compiler implements dependency checking. -@@ -1018,6 +1185,7 @@ - ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -@@ -1083,13 +1251,19 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi -@@ -1130,29 +1304,20 @@ - AMDEPBACKSLASH='\' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl - ]) - --# Generate code to set up dependency tracking. -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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. -+# Generate code to set up dependency tracking. -*- Autoconf -*- - --# 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. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --#serial 2 -+#serial 3 - - # _AM_OUTPUT_DEPENDENCY_COMMANDS - # ------------------------------ -@@ -1165,33 +1330,28 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi -- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -@@ -1217,54 +1377,31 @@ - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) - ]) - --# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -- --# Copyright (C) 1996, 1997, 2000, 2001, 2003 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 --# 02111-1307, USA. -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 7 -+# serial 8 - - # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. - AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - --# Do all the work for Automake. -*- Autoconf -*- -- --# 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. -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# 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. -+# Do all the work for Automake. -*- Autoconf -*- - --# 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. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2008 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# 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. -+# serial 13 - --# serial 11 -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. - - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) - # AM_INIT_AUTOMAKE([OPTIONS]) -@@ -1278,16 +1415,20 @@ - # arguments mandatory, and then we can depend on a new Autoconf - # release and drop the old call support. - AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.58])dnl -+[AC_PREREQ([2.60])dnl - dnl Autoconf wants to disallow AM_ names. We explicitly allow - dnl the ones we care about. - m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl --# 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]) -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi - fi - - # test whether we have cygpath -@@ -1307,6 +1448,9 @@ - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -@@ -1322,7 +1466,6 @@ - AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) - AM_MISSING_PROG(AUTOHEADER, autoheader) - AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) - AM_PROG_INSTALL_SH - AM_PROG_INSTALL_STRIP - AC_REQUIRE([AM_PROG_MKDIR_P])dnl -@@ -1331,7 +1474,9 @@ - AC_REQUIRE([AC_PROG_AWK])dnl - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AM_SET_LEADING_DOT])dnl -- -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) - _AM_IF_OPTION([no-dependencies],, - [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], -@@ -1341,6 +1486,10 @@ - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl - ]) - ]) - -@@ -1354,62 +1503,39 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - - # AM_PROG_INSTALL_SH - # ------------------ - # Define $install_sh. -- --# Copyright (C) 2001, 2003 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 --# 02111-1307, USA. -- - AC_DEFUN([AM_PROG_INSTALL_SH], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - AC_SUBST(install_sh)]) - --# -*- Autoconf -*- --# Copyright (C) 2003 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 --# 02111-1307, USA. -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 1 -+# serial 2 - - # Check whether the underlying file-system supports filenames - # with a leading dot. For instance MS-DOS doesn't. -@@ -1424,28 +1550,17 @@ - rmdir .tst 2>/dev/null - AC_SUBST([am__leading_dot])]) - --# Add --enable-maintainer-mode option to configure. -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- - # From Jim Meyering - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 - # Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# 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 --# 02111-1307, USA. -- --# serial 3 -+# serial 4 - - AC_DEFUN([AM_MAINTAINER_MODE], - [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -@@ -1464,26 +1579,15 @@ - - AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - --# Check to see how 'make' treats includes. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003 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. -+# Check to see how 'make' treats includes. -*- Autoconf -*- - --# 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. -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 3 - - # AM_MAKE_INCLUDE() - # ----------------- -@@ -1527,27 +1631,16 @@ - rm -f confinc confmf - ]) - --# -*- Autoconf -*- -- -- --# Copyright (C) 1997, 1999, 2000, 2001, 2003 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. -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - --# 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. -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 3 -+# serial 5 - - # AM_MISSING_PROG(NAME, PROGRAM) - # ------------------------------ -@@ -1563,6 +1656,7 @@ - # If it does, set am_missing_run to use it, otherwise, to nothing. - AC_DEFUN([AM_MISSING_HAS_RUN], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl - test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" - # Use eval to expand $SHELL - if eval "$MISSING --run true"; then -@@ -1573,92 +1667,41 @@ - fi - ]) - -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ - # AM_PROG_MKDIR_P - # --------------- --# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -- --# Copyright (C) 2003, 2004 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 --# 02111-1307, USA. -- --# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories --# created by `make install' are always world readable, even if the --# installer happens to have an overly restrictive umask (e.g. 077). --# This was a mistake. There are at least two reasons why we must not --# use `-m 0755': --# - it causes special bits like SGID to be ignored, --# - it may be too restrictive (some setups expect 775 directories). --# --# Do not use -m 0755 and let people choose whatever they expect by --# setting umask. --# --# We cannot accept any implementation of `mkdir' that recognizes `-p'. --# Some implementations (such as Solaris 8's) are not thread-safe: if a --# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' --# concurrently, both version can detect that a/ is missing, but only --# one can create it and the other will error out. Consequently we --# restrict ourselves to GNU make (using the --version option ensures --# this.) -+# Check for `mkdir -p'. - AC_DEFUN([AM_PROG_MKDIR_P], --[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # Keeping the `.' argument allows $(mkdir_p) to be used without -- # argument. Indeed, we sometimes output rules like -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. -- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more -- # expensive solution, as it forces Make to start a sub-shell.) -- mkdir_p='mkdir -p -- .' --else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -- else -- mkdir_p='$(install_sh) -d' -- fi --fi --AC_SUBST([mkdir_p])]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003 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. -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) - --# 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. -+# Helper functions for option handling. -*- Autoconf -*- - --# 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. -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 3 - - # _AM_MANGLE_OPTION(NAME) - # ----------------------- -@@ -1683,28 +1726,16 @@ - AC_DEFUN([_AM_IF_OPTION], - [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - --# --# Check to make sure that the build environment is sane. --# -- --# Copyright (C) 1996, 1997, 2000, 2001, 2003 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. -+# Check to make sure that the build environment is sane. -*- Autoconf -*- - --# 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. -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 3 -+# serial 4 - - # AM_SANITY_CHECK - # --------------- -@@ -1747,25 +1778,14 @@ - fi - AC_MSG_RESULT(yes)]) - --# AM_PROG_INSTALL_STRIP -- --# Copyright (C) 2001, 2003 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 --# 02111-1307, USA. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -+# AM_PROG_INSTALL_STRIP -+# --------------------- - # One issue with vendor `install' (even GNU) is that you can't - # specify the program used to strip binaries. This is especially - # annoying in cross-compiling environments, where the build's strip -@@ -1783,9 +1803,117 @@ - if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -+# Copyright (C) 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ -+# Check how to create a tarball. -*- Autoconf -*- -+ -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac -+ -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break -+ -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir -+ -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR -+ - m4_include([m4/codeset.m4]) - m4_include([m4/gdk-pixbuf.m4]) - m4_include([m4/gettext.m4]) -@@ -1795,6 +1923,7 @@ - m4_include([m4/iconv.m4]) - m4_include([m4/imlib.m4]) - m4_include([m4/intltool.m4]) -+m4_include([m4/isc-posix.m4]) - m4_include([m4/lcmessage.m4]) - m4_include([m4/libcharset.m4]) - m4_include([m4/libtool.m4]) -diff -urNad gimageview-0.2.27~/configure gimageview-0.2.27/configure ---- gimageview-0.2.27~/configure 2004-12-28 05:01:35.000000000 +0100 -+++ gimageview-0.2.27/configure 2008-08-14 00:26:57.312229846 +0200 -@@ -1,25 +1,54 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.61. - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 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 -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # 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 -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# 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 --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -29,8 +58,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+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 -+IFS=$as_save_IFS -+ -+ ;; -+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_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -44,18 +108,19 @@ - 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 -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -63,157 +128,388 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH - - --# 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 -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi - --# 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 -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. - fi - -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi - -- 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 -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi - -- ;; -- 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 -- '') -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= - 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 -+ case $as_dir in - /*) -- if ("$as_dir/$as_base" -c ' -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( - 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 -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line 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. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $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 -+ # original and so on. Autoconf is especially sensitive 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= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - 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='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - 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 -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -222,7 +518,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # 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'" -@@ -231,25 +548,6 @@ - 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 -- -- --# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac --fi - - - # Check that we are running under the correct shell. -@@ -269,7 +567,7 @@ - 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 -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : - else -@@ -281,22 +579,22 @@ - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -315,8 +613,9 @@ - # - # So, first we look for a working echo in the user's PATH. - -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -+ 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` && -@@ -325,7 +624,7 @@ - break - fi - done -- IFS="$save_ifs" -+ IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. -@@ -399,29 +698,31 @@ - - - -+ -+tagnames=${tagnames+${tagnames},}CXX -+ -+tagnames=${tagnames+${tagnames},}F77 -+ -+exec 7<&0 &1 -+ - # 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_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - 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= -@@ -433,42 +734,322 @@ - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef 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 CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S YACC CPP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE WINDRES OS_WIN32_TRUE OS_WIN32_FALSE ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL GLIB_REQUIRED GTK_REQUIRED IMLIB_REQUIRED GDK_PIXBUF_REQUIRED LIBRSVG_REQUIRED LIBWMF_REQUIRED XINE_REQUIRED GLIB2_REQUIRED GMODULE2_REQUIRED GTK2_REQUIRED GDK_PIXBUF2_REQUIRED PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG IMLIB_CONFIG GDK_IMLIB_CFLAGS GDK_IMLIB_LIBS GDK_PIXBUF_CONFIG GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS ENABLE_GDK_PIXBUF_TRUE ENABLE_GDK_PIXBUF_FALSE ENABLE_GDK_IMLIB_TRUE ENABLE_GDK_IMLIB_FALSE GIMV_IMAGELIB_CFLAGS GIMV_IMAGELIB_LIBS ZLIB_CFLAGS ZLIB_LIBS HAVE_BZLIB_TRUE HAVE_BZLIB_FALSE BZLIB_CFLAGS BZLIB_LIBS PNG_CFLAGS PNG_LIBS HAVE_PNG_TRUE HAVE_PNG_FALSE ENABLE_JPEG_TRUE ENABLE_JPEG_FALSE JPEG_CFLAGS JPEG_LIBS ENABLE_MNG_TRUE ENABLE_MNG_FALSE MNG_CFLAGS MNG_LIBS LIBRSVG_CFLAGS LIBRSVG_LIBS GNOME_CONFIG GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS ZVT_LIBS GLIB_CFLAGS GLIB_LIBS OAF_CFLAGS OAF_LIBS GNORBA_CFLAGS GNORBA_LIBS ENABLE_LIBRSVG_TRUE ENABLE_LIBRSVG_FALSE XML_CFLAGS XML_LIBS LIBWMF_CONFIG LIBWMF_CFLAGS LIBWMF_LIBS ENABLE_WMF_TRUE ENABLE_WMF_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS XINE_CONFIG XINE_CFLAGS XINE_LIBS XINE_ACFLAGS ENABLE_XINE_TRUE ENABLE_XINE_FALSE ALLOCA GLIBC21 LIBICONV LTLIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX localedir LIBCHARSET INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ENABLE_EXIF_TRUE ENABLE_EXIF_FALSE EXIF_CFLAGS EXIF_LIBS ENABLE_SPI_TRUE ENABLE_SPI_FALSE DLLLOADER_CFLAGS DLLLOADER_LIBS ENABLE_MPLAYER_TRUE ENABLE_MPLAYER_FALSE LIBOBJS docdir gimv_datadir gimv_docdir gimv_icondir plugindir ARCHIVER_PLUGIN_DIR IMAGE_LOADER_PLUGIN_DIR IMAGE_SAVER_PLUGIN_DIR IO_STREAM_PLUGIN_DIR IMAGE_VIEW_PLUGIN_DIR THUMBNAIL_VIEW_PLUGIN_DIR THUMBNAIL_PLUGIN_DIR LTLIBOBJS' -+ac_header_list= -+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 -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+am__isrc -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+CXX -+CXXFLAGS -+ac_ct_CXX -+CXXDEPMODE -+am__fastdepCXX_TRUE -+am__fastdepCXX_FALSE -+LN_S -+YACC -+YFLAGS -+XMKMF -+CPP -+MAINTAINER_MODE_TRUE -+MAINTAINER_MODE_FALSE -+MAINT -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+PLATFORM_WIN32_TRUE -+PLATFORM_WIN32_FALSE -+WINDRES -+OS_WIN32_TRUE -+OS_WIN32_FALSE -+SED -+GREP -+EGREP -+ECHO -+AR -+RANLIB -+DSYMUTIL -+NMEDIT -+DLLTOOL -+AS -+OBJDUMP -+CXXCPP -+F77 -+FFLAGS -+ac_ct_F77 -+LIBTOOL -+GLIB_REQUIRED -+GTK_REQUIRED -+IMLIB_REQUIRED -+GDK_PIXBUF_REQUIRED -+LIBRSVG_REQUIRED -+LIBWMF_REQUIRED -+XINE_REQUIRED -+GLIB2_REQUIRED -+GMODULE2_REQUIRED -+GTK2_REQUIRED -+GDK_PIXBUF2_REQUIRED -+PKG_CONFIG -+GTK_CFLAGS -+GTK_LIBS -+GTK_CONFIG -+IMLIB_CONFIG -+GDK_IMLIB_CFLAGS -+GDK_IMLIB_LIBS -+GDK_PIXBUF_CONFIG -+GDK_PIXBUF_CFLAGS -+GDK_PIXBUF_LIBS -+ENABLE_GDK_PIXBUF_TRUE -+ENABLE_GDK_PIXBUF_FALSE -+ENABLE_GDK_IMLIB_TRUE -+ENABLE_GDK_IMLIB_FALSE -+GIMV_IMAGELIB_CFLAGS -+GIMV_IMAGELIB_LIBS -+ZLIB_CFLAGS -+ZLIB_LIBS -+HAVE_BZLIB_TRUE -+HAVE_BZLIB_FALSE -+BZLIB_CFLAGS -+BZLIB_LIBS -+PNG_CFLAGS -+PNG_LIBS -+HAVE_PNG_TRUE -+HAVE_PNG_FALSE -+ENABLE_JPEG_TRUE -+ENABLE_JPEG_FALSE -+JPEG_CFLAGS -+JPEG_LIBS -+ENABLE_MNG_TRUE -+ENABLE_MNG_FALSE -+MNG_CFLAGS -+MNG_LIBS -+LIBRSVG_CFLAGS -+LIBRSVG_LIBS -+GNOME_CONFIG -+GNOME_CFLAGS -+GNOME_LIBS -+GNOMEUI_CFLAGS -+GNOMEUI_LIBS -+ZVT_LIBS -+GLIB_CFLAGS -+GLIB_LIBS -+OAF_CFLAGS -+OAF_LIBS -+GNORBA_CFLAGS -+GNORBA_LIBS -+ENABLE_LIBRSVG_TRUE -+ENABLE_LIBRSVG_FALSE -+XML_CFLAGS -+XML_LIBS -+LIBWMF_CONFIG -+LIBWMF_CFLAGS -+LIBWMF_LIBS -+ENABLE_WMF_TRUE -+ENABLE_WMF_FALSE -+X_CFLAGS -+X_PRE_LIBS -+X_LIBS -+X_EXTRA_LIBS -+XINERAMA_LIBS -+XINE_CONFIG -+XINE_CFLAGS -+XINE_LIBS -+XINE_ACFLAGS -+ENABLE_XINE_TRUE -+ENABLE_XINE_FALSE -+ALLOCA -+GLIBC21 -+LIBICONV -+LTLIBICONV -+USE_NLS -+MSGFMT -+GMSGFMT -+XGETTEXT -+INTLBISON -+BUILD_INCLUDED_LIBINTL -+USE_INCLUDED_LIBINTL -+CATALOGS -+CATOBJEXT -+GMOFILES -+INTLLIBS -+INTLOBJS -+POFILES -+POSUB -+DATADIRNAME -+INSTOBJEXT -+GENCAT -+MKINSTALLDIRS -+INTL_LIBTOOL_SUFFIX_PREFIX -+LIBCHARSET -+INTLTOOL_DESKTOP_RULE -+INTLTOOL_DIRECTORY_RULE -+INTLTOOL_KEYS_RULE -+INTLTOOL_PROP_RULE -+INTLTOOL_OAF_RULE -+INTLTOOL_PONG_RULE -+INTLTOOL_SERVER_RULE -+INTLTOOL_SHEET_RULE -+INTLTOOL_SOUNDLIST_RULE -+INTLTOOL_UI_RULE -+INTLTOOL_XML_RULE -+INTLTOOL_CAVES_RULE -+INTLTOOL_SCHEMAS_RULE -+INTLTOOL_THEME_RULE -+INTLTOOL_EXTRACT -+INTLTOOL_MERGE -+INTLTOOL_UPDATE -+INTLTOOL_PERL -+ENABLE_EXIF_TRUE -+ENABLE_EXIF_FALSE -+EXIF_CFLAGS -+EXIF_LIBS -+ENABLE_SPI_TRUE -+ENABLE_SPI_FALSE -+DLLLOADER_CFLAGS -+DLLLOADER_LIBS -+ENABLE_MPLAYER_TRUE -+ENABLE_MPLAYER_FALSE -+LIBOBJS -+gimv_datadir -+gimv_docdir -+gimv_icondir -+plugindir -+ARCHIVER_PLUGIN_DIR -+IMAGE_LOADER_PLUGIN_DIR -+IMAGE_SAVER_PLUGIN_DIR -+IO_STREAM_PLUGIN_DIR -+IMAGE_VIEW_PLUGIN_DIR -+THUMBNAIL_VIEW_PLUGIN_DIR -+THUMBNAIL_PLUGIN_DIR -+LTLIBOBJS' - ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+YACC -+YFLAGS -+XMKMF -+CPP -+CXXCPP -+F77 -+FFLAGS' -+ - - # Initialize some variables set by options. - ac_init_help= -@@ -495,34 +1076,48 @@ - # 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. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - 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' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -544,33 +1139,45 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$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 && -+ 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" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -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 && -+ 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'" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -597,6 +1204,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -621,13 +1234,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -692,6 +1308,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -744,24 +1370,20 @@ - -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 && -+ 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'" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ 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 && -+ 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" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -792,8 +1414,7 @@ - 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'" -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) -@@ -813,27 +1434,19 @@ - { (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 -+# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$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; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -860,82 +1473,76 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ - # 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 || -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ 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'` -+ 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 -+ 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 -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { 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 -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&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_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_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -964,9 +1571,6 @@ - -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] -@@ -984,15 +1588,22 @@ - --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] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1023,9 +1634,10 @@ - --enable-dependency-tracking do not reject slow dependency extractors - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer -- --enable-shared=PKGS build shared libraries default=yes -- --enable-static=PKGS build static libraries default=no -- --enable-fast-install=PKGS optimize for fast installation default=yes -+ --enable-shared[=PKGS] build shared libraries [default=yes] -+ --enable-static[=PKGS] build static libraries [default=no] -+ --enable-fast-install[=PKGS] -+ optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-gtktest Do not try to compile and run a test GTK program - --disable-imlib Do not use imlib -@@ -1045,8 +1657,10 @@ - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-x use the X Window System -- --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-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-gtk2 Use Gtk+-2.0 (experimental) default=no - --with-gtk-prefix=PFX Prefix where GTK is installed (optional) - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) -@@ -1064,6 +1678,7 @@ - --with-xine Use Xine library for movie (experimental) default=no - --with-xine-prefix=PFX Prefix where XINE is installed (optional) - --with-xine-exec-prefix=PFX Exec prefix where XINE is installed (optional) -+ --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-included-gettext use the GNU gettext library included here -@@ -1074,128 +1689,106 @@ - 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 -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags -+ YACC The `Yet Another C Compiler' implementation to use. Defaults to -+ the first program found out of: `bison -y', `byacc', `yacc'. -+ YFLAGS The list of arguments that will be passed by default to $YACC. -+ This script will default YFLAGS to the empty string to avoid a -+ default value of `-d' given by some make applications. -+ XMKMF Path to xmkmf, Makefile generator for X Window System - CPP C preprocessor -+ 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 -+ac_status=$? - 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 -+ test -d "$ac_dir" || continue - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - 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 -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # 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_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - 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;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # 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 -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.61 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 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 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1214,7 +1807,7 @@ - /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` -+/usr/bin/hostinfo = `(/usr/bin/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` -@@ -1228,6 +1821,7 @@ - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" - done -+IFS=$as_save_IFS - - } >&5 - -@@ -1249,7 +1843,6 @@ - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1260,7 +1853,7 @@ - -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 -@@ -1282,9 +1875,7 @@ - -* ) 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=" " -+ ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -@@ -1295,8 +1886,8 @@ - # 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. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1309,20 +1900,34 @@ - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "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" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1333,22 +1938,28 @@ - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1360,26 +1971,24 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - 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 && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 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 -+rm -f -r conftest* confdefs.h - - # Predefined preprocessor variables. - -@@ -1410,14 +2019,17 @@ - - # 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 -+if test -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in $CONFIG_SITE; do -+shift -+for ac_site_file -+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;} -@@ -1433,8 +2045,8 @@ - { 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;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -@@ -1443,15 +2055,15 @@ - >$cache_file - fi - -+ac_header_list="$ac_header_list utime.h" - # 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 -+for ac_var in $ac_precious_vars; 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" -+ 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 -@@ -1476,8 +2088,7 @@ - # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1494,12 +2105,6 @@ - { (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 -- - - - -@@ -1516,6 +2121,11 @@ - - - -+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 - - - PACKAGE=gimageview -@@ -1526,31 +2136,38 @@ - EXTRA_VERSION= - VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION - --am__api_version="1.8" -+am__api_version='1.10' -+ - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -+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 -+ 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 -+ 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;} -+ { { 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. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -1565,8 +2182,8 @@ - # 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 -+{ 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 -@@ -1588,7 +2205,7 @@ - # 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. -@@ -1607,21 +2224,22 @@ - ;; - esac - done -+IFS=$as_save_IFS - - - 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 -+ # As a last resort, use the slow shell script. Don't cache a -+ # value 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. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ 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. -@@ -1631,8 +2249,8 @@ - - 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 -+{ 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 > conftest.file -@@ -1674,20 +2292,20 @@ - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ 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" -+ 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" -+ 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 -+rm -f conftest.sed - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -1702,37 +2320,60 @@ - echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - --if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # Keeping the `.' argument allows $(mkdir_p) to be used without -- # argument. Indeed, we sometimes output rules like -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. -- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more -- # expensive solution, as it forces Make to start a sub-shell.) -- mkdir_p='mkdir -p -- .' -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ -+fi -+ -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" - else -- mkdir_p='$(install_sh) -d' -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for MKDIR_P within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ test -d ./--version && rmdir ./--version -+ MKDIR_P="$ac_install_sh -d" - fi - fi -+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+echo "${ECHO_T}$MKDIR_P" >&6; } -+ -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac - - for ac_prog in gawk mawk nawk awk - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1745,54 +2386,57 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$AWK" && break - done - --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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(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 -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - 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 -+if eval test \$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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -1805,12 +2449,16 @@ - fi - rmdir .tst 2>/dev/null - --# test to see if srcdir already configured --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 -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ am__isrc=' -I$(srcdir)' -+ # test to see if srcdir already configured -+ if 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 - fi - - # test whether we have cygpath -@@ -1853,10 +2501,7 @@ - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -- --AMTAR=${AMTAR-"${am_missing_run}tar"} -- --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - - # Installed binaries are usually stripped using `strip' when the user - # run `make install-strip'. However `strip' might not be the right -@@ -1866,8 +2511,8 @@ - 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 -+{ 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 -@@ -1880,32 +2525,34 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ { 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 -+ { 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 -+{ 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 -@@ -1918,36 +2565,57 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi - else - STRIP="$ac_cv_prog_STRIP" - fi - - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+ -+ - - - -@@ -1960,7 +2628,7 @@ - _ACEOF - - -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - - -@@ -1970,8 +2638,8 @@ - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1984,25 +2652,27 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$AWK" && break - done - -@@ -2014,8 +2684,8 @@ - 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 -+{ 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 -@@ -2028,32 +2698,34 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { 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 -+ { 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 -+{ 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 -@@ -2066,36 +2738,51 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - 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. -+ 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 -+{ 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 -@@ -2108,74 +2795,34 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - 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 -+ { 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 -+ { 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 - 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 -+{ 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 -@@ -2189,7 +2836,7 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -2200,6 +2847,7 @@ - fi - done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2217,22 +2865,23 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { 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 -+ { 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 -+ for ac_prog in cl.exe - 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 -+{ 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 -@@ -2245,36 +2894,38 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { 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 -+ { 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 -+ for ac_prog in cl.exe - 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 -+{ 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 -@@ -2287,29 +2938,45 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi -@@ -2322,21 +2989,35 @@ - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 -+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_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -@@ -2361,47 +3042,77 @@ - # 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 -+{ 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 -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - 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. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [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 -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -+ ac_file='' -+fi -+ -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -@@ -2413,19 +3124,21 @@ - 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 -+# Check that 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 -+{ 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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -2444,22 +3157,27 @@ - fi - fi - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ 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 -+# Check that 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 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 -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -2470,9 +3188,8 @@ - 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac -@@ -2486,14 +3203,14 @@ - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ 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 -+{ 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 -@@ -2513,14 +3230,20 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -@@ -2538,12 +3261,12 @@ - - 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 -+{ 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 -+{ 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 -@@ -2566,50 +3289,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+{ 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 -+{ 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 -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2625,38 +3347,118 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ -+rm -f core 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 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ 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 -@@ -2672,12 +3474,12 @@ - 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 "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2711,12 +3513,17 @@ - /* 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 -+ as 'x'. The following induces an error, until -std 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. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2731,205 +3538,57 @@ - 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__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - 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 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&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" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - 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' -@@ -2937,7 +3596,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - DEPDIR="${am__leading_dot}deps" - -- ac_config_commands="$ac_config_commands depfiles" -+ac_config_commands="$ac_config_commands depfiles" - - - am_make=${MAKE-make} -@@ -2947,8 +3606,8 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -2975,22 +3634,20 @@ - fi - - --echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6 -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -+# Check whether --enable-dependency-tracking was given. - if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -+ enableval=$enable_dependency_tracking; -+fi - --fi; - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- -- --if test "x$enable_dependency_tracking" != xno; then -+ if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3000,11 +3657,10 @@ - - - -- - depcc="$CC" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3068,13 +3724,19 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi -@@ -3088,13 +3750,11 @@ - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -3105,18 +3765,22 @@ - fi - - --ac_ext=cc -+ac_ext=cpp - 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 -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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 -+{ 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 -@@ -3129,36 +3793,38 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { 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 -+ { 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 -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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 -+{ 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 -@@ -3171,55 +3837,85 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 -+IFS=$as_save_IFS - - 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 -+ { 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 -+ { 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 -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 -+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_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+{ 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 -@@ -3242,50 +3938,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+{ 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 -+{ 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 -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -3301,159 +3996,133 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ CXXFLAGS="" -+ 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cxx_g=yes - 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 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3462,8 +4131,8 @@ - - depcc="$CXX" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3527,13 +4196,19 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi -@@ -3547,13 +4222,11 @@ - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -3577,8 +4250,8 @@ - # 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 -+{ 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 -@@ -3600,7 +4273,7 @@ - # 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. -@@ -3619,21 +4292,22 @@ - ;; - esac - done -+IFS=$as_save_IFS - - - 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 -+ # As a last resort, use the slow shell script. Don't cache a -+ # value 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. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ 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. -@@ -3643,43 +4317,44 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo "$as_me:$LINENO: checking whether ln -s works" >&5 --echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -+{ 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } - fi - --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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(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 -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - 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 -+if eval test \$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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -3687,8 +4362,8 @@ - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3701,37 +4376,40 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_YACC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - YACC=$ac_cv_prog_YACC - if test -n "$YACC"; then -- echo "$as_me:$LINENO: result: $YACC" >&5 --echo "${ECHO_T}$YACC" >&6 -+ { echo "$as_me:$LINENO: result: $YACC" >&5 -+echo "${ECHO_T}$YACC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$YACC" && break - done - test -n "$YACC" || YACC="yacc" - - --echo "$as_me:$LINENO: checking for library containing strerror" >&5 --echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 --if test "${ac_cv_search_strerror+set}" = set; then -+ -+ { 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_func_search_save_LIBS=$LIBS --ac_cv_search_strerror=no -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcposix $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3739,125 +4417,66 @@ - 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 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ --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_search_strerror="none required" --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 "$ac_cv_search_strerror" = no; then -- for ac_lib in cposix; do -- LIBS="-l$ac_lib $ac_func_search_save_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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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_search_strerror="-l$ac_lib" --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- done -+LIBS=$ac_check_lib_save_LIBS - fi --LIBS=$ac_func_search_save_LIBS -+{ 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 --echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --echo "${ECHO_T}$ac_cv_search_strerror" >&6 --if test "$ac_cv_search_strerror" != no; then -- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" - --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 how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ 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= -@@ -3891,24 +4510,22 @@ - #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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3917,9 +4534,10 @@ - # 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 -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3929,24 +4547,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3957,6 +4573,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3974,8 +4591,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ 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 -@@ -3998,24 +4615,22 @@ - #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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -4024,9 +4639,10 @@ - # 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 -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4036,24 +4652,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -4064,6 +4678,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -4086,44 +4701,49 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for X" >&5 --echo $ECHO_N "checking for X... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for X" >&5 -+echo $ECHO_N "checking for X... $ECHO_C" >&6; } - - --# Check whether --with-x or --without-x was given. -+# Check whether --with-x was given. - if test "${with_x+set}" = set; then -- withval="$with_x" -+ withval=$with_x; -+fi - --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 -+ case $x_includes,$x_libraries in #( -+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -+echo "$as_me: error: Cannot use X directory names containing '" >&2;} -+ { (exit 1); exit 1; }; };; #( -+ *,NONE | NONE,*) 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 -+rm -f -r 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}"' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' - _ACEOF -- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -+ if (export CC; ${XMKMF-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` -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done - # 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 -+ 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 -@@ -4131,7 +4751,7 @@ - # 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) ;; -+ /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -@@ -4140,7 +4760,7 @@ - esac - fi - cd .. -- rm -fr conftest.dir -+ rm -f -r conftest.dir - fi - - # Standard set of common directories for X headers. -@@ -4181,7 +4801,7 @@ - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4189,26 +4809,24 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # We can compile using X headers with no special include directory. - ac_x_includes= - else -@@ -4216,12 +4834,13 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi - done - fi -+ - rm -f conftest.err conftest.$ac_ext - fi # $ac_x_includes = no - -@@ -4230,44 +4849,40 @@ - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -+ LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries= -@@ -4275,65 +4890,68 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --LIBS=$ac_save_LIBS -+ 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 -+ if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done - done - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no";; #( -+ *) -+ # 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'" -+esac - fi -- -- fi -+;; #( -+ *) have_x=yes;; -+ esac - 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 -+ { 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" -- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } - fi - --echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 -- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -+ # Check whether --enable-maintainer-mode was given. - if test "${enable_maintainer_mode+set}" = set; then -- enableval="$enable_maintainer_mode" -- USE_MAINTAINER_MODE=$enableval -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval - else - USE_MAINTAINER_MODE=no --fi; -- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 --echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 -- -+fi - --if test $USE_MAINTAINER_MODE = yes; then -+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' - else -@@ -4347,62 +4965,91 @@ - - - # 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;} -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/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 -+{ 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" && -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && - { { 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;} -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_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 -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - 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/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+{ 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;} -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - 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_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - --echo "$as_me:$LINENO: checking for some Win32 platform" >&5 --echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -+echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } - case "$host" in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes -@@ -4411,11 +5058,9 @@ - platform_win32=no - ;; - esac --echo "$as_me:$LINENO: result: $platform_win32" >&5 --echo "${ECHO_T}$platform_win32" >&6 -- -- --if test x"$platform_win32" = x"yes"; then -+{ echo "$as_me:$LINENO: result: $platform_win32" >&5 -+echo "${ECHO_T}$platform_win32" >&6; } -+ if test x"$platform_win32" = x"yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' - else -@@ -4429,8 +5074,8 @@ - - fi - --echo "$as_me:$LINENO: checking for native Win32" >&5 --echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for native Win32" >&5 -+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } - case "$host" in - *-*-mingw*) - os_win32=yes -@@ -4439,11 +5084,9 @@ - os_win32=no - ;; - esac --echo "$as_me:$LINENO: result: $os_win32" >&5 --echo "${ECHO_T}$os_win32" >&6 -- -- --if test x"$os_win32" = x"yes"; then -+{ echo "$as_me:$LINENO: result: $os_win32" >&5 -+echo "${ECHO_T}$os_win32" >&6; } -+ if test x"$os_win32" = x"yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' - else -@@ -4453,86 +5096,314 @@ - - - --# Check whether --enable-shared or --disable-shared was given. -+# Check whether --enable-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. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ 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. -+fi -+ -+ -+# Check whether --enable-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 ;; --*) -+ 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=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -+fi -+ -+ -+ -+ -+# Check whether --enable-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 -+ -+ -+{ 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 { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$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 -+IFS=$as_save_IFS -+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 && continue -+ 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 -- IFS="$ac_save_ifs" -- ;; -+done -+ -+fi -+ -+SED=$lt_cv_path_SED -+ -+{ echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ # Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac -+ -+ -+ $ac_path_GREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ - else -- enable_static=no --fi; -+ ac_cv_path_GREP=$GREP -+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 ;; -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_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_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ # Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; - *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break - done -- IFS="$ac_save_ifs" -- ;; -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac -+ -+ -+ $ac_path_EGREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ - else -- enable_fast_install=yes --fi; -+ ac_cv_path_EGREP=$EGREP -+fi - --# Check whether --with-gnu-ld or --without-gnu-ld was given. -+ -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ -+ -+ -+# Check whether --with-gnu-ld was given. - if test "${with_gnu_ld+set}" = set; then -- withval="$with_gnu_ld" -- test "$withval" = no || with_gnu_ld=yes -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no --fi; -+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 GCC" >&5 --echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 -+ { 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 -@@ -4542,12 +5413,12 @@ - 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'` -+ # 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%/%"` -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; -@@ -4561,32 +5432,36 @@ - ;; - 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 -+ { 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 -+ { 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 -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -+ 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. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -+ case `"$lt_cv_path_LD" -v 2>&1 &5 --echo "${ECHO_T}$LD" >&6 -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { 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 -+{ 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. --if $LD -v 2>&1 &5; then -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 &5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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 -+{ 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 -+{ 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 --test -n "$reload_flag" && reload_flag=" $reload_flag" -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - --echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 --echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -+{ 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 -@@ -4641,38 +5532,52 @@ - # Let the user override the test. - lt_cv_path_NM="$NM" - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -- 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 -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -- lt_cv_path_NM="$tmp_nm -B" -- break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -- else -- 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 -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ 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 -- fi -+ done -+ IFS="$lt_save_ifs" - done -- IFS="$ac_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: result: $NM" >&5 --echo "${ECHO_T}$NM" >&6 - --echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 --echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4685,13 +5590,13 @@ - # `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 egrep regex. -+# '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*) -+aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -4699,37 +5604,42 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --bsdi4*) -+bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin* | mingw* | pw32*) -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -+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', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -+ lt_cv_deplibs_check_method=pass_all - ;; - --freebsd*) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -4743,50 +5653,49 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --hpux10.20*|hpux11*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -- --irix5* | irix6*) -- case $host_os in -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -+ 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 - ;; - *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" -+ 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 -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -+ ;; -+ -+interix[3-9]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-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-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -+ 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$' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -@@ -4796,37 +5705,31 @@ - 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' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - - osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - --sco3.2v5*) -+rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - - solaris*) - lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- --sysv5uw[78]* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all - ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' -@@ -4844,234 +5747,552 @@ - 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 -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | 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 -+{ 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"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -+# Allow CC to be a program name with arguments. -+compiler=$CC - --# Check for command to grab the raw symbol name followed by C symbol from nm. --echo "$as_me:$LINENO: checking command to parse $NM output" >&5 --echo $ECHO_N "checking command to parse $NM output... $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_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- symcode='[BCDEGRST]' -- ;; --solaris* | sysv5*) -- symcode='[BDT]' -+# 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* - ;; --sysv4) -- symcode='[DFNSTU]' -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line 5814 "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* - ;; --esac - --# Handle CRLF in mingw tool chain --opt_cr= --case $host_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+x86_64-*kfreebsd*-gnu|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-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ 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-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ 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* - ;; --esac - --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[ABCDGISTW]' --fi -+*-*-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 - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- # 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'" -+int -+main () -+{ - -- # Check to see that the pipe works correctly. -- pipe_works=no -- rm -f conftest* -- cat > conftest.$ac_ext <&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); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ 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 -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # 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 -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -+echo "${ECHO_T}$DLLTOOL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - -- cat <> conftest.$ac_ext --#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[] = --{ --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ 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_DLLTOOL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$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; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$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 -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" - else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL - fi -- rm -f conftest* conftst* -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi - -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -+set dummy ${ac_tool_prefix}as; 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_AS+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AS"; then -+ ac_cv_prog_AS="$AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AS="${ac_tool_prefix}as" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 - fi - done -+done -+IFS=$as_save_IFS - - fi -+fi -+AS=$ac_cv_prog_AS -+if test -n "$AS"; then -+ { echo "$as_me:$LINENO: result: $AS" >&5 -+echo "${ECHO_T}$AS" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= -+ -+fi -+if test -z "$ac_cv_prog_AS"; then -+ ac_ct_AS=$AS -+ # Extract the first word of "as", so it can be a program name with args. -+set dummy as; 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_AS+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -+ if test -n "$ac_ct_AS"; then -+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_AS="as" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ - fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+fi -+ac_ct_AS=$ac_cv_prog_ac_ct_AS -+if test -n "$ac_ct_AS"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -+echo "${ECHO_T}$ac_ct_AS" >&6; } - else -- echo "$as_me:$LINENO: result: ok" >&5 --echo "${ECHO_T}ok" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --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 -+ if test "x$ac_ct_AS" = x; then -+ AS="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ AS=$ac_ct_AS -+ fi -+else -+ AS="$ac_cv_prog_AS" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -+set dummy ${ac_tool_prefix}objdump; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_OBJDUMP+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 -+ if test -n "$OBJDUMP"; then -+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+OBJDUMP=$ac_cv_prog_OBJDUMP -+if test -n "$OBJDUMP"; then -+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+echo "${ECHO_T}$OBJDUMP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -+fi -+if test -z "$ac_cv_prog_OBJDUMP"; then -+ ac_ct_OBJDUMP=$OBJDUMP -+ # Extract the first word of "objdump", so it can be a program name with args. -+set dummy objdump; ac_word=$2 -+{ 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_OBJDUMP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_OBJDUMP"; then -+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_OBJDUMP="objdump" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -+if test -n "$ac_ct_OBJDUMP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_OBJDUMP" = x; then -+ OBJDUMP="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ OBJDUMP=$ac_ct_OBJDUMP -+ fi -+else -+ OBJDUMP="$ac_cv_prog_OBJDUMP" -+fi -+ -+ ;; -+ -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+ -+{ 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 -@@ -5095,35 +6316,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -5179,6 +6396,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -5198,18 +6416,27 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -5222,12 +6449,14 @@ - ( 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 -+rm -f core *.core core.conftest.* 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 -+{ 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 -@@ -5250,9 +6479,9 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5266,38 +6495,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -5312,18 +6538,19 @@ - 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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -5334,41 +6561,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -5377,24 +6600,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -5402,9 +6623,10 @@ - - 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 -+{ 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 -@@ -5428,25 +6650,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -5460,39 +6676,1269 @@ - - - -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+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 { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.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 nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.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 { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.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 nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.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=cpp -+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 -+ -+fi -+ -+ -+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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 -+IFS=$as_save_IFS -+ -+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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_F77="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 -+ -+ if test "x$ac_ct_F77" = x; then -+ F77="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ F77=$ac_ct_F77 -+ fi -+fi -+ -+ -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 core 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 { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 core 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; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ 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` -+ fi -+ ;; -+ 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 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'" -+ ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDGIRSTW]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[BCDEGRST]' -+ ;; -+osf*) -+ symcode='[BCDEGQRST]' -+ ;; -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' -+ ;; -+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 -+ -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ -+ # 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 -rf 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 1s/^X//' -+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+ -+# Sed substitution 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 MSVC, -+# 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_AR="ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ AR=$ac_ct_AR -+ fi -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_RANLIB="ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 -+ -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+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 -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+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 "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+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_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in - file_magic*) - 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 -+ { 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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$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 \(.*\)\"`" -+ 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 -+ $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 -@@ -5513,50 +7959,48 @@ - break - fi - done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -+ 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 -+ { 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 -+ { 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 -+ { 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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$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 \(.*\)\"`" -+ 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 -+ $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 -@@ -5577,19 +8021,19 @@ - break - fi - done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -+ 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - else -@@ -5601,16 +8045,19 @@ - ;; - esac - --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 -+ -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+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. -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5618,37 +8065,39 @@ - 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" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi --RANLIB=$ac_cv_prog_RANLIB --if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { 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 -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ 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_DSYMUTIL+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. -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5656,41 +8105,55 @@ - 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" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- 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 -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi - else -- RANLIB="$ac_cv_prog_RANLIB" -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" - 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 -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+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. -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5698,37 +8161,39 @@ - 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" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { 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 -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ 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_NMEDIT+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. -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5736,86 +8201,79 @@ - 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" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- 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 -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi - else -- STRIP="$ac_cv_prog_STRIP" -+ NMEDIT="$ac_cv_prog_NMEDIT" - fi - - --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 -- --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '#line 5780 "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 -- 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 -- 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 "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+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 -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -5831,569 +8289,1029 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --lt_cv_cc_needs_belf=no -+ lt_cv_ld_exported_symbols_list=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- ac_ext=c -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ -+enable_dlopen=no -+enable_win32_dll=yes -+ -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+ -+# Check whether --with-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 - --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 -- ;; - -+# Source file extension for C test sources. -+ac_ext=c - --esac -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext - --# 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' -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" - --# Same as above, but do not quote variable references. --double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - --# Constants: --rm="rm -f" -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --# Global variables: --default_ofile=libtool --can_build_shared=yes -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --# 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" --need_locks="$enable_libtool_lock" -+# Allow CC to be a program name with arguments. -+compiler=$CC - --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 "$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 "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* - --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* - --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac - --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 -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... - --# 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= -+lt_prog_compiler_no_builtin_flag= - --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 -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' - --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="$2" - --## FIXME: this should be a separate macro --## --echo "$as_me:$LINENO: checking for objdir" >&5 --echo $ECHO_N "checking for objdir... $ECHO_C" >&6 --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs -+{ 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 -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="-fno-rtti -fno-exceptions" -+ # 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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:8457: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:8461: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ - fi --rmdir .libs 2>/dev/null --echo "$as_me:$LINENO: result: $objdir" >&5 --echo "${ECHO_T}$objdir" >&6 --## --## END FIXME -+{ 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 - --## FIXME: this should be a separate macro --## -+fi - --# 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 -+lt_prog_compiler_wl= -+lt_prog_compiler_pic= -+lt_prog_compiler_static= - --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. --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 "${lt_cv_prog_cc_pic+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared -+{ 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_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_static='-static' - - case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -+ 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_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -+ -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ lt_prog_compiler_pic='-DDLL_EXPORT' -+ ;; -+ - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -+ lt_prog_compiler_pic='-fno-common' - ;; -- cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. - ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared=no -+ enable_shared=no -+ ;; -+ - sysv4*MP*) - if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -+ 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_cv_prog_cc_pic='-fPIC' -+ lt_prog_compiler_pic='-fPIC' - ;; - esac - else -- # PORTME Check for PIC flags for the system compiler. -+ # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -+ aix*) -+ lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -+ lt_prog_compiler_static='-Bstatic' - else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | 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*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -+ 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*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static='-non_shared' - ;; - -- cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' -+ newsos6) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ esac -+ ;; -+ esac - ;; - - osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -+ lt_prog_compiler_static='-non_shared' - ;; - -- sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -+ rdos*) -+ lt_prog_compiler_static='-non_shared' - ;; - - solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl='-Wl,';; -+ esac - ;; - - sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -- ;; -- -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -- else -- lt_cv_prog_cc_wl='-Wl,' -- fi -+ lt_prog_compiler_wl='-Qoption ld ' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -+ lt_prog_compiler_pic='-Kconform_pic' -+ lt_prog_compiler_static='-Bstatic' - fi - ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic='-pic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ - *) -- lt_cv_prog_cc_can_build_shared=no -+ lt_prog_compiler_can_build_shared=no - ;; - esac - fi - --fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - --if test -z "$lt_cv_prog_cc_pic"; then -- echo "$as_me:$LINENO: result: none" >&5 --echo "${ECHO_T}none" >&6 --else -- echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic"; then - -- # Check to make sure the pic_flag actually works. -- echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 -- if test "${lt_cv_prog_cc_pic_works+set}" = set; 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_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -+ lt_cv_prog_compiler_pic_works=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -+ # 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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:8747: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:8751: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works=yes -+ fi -+ fi -+ $rm conftest* - -- ; -- 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 -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -- esac -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -+ case $lt_prog_compiler_pic in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -+ esac - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ lt_prog_compiler_pic= -+ lt_prog_compiler_can_build_shared=no -+fi - -- lt_cv_prog_cc_pic_works=no -+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 -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then -+ : -+else -+ lt_prog_compiler_static= - fi - - -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+ 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 -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:8851: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:8855: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $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* - -- echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 - fi --## --## END FIXME -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 --echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} -- if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : -- else -- { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 --echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} -- lt_cv_prog_cc_can_build_shared=no -+ -+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 - --## FIXME: this should be a separate macro --## --echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 --if test "${lt_cv_prog_cc_static_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+{ 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; } - --int --main () --{ -+ 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_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # 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. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -- ; -- 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_prog_cc_static_works=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ 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 -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac - --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ ld_shlibs=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - --fi -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # 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. - --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 -+EOF -+ fi -+ ;; - --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" --## --## END FIXME -+ 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 -+ ;; - --## FIXME: this should be a separate macro --## --# Check to see if options -o and -c are simultaneously supported by compiler --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_compiler_c_o+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -+ 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 -+ ;; - --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:6356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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_compiler_c_o=no -+ 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 '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs=no -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ 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 -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ *) -+ 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" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ fi - else -- lt_cv_compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&5 -- lt_cv_compiler_c_o=no --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null -+ # 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 "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; - --fi -+ aix[4-9]*) -+ 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 - --compiler_c_o=$lt_cv_compiler_c_o --echo "$as_me:$LINENO: result: $compiler_c_o" >&5 --echo "${ECHO_T}$compiler_c_o" >&6 -+ # 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].*|aix[5-9]*) -+ 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 - --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 -- if test "${lt_cv_compiler_o_lo+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- cat >conftest.$ac_ext <<_ACEOF -+ # 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 -@@ -6403,99 +9321,63 @@ - int - main () - { --int some_variable = 0; -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -- # 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_compiler_o_lo=no -- else -- lt_cv_compiler_o_lo=yes -- fi -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - 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_objext="$save_objext" -- CFLAGS="$save_CFLAGS" - - fi - -- compiler_o_lo=$lt_cv_compiler_o_lo -- echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 --echo "${ECHO_T}$compiler_o_lo" >&6 --else -- compiler_o_lo=no --fi --## --## END FIXME -- --## FIXME: this should be a separate macro --## --# Check to see if we can do hard links to lock some files if needed --hard_links="nottested" --if test "$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 --## --## END FIXME -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - --## FIXME: this should be a separate macro --## --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- 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 -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- cat >conftest.$ac_ext <<_ACEOF -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag="-z nodefs" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -6505,782 +9387,573 @@ - int - main () - { --int some_variable = 0; -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -- # 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 -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - 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 -- CFLAGS="$save_CFLAGS" -- echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$compiler_rtti_exceptions" >&6 - -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -- else -- no_builtin_flag=' -fno-builtin' -- fi - fi --## --## END FIXME -- --## FIXME: this should be a separate macro --## --# See if the linker supports building shared libraries. --echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 - --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --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_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --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 egrep regular expression 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, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- 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 -- ;; -- -- 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 -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- # 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 use -- # them. -- ld_shlibs=no -- ;; -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag=' ${wl}-bernotok' -+ allow_undefined_flag=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec='$convenience' -+ archive_cmds_need_lc=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - -- beos*) -- if $LD --help 2>&1 | egrep ': 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 -+ 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 -- fi -- ;; -- -- cygwin* | mingw* | pw32*) -- # 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=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; -- esac -- -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -- else -- ltdll_obj= -- ltdll_cmds= -- fi -- -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' -+ bsdi[45]*) -+ export_dynamic_flag_spec=-rdynamic -+ ;; - -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \$# in -- 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -- ;; -+ 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 -+ ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc=no -+ hardcode_direct=no -+ hardcode_automatic=yes -+ hardcode_shlibpath_var=unsupported -+ whole_archive_flag_spec='' -+ link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else -- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac - fi -- ;; -- -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep '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. -+ dgux*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; - --EOF -- elif $LD --help 2>&1 | egrep ': 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 -+ freebsd1*) - 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 -- ;; -+ # 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 -+ ;; - -- *) -- if $LD --help 2>&1 | egrep ': 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 -+ # 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 -+ ;; - -- 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' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ -+ 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 -- whole_archive_flag_spec= -+ 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' - ;; -- esac -- 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 -- aix_use_runtimelinking=no -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: - -- # 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 -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ 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. -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: - -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld='+b $libdir' -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ ;; -+ *) - 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 -+ 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 -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -- esac -+ ;; -+ esac -+ fi -+ ;; - -- shared_flag='-shared' -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- shared_flag='${wl}-G' -+ 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 -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -+ 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 -- fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ link_all_deplibs=yes -+ ;; - -- # It seems that -bexpall can do strange things, 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' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- 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 ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but 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 ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - 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 -- ;; -- -- 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 -- # 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"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; - -- 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 -- ;; -+ 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 -+ ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; - -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -+ 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' -+ ;; - -- irix5* | irix6*) -- 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' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && 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=: -+ ;; - -- netbsd*) -- 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 -- ;; -+ 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 ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - -- 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 -- ;; -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; - -- 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 $linker_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' -- ;; -+ solaris*) -+ no_undefined_flag=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_shlibpath_var=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - 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 "-exported_symbol " >> $lib.exp; echo "\$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 -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -+ link_all_deplibs=yes -+ ;; - -- solaris*) -- no_undefined_flag=' -z defs' -- # $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='-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 -+ ;; - -- 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) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- else -+ sysv4.3*) - 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 -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='-Bexport' -+ ;; - -- 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 -+ ;; - -- 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' -- ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag='${wl}-z,text' -+ archive_cmds_need_lc=no -+ 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 -- ;; -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag='${wl}-z,text' -+ allow_undefined_flag='${wl}-z,nodefs' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ export_dynamic_flag_spec='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - -- sysv4*MP*) -- if test -d /usr/nec; then -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' - 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 -- ;; -+ ;; - -- sysv5uw7* | 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 -- ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi - -- *) -- ld_shlibs=no -- ;; -- esac --fi --echo "$as_me:$LINENO: result: $ld_shlibs" >&5 --echo "${ECHO_T}$ld_shlibs" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no --## --## END FIXME - --## FIXME: this should be a separate macro --## --# Check hardcoding attributes. --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"; 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 "$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 --## --## END FIXME -+# -+# 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 - --## FIXME: this should be a separate macro --## --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 -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi --## --## END FIXME -+ 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* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown -+ 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 -+ pic_flag=$lt_prog_compiler_pic -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (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 - --## FIXME: this should be a separate macro --## --# PORTME Fill in your ld.so characteristics --echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+{ 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= -@@ -7290,23 +9963,83 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" -+ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[lt_foo]++; } -+ if (lt_freq[lt_foo] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+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}.so$versuffix $libname.a' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - 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}.so$major ${libname}${release}.so$versuffix $libname.so' -+ 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 -@@ -7315,7 +10048,7 @@ - # 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].*) -+ 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 -@@ -7325,20 +10058,19 @@ - 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. -+ # 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}.so$versuffix ${libname}${release}.so$major $libname.so' -+ 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}.so$major' -+ soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -7347,25 +10079,24 @@ - 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' -+ 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}.so' -+ library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic - # 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 -@@ -7373,29 +10104,56 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no -+ - case $GCC,$host_os in -- yes,cygwin*) -+ yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -+ # 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 .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -+ 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 - ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' -- ;; -+ - *) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -7408,30 +10166,49 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -+ 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`' -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" -+ 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 - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ 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}.so$versuffix $libname.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac -@@ -7440,10 +10217,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- *) -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -7451,8 +10237,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -7460,33 +10246,87 @@ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -- dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -+ 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*) -- version_type=irix -+interix[3-9]*) -+ version_type=linux - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) - case $host_os in -- irix5*) -+ 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 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *-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 - ;; -@@ -7495,20 +10335,21 @@ - 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-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -+linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -7517,6 +10358,12 @@ - # 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=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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, -@@ -7526,17 +10373,29 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -7546,63 +10405,77 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ 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 -+ sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no -- need_version=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac - else - shlibpath_overrides_runpath=yes - fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH - ;; - - os2*) - libname_spec='$name' -+ shrext_cmds=".dll" - need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -+ 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}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ 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}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -7612,7 +10485,7 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -7622,14 +10495,20 @@ - need_version=yes - ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+sysv4 | sysv4.3*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - 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 -@@ -7640,89 +10519,100 @@ - esac - ;; - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -+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 - ;; - --dgux*) -- version_type=linux -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' - ;; - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$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 -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no --## --## END FIXME - --## FIXME: this should be a separate macro --## --# Report the final consequences. --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 --## --## END FIXME -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi - --## FIXME: this should be a separate macro --## --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 -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi - --# 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 -- ;; -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - --aix4*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6 --## --## END FIXME -+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 - --## FIXME: this should be a separate macro --## --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 --## --## END FIXME -+{ 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 -@@ -7733,9 +10623,34 @@ - enable_fast_install=needless - fi - --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" -+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" -+ old_striplib="$STRIP -S" -+ { 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 -@@ -7753,14 +10668,94 @@ - lt_cv_dlopen_self=yes - ;; - -- cygwin* | mingw* | pw32*) -+ 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 GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ 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 -+ { 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 -@@ -7787,73 +10782,64 @@ - - #undef shl_load - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -7866,61 +10852,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dld_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -+{ 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" -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else -- echo "$as_me:$LINENO: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -+ { 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 -@@ -7947,73 +10930,64 @@ - - #undef dlopen - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_dlopen || defined __stub___dlopen - choke me --#else --char (*f) () = dlopen; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != dlopen; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -8026,61 +11000,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+{ 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 -+ { 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 -@@ -8093,61 +11064,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_svld_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -+{ 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 -+ { 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 -@@ -8160,58 +11128,55 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dld_dld_link=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -+{ 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" -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - - -@@ -8241,26 +11206,26 @@ - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - -- 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 -+ { 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_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed -@@ -8342,23 +11309,23 @@ - - - fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+{ 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 -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } - if test "${lt_cv_dlopen_self_static+set}" = set; then - 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_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed -@@ -8440,8 +11409,8 @@ - - - fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" -@@ -8462,115 +11431,116 @@ - fi - - --## FIXME: this should be a separate macro --## --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 -- if test "${lt_cv_archive_cmds_need_lc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- $rm conftest* -- echo 'static int dummy;' > conftest.$ac_ext -+# Report which library types will actually be built -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - -- 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 -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- 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 -- lt_cv_archive_cmds_need_lc=no -- else -- lt_cv_archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi --fi -+{ 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 - -- echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 --echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 -+# 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 -+ ;; -+ -+aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; -- esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} --## --## END FIXME -+esac -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - --## FIXME: this should be a separate macro --## --# The second clause should only fire when bootstrapping the -+{ 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 -- : --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. -- test -f Makefile && make "$ltmain" --fi -- --if test -f "$ltmain"; then -- trap "$rm \"${ofile}T\"; exit 1" 1 2 15 -- $rm -f "${ofile}T" -- -- echo creating $ofile -- -+ # 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 CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+ 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 \ -+ compiler_lib_search_dirs \ -+ 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 \ -+ fix_srcfile_path \ -+ exclude_expsyms \ -+ include_expsyms; do - - case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -+ 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 | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ 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\"\`\\\"" - ;; -@@ -8580,14 +11550,29 @@ - esac - done - -- cat <<__EOF__ > "${ofile}T" -+ 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 "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# `$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-2000 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# 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 -@@ -8602,19 +11587,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+# 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//" -+Xsed="$SED -e 1s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# The names of the tagged configurations supported by this script. -+available_tags= - - # ### BEGIN LIBTOOL CONFIG - -@@ -8630,7 +11621,10 @@ - build_old_libs=$enable_static - - # Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+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 -@@ -8638,6 +11632,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -8646,12 +11646,21 @@ - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - --# The default C compiler. --CC=$lt_CC -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# 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 - -@@ -8662,7 +11671,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -8684,7 +11693,7 @@ - reload_cmds=$lt_reload_cmds - - # How to pass a linker flag through the compiler. --wl=$lt_wl -+wl=$lt_lt_prog_compiler_wl - - # Object file suffix (normally "o"). - objext="$ac_objext" -@@ -8692,20 +11701,23 @@ - # 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_pic_flag -+pic_flag=$lt_lt_prog_compiler_pic - pic_mode=$pic_mode - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -8724,10 +11736,10 @@ - dlopen_self_static=$enable_dlopen_self_static - - # Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+link_static_flag=$lt_lt_prog_compiler_static - - # Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+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 -@@ -8769,10 +11781,38 @@ - 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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+ -+# 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 - -@@ -8792,13 +11832,13 @@ - finish_eval=$lt_finish_eval - - # Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe -+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_global_symbol_to_cdecl -+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_global_symbol_to_c_name_address -+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 -@@ -8819,10 +11859,15 @@ - # 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.so during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the - # resulting binary. - hardcode_direct=$hardcode_direct - -@@ -8834,6 +11879,10 @@ - # 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" -@@ -8848,7 +11897,7 @@ - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols -@@ -8869,9 +11918,10 @@ - - __EOF__ - -+ - case $host_os in - aix3*) -- cat <<\EOF >> "${ofile}T" -+ 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 -@@ -8884,200 +11934,8886 @@ - ;; - esac - -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* 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 */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# 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. --# */ -+ # 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 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 -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ 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" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+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_shlibpath_var_CXX=unsupported -+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= -+compiler_lib_search_dirs_CXX= -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# 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;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ -+# 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 -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+compiler_CXX=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# 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 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 variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &5 -+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 lds 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 -+ ;; -+ aix[4-9]*) -+ 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].*|aix[5-9]*) -+ 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_CXX="-z nodefs" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* 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 { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ 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' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX='$convenience' -+ archive_cmds_need_lc_CXX=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # 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 -+ ;; -+ freebsd[12]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ ld_shlibs_CXX=no -+ ;; -+ freebsd-elf*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ freebsd* | dragonfly*) -+ # 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 -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ ;; -+ *) -+ 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*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ 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 -+ hppa*64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[3-9]*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # 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 ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # 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}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ link_all_deplibs_CXX=yes -+ ;; -+ esac -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ ;; -+ linux* | k*bsd*-gnu) -+ 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 -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ 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' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ 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' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # 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' -+ ;; -+ esac -+ ;; -+ 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) -+ 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::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ 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 ${output_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}${output_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 ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_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}${output_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 -+ ;; -+ 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++ -+ archive_cmds_need_lc_CXX=yes -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${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 compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ link_all_deplibs_CXX=yes -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # 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' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_CXX='${wl}-z,text' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ no_undefined_flag_CXX='${wl}-z,text' -+ allow_undefined_flag_CXX='${wl}-z,nodefs' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ export_dynamic_flag_spec_CXX='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # 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" -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+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 -+ -+compiler_lib_search_dirs_CXX= -+if test -n "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ -+# PORTME: override above test on systems where it is broken -+case $host_os in -+interix[3-9]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+ -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac -+ -+lt_prog_compiler_wl_CXX= -+lt_prog_compiler_pic_CXX= -+lt_prog_compiler_static_CXX= -+ -+{ 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* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ 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= -+ ;; -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_CXX=-Kconform_pic -+ 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 -+ aix[4-9]*) -+ # 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 -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${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='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ icpc* | ecpc*) -+ # Intel C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ lt_prog_compiler_pic_CXX='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-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*) -+ ;; -+ 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 -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ 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; } -+ - # --# #include /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ -+# Check to make sure the PIC flag actually works. - # --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif -+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_cv_prog_compiler_pic_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_CXX=no -+ ac_outfile=conftest.$ac_objext -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:13733: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:13737: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_CXX=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -+ -+if test x"$lt_cv_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 -+ - # --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } -+# Check to make sure the static flag actually works. - # --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } -+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -+ -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -+ : -+else -+ lt_prog_compiler_static_CXX= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ 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 -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:13837: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:13841: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $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 -+ aix[4-9]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ 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 '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ -+{ 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 -+ - # --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } -+# Do we need to explicitly link libc? - # --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; -+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* -+ echo "$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 -+ pic_flag=$lt_prog_compiler_pic_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" -+ -+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' -+ ;; -+ -+aix[4-9]*) -+ 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 -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ 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`' -+ -+ 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 -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ 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* | k*bsd*-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' -+ 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=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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' -+ ;; -+ -+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 -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+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" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+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.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ 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 -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || \ -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ -+ # 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 -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_CXX \ -+ CC_CXX \ -+ LD_CXX \ -+ lt_prog_compiler_wl_CXX \ -+ lt_prog_compiler_pic_CXX \ -+ lt_prog_compiler_static_CXX \ -+ lt_prog_compiler_no_builtin_flag_CXX \ -+ export_dynamic_flag_spec_CXX \ -+ thread_safe_flag_spec_CXX \ -+ whole_archive_flag_spec_CXX \ -+ enable_shared_with_static_runtimes_CXX \ -+ old_archive_cmds_CXX \ -+ old_archive_from_new_cmds_CXX \ -+ predep_objects_CXX \ -+ postdep_objects_CXX \ -+ predeps_CXX \ -+ postdeps_CXX \ -+ compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_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 \ -+ fix_srcfile_path_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 -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# 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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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=$lt_fix_srcfile_path -+ -+# 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 -+ return -+ end -+" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+compiler_F77=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+{ 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 -+ ;; -+aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+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; } -+ -+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* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ 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' -+ ;; -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ 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 -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | 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* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl_F77='-Qoption ld ' -+ lt_prog_compiler_pic_F77='-PIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ 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 -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic_F77='-pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ *) -+ 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; } -+ - # --# filename = argv[1]; -+# Check to make sure the PIC flag actually works. - # --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; -+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_cv_prog_compiler_pic_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_F77=no -+ ac_outfile=conftest.$ac_objext -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:15435: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:15439: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_F77=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -+ -+if test x"$lt_cv_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 -+ - # --# dll_name = filename; -+# Check to make sure the static flag actually works. - # --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; -+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_F77=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_F77=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_F77=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -+ -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then -+ : -+else -+ lt_prog_compiler_static_F77= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -+ 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 -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:15539: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:15543: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_F77=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $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_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # 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. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # 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 -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ 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}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # 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 '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_F77=no -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-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*) -+ 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 -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_F77=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ *) -+ 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" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ 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 "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_F77=unsupported -+ fi -+ ;; -+ -+ aix[4-9]*) -+ 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].*|aix[5-9]*) -+ 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_F77="-z nodefs" -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ 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' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_F77='$convenience' -+ archive_cmds_need_lc_F77=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ 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 -+ ;; -+ -+ bsdi[45]*) -+ 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_F77='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_F77=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_F77=no -+ hardcode_direct_F77=no -+ hardcode_automatic_F77=yes -+ hardcode_shlibpath_var_F77=unsupported -+ whole_archive_flag_spec_F77='' -+ link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ 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* | dragonfly*) -+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ 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*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_F77='+b $libdir' -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ ;; -+ *) -+ 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) -+ 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*) -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ 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 -+ else -+ ld_shlibs_F77=no -+ 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 ${output_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=: -+ ;; -+ -+ solaris*) -+ no_undefined_flag_F77=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_shlibpath_var_F77=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ 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*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_F77='${wl}-z,text' -+ archive_cmds_need_lc_F77=no -+ hardcode_shlibpath_var_F77=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_F77='${wl}-z,text' -+ allow_undefined_flag_F77='${wl}-z,nodefs' -+ archive_cmds_need_lc_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ 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 -+ - # --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); -+# Do we need to explicitly link libc? - # --# if (num_entries < 1) /* no exports */ --# return 1; -+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* -+ echo "$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 -+ pic_flag=$lt_prog_compiler_pic_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" -+ -+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' -+ ;; -+ -+aix[4-9]*) -+ 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 -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ 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`' -+ -+ 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 -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ 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* | k*bsd*-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' -+ 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=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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' -+ ;; -+ -+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 -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+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" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+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.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ 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 -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_F77= -+if test -n "$hardcode_libdir_flag_spec_F77" || \ -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then -+ -+ # 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 -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_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 \ -+ compiler_lib_search_dirs_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 \ -+ fix_srcfile_path_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 -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# 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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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=$lt_fix_srcfile_path -+ -+# 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 {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+archive_cmds_need_lc_GCJ=no -+ -+old_archive_cmds_GCJ=$old_archive_cmds -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+ -+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 -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:17763: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:17767: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $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* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_GCJ='-fno-common' -+ ;; -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ 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 -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | 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). -+ -+ ;; -+ -+ 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* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ' -+ lt_prog_compiler_pic_GCJ='-PIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ 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 -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic_GCJ='-pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ *) -+ 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; } -+ - # --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); -+# Check to make sure the PIC flag actually works. - # --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } -+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_cv_prog_compiler_pic_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_GCJ=no -+ ac_outfile=conftest.$ac_objext -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:18053: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:18057: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_GCJ=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -+ -+if test x"$lt_cv_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 -+ - # --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; -+# Check to make sure the static flag actually works. - # --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); -+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_GCJ=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_GCJ=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_GCJ=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -+ -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then -+ : -+else -+ lt_prog_compiler_static_GCJ= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -+ 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 -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:18157: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:18161: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_GCJ=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $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_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # 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. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # 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 -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ 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}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # 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 '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_GCJ=no -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-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*) -+ 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 -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_GCJ=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ *) -+ 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" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ 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 "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_GCJ=unsupported -+ fi -+ ;; -+ -+ aix[4-9]*) -+ 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].*|aix[5-9]*) -+ 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_GCJ="-z nodefs" -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* 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 { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ 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' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_GCJ='$convenience' -+ archive_cmds_need_lc_GCJ=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ 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 -+ ;; -+ -+ bsdi[45]*) -+ 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_GCJ='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_GCJ=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_GCJ=no -+ hardcode_direct_GCJ=no -+ hardcode_automatic_GCJ=yes -+ hardcode_shlibpath_var_GCJ=unsupported -+ whole_archive_flag_spec_GCJ='' -+ link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ 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* | dragonfly*) -+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ 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*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ *) -+ 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) -+ 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*) -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ 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 -+ else -+ ld_shlibs_GCJ=no -+ 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 ${output_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=: -+ ;; -+ -+ solaris*) -+ no_undefined_flag_GCJ=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ 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*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_GCJ='${wl}-z,text' -+ archive_cmds_need_lc_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_GCJ='${wl}-z,text' -+ allow_undefined_flag_GCJ='${wl}-z,nodefs' -+ archive_cmds_need_lc_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ 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 -+ - # --# printf ("EXPORTS\n"); --# for (i = 0; i&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ $rm conftest* -+ echo "$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 -+ pic_flag=$lt_prog_compiler_pic_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" -+ -+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' -+ ;; -+ -+aix[4-9]*) -+ 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 -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ 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 -+ ;; - -- # 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" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) -+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`' - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -- chmod +x "$ofile" -+ 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 -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ 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* | k*bsd*-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' -+ 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=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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' -+ ;; -+ -+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 -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+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" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+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.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ 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 -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi --## --## END FIXME - -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_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 -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_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 \ -+ compiler_lib_search_dirs_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 \ -+ fix_srcfile_path_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 -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# 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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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=$lt_fix_srcfile_path -+ -+# 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 }' -+ -+# 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"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+lt_cv_prog_compiler_c_o_RC=yes -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_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 \ -+ compiler_lib_search_dirs_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 \ -+ fix_srcfile_path_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 -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# 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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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=$lt_fix_srcfile_path -+ -+# 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 - - - -@@ -9092,6 +20828,24 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - GLIB_REQUIRED=1.2.6 - GTK_REQUIRED=1.2.6 - IMLIB_REQUIRED=1.9 -@@ -9123,13 +20877,13 @@ - - - --# Check whether --with-gtk2 or --without-gtk2 was given. -+# Check whether --with-gtk2 was given. - if test "${with_gtk2+set}" = set; then -- withval="$with_gtk2" -- enable_gtk2="${withval}" -+ withval=$with_gtk2; enable_gtk2="${withval}" - else - enable_gtk2=no --fi; -+fi -+ - if test x"$enable_gtk2" != xno; then - if test x"$enable_gtk2" != xyes; then - GTK2_TARGET=$enable_gtk2 -@@ -9140,8 +20894,8 @@ - if test -z "$PKG_CONFIG"; then - # 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9156,28 +20910,29 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; - esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG -- - if test -n "$PKG_CONFIG"; then -- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --echo "${ECHO_T}$PKG_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - - if test "$PKG_CONFIG" = "no" ; then -@@ -9188,40 +20943,40 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo "$as_me:$LINENO: checking for glib-2.0 >= $GLIB2_REQUIRED -+ { echo "$as_me:$LINENO: checking for glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED" >&5 - echo $ECHO_N "checking for glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED -- $GTK2_TARGET >= $GTK2_REQUIRED... $ECHO_C" >&6 -+ $GTK2_TARGET >= $GTK2_REQUIRED... $ECHO_C" >&6; } - - if $PKG_CONFIG --exists "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - succeeded=yes - -- echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 --echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -+echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } - GTK_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED"` -- echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 --echo "${ECHO_T}$GTK_CFLAGS" >&6 -+ { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -+echo "${ECHO_T}$GTK_CFLAGS" >&6; } - -- echo "$as_me:$LINENO: checking GTK_LIBS" >&5 --echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -+echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } - GTK_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB2_REQUIRED - gmodule-2.0 >= $GMODULE2_REQUIRED - gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED - $GTK2_TARGET >= $GTK2_REQUIRED"` -- echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 --echo "${ECHO_T}$GTK_LIBS" >&6 -+ { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -+echo "${ECHO_T}$GTK_LIBS" >&6; } - else - GTK_CFLAGS="" - GTK_LIBS="" -@@ -9269,28 +21024,28 @@ - - else - --# Check whether --with-gtk-prefix or --without-gtk-prefix was given. -+# Check whether --with-gtk-prefix was given. - if test "${with_gtk_prefix+set}" = set; then -- withval="$with_gtk_prefix" -- gtk_config_prefix="$withval" -+ withval=$with_gtk_prefix; gtk_config_prefix="$withval" - else - gtk_config_prefix="" --fi; -+fi - --# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -+ -+# Check whether --with-gtk-exec-prefix was given. - if test "${with_gtk_exec_prefix+set}" = set; then -- withval="$with_gtk_exec_prefix" -- gtk_config_exec_prefix="$withval" -+ withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" - else - gtk_config_exec_prefix="" --fi; --# Check whether --enable-gtktest or --disable-gtktest was given. --if test "${enable_gtktest+set}" = set; then -- enableval="$enable_gtktest" -+fi - -+# Check whether --enable-gtktest was given. -+if test "${enable_gtktest+set}" = set; then -+ enableval=$enable_gtktest; - else - enable_gtktest=yes --fi; -+fi -+ - - for module in . - do -@@ -9316,8 +21071,8 @@ - - # Extract the first word of "gtk-config", so it can be a program name with args. - set dummy gtk-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9332,31 +21087,32 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTK_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; - esac - fi - GTK_CONFIG=$ac_cv_path_GTK_CONFIG -- - if test -n "$GTK_CONFIG"; then -- echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 --echo "${ECHO_T}$GTK_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -+echo "${ECHO_T}$GTK_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - min_gtk_version=$GTK_REQUIRED -- echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 --echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes -@@ -9461,13 +21217,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -9480,19 +21245,21 @@ - ( exit $ac_status ) - no_gtk=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -@@ -9524,27 +21291,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -@@ -9563,12 +21326,13 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -9587,20 +21351,20 @@ - fi - - --# Check whether --enable-imlib or --disable-imlib was given. -+# Check whether --enable-imlib was given. - if test "${enable_imlib+set}" = set; then -- enableval="$enable_imlib" -- disable_imlib=yes -+ enableval=$enable_imlib; disable_imlib=yes - else - disable_imlib=no --fi; --# Check whether --enable-gdk-pixbuf or --disable-gdk-pixbuf was given. -+fi -+ -+# Check whether --enable-gdk-pixbuf was given. - if test "${enable_gdk_pixbuf+set}" = set; then -- enableval="$enable_gdk_pixbuf" -- disable_gdk_pixbuf=yes -+ enableval=$enable_gdk_pixbuf; disable_gdk_pixbuf=yes - else - disable_gdk_pixbuf=no --fi; -+fi -+ - - if test x"$disable_imlib" = xyes -a x"$disable_gdk_pixbuf" = xyes; then - { { echo "$as_me:$LINENO: error: *** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***" >&5 -@@ -9617,28 +21381,28 @@ - have_gdk_pixbuf=yes - else - --# Check whether --with-imlib-prefix or --without-imlib-prefix was given. -+# Check whether --with-imlib-prefix was given. - if test "${with_imlib_prefix+set}" = set; then -- withval="$with_imlib_prefix" -- imlib_prefix="$withval" -+ withval=$with_imlib_prefix; imlib_prefix="$withval" - else - imlib_prefix="" --fi; -+fi - --# Check whether --with-imlib-exec-prefix or --without-imlib-exec-prefix was given. -+ -+# Check whether --with-imlib-exec-prefix was given. - if test "${with_imlib_exec_prefix+set}" = set; then -- withval="$with_imlib_exec_prefix" -- imlib_exec_prefix="$withval" -+ withval=$with_imlib_exec_prefix; imlib_exec_prefix="$withval" - else - imlib_exec_prefix="" --fi; --# Check whether --enable-imlibtest or --disable-imlibtest was given. --if test "${enable_imlibtest+set}" = set; then -- enableval="$enable_imlibtest" -+fi - -+# Check whether --enable-imlibtest was given. -+if test "${enable_imlibtest+set}" = set; then -+ enableval=$enable_imlibtest; - else - enable_imlibtest=yes --fi; -+fi -+ - - if test x$imlib_exec_prefix != x ; then - imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" -@@ -9655,8 +21419,8 @@ - - # Extract the first word of "imlib-config", so it can be a program name with args. - set dummy imlib-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_IMLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9671,31 +21435,32 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IMLIB_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_IMLIB_CONFIG" && ac_cv_path_IMLIB_CONFIG="no" - ;; - esac - fi - IMLIB_CONFIG=$ac_cv_path_IMLIB_CONFIG -- - if test -n "$IMLIB_CONFIG"; then -- echo "$as_me:$LINENO: result: $IMLIB_CONFIG" >&5 --echo "${ECHO_T}$IMLIB_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $IMLIB_CONFIG" >&5 -+echo "${ECHO_T}$IMLIB_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - min_imlib_version=$IMLIB_REQUIRED -- echo "$as_me:$LINENO: checking for IMLIB - version >= $min_imlib_version" >&5 --echo $ECHO_N "checking for IMLIB - version >= $min_imlib_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for IMLIB - version >= $min_imlib_version" >&5 -+echo $ECHO_N "checking for IMLIB - version >= $min_imlib_version... $ECHO_C" >&6; } - no_imlib="" - if test "$IMLIB_CONFIG" = "no" ; then - no_imlib=yes -@@ -9761,13 +21526,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -9780,19 +21554,21 @@ - ( exit $ac_status ) - no_imlib=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_imlib" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - have_imlib=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$IMLIB_CONFIG" = "no" ; then - echo "*** The imlib-config script installed by IMLIB could not be found" - echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" -@@ -9824,27 +21600,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding IMLIB or finding the wrong" - echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" -@@ -9858,12 +21630,13 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" - echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" - echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -9878,28 +21651,28 @@ - rm -f conf.gdkimlibtest - - --# Check whether --with-gdk-pixbuf-prefix or --without-gdk-pixbuf-prefix was given. -+# Check whether --with-gdk-pixbuf-prefix was given. - if test "${with_gdk_pixbuf_prefix+set}" = set; then -- withval="$with_gdk_pixbuf_prefix" -- gdk_pixbuf_prefix="$withval" -+ withval=$with_gdk_pixbuf_prefix; gdk_pixbuf_prefix="$withval" - else - gdk_pixbuf_prefix="" --fi; -+fi - --# Check whether --with-gdk-pixbuf-exec-prefix or --without-gdk-pixbuf-exec-prefix was given. -+ -+# Check whether --with-gdk-pixbuf-exec-prefix was given. - if test "${with_gdk_pixbuf_exec_prefix+set}" = set; then -- withval="$with_gdk_pixbuf_exec_prefix" -- gdk_pixbuf_exec_prefix="$withval" -+ withval=$with_gdk_pixbuf_exec_prefix; gdk_pixbuf_exec_prefix="$withval" - else - gdk_pixbuf_exec_prefix="" --fi; --# Check whether --enable-gdk_pixbuftest or --disable-gdk_pixbuftest was given. --if test "${enable_gdk_pixbuftest+set}" = set; then -- enableval="$enable_gdk_pixbuftest" -+fi - -+# Check whether --enable-gdk_pixbuftest was given. -+if test "${enable_gdk_pixbuftest+set}" = set; then -+ enableval=$enable_gdk_pixbuftest; - else - enable_gdk_pixbuftest=yes --fi; -+fi -+ - - if test x$gdk_pixbuf_exec_prefix != x ; then - gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" -@@ -9916,8 +21689,8 @@ - - # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args. - set dummy gdk-pixbuf-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GDK_PIXBUF_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9932,31 +21705,32 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GDK_PIXBUF_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GDK_PIXBUF_CONFIG" && ac_cv_path_GDK_PIXBUF_CONFIG="no" - ;; - esac - fi - GDK_PIXBUF_CONFIG=$ac_cv_path_GDK_PIXBUF_CONFIG -- - if test -n "$GDK_PIXBUF_CONFIG"; then -- echo "$as_me:$LINENO: result: $GDK_PIXBUF_CONFIG" >&5 --echo "${ECHO_T}$GDK_PIXBUF_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CONFIG" >&5 -+echo "${ECHO_T}$GDK_PIXBUF_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - min_gdk_pixbuf_version=$GDK_PIXBUF_REQUIRED -- echo "$as_me:$LINENO: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5 --echo $ECHO_N "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5 -+echo $ECHO_N "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version... $ECHO_C" >&6; } - no_gdk_pixbuf="" - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - no_gdk_pixbuf=yes -@@ -10042,13 +21816,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -10061,19 +21844,21 @@ - ( exit $ac_status ) - no_gdk_pixbuf=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gdk_pixbuf" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - have_gdk_pixbuf=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" - echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" -@@ -10105,27 +21890,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" - echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" -@@ -10139,12 +21920,13 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" - echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" - echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -10197,9 +21979,7 @@ - fi - fi - -- -- --if test "x$disable_gdk_pixbuf" = xno -a "x$have_gdk_pixbuf" = xyes; then -+ if test "x$disable_gdk_pixbuf" = xno -a "x$have_gdk_pixbuf" = xyes; then - ENABLE_GDK_PIXBUF_TRUE= - ENABLE_GDK_PIXBUF_FALSE='#' - else -@@ -10207,9 +21987,7 @@ - ENABLE_GDK_PIXBUF_FALSE= - fi - -- -- --if test "x$disable_imlib" = xno -a "x$have_imlib" = xyes; then -+ if test "x$disable_imlib" = xno -a "x$have_imlib" = xyes; then - ENABLE_GDK_IMLIB_TRUE= - ENABLE_GDK_IMLIB_FALSE='#' - else -@@ -10230,17 +22008,17 @@ - BZLIB_CFLAGS="" - BZLIB_LIBS="" - if test "${ac_cv_header_bzlib_h+set}" = set; then -- echo "$as_me:$LINENO: checking for bzlib.h" >&5 --echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for bzlib.h" >&5 -+echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; } - if test "${ac_cv_header_bzlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 --echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 -+echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking bzlib.h usability" >&5 --echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking bzlib.h usability" >&5 -+echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -10251,41 +22029,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 bzlib.h presence" >&5 --echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking bzlib.h presence" >&5 -+echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -10294,24 +22068,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10319,9 +22091,10 @@ - - 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 -+{ 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 -@@ -10345,31 +22118,24 @@ - echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: bzlib.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 bzlib.h" >&5 --echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for bzlib.h" >&5 -+echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; } - if test "${ac_cv_header_bzlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_bzlib_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 --echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 -+echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; } - - fi - if test $ac_cv_header_bzlib_h = yes; then - -- echo "$as_me:$LINENO: checking for BZ2_bzlibVersion in -lbz2" >&5 --echo $ECHO_N "checking for BZ2_bzlibVersion in -lbz2... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for BZ2_bzlibVersion in -lbz2" >&5 -+echo $ECHO_N "checking for BZ2_bzlibVersion in -lbz2... $ECHO_C" >&6; } - if test "${ac_cv_lib_bz2_BZ2_bzlibVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -10382,56 +22148,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char BZ2_bzlibVersion (); - int - main () - { --BZ2_bzlibVersion (); -+return BZ2_bzlibVersion (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_bz2_BZ2_bzlibVersion=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_bz2_BZ2_bzlibVersion=no -+ ac_cv_lib_bz2_BZ2_bzlibVersion=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzlibVersion" >&5 --echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzlibVersion" >&5 -+echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6; } - if test $ac_cv_lib_bz2_BZ2_bzlibVersion = yes; then - - available_bzlib=yes; -@@ -10444,8 +22207,8 @@ - - else - -- echo "$as_me:$LINENO: checking for bzlibVersion in -lbz2" >&5 --echo $ECHO_N "checking for bzlibVersion in -lbz2... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for bzlibVersion in -lbz2" >&5 -+echo $ECHO_N "checking for bzlibVersion in -lbz2... $ECHO_C" >&6; } - if test "${ac_cv_lib_bz2_bzlibVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -10458,56 +22221,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char bzlibVersion (); - int - main () - { --bzlibVersion (); -+return bzlibVersion (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_bz2_bzlibVersion=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_bz2_bzlibVersion=no -+ ac_cv_lib_bz2_bzlibVersion=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzlibVersion" >&5 --echo "${ECHO_T}$ac_cv_lib_bz2_bzlibVersion" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzlibVersion" >&5 -+echo "${ECHO_T}$ac_cv_lib_bz2_bzlibVersion" >&6; } - if test $ac_cv_lib_bz2_bzlibVersion = yes; then - - available_bzlib=yes; BZLIB_LIBS="-lbz2"; -@@ -10529,9 +22289,7 @@ - _ACEOF - - fi -- -- --if test x"$available_bzlib" = x"yes"; then -+ if test x"$available_bzlib" = x"yes"; then - HAVE_BZLIB_TRUE= - HAVE_BZLIB_FALSE='#' - else -@@ -10545,8 +22303,8 @@ - - PNG_CFLAGS="" - PNG_LIBS="" --echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 --echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -+echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } - if test "${ac_cv_lib_png_png_read_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -10559,70 +22317,67 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char png_read_info (); - int - main () - { --png_read_info (); -+return png_read_info (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_read_info=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_png_png_read_info=no -+ ac_cv_lib_png_png_read_info=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 --echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -+echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } - if test $ac_cv_lib_png_png_read_info = yes; then - - 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 -+ { 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 -+{ 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 -+{ 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 -@@ -10633,41 +22388,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -10676,24 +22427,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10701,9 +22450,10 @@ - - 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 -+{ 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 -@@ -10727,25 +22477,18 @@ - 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 -+{ 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 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -+echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - - fi - if test $ac_cv_header_png_h = yes; then -@@ -10766,8 +22509,8 @@ - - - if test x"$png_ok" = xyes; then -- echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 --echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -+echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -10788,37 +22531,33 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - png_ok=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- png_ok=no -+ png_ok=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $png_ok" >&5 --echo "${ECHO_T}$png_ok" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ { echo "$as_me:$LINENO: result: $png_ok" >&5 -+echo "${ECHO_T}$png_ok" >&6; } - if test x"$png_ok" = xyes; then - PNG_LIBS="-lpng -lz" - else -@@ -10834,9 +22573,7 @@ - - - -- -- --if test "x$PNG_LIBS" != x; then -+ if test "x$PNG_LIBS" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' - else -@@ -10849,8 +22586,8 @@ - JPEG_CFLAGS="" - JPEG_LIBS="" - available_jpeg=no --echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 --echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -10863,56 +22600,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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_decompress (); - int - main () - { --jpeg_destroy_decompress (); -+return jpeg_destroy_decompress (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_jpeg_jpeg_destroy_decompress=no -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 --echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } - if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then - available_jpeg=yes - else -@@ -10921,8 +22655,8 @@ - - - if test x"$available_jpeg" = xyes; then -- echo "$as_me:$LINENO: checking for jpeglib.h" >&5 --echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -10935,24 +22669,22 @@ - #undef HAVE_STDLIB_H - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - available_jpeg=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10960,13 +22692,14 @@ - - available_jpeg=no - fi -+ - rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $available_jpeg" >&5 --echo "${ECHO_T}$available_jpeg" >&6 -+ { echo "$as_me:$LINENO: result: $available_jpeg" >&5 -+echo "${ECHO_T}$available_jpeg" >&6; } - if test x"$available_jpeg" = xyes; then - JPEG_LIBS='-ljpeg' -- echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 --echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -10979,56 +22712,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char jpeg_simple_progression (); - int - main () - { --jpeg_simple_progression (); -+return jpeg_simple_progression (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_simple_progression=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_jpeg_jpeg_simple_progression=no -+ ac_cv_lib_jpeg_jpeg_simple_progression=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 --echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } - if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -11054,9 +22784,7 @@ - echo "$as_me: WARNING: *** JPEG loader will not be built ***" >&2;} - fi - -- -- --if test x"$available_jpeg" = x"yes"; then -+ if test x"$available_jpeg" = x"yes"; then - ENABLE_JPEG_TRUE= - ENABLE_JPEG_FALSE='#' - else -@@ -11071,30 +22799,30 @@ - - - --# Check whether --with-libmng or --without-libmng was given. -+# Check whether --with-libmng was given. - if test "${with_libmng+set}" = set; then -- withval="$with_libmng" -- enable_mng="${withval}" -+ withval=$with_libmng; enable_mng="${withval}" - else - enable_mng=yes --fi; -+fi -+ - - MNG_CFLAGS="" - MNG_LIBS="" - if test x"$enable_mng" = x"yes"; then - if test x"$available_jpeg" = x"yes"; then - if test "${ac_cv_header_libmng_h+set}" = set; then -- echo "$as_me:$LINENO: checking for libmng.h" >&5 --echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libmng.h" >&5 -+echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libmng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 --echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking libmng.h usability" >&5 --echo $ECHO_N "checking libmng.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking libmng.h usability" >&5 -+echo $ECHO_N "checking libmng.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11105,41 +22833,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 libmng.h presence" >&5 --echo $ECHO_N "checking libmng.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking libmng.h presence" >&5 -+echo $ECHO_N "checking libmng.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11148,24 +22872,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -11173,9 +22895,10 @@ - - 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 -+{ 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 -@@ -11199,31 +22922,24 @@ - echo "$as_me: WARNING: libmng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libmng.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: libmng.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 libmng.h" >&5 --echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libmng.h" >&5 -+echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libmng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_libmng_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 --echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; } - - fi - if test $ac_cv_header_libmng_h = yes; then - -- echo "$as_me:$LINENO: checking for mng_initialize in -lmng" >&5 --echo $ECHO_N "checking for mng_initialize in -lmng... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for mng_initialize in -lmng" >&5 -+echo $ECHO_N "checking for mng_initialize in -lmng... $ECHO_C" >&6; } - if test "${ac_cv_lib_mng_mng_initialize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11236,60 +22952,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char mng_initialize (); - int - main () - { --mng_initialize (); -+return mng_initialize (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_mng_mng_initialize=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_mng_mng_initialize=no -+ ac_cv_lib_mng_mng_initialize=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_initialize" >&5 --echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_initialize" >&5 -+echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6; } - if test $ac_cv_lib_mng_mng_initialize = yes; then - -- echo "$as_me:$LINENO: checking for libmng functions" >&5 --echo $ECHO_N "checking for libmng functions... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libmng functions" >&5 -+echo $ECHO_N "checking for libmng functions... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11322,27 +23035,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - MNG_LIBS="$JPEG_LIBS -lz -lmng"; - - cat >>confdefs.h <<\_ACEOF -@@ -11353,13 +23061,14 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- enable_mng=no; -+ enable_mng=no; - { echo "$as_me:$LINENO: WARNING: *** MNG library (libmng) is found but it is too old ***" >&5 - echo "$as_me: WARNING: *** MNG library (libmng) is found but it is too old ***" >&2;} - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $enable_mng" >&5 --echo "${ECHO_T}$enable_mng" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ { echo "$as_me:$LINENO: result: $enable_mng" >&5 -+echo "${ECHO_T}$enable_mng" >&6; } - - else - -@@ -11382,9 +23091,7 @@ - fi - fi - -- -- --if test x"$enable_mng" = xyes; then -+ if test x"$enable_mng" = xyes; then - ENABLE_MNG_TRUE= - ENABLE_MNG_FALSE='#' - else -@@ -11397,13 +23104,13 @@ - - - --# Check whether --with-librsvg or --without-librsvg was given. -+# Check whether --with-librsvg was given. - if test "${with_librsvg+set}" = set; then -- withval="$with_librsvg" -- enable_librsvg="${withval}" -+ withval=$with_librsvg; enable_librsvg="${withval}" - else - enable_librsvg=yes --fi; -+fi -+ - - if test x"$enable_librsvg" = xyes; then - if test x"$enable_gtk2" != xno; then -@@ -11413,8 +23120,8 @@ - if test -z "$PKG_CONFIG"; then - # 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11429,28 +23136,29 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; - esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG -- - if test -n "$PKG_CONFIG"; then -- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --echo "${ECHO_T}$PKG_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - - if test "$PKG_CONFIG" = "no" ; then -@@ -11461,25 +23169,25 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo "$as_me:$LINENO: checking for librsvg-2.0" >&5 --echo $ECHO_N "checking for librsvg-2.0... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for librsvg-2.0" >&5 -+echo $ECHO_N "checking for librsvg-2.0... $ECHO_C" >&6; } - - if $PKG_CONFIG --exists "librsvg-2.0" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - succeeded=yes - -- echo "$as_me:$LINENO: checking LIBRSVG_CFLAGS" >&5 --echo $ECHO_N "checking LIBRSVG_CFLAGS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking LIBRSVG_CFLAGS" >&5 -+echo $ECHO_N "checking LIBRSVG_CFLAGS... $ECHO_C" >&6; } - LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0"` -- echo "$as_me:$LINENO: result: $LIBRSVG_CFLAGS" >&5 --echo "${ECHO_T}$LIBRSVG_CFLAGS" >&6 -+ { echo "$as_me:$LINENO: result: $LIBRSVG_CFLAGS" >&5 -+echo "${ECHO_T}$LIBRSVG_CFLAGS" >&6; } - -- echo "$as_me:$LINENO: checking LIBRSVG_LIBS" >&5 --echo $ECHO_N "checking LIBRSVG_LIBS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking LIBRSVG_LIBS" >&5 -+echo $ECHO_N "checking LIBRSVG_LIBS... $ECHO_C" >&6; } - LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0"` -- echo "$as_me:$LINENO: result: $LIBRSVG_LIBS" >&5 --echo "${ECHO_T}$LIBRSVG_LIBS" >&6 -+ { echo "$as_me:$LINENO: result: $LIBRSVG_LIBS" >&5 -+echo "${ECHO_T}$LIBRSVG_LIBS" >&6; } - else - LIBRSVG_CFLAGS="" - LIBRSVG_LIBS="" -@@ -11510,21 +23218,21 @@ - else - if test x"$disable_gdk_pixbuf" = xno -a x"$have_gdk_pixbuf" = xyes; then - --# Check whether --with-gnome-prefix or --without-gnome-prefix was given. -+# Check whether --with-gnome-prefix was given. - if test "${with_gnome_prefix+set}" = set; then -- withval="$with_gnome_prefix" -- gnome_config_prefix="$withval" -+ withval=$with_gnome_prefix; gnome_config_prefix="$withval" - else - gnome_config_prefix="" --fi; -+fi - --# Check whether --with-gnome-exec-prefix or --without-gnome-exec-prefix was given. -+ -+# Check whether --with-gnome-exec-prefix was given. - if test "${with_gnome_exec_prefix+set}" = set; then -- withval="$with_gnome_exec_prefix" -- gnome_config_exec_prefix="$withval" -+ withval=$with_gnome_exec_prefix; gnome_config_exec_prefix="$withval" - else - gnome_config_exec_prefix="" --fi; -+fi -+ - - if test x$gnome_config_exec_prefix != x ; then - gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix" -@@ -11541,8 +23249,8 @@ - - # Extract the first word of "gnome-config", so it can be a program name with args. - set dummy gnome-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11557,32 +23265,33 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GNOME_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" - ;; - esac - fi - GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG -- - if test -n "$GNOME_CONFIG"; then -- echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 --echo "${ECHO_T}$GNOME_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 -+echo "${ECHO_T}$GNOME_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - min_gnome_version=1.2.8 - -- echo "$as_me:$LINENO: checking for GNOME - version >= $min_gnome_version" >&5 --echo $ECHO_N "checking for GNOME - version >= $min_gnome_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNOME - version >= $min_gnome_version" >&5 -+echo $ECHO_N "checking for GNOME - version >= $min_gnome_version... $ECHO_C" >&6; } - no_gnome="" - if test "$GNOME_CONFIG" = "no" ; then - no_gnome=yes -@@ -11638,12 +23347,12 @@ - - - if test "x$no_gnome" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$GNOME_CONFIG" = "no" ; then - echo "*** The gnome-config script could not be found." - else -@@ -11660,8 +23369,8 @@ - - tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir` - if test -n "xml librsvg"; then -- echo "$as_me:$LINENO: checking for additional GNOME modules" >&5 --echo $ECHO_N "checking for additional GNOME modules... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for additional GNOME modules" >&5 -+echo $ECHO_N "checking for additional GNOME modules... $ECHO_C" >&6; } - fi - for module in xml librsvg ""; do - gnome_m4_notfound=no -@@ -11694,8 +23403,8 @@ - eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\" - eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\" - else -- echo "$as_me:$LINENO: result: *** $module library is not installed" >&5 --echo "${ECHO_T}*** $module library is not installed" >&6 -+ { echo "$as_me:$LINENO: result: *** $module library is not installed" >&5 -+echo "${ECHO_T}*** $module library is not installed" >&6; } - - enable_librsvg=no; - { echo "$as_me:$LINENO: WARNING: Did not find librsvg installed" >&5 -@@ -11709,8 +23418,8 @@ - fi - done - if test -n "xml librsvg"; then -- echo "$as_me:$LINENO: result: " >&5 --echo "${ECHO_T}" >&6 -+ { echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } - fi - - else -@@ -11719,9 +23428,7 @@ - fi - fi - -- -- --if test x"$enable_librsvg" = xyes; then -+ if test x"$enable_librsvg" = xyes; then - ENABLE_LIBRSVG_TRUE= - ENABLE_LIBRSVG_FALSE='#' - else -@@ -11750,39 +23457,39 @@ - - - --# Check whether --with-libwmf or --without-libwmf was given. -+# Check whether --with-libwmf was given. - if test "${with_libwmf+set}" = set; then -- withval="$with_libwmf" -- enable_libwmf="${withval}" -+ withval=$with_libwmf; enable_libwmf="${withval}" - else - enable_libwmf=yes --fi; -+fi -+ - - if test "x$enable_libwmf" = xyes; then - have_libwmf=no - --# Check whether --with-libwmf-prefix or --without-libwmf-prefix was given. -+# Check whether --with-libwmf-prefix was given. - if test "${with_libwmf_prefix+set}" = set; then -- withval="$with_libwmf_prefix" -- libwmf_prefix="$withval" -+ withval=$with_libwmf_prefix; libwmf_prefix="$withval" - else - libwmf_prefix="" --fi; -+fi - --# Check whether --with-libwmf-exec-prefix or --without-libwmf-exec-prefix was given. -+ -+# Check whether --with-libwmf-exec-prefix was given. - if test "${with_libwmf_exec_prefix+set}" = set; then -- withval="$with_libwmf_exec_prefix" -- libwmf_exec_prefix="$withval" -+ withval=$with_libwmf_exec_prefix; libwmf_exec_prefix="$withval" - else - libwmf_exec_prefix="" --fi; --# Check whether --enable-libwmftest or --disable-libwmftest was given. --if test "${enable_libwmftest+set}" = set; then -- enableval="$enable_libwmftest" -+fi - -+# Check whether --enable-libwmftest was given. -+if test "${enable_libwmftest+set}" = set; then -+ enableval=$enable_libwmftest; - else - enable_libwmftest=yes --fi; -+fi -+ - - if test x$libwmf_exec_prefix != x ; then - libwmf_args="$libwmf_args --exec-prefix=$libwmf_exec_prefix" -@@ -11799,8 +23506,8 @@ - - # Extract the first word of "libwmf-config", so it can be a program name with args. - set dummy libwmf-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_LIBWMF_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11815,31 +23522,32 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LIBWMF_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_LIBWMF_CONFIG" && ac_cv_path_LIBWMF_CONFIG="no" - ;; - esac - fi - LIBWMF_CONFIG=$ac_cv_path_LIBWMF_CONFIG -- - if test -n "$LIBWMF_CONFIG"; then -- echo "$as_me:$LINENO: result: $LIBWMF_CONFIG" >&5 --echo "${ECHO_T}$LIBWMF_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $LIBWMF_CONFIG" >&5 -+echo "${ECHO_T}$LIBWMF_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - min_libwmf_version=$LIBWMF_REQUIRED -- echo "$as_me:$LINENO: checking for libwmf - version >= $min_libwmf_version" >&5 --echo $ECHO_N "checking for libwmf - version >= $min_libwmf_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libwmf - version >= $min_libwmf_version" >&5 -+echo $ECHO_N "checking for libwmf - version >= $min_libwmf_version... $ECHO_C" >&6; } - no_libwmf="" - if test "$LIBWMF_CONFIG" = "no" ; then - no_libwmf=yes -@@ -11909,13 +23617,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -11928,19 +23645,21 @@ - ( exit $ac_status ) - no_libwmf=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_libwmf" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - have_libwmf=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$LIBWMF_CONFIG" = "no" ; then - echo "*** The libwmf-config script installed by LIBWMF could not be found" - echo "*** If LIBWMF was installed in PREFIX, make sure PREFIX/bin is in" -@@ -11972,27 +23691,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBWMF or finding the wrong" - echo "*** version of LIBWMF. If it is not finding LIBWMF, you'll need to set your" -@@ -12006,12 +23721,13 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LIBWMF was incorrectly installed" - echo "*** or that you have moved LIBWMF since it was installed. In the latter case, you" - echo "*** may want to edit the libwmf-config script: $LIBWMF_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -12039,9 +23755,7 @@ - fi - fi - -- -- --if test x"$enable_libwmf" = xyes; then -+ if test x"$enable_libwmf" = xyes; then - ENABLE_WMF_TRUE= - ENABLE_WMF_FALSE='#' - else -@@ -12069,12 +23783,12 @@ - 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 -+ { 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" -+ ac_xsave_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -12090,43 +23804,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ X_LIBS="$X_LIBS -R$x_libraries" - 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 -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -12142,47 +23845,42 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_R_space=no -+ { echo "$as_me:$LINENO: result: neither works" >&5 -+echo "${ECHO_T}neither works" >&6; } - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_c_werror_flag=$ac_xsave_c_werror_flag -+ LIBS=$ac_xsave_LIBS - fi - - # Check for system-dependent libraries X programs must link with. -@@ -12203,50 +23901,46 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ { 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 -@@ -12259,63 +23953,60 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dnet_dnet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -+{ 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 -+ { 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 -@@ -12328,63 +24019,61 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dnet_stub_dnet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -+{ 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 \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - -@@ -12396,8 +24085,8 @@ - # 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 -+ { 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 -@@ -12424,72 +24113,63 @@ - - #undef gethostbyname - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_gethostbyname || defined __stub___gethostbyname - choke me --#else --char (*f) () = gethostbyname; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != gethostbyname; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -12502,63 +24182,60 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_nsl_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -+{ 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 -+ { 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 -@@ -12571,56 +24248,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_bsd_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -+{ 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 -@@ -12635,8 +24309,8 @@ - # 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 -+ { 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 -@@ -12663,72 +24337,63 @@ - - #undef connect - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_connect || defined __stub___connect - choke me --#else --char (*f) () = connect; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != connect; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_connect=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -12741,56 +24406,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_socket_connect=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -+{ 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 -@@ -12798,8 +24460,8 @@ - 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 -+ { 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 -@@ -12826,72 +24488,63 @@ - - #undef remove - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_remove || defined __stub___remove - choke me --#else --char (*f) () = remove; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != remove; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_remove=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -12904,56 +24557,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_posix_remove=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -+{ 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 -@@ -12961,8 +24611,8 @@ - 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 -+ { 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 -@@ -12989,72 +24639,63 @@ - - #undef shmat - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_shmat || defined __stub___shmat - choke me --#else --char (*f) () = shmat; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != shmat; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_shmat=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -+ { 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 -@@ -13067,56 +24708,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_ipc_shmat=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -+{ 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 -@@ -13133,8 +24771,8 @@ - # 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 -+ { 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 -@@ -13147,56 +24785,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_ICE_IceConnectionNumber=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -+{ 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 -@@ -13206,8 +24841,8 @@ - fi - - XINERAMA_LIBS="" --echo "$as_me:$LINENO: checking for XineramaQueryScreens in -lXinerama" >&5 --echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6 -+{ 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 -@@ -13220,74 +24855,72 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_Xinerama_XineramaQueryScreens=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 --echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6 -+{ 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 - XINERAMA_LIBS="-lXinerama" - - for ac_header in X11/extensions/Xinerama.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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -13298,41 +24931,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -13341,24 +24970,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -13366,9 +24993,10 @@ - - 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 -+{ 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 -@@ -13392,25 +25020,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -13431,39 +25053,39 @@ - movie_support="" - - --# Check whether --with-xine or --without-xine was given. -+# Check whether --with-xine was given. - if test "${with_xine+set}" = set; then -- withval="$with_xine" -- enable_xine="${withval}" -+ withval=$with_xine; enable_xine="${withval}" - else - enable_xine=no --fi; -+fi -+ - - if test x"$enable_xine" = xyes; then - have_xine=no - --# Check whether --with-xine-prefix or --without-xine-prefix was given. -+# Check whether --with-xine-prefix was given. - if test "${with_xine_prefix+set}" = set; then -- withval="$with_xine_prefix" -- xine_config_prefix="$withval" -+ withval=$with_xine_prefix; xine_config_prefix="$withval" - else - xine_config_prefix="" --fi; -+fi - --# Check whether --with-xine-exec-prefix or --without-xine-exec-prefix was given. -+ -+# Check whether --with-xine-exec-prefix was given. - if test "${with_xine_exec_prefix+set}" = set; then -- withval="$with_xine_exec_prefix" -- xine_config_exec_prefix="$withval" -+ withval=$with_xine_exec_prefix; xine_config_exec_prefix="$withval" - else - xine_config_exec_prefix="" --fi; --# Check whether --enable-xinetest or --disable-xinetest was given. --if test "${enable_xinetest+set}" = set; then -- enableval="$enable_xinetest" -+fi - -+# Check whether --enable-xinetest was given. -+if test "${enable_xinetest+set}" = set; then -+ enableval=$enable_xinetest; - else - enable_xinetest=yes --fi; -+fi -+ - - if test x$xine_config_exec_prefix != x ; then - xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix" -@@ -13480,13 +25102,13 @@ - - min_xine_version=$XINE_REQUIRED - if test "x$enable_xinetest" != "xyes" ; then -- echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 --echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 -+echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6; } - else - # Extract the first word of "xine-config", so it can be a program name with args. - set dummy xine-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XINE_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -13501,30 +25123,31 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XINE_CONFIG="$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 -+IFS=$as_save_IFS - - test -z "$ac_cv_path_XINE_CONFIG" && ac_cv_path_XINE_CONFIG="no" - ;; - esac - fi - XINE_CONFIG=$ac_cv_path_XINE_CONFIG -- - if test -n "$XINE_CONFIG"; then -- echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5 --echo "${ECHO_T}$XINE_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5 -+echo "${ECHO_T}$XINE_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 --echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5 -+echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6; } - no_xine="" - if test "$XINE_CONFIG" = "no" ; then - no_xine=yes -@@ -13547,7 +25170,6 @@ - CFLAGS="$CFLAGS $XINE_CFLAGS" - LIBS="$XINE_LIBS $LIBS" - -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -13632,13 +25254,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -13651,19 +25282,21 @@ - ( exit $ac_status ) - no_xine=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_xine" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - have_xine=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$XINE_CONFIG" = "no" ; then - echo "*** The xine-config script installed by XINE could not be found" - echo "*** If XINE was installed in PREFIX, make sure PREFIX/bin is in" -@@ -13695,27 +25328,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding XINE or finding the wrong" - echo "*** version of XINE. If it is not finding XINE, you'll need to set your" -@@ -13730,12 +25359,13 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means XINE was incorrectly installed" - echo "*** or that you have moved XINE since it was installed. In the latter case, you" - echo "*** may want to edit the xine-config script: $XINE_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -13762,9 +25392,9 @@ - for ac_func in strsep strpbrk setenv - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -13790,68 +25420,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -13876,9 +25498,7 @@ - fi - fi - -- -- --if test x"$enable_xine" = xyes; then -+ if test x"$enable_xine" = xyes; then - ENABLE_XINE_TRUE= - ENABLE_XINE_FALSE='#' - else -@@ -13892,8 +25512,8 @@ - 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 -+{ 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 -@@ -13906,32 +25526,34 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { 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 -+ { 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 -+{ 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 -@@ -13944,33 +25566,47 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- 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 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - 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 -+{ 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 -@@ -13988,10 +25624,10 @@ - #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset x; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ -- char const *const *ccp; -- char **p; -+ char const *const *pcpcc; -+ char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -@@ -14000,16 +25636,17 @@ - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; -- ccp = &g + (g ? g-g : 0); -+ pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ -- ++ccp; -- p = (char**) ccp; -- ccp = (char const *const *) p; -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -+ if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; -@@ -14028,7 +25665,9 @@ - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -+ if (!foo) return 0; - } -+ return !cs[0] && !zero.x; - #endif - - ; -@@ -14036,38 +25675,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cv_c_const=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+{ 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 -@@ -14076,8 +25711,8 @@ - - fi - --echo "$as_me:$LINENO: checking for inline" >&5 --echo $ECHO_N "checking for inline... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for inline" >&5 -+echo $ECHO_N "checking for inline... $ECHO_C" >&6; } - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -14097,39 +25732,37 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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_inline=$ac_kw; break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_inline=$ac_kw - 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 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break - done - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 --echo "${ECHO_T}$ac_cv_c_inline" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+echo "${ECHO_T}$ac_cv_c_inline" >&6; } - - - case $ac_cv_c_inline in -@@ -14147,8 +25780,8 @@ - ;; - esac - --echo "$as_me:$LINENO: checking for off_t" >&5 --echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for off_t" >&5 -+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } - if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -14159,62 +25792,59 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef off_t ac__type_new_; - int - main () - { --if ((off_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (off_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_off_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_off_t=no -+ ac_cv_type_off_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 --echo "${ECHO_T}$ac_cv_type_off_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -+echo "${ECHO_T}$ac_cv_type_off_t" >&6; } - if test $ac_cv_type_off_t = yes; then - : - else - - cat >>confdefs.h <<_ACEOF --#define off_t long -+#define off_t long int - _ACEOF - - fi - --echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for size_t" >&5 -+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } - if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -14225,64 +25855,61 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef size_t ac__type_new_; - int - main () - { --if ((size_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (size_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_size_t=no -+ ac_cv_type_size_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+echo "${ECHO_T}$ac_cv_type_size_t" >&6; } - if test $ac_cv_type_size_t = yes; then - : - else - - cat >>confdefs.h <<_ACEOF --#define size_t unsigned -+#define size_t unsigned int - _ACEOF - - fi - - # 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 -+{ 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 -@@ -14297,44 +25924,42 @@ - main () - { - char *p = (char *) alloca (2 * sizeof (int)); -+ if (p) return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_working_alloca_h=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -@@ -14343,8 +25968,8 @@ - - fi - --echo "$as_me:$LINENO: checking for alloca" >&5 --echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -+{ 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 -@@ -14361,7 +25986,7 @@ - # include - # define alloca _alloca - # else --# if HAVE_ALLOCA_H -+# ifdef HAVE_ALLOCA_H - # include - # else - # ifdef _AIX -@@ -14379,44 +26004,42 @@ - main () - { - char *p = (char *) alloca (1); -+ if (p) return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_alloca_works=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 - -@@ -14430,15 +26053,15 @@ - # 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 -+ALLOCA=\${LIBOBJDIR}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 -+{ 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 -@@ -14448,7 +26071,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#if defined(CRAY) && ! defined(CRAY2) -+#if defined CRAY && ! defined CRAY2 - webecray - #else - wenotbecray -@@ -14464,14 +26087,14 @@ - rm -f conftest* - - fi --echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 --echo "${ECHO_T}$ac_cv_os_cray" >&6 -+{ 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -14497,68 +26120,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -14571,8 +26186,8 @@ - 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 -+{ 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 -@@ -14585,6 +26200,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+$ac_includes_default - int - find_stack_direction () - { -@@ -14602,17 +26218,26 @@ - int - main () - { -- exit (find_stack_direction () < 0); -+ return find_stack_direction () < 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -14625,11 +26250,13 @@ - ( 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 -+rm -f core *.core core.conftest.* 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 -+{ 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 -@@ -14643,18 +26270,19 @@ - for ac_header in stdlib.h unistd.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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -14665,41 +26293,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -14708,24 +26332,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -14733,9 +26355,10 @@ - - 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 -+{ 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 -@@ -14759,25 +26382,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -14793,9 +26410,9 @@ - for ac_func in getpagesize - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -14821,68 +26438,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -14891,8 +26500,8 @@ - fi - done - --echo "$as_me:$LINENO: checking for working mmap" >&5 --echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for working mmap" >&5 -+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } - if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -14934,21 +26543,21 @@ - #include - #include - --#if !STDC_HEADERS && !HAVE_STDLIB_H -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H - char *malloc (); - #endif - - /* This mess was copied from the GNU getpagesize.h. */ --#if !HAVE_GETPAGESIZE -+#ifndef HAVE_GETPAGESIZE - /* Assume that all systems that can run configure have sys/param.h. */ --# if !HAVE_SYS_PARAM_H -+# ifndef HAVE_SYS_PARAM_H - # define HAVE_SYS_PARAM_H 1 - # endif - - # ifdef _SC_PAGESIZE - # define getpagesize() sysconf(_SC_PAGESIZE) - # else /* no _SC_PAGESIZE */ --# if HAVE_SYS_PARAM_H -+# ifdef HAVE_SYS_PARAM_H - # include - # ifdef EXEC_PAGESIZE - # define getpagesize() EXEC_PAGESIZE -@@ -14987,15 +26596,15 @@ - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) -- exit (1); -+ return 1; - if (write (fd, data, pagesize) != pagesize) -- exit (1); -+ return 1; - close (fd); - - /* Next, try to mmap the file at a fixed address which already has -@@ -15003,17 +26612,17 @@ - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) -- exit (1); -+ return 1; - data2 = (char *) malloc (2 * pagesize); - if (!data2) -- exit (1); -- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); -+ return 1; -+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) -- exit (1); -+ return 1; - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on -@@ -15022,24 +26631,33 @@ - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) -- exit (1); -+ return 1; - if (read (fd, data3, pagesize) != pagesize) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) -- exit (1); -+ return 1; - close (fd); -- exit (0); -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -15052,11 +26670,13 @@ - ( exit $ac_status ) - ac_cv_func_mmap_fixed_mapped=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } - if test $ac_cv_func_mmap_fixed_mapped = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -15067,8 +26687,8 @@ - rm -f conftest.mmap - - -- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 --echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 -+echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; } - if test "${ac_cv_gnu_library_2_1+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -15098,8 +26718,8 @@ - - - fi --echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 --echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 -+echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define HAVE_GLIBC21 1 -@@ -15126,13 +26746,13 @@ - prefix="$acl_save_prefix" - - --# Check whether --with-gnu-ld or --without-gnu-ld was given. -+# Check whether --with-gnu-ld was given. - if test "${with_gnu_ld+set}" = set; then -- withval="$with_gnu_ld" -- test "$withval" = no || with_gnu_ld=yes -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no --fi; -+fi -+ - # Prepare PATH_SEPARATOR. - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -@@ -15149,8 +26769,8 @@ - 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 GCC" >&5 --echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 -+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -15179,11 +26799,11 @@ - ;; - 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 -+ { 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 -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${acl_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15213,17 +26833,17 @@ - - LD="$acl_cv_path_LD" - if test -n "$LD"; then -- echo "$as_me:$LINENO: result: $LD" >&5 --echo "${ECHO_T}$LD" >&6 -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { 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 -+{ 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 "${acl_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -15235,14 +26855,15 @@ - acl_cv_prog_gnu_ld=no ;; - esac - fi --echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 --echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 -+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$acl_cv_prog_gnu_ld - - - -- echo "$as_me:$LINENO: checking for shared library run path origin" >&5 --echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 -+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } - if test "${acl_cv_rpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -15254,22 +26875,45 @@ - acl_cv_rpath=done - - fi --echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 --echo "${ECHO_T}$acl_cv_rpath" >&6 -+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 -+echo "${ECHO_T}$acl_cv_rpath" >&6; } - 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" -- # Check whether --enable-rpath or --disable-rpath was given. -+ acl_libext="$acl_cv_libext" -+ acl_shlibext="$acl_cv_shlibext" -+ acl_libname_spec="$acl_cv_libname_spec" -+ acl_library_names_spec="$acl_cv_library_names_spec" -+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -+ acl_hardcode_direct="$acl_cv_hardcode_direct" -+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" -+ # Check whether --enable-rpath was given. - if test "${enable_rpath+set}" = set; then -- enableval="$enable_rpath" -- : -+ enableval=$enable_rpath; : - else - enable_rpath=yes --fi; -+fi -+ -+ -+ -+ acl_libdirstem=lib -+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -+ if test -n "$searchpath"; then -+ acl_save_IFS="${IFS= }"; IFS=":" -+ for searchdir in $searchpath; do -+ if test -d "$searchdir"; then -+ case "$searchdir" in -+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -+ *) searchdir=`cd "$searchdir" && pwd` -+ case "$searchdir" in -+ */lib64 ) acl_libdirstem=lib64 ;; -+ esac ;; -+ esac -+ fi -+ done -+ IFS="$acl_save_IFS" -+ fi -+ -+ - - - -@@ -15291,10 +26935,9 @@ - prefix="$acl_save_prefix" - - --# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. -+# Check whether --with-libiconv-prefix was given. - if test "${with_libiconv_prefix+set}" = set; then -- withval="$with_libiconv_prefix" -- -+ withval=$with_libiconv_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else -@@ -15313,14 +26956,16 @@ - - else - additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -+ additional_libdir="$withval/$acl_libdirstem" - fi - fi - --fi; -+fi -+ - LIBICONV= - LTLIBICONV= - INCICONV= -+ LIBICONV_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= -@@ -15354,22 +26999,52 @@ - found_la= - found_so= - found_a= -+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name -+ if test -n "$acl_shlibext"; then -+ shrext=".$acl_shlibext" # typically: shrext=.so -+ else -+ shrext= -+ fi - 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" -+ dir="$additional_libdir" -+ if test -n "$acl_shlibext"; then -+ if test -f "$dir/$libname$shrext"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext" -+ else -+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then -+ ver=`(cd "$dir" && \ -+ for f in "$libname$shrext".*; do echo "$f"; done \ -+ | sed -e "s,^$libname$shrext\\\\.,," \ -+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ -+ | sed 1q ) 2>/dev/null` -+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext.$ver" -+ fi -+ else -+ eval library_names=\"$acl_library_names_spec\" -+ for f in $library_names; do -+ if test -f "$dir/$f"; then -+ found_dir="$dir" -+ found_so="$dir/$f" -+ break -+ fi -+ done - fi - fi - fi -+ if test "X$found_dir" = "X"; then -+ if test -f "$dir/$libname.$acl_libext"; then -+ found_dir="$dir" -+ found_a="$dir/$libname.$acl_libext" -+ fi -+ fi -+ if test "X$found_dir" != "X"; then -+ if test -f "$dir/$libname.la"; then -+ found_la="$dir/$libname.la" -+ fi -+ fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do -@@ -15385,21 +27060,44 @@ - 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 -+ if test -n "$acl_shlibext"; then -+ if test -f "$dir/$libname$shrext"; then - found_dir="$dir" -- found_a="$dir/lib$name.$libext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -+ found_so="$dir/$libname$shrext" -+ else -+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then -+ ver=`(cd "$dir" && \ -+ for f in "$libname$shrext".*; do echo "$f"; done \ -+ | sed -e "s,^$libname$shrext\\\\.,," \ -+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ -+ | sed 1q ) 2>/dev/null` -+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then -+ found_dir="$dir" -+ found_so="$dir/$libname$shrext.$ver" -+ fi -+ else -+ eval library_names=\"$acl_library_names_spec\" -+ for f in $library_names; do -+ if test -f "$dir/$f"; then -+ found_dir="$dir" -+ found_so="$dir/$f" -+ break -+ fi -+ done - fi - fi - fi -+ if test "X$found_dir" = "X"; then -+ if test -f "$dir/$libname.$acl_libext"; then -+ found_dir="$dir" -+ found_a="$dir/$libname.$acl_libext" -+ fi -+ fi -+ if test "X$found_dir" != "X"; then -+ if test -f "$dir/$libname.la"; then -+ found_la="$dir/$libname.la" -+ fi -+ fi - ;; - esac - if test "X$found_dir" != "X"; then -@@ -15410,7 +27108,7 @@ - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then -- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= -@@ -15423,10 +27121,10 @@ - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi -- if test "$hardcode_direct" = yes; then -+ if test "$acl_hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else -- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do -@@ -15458,7 +27156,7 @@ - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi -- if test "$hardcode_minus_L" != no; then -+ if test "$acl_hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" -@@ -15475,8 +27173,9 @@ - fi - additional_includedir= - case "$found_dir" in -- */lib | */lib/) -- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` -+ */$acl_libdirstem | */$acl_libdirstem/) -+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` -+ LIBICONV_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac -@@ -15486,7 +27185,7 @@ - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi -@@ -15525,12 +27224,12 @@ - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` -- if test "X$additional_libdir" != "X/usr/lib"; then -+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= -- if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi -@@ -15627,21 +27326,21 @@ - done - done - if test "X$rpathdirs" != "X"; then -- if test -n "$hardcode_libdir_separator"; then -+ if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do -- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" -- eval flag=\"$hardcode_libdir_flag_spec\" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" -- eval flag=\"$hardcode_libdir_flag_spec\" -+ eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done -@@ -15669,18 +27368,19 @@ - stdlib.h string.h unistd.h sys/param.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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -15691,41 +27391,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -15734,24 +27430,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -15759,9 +27453,10 @@ - - 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 -+{ 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 -@@ -15785,25 +27480,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -15841,9 +27530,9 @@ - strdup strtoul tsearch __argz_count __argz_stringify __argz_next - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -15869,68 +27558,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -15970,8 +27651,8 @@ - done - - -- echo "$as_me:$LINENO: checking for iconv" >&5 --echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for iconv" >&5 -+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; } - if test "${am_cv_func_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -15997,34 +27678,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_func_iconv=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" -@@ -16048,42 +27727,40 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_lib_iconv=yes - am_cv_func_iconv=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 --echo "${ECHO_T}$am_cv_func_iconv" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -+echo "${ECHO_T}$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -16092,10 +27769,10 @@ - - fi - if test "$am_cv_lib_iconv" = yes; then -- echo "$as_me:$LINENO: checking how to link with libiconv" >&5 --echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 -- echo "$as_me:$LINENO: result: $LIBICONV" >&5 --echo "${ECHO_T}$LIBICONV" >&6 -+ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 -+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: result: $LIBICONV" >&5 -+echo "${ECHO_T}$LIBICONV" >&6; } - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= -@@ -16105,8 +27782,8 @@ - - - if test "$am_cv_func_iconv" = yes; then -- echo "$as_me:$LINENO: checking for iconv declaration" >&5 --echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5 -+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; } - if test "${am_cv_proto_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16139,43 +27816,39 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - am_cv_proto_iconv_arg1="" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --am_cv_proto_iconv_arg1="const" -+ am_cv_proto_iconv_arg1="const" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" - fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` -- echo "$as_me:$LINENO: result: ${ac_t:- -+ { echo "$as_me:$LINENO: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 - echo "${ECHO_T}${ac_t:- -- }$am_cv_proto_iconv" >&6 -+ }$am_cv_proto_iconv" >&6; } - - cat >>confdefs.h <<_ACEOF - #define ICONV_CONST $am_cv_proto_iconv_arg1 -@@ -16184,8 +27857,8 @@ - fi - - -- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 --echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 -+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; } - if test "${am_cv_langinfo_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16205,40 +27878,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_langinfo_codeset=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --am_cv_langinfo_codeset=no -+ am_cv_langinfo_codeset=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 --echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 -+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; } - if test $am_cv_langinfo_codeset = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -16248,8 +27918,8 @@ - fi - - if test $ac_cv_header_locale_h = yes; then -- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 --echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } - if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16269,39 +27939,36 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_val_LC_MESSAGES=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --am_cv_val_LC_MESSAGES=no -+ am_cv_val_LC_MESSAGES=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 --echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -16310,17 +27977,17 @@ - - fi - fi -- echo "$as_me:$LINENO: checking whether NLS is requested" >&5 --echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -- # Check whether --enable-nls or --disable-nls was given. -+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } -+ # Check whether --enable-nls was given. - if test "${enable_nls+set}" = set; then -- enableval="$enable_nls" -- USE_NLS=$enableval -+ enableval=$enable_nls; USE_NLS=$enableval - else - USE_NLS=yes --fi; -- echo "$as_me:$LINENO: result: $USE_NLS" >&5 --echo "${ECHO_T}$USE_NLS" >&6 -+fi -+ -+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5 -+echo "${ECHO_T}$USE_NLS" >&6; } - - - BUILD_INCLUDED_LIBINTL=no -@@ -16333,18 +28000,18 @@ - #define ENABLE_NLS 1 - _ACEOF - -- echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 --echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 -+echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; } - --# Check whether --with-included-gettext or --without-included-gettext was given. -+# Check whether --with-included-gettext was given. - if test "${with_included_gettext+set}" = set; then -- withval="$with_included_gettext" -- nls_cv_force_use_gnu_gettext=$withval -+ withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval - else - nls_cv_force_use_gnu_gettext=no --fi; -- echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 --echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 -+fi -+ -+ { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 -+echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; } - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -@@ -16354,17 +28021,17 @@ - - - if test "${ac_cv_header_libintl_h+set}" = set; then -- echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking libintl.h usability" >&5 --echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -16375,41 +28042,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 libintl.h presence" >&5 --echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -16418,24 +28081,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -16443,9 +28104,10 @@ - - 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 -+{ 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 -@@ -16469,30 +28131,23 @@ - echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: libintl.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 libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_libintl_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - - fi - if test $ac_cv_header_libintl_h = yes; then -- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 --echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 -+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; } - if test "${gt_cv_func_gnugettext1_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16514,43 +28169,40 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gt_cv_func_gnugettext1_libc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --gt_cv_func_gnugettext1_libc=no -+ gt_cv_func_gnugettext1_libc=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 --echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 -+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; } - - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then -- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 --echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 -+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; } - if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16574,40 +28226,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gt_cv_func_gnugettext1_libintl=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --gt_cv_func_gnugettext1_libintl=no -+ gt_cv_func_gnugettext1_libintl=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" - fi --echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 --echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 -+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 -+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ -@@ -16629,9 +28278,9 @@ - for ac_func in dcgettext - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -16657,68 +28306,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -16731,8 +28372,8 @@ - - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16758,17 +28399,17 @@ - fi - MSGFMT="$ac_cv_path_MSGFMT" - if test "$MSGFMT" != ":"; then -- echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16783,33 +28424,34 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; - esac - fi - GMSGFMT=$ac_cv_path_GMSGFMT -- - if test -n "$GMSGFMT"; then -- echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --echo "${ECHO_T}$GMSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16835,11 +28477,11 @@ - fi - XGETTEXT="$ac_cv_path_XGETTEXT" - if test "$XGETTEXT" != ":"; then -- echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -16859,8 +28501,8 @@ - INTLOBJS="\$(GETTOBJS)" - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16886,17 +28528,17 @@ - fi - MSGFMT="$ac_cv_path_MSGFMT" - if test "$MSGFMT" != ":"; then -- echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16911,32 +28553,33 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; - esac - fi - GMSGFMT=$ac_cv_path_GMSGFMT -- - if test -n "$GMSGFMT"; then -- echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --echo "${ECHO_T}$GMSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16962,11 +28605,11 @@ - fi - XGETTEXT="$ac_cv_path_XGETTEXT" - if test "$XGETTEXT" != ":"; then -- echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6 -+ { 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -16986,8 +28629,8 @@ - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else -- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 --echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 -+ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; } - GMSGFMT=":" - fi - fi -@@ -16996,15 +28639,15 @@ - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else -- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 --echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 -+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi - - POSUB=po - fi -- ac_config_commands="$ac_config_commands default-1" -+ ac_config_commands="$ac_config_commands default-1" - - - -@@ -17016,8 +28659,8 @@ - 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_INTLBISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -17030,33 +28673,35 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_INTLBISON="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - INTLBISON=$ac_cv_prog_INTLBISON - if test -n "$INTLBISON"; then -- echo "$as_me:$LINENO: result: $INTLBISON" >&5 --echo "${ECHO_T}$INTLBISON" >&6 -+ { echo "$as_me:$LINENO: result: $INTLBISON" >&5 -+echo "${ECHO_T}$INTLBISON" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$INTLBISON" && break - done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else -- echo "$as_me:$LINENO: checking version of bison" >&5 --echo $ECHO_N "checking version of bison... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking version of bison" >&5 -+echo $ECHO_N "checking version of bison... $ECHO_C" >&6; } - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -@@ -17064,8 +28709,8 @@ - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac -- echo "$as_me:$LINENO: result: $ac_prog_version" >&5 --echo "${ECHO_T}$ac_prog_version" >&6 -+ { echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -+echo "${ECHO_T}$ac_prog_version" >&6; } - fi - if test $ac_verc_fail = yes; then - INTLBISON=: -@@ -17103,8 +28748,8 @@ - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else -- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no -@@ -17123,8 +28768,8 @@ - fi - done - LINGUAS=$NEW_LINGUAS -- echo "$as_me:$LINENO: result: $LINGUAS" >&5 --echo "${ECHO_T}$LINGUAS" >&6 -+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+echo "${ECHO_T}$LINGUAS" >&6; } - fi - - if test -n "$LINGUAS"; then -@@ -17144,8 +28789,8 @@ - INTL_LIBTOOL_SUFFIX_PREFIX= - - --echo "$as_me:$LINENO: checking for gettext" >&5 --echo $ECHO_N "checking for gettext... $ECHO_C" >&6 -+{ 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 -@@ -17172,74 +28817,65 @@ - - #undef gettext - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub_gettext || defined __stub___gettext - choke me --#else --char (*f) () = gettext; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != gettext; -+return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_gettext=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 - : - else - --echo "$as_me:$LINENO: checking for gettext in -lintl" >&5 --echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6 -+{ 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 -@@ -17252,56 +28888,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* 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 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_intl_gettext=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6 -+{ 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 - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBINTL 1 -@@ -17323,9 +28956,9 @@ - for ac_func in bind_textdomain_codeset - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -17351,68 +28984,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -17426,19 +29051,19 @@ - - - --# Check whether --with-libcharset-prefix or --without-libcharset-prefix was given. -+# Check whether --with-libcharset-prefix was given. - if test "${with_libcharset_prefix+set}" = set; then -- withval="$with_libcharset_prefix" -- -+ withval=$with_libcharset_prefix; - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - --fi; -+fi - -- echo "$as_me:$LINENO: checking for libcharset" >&5 --echo $ECHO_N "checking for libcharset... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for libcharset" >&5 -+echo $ECHO_N "checking for libcharset... $ECHO_C" >&6; } - if test "${am_cv_libcharset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -17462,40 +29087,38 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_libcharset=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - - fi --echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5 --echo "${ECHO_T}$am_cv_libcharset" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5 -+echo "${ECHO_T}$am_cv_libcharset" >&6; } - - LIBCHARSET= - if test "$am_cv_libcharset" = yes; then -@@ -17513,8 +29136,8 @@ - - - if test -n ""; then -- echo "$as_me:$LINENO: checking for intltool >= " >&5 --echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for intltool >= " >&5 -+echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ printf "%d", $1 * 100 + $2; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }' < ${srcdir}/intltool-update.in` -@@ -17523,11 +29146,11 @@ - - - if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then -- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 --echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6 -+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } - else -- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&5 --echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&6 -+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&5 -+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool or later." >&6; } - exit 1 - fi - fi -@@ -17574,8 +29197,8 @@ - - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -17590,27 +29213,28 @@ - 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - ;; - esac - fi - INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -- - if test -n "$INTLTOOL_PERL"; then -- echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 --echo "${ECHO_T}$INTLTOOL_PERL" >&6 -+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -+echo "${ECHO_T}$INTLTOOL_PERL" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 - echo "$as_me: error: perl not found; required for intltool" >&2;} -@@ -17632,22 +29256,20 @@ - - # Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. - -- ac_config_commands="$ac_config_commands default-2" -+ac_config_commands="$ac_config_commands default-2" - - - - - --# Check whether --enable-exif or --disable-exif was given. -+# Check whether --enable-exif was given. - if test "${enable_exif+set}" = set; then -- enableval="$enable_exif" -- enable_exif="${enableval}" -+ enableval=$enable_exif; enable_exif="${enableval}" - else - enable_exif=yes --fi; -- -+fi - --if test x"$enable_exif" = xyes; then -+ if test x"$enable_exif" = xyes; then - ENABLE_EXIF_TRUE= - ENABLE_EXIF_FALSE='#' - else -@@ -17668,16 +29290,14 @@ - fi - - --# Check whether --enable-spi or --disable-spi was given. -+# Check whether --enable-spi was given. - if test "${enable_spi+set}" = set; then -- enableval="$enable_spi" -- enable_spi="${enableval}" -+ enableval=$enable_spi; enable_spi="${enableval}" - else - enable_spi=no --fi; -- -+fi - --if test x"$enable_spi" = xyes; then -+ if test x"$enable_spi" = xyes; then - ENABLE_SPI_TRUE= - ENABLE_SPI_FALSE='#' - else -@@ -17701,13 +29321,13 @@ - fi - - --# Check whether --enable-splash or --disable-splash was given. -+# Check whether --enable-splash was given. - if test "${enable_splash+set}" = set; then -- enableval="$enable_splash" -- enable_splash="${enableval}" -+ enableval=$enable_splash; enable_splash="${enableval}" - else - enable_splash=yes --fi; -+fi -+ - if test x"$enable_splash" = xyes; then - - cat >>confdefs.h <<\_ACEOF -@@ -17717,13 +29337,13 @@ - fi - - --# Check whether --enable-mplayer or --disable-mplayer was given. -+# Check whether --enable-mplayer was given. - if test "${enable_mplayer+set}" = set; then -- enableval="$enable_mplayer" -- enable_mplayer="${enableval}" -+ enableval=$enable_mplayer; enable_mplayer="${enableval}" - else - enable_mplayer=no --fi; -+fi -+ - if test x"$enable_mplayer" = xyes; then - - cat >>confdefs.h <<\_ACEOF -@@ -17733,9 +29353,7 @@ - movie_support="MPlayer ${movie_support}" - fi - -- -- --if test x"$enable_mplayer" = x"yes"; then -+ if test x"$enable_mplayer" = x"yes"; then - ENABLE_MPLAYER_TRUE= - ENABLE_MPLAYER_FALSE='#' - else -@@ -17764,9 +29382,9 @@ - ac_header_dirent=no - for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 --echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -17788,38 +29406,35 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -@@ -17831,13 +29446,12 @@ - done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then -- echo "$as_me:$LINENO: checking for library containing opendir" >&5 --echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5 -+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } - if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS --ac_cv_search_opendir=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -17845,126 +29459,83 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char opendir (); - int - main () - { --opendir (); -+return opendir (); - ; - 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 -+for ac_lib in '' dir; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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_search_opendir="none required" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_opendir=$ac_res - 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 "$ac_cv_search_opendir" = no; then -- for ac_lib in dir; do -- LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); --int --main () --{ --opendir (); -- ; -- 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_search_opendir="-l$ac_lib" --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then -+ break - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+done -+if test "${ac_cv_search_opendir+set}" = set; then -+ : -+else -+ ac_cv_search_opendir=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 --echo "${ECHO_T}$ac_cv_search_opendir" >&6 --if test "$ac_cv_search_opendir" != no; then -- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -+echo "${ECHO_T}$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - - else -- echo "$as_me:$LINENO: checking for library containing opendir" >&5 --echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5 -+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } - if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS --ac_cv_search_opendir=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -17972,122 +29543,80 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char opendir (); - int - main () - { --opendir (); -+return opendir (); - ; - 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 -+for ac_lib in '' x; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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_search_opendir="none required" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_opendir=$ac_res - 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 "$ac_cv_search_opendir" = no; then -- for ac_lib in x; do -- LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); --int --main () --{ --opendir (); -- ; -- 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_search_opendir="-l$ac_lib" --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then -+ break - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+done -+if test "${ac_cv_search_opendir+set}" = set; then -+ : -+else -+ ac_cv_search_opendir=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 --echo "${ECHO_T}$ac_cv_search_opendir" >&6 --if test "$ac_cv_search_opendir" != no; then -- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -+echo "${ECHO_T}$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - - fi - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -+{ 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 -@@ -18111,35 +29640,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -18195,6 +29720,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -18214,18 +29740,27 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -18238,12 +29773,14 @@ - ( 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 -+rm -f core *.core core.conftest.* 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 -+{ 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 -@@ -18252,8 +29789,8 @@ - - fi - --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 -+{ 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 -@@ -18266,7 +29803,7 @@ - #include - #include - #ifndef WEXITSTATUS --# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) - #endif - #ifndef WIFEXITED - # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -@@ -18283,38 +29820,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cv_header_sys_wait_h=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+{ 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 -@@ -18355,18 +29888,19 @@ - - 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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -18377,41 +29911,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -18420,24 +29950,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -18445,9 +29973,10 @@ - - 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 -+{ 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 -@@ -18471,25 +30000,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -18503,8 +30026,8 @@ - - - --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 -+{ 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 -@@ -18522,10 +30045,10 @@ - #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset x; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ -- char const *const *ccp; -- char **p; -+ char const *const *pcpcc; -+ char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -@@ -18534,16 +30057,17 @@ - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; -- ccp = &g + (g ? g-g : 0); -+ pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ -- ++ccp; -- p = (char**) ccp; -- ccp = (char const *const *) p; -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -+ if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; -@@ -18562,7 +30086,9 @@ - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -+ if (!foo) return 0; - } -+ return !cs[0] && !zero.x; - #endif - - ; -@@ -18570,38 +30096,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 -+ ac_cv_c_const=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core 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 -+{ 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 -@@ -18610,8 +30132,8 @@ - - fi - --echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 --echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } - if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18633,8 +30155,8 @@ - rm -f conftest* - - fi --echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 --echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } - if test $ac_cv_type_uid_t = no; then - - cat >>confdefs.h <<\_ACEOF -@@ -18648,8 +30170,8 @@ - - fi - --echo "$as_me:$LINENO: checking for inline" >&5 --echo $ECHO_N "checking for inline... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for inline" >&5 -+echo $ECHO_N "checking for inline... $ECHO_C" >&6; } - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18669,39 +30191,37 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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_inline=$ac_kw; break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_inline=$ac_kw - 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 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break - done - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 --echo "${ECHO_T}$ac_cv_c_inline" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+echo "${ECHO_T}$ac_cv_c_inline" >&6; } - - - case $ac_cv_c_inline in -@@ -18719,8 +30239,8 @@ - ;; - esac - --echo "$as_me:$LINENO: checking for mode_t" >&5 --echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for mode_t" >&5 -+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } - if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18731,50 +30251,47 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef mode_t ac__type_new_; - int - main () - { --if ((mode_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (mode_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_mode_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_mode_t=no -+ ac_cv_type_mode_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 --echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; } - if test $ac_cv_type_mode_t = yes; then - : - else -@@ -18785,8 +30302,8 @@ - - fi - --echo "$as_me:$LINENO: checking for off_t" >&5 --echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for off_t" >&5 -+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } - if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18797,62 +30314,59 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef off_t ac__type_new_; - int - main () - { --if ((off_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (off_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_off_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_off_t=no -+ ac_cv_type_off_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 --echo "${ECHO_T}$ac_cv_type_off_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -+echo "${ECHO_T}$ac_cv_type_off_t" >&6; } - if test $ac_cv_type_off_t = yes; then - : - else - - cat >>confdefs.h <<_ACEOF --#define off_t long -+#define off_t long int - _ACEOF - - fi - --echo "$as_me:$LINENO: checking for pid_t" >&5 --echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for pid_t" >&5 -+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } - if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18863,50 +30377,47 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef pid_t ac__type_new_; - int - main () - { --if ((pid_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (pid_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_pid_t=no -+ ac_cv_type_pid_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 --echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } - if test $ac_cv_type_pid_t = yes; then - : - else -@@ -18917,8 +30428,8 @@ - - fi - --echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for size_t" >&5 -+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } - if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18929,62 +30440,59 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef size_t ac__type_new_; - int - main () - { --if ((size_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (size_t)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_size_t=no -+ ac_cv_type_size_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+echo "${ECHO_T}$ac_cv_type_size_t" >&6; } - if test $ac_cv_type_size_t = yes; then - : - else - - cat >>confdefs.h <<_ACEOF --#define size_t unsigned -+#define size_t unsigned int - _ACEOF - - fi - --echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 --echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } - if test "${ac_cv_struct_tm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -19000,44 +30508,42 @@ - int - main () - { --struct tm *tp; tp->tm_sec; -+struct tm tm; -+ int *p = &tm.tm_sec; -+ return !p; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_struct_tm=time.h - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_struct_tm=sys/time.h -+ ac_cv_struct_tm=sys/time.h - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 --echo "${ECHO_T}$ac_cv_struct_tm" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -+echo "${ECHO_T}$ac_cv_struct_tm" >&6; } - if test $ac_cv_struct_tm = sys/time.h; then - - cat >>confdefs.h <<\_ACEOF -@@ -19046,8 +30552,8 @@ - - fi - --echo "$as_me:$LINENO: checking for struct user_desc" >&5 --echo $ECHO_N "checking for struct user_desc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for struct user_desc" >&5 -+echo $ECHO_N "checking for struct user_desc... $ECHO_C" >&6; } - if test "${ac_cv_type_struct_user_desc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -19059,50 +30565,47 @@ - /* end confdefs.h. */ - #include - -+typedef struct user_desc ac__type_new_; - int - main () - { --if ((struct user_desc *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (struct user_desc)) -+if (sizeof (ac__type_new_)) - 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 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_struct_user_desc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_struct_user_desc=no -+ ac_cv_type_struct_user_desc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_struct_user_desc" >&5 --echo "${ECHO_T}$ac_cv_type_struct_user_desc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_user_desc" >&5 -+echo "${ECHO_T}$ac_cv_type_struct_user_desc" >&6; } - if test $ac_cv_type_struct_user_desc = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -19121,8 +30624,8 @@ - - # 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 -+{ 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 -@@ -19137,44 +30640,42 @@ - main () - { - char *p = (char *) alloca (2 * sizeof (int)); -+ if (p) return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_working_alloca_h=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -@@ -19183,8 +30684,8 @@ - - fi - --echo "$as_me:$LINENO: checking for alloca" >&5 --echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -+{ 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 -@@ -19201,7 +30702,7 @@ - # include - # define alloca _alloca - # else --# if HAVE_ALLOCA_H -+# ifdef HAVE_ALLOCA_H - # include - # else - # ifdef _AIX -@@ -19219,44 +30720,42 @@ - main () - { - char *p = (char *) alloca (1); -+ if (p) return 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_alloca_works=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 - -@@ -19270,15 +30769,15 @@ - # 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 -+ALLOCA=\${LIBOBJDIR}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 -+{ 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 -@@ -19288,7 +30787,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#if defined(CRAY) && ! defined(CRAY2) -+#if defined CRAY && ! defined CRAY2 - webecray - #else - wenotbecray -@@ -19304,14 +30803,14 @@ - rm -f conftest* - - fi --echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 --echo "${ECHO_T}$ac_cv_os_cray" >&6 -+{ 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -19337,68 +30836,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -19411,8 +30902,8 @@ - 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 -+{ 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 -@@ -19425,6 +30916,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+$ac_includes_default - int - find_stack_direction () - { -@@ -19442,17 +30934,26 @@ - int - main () - { -- exit (find_stack_direction () < 0); -+ return find_stack_direction () < 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -19465,11 +30966,13 @@ - ( 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 -+rm -f core *.core core.conftest.* 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 -+{ 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 -@@ -19478,8 +30981,8 @@ - - fi - --echo "$as_me:$LINENO: checking for working memcmp" >&5 --echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for working memcmp" >&5 -+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } - if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -19498,9 +31001,9 @@ - { - - /* Some versions of memcmp are not 8-bit clean. */ -- char c0 = 0x40, c1 = 0x80, c2 = 0x81; -+ char c0 = '\100', c1 = '\200', c2 = '\201'; - if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) -- exit (1); -+ return 1; - - /* The Next x86 OpenStep bug shows up only when comparing 16 bytes - or more and with at least one buffer not starting on a 4-byte boundary. -@@ -19516,9 +31019,9 @@ - strcpy (a, "--------01111111"); - strcpy (b, "--------10000000"); - if (memcmp (a, b, 16) >= 0) -- exit (1); -+ return 1; - } -- exit (0); -+ return 0; - } - - ; -@@ -19526,13 +31029,22 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -19545,17 +31057,17 @@ - ( exit $ac_status ) - ac_cv_func_memcmp_working=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 --echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 --test $ac_cv_func_memcmp_working = no && case $LIBOBJS in -- "memcmp.$ac_objext" | \ -- *" memcmp.$ac_objext" | \ -- "memcmp.$ac_objext "* | \ -+{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } -+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in - *" memcmp.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; -+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" -+ ;; - esac - - -@@ -19564,18 +31076,19 @@ - for ac_header in stdlib.h unistd.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 -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -19586,41 +31099,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ 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 -+ -+rm -f core 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 -+{ 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 -@@ -19629,24 +31138,22 @@ - /* 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 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -19654,9 +31161,10 @@ - - 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 -+{ 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 -@@ -19680,25 +31188,19 @@ - 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 "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -19714,9 +31216,9 @@ - for ac_func in getpagesize - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -19742,68 +31244,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -19812,8 +31306,8 @@ - fi - done - --echo "$as_me:$LINENO: checking for working mmap" >&5 --echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for working mmap" >&5 -+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } - if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -19855,21 +31349,21 @@ - #include - #include - --#if !STDC_HEADERS && !HAVE_STDLIB_H -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H - char *malloc (); - #endif - - /* This mess was copied from the GNU getpagesize.h. */ --#if !HAVE_GETPAGESIZE -+#ifndef HAVE_GETPAGESIZE - /* Assume that all systems that can run configure have sys/param.h. */ --# if !HAVE_SYS_PARAM_H -+# ifndef HAVE_SYS_PARAM_H - # define HAVE_SYS_PARAM_H 1 - # endif - - # ifdef _SC_PAGESIZE - # define getpagesize() sysconf(_SC_PAGESIZE) - # else /* no _SC_PAGESIZE */ --# if HAVE_SYS_PARAM_H -+# ifdef HAVE_SYS_PARAM_H - # include - # ifdef EXEC_PAGESIZE - # define getpagesize() EXEC_PAGESIZE -@@ -19908,15 +31402,15 @@ - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) -- exit (1); -+ return 1; - if (write (fd, data, pagesize) != pagesize) -- exit (1); -+ return 1; - close (fd); - - /* Next, try to mmap the file at a fixed address which already has -@@ -19924,17 +31418,17 @@ - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) -- exit (1); -+ return 1; - data2 = (char *) malloc (2 * pagesize); - if (!data2) -- exit (1); -- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); -+ return 1; -+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) -- exit (1); -+ return 1; - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on -@@ -19943,24 +31437,33 @@ - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) -- exit (1); -+ return 1; - if (read (fd, data3, pagesize) != pagesize) -- exit (1); -+ return 1; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) -- exit (1); -+ return 1; - close (fd); -- exit (0); -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -19973,11 +31476,13 @@ - ( exit $ac_status ) - ac_cv_func_mmap_fixed_mapped=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } - if test $ac_cv_func_mmap_fixed_mapped = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -19991,9 +31496,9 @@ - for ac_func in strftime - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -20019,68 +31524,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -20088,8 +31585,8 @@ - - else - # strftime is in -lintl on SCO UNIX. --echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 --echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -+echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_strftime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -20102,56 +31599,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char strftime (); - int - main () - { --strftime (); -+return strftime (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_strftime=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_intl_strftime=no -+ ac_cv_lib_intl_strftime=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } - if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_STRFTIME 1 -@@ -20163,8 +31657,159 @@ - fi - done - --echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 --echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 -+ -+ -+ -+ -+for ac_header in $ac_header_list -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ 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 { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ 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;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 utime accepts a null argument" >&5 -+echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; } - if test "${ac_cv_func_utime_null+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -20180,27 +31825,39 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ #ifdef HAVE_UTIME_H -+ # include -+ #endif - int - main () - { - struct stat s, t; -- exit (!(stat ("conftest.data", &s) == 0 -- && utime ("conftest.data", (long *)0) == 0 -- && stat ("conftest.data", &t) == 0 -- && t.st_mtime >= s.st_mtime -- && t.st_mtime - s.st_mtime < 120)); -+ return ! (stat ("conftest.data", &s) == 0 -+ && utime ("conftest.data", 0) == 0 -+ && stat ("conftest.data", &t) == 0 -+ && t.st_mtime >= s.st_mtime -+ && t.st_mtime - s.st_mtime < 120); - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -20213,12 +31870,13 @@ - ( exit $ac_status ) - ac_cv_func_utime_null=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi --rm -f core *.core -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 --echo "${ECHO_T}$ac_cv_func_utime_null" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 -+echo "${ECHO_T}$ac_cv_func_utime_null" >&6; } - if test $ac_cv_func_utime_null = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -20232,9 +31890,9 @@ - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -20260,75 +31918,67 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&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 -+{ 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 -@@ -20355,68 +32005,59 @@ - - #undef _doprnt - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#if defined __stub__doprnt || defined __stub____doprnt - choke me --#else --char (*f) () = _doprnt; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != _doprnt; -+return _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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func__doprnt=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+{ 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 -@@ -20476,9 +32117,9 @@ - - 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 "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -20504,68 +32145,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* 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) -+#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 $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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -20604,7 +32237,8 @@ - - - -- ac_config_files="$ac_config_files Makefile doc/Makefile doc/ja/Makefile etc/Makefile m4/Makefile intl/Makefile po/Makefile.in lib/Makefile lib/dllloader/Makefile lib/libexif/Makefile plugins/Makefile plugins/archiver/Makefile plugins/image_loader/Makefile plugins/image_saver/Makefile plugins/image_view/Makefile plugins/io_stream/Makefile plugins/thumbnail/Makefile plugins/thumbnail_view/Makefile src/Makefile src/cursors/Makefile src/pixmaps/Makefile src/prefs_ui/Makefile gimageview.spec" -+ac_config_files="$ac_config_files Makefile doc/Makefile doc/ja/Makefile etc/Makefile m4/Makefile intl/Makefile po/Makefile.in lib/Makefile lib/dllloader/Makefile lib/libexif/Makefile plugins/Makefile plugins/archiver/Makefile plugins/image_loader/Makefile plugins/image_saver/Makefile plugins/image_view/Makefile plugins/io_stream/Makefile plugins/thumbnail/Makefile plugins/thumbnail_view/Makefile src/Makefile src/cursors/Makefile src/pixmaps/Makefile src/prefs_ui/Makefile gimageview.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 -@@ -20623,39 +32257,58 @@ - - # 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. -+# So, we kill variables containing newlines. - # 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. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - 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" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : 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" -+ 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 "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -20664,32 +32317,18 @@ - # 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' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -20853,17 +32492,45 @@ - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # 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 -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# 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 --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -20873,8 +32540,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+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 -+IFS=$as_save_IFS -+ -+ ;; -+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_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -20888,18 +32590,19 @@ - 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 -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -20907,159 +32610,120 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ 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 -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# 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 -+# CDPATH. -+$as_unset CDPATH - - -- 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 -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line 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. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\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;} -+ 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 -+ # original and so on. Autoconf is especially sensitive 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= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - 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='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - 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 -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -21068,7 +32732,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # 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'" -@@ -21077,31 +32762,14 @@ - 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 -+# Save the log message, to keep $[0] and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. 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 -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -21109,30 +32777,20 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - -+cat >>$CONFIG_STATUS <<_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 -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -21140,7 +32798,7 @@ - Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -+ -V, --version print version number and configuration settings, 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 -@@ -21159,19 +32817,22 @@ - $config_commands - - Report bugs to ." --_ACEOF - -+_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'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2006 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" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+MKDIR_P='$MKDIR_P' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -21182,39 +32843,24 @@ - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ 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 ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -@@ -21224,18 +32870,24 @@ - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { 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 ;; - -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;} -+ -*) { 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" ;; -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -21251,63 +32903,75 @@ - _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 -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - # --# INIT-COMMANDS section. -+# INIT-COMMANDS - # -- - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - INTLTOOL_PERL=${INTLTOOL_PERL} - - _ACEOF - -- -- - cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; -- "doc/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;; -- "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; -- "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; -- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; -- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; -- "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; -- "lib/dllloader/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dllloader/Makefile" ;; -- "lib/libexif/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libexif/Makefile" ;; -- "plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; -- "plugins/archiver/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/archiver/Makefile" ;; -- "plugins/image_loader/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_loader/Makefile" ;; -- "plugins/image_saver/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_saver/Makefile" ;; -- "plugins/image_view/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/image_view/Makefile" ;; -- "plugins/io_stream/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/io_stream/Makefile" ;; -- "plugins/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/thumbnail/Makefile" ;; -- "plugins/thumbnail_view/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/thumbnail_view/Makefile" ;; -- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -- "src/cursors/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cursors/Makefile" ;; -- "src/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;; -- "src/prefs_ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/prefs_ui/Makefile" ;; -- "gimageview.spec" ) CONFIG_FILES="$CONFIG_FILES gimageview.spec" ;; -- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -- "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -+ "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; -+ "doc/ja/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;; -+ "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; -+ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; -+ "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; -+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; -+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; -+ "lib/dllloader/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dllloader/Makefile" ;; -+ "lib/libexif/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libexif/Makefile" ;; -+ "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; -+ "plugins/archiver/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/archiver/Makefile" ;; -+ "plugins/image_loader/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/image_loader/Makefile" ;; -+ "plugins/image_saver/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/image_saver/Makefile" ;; -+ "plugins/image_view/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/image_view/Makefile" ;; -+ "plugins/io_stream/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/io_stream/Makefile" ;; -+ "plugins/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/thumbnail/Makefile" ;; -+ "plugins/thumbnail_view/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/thumbnail_view/Makefile" ;; -+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -+ "src/cursors/Makefile") CONFIG_FILES="$CONFIG_FILES src/cursors/Makefile" ;; -+ "src/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;; -+ "src/prefs_ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/prefs_ui/Makefile" ;; -+ "gimageview.spec") CONFIG_FILES="$CONFIG_FILES gimageview.spec" ;; -+ - *) { { 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 -@@ -21319,496 +32983,663 @@ - 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, -+# simply because there is no reason against having 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. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$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` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) -+ tmp=./conf$$-$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. -+# Set up the sed scripts for 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,@CYGPATH_W@,$CYGPATH_W,;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,@AMTAR@,$AMTAR,;t t --s,@install_sh@,$install_sh,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t --s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t --s,@mkdir_p@,$mkdir_p,;t t --s,@AWK@,$AWK,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@am__leading_dot@,$am__leading_dot,;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,@DEPDIR@,$DEPDIR,;t t --s,@am__include@,$am__include,;t t --s,@am__quote@,$am__quote,;t t --s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t --s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t --s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t --s,@CCDEPMODE@,$CCDEPMODE,;t t --s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t --s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@CXXDEPMODE@,$CXXDEPMODE,;t t --s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t --s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t --s,@LN_S@,$LN_S,;t t --s,@YACC@,$YACC,;t t --s,@CPP@,$CPP,;t t --s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t --s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t --s,@MAINT@,$MAINT,;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,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t --s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t --s,@WINDRES@,$WINDRES,;t t --s,@OS_WIN32_TRUE@,$OS_WIN32_TRUE,;t t --s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t --s,@ECHO@,$ECHO,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@EGREP@,$EGREP,;t t --s,@LIBTOOL@,$LIBTOOL,;t t --s,@GLIB_REQUIRED@,$GLIB_REQUIRED,;t t --s,@GTK_REQUIRED@,$GTK_REQUIRED,;t t --s,@IMLIB_REQUIRED@,$IMLIB_REQUIRED,;t t --s,@GDK_PIXBUF_REQUIRED@,$GDK_PIXBUF_REQUIRED,;t t --s,@LIBRSVG_REQUIRED@,$LIBRSVG_REQUIRED,;t t --s,@LIBWMF_REQUIRED@,$LIBWMF_REQUIRED,;t t --s,@XINE_REQUIRED@,$XINE_REQUIRED,;t t --s,@GLIB2_REQUIRED@,$GLIB2_REQUIRED,;t t --s,@GMODULE2_REQUIRED@,$GMODULE2_REQUIRED,;t t --s,@GTK2_REQUIRED@,$GTK2_REQUIRED,;t t --s,@GDK_PIXBUF2_REQUIRED@,$GDK_PIXBUF2_REQUIRED,;t t --s,@PKG_CONFIG@,$PKG_CONFIG,;t t --s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t --s,@GTK_LIBS@,$GTK_LIBS,;t t --s,@GTK_CONFIG@,$GTK_CONFIG,;t t --s,@IMLIB_CONFIG@,$IMLIB_CONFIG,;t t --s,@GDK_IMLIB_CFLAGS@,$GDK_IMLIB_CFLAGS,;t t --s,@GDK_IMLIB_LIBS@,$GDK_IMLIB_LIBS,;t t --s,@GDK_PIXBUF_CONFIG@,$GDK_PIXBUF_CONFIG,;t t --s,@GDK_PIXBUF_CFLAGS@,$GDK_PIXBUF_CFLAGS,;t t --s,@GDK_PIXBUF_LIBS@,$GDK_PIXBUF_LIBS,;t t --s,@ENABLE_GDK_PIXBUF_TRUE@,$ENABLE_GDK_PIXBUF_TRUE,;t t --s,@ENABLE_GDK_PIXBUF_FALSE@,$ENABLE_GDK_PIXBUF_FALSE,;t t --s,@ENABLE_GDK_IMLIB_TRUE@,$ENABLE_GDK_IMLIB_TRUE,;t t --s,@ENABLE_GDK_IMLIB_FALSE@,$ENABLE_GDK_IMLIB_FALSE,;t t --s,@GIMV_IMAGELIB_CFLAGS@,$GIMV_IMAGELIB_CFLAGS,;t t --s,@GIMV_IMAGELIB_LIBS@,$GIMV_IMAGELIB_LIBS,;t t --s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t --s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t --s,@HAVE_BZLIB_TRUE@,$HAVE_BZLIB_TRUE,;t t --s,@HAVE_BZLIB_FALSE@,$HAVE_BZLIB_FALSE,;t t --s,@BZLIB_CFLAGS@,$BZLIB_CFLAGS,;t t --s,@BZLIB_LIBS@,$BZLIB_LIBS,;t t --s,@PNG_CFLAGS@,$PNG_CFLAGS,;t t --s,@PNG_LIBS@,$PNG_LIBS,;t t --s,@HAVE_PNG_TRUE@,$HAVE_PNG_TRUE,;t t --s,@HAVE_PNG_FALSE@,$HAVE_PNG_FALSE,;t t --s,@ENABLE_JPEG_TRUE@,$ENABLE_JPEG_TRUE,;t t --s,@ENABLE_JPEG_FALSE@,$ENABLE_JPEG_FALSE,;t t --s,@JPEG_CFLAGS@,$JPEG_CFLAGS,;t t --s,@JPEG_LIBS@,$JPEG_LIBS,;t t --s,@ENABLE_MNG_TRUE@,$ENABLE_MNG_TRUE,;t t --s,@ENABLE_MNG_FALSE@,$ENABLE_MNG_FALSE,;t t --s,@MNG_CFLAGS@,$MNG_CFLAGS,;t t --s,@MNG_LIBS@,$MNG_LIBS,;t t --s,@LIBRSVG_CFLAGS@,$LIBRSVG_CFLAGS,;t t --s,@LIBRSVG_LIBS@,$LIBRSVG_LIBS,;t t --s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t --s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t --s,@GNOME_LIBS@,$GNOME_LIBS,;t t --s,@GNOMEUI_CFLAGS@,$GNOMEUI_CFLAGS,;t t --s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t --s,@ZVT_LIBS@,$ZVT_LIBS,;t t --s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t --s,@GLIB_LIBS@,$GLIB_LIBS,;t t --s,@OAF_CFLAGS@,$OAF_CFLAGS,;t t --s,@OAF_LIBS@,$OAF_LIBS,;t t --s,@GNORBA_CFLAGS@,$GNORBA_CFLAGS,;t t --s,@GNORBA_LIBS@,$GNORBA_LIBS,;t t --s,@ENABLE_LIBRSVG_TRUE@,$ENABLE_LIBRSVG_TRUE,;t t --s,@ENABLE_LIBRSVG_FALSE@,$ENABLE_LIBRSVG_FALSE,;t t --s,@XML_CFLAGS@,$XML_CFLAGS,;t t --s,@XML_LIBS@,$XML_LIBS,;t t --s,@LIBWMF_CONFIG@,$LIBWMF_CONFIG,;t t --s,@LIBWMF_CFLAGS@,$LIBWMF_CFLAGS,;t t --s,@LIBWMF_LIBS@,$LIBWMF_LIBS,;t t --s,@ENABLE_WMF_TRUE@,$ENABLE_WMF_TRUE,;t t --s,@ENABLE_WMF_FALSE@,$ENABLE_WMF_FALSE,;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,@XINERAMA_LIBS@,$XINERAMA_LIBS,;t t --s,@XINE_CONFIG@,$XINE_CONFIG,;t t --s,@XINE_CFLAGS@,$XINE_CFLAGS,;t t --s,@XINE_LIBS@,$XINE_LIBS,;t t --s,@XINE_ACFLAGS@,$XINE_ACFLAGS,;t t --s,@ENABLE_XINE_TRUE@,$ENABLE_XINE_TRUE,;t t --s,@ENABLE_XINE_FALSE@,$ENABLE_XINE_FALSE,;t t --s,@ALLOCA@,$ALLOCA,;t t --s,@GLIBC21@,$GLIBC21,;t t --s,@LIBICONV@,$LIBICONV,;t t --s,@LTLIBICONV@,$LTLIBICONV,;t t --s,@USE_NLS@,$USE_NLS,;t t --s,@MSGFMT@,$MSGFMT,;t t --s,@GMSGFMT@,$GMSGFMT,;t t --s,@XGETTEXT@,$XGETTEXT,;t t --s,@INTLBISON@,$INTLBISON,;t t --s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t --s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t --s,@CATALOGS@,$CATALOGS,;t t --s,@CATOBJEXT@,$CATOBJEXT,;t t --s,@GMOFILES@,$GMOFILES,;t t --s,@INTLLIBS@,$INTLLIBS,;t t --s,@INTLOBJS@,$INTLOBJS,;t t --s,@POFILES@,$POFILES,;t t --s,@POSUB@,$POSUB,;t t --s,@DATADIRNAME@,$DATADIRNAME,;t t --s,@INSTOBJEXT@,$INSTOBJEXT,;t t --s,@GENCAT@,$GENCAT,;t t --s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t --s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t --s,@localedir@,$localedir,;t t --s,@LIBCHARSET@,$LIBCHARSET,;t t --s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t --s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t --s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t --s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t --s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t --s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t --s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t --s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t --s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t --s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t --s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t --s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t --s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t --s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t --s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t --s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t --s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t --s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t --s,@ENABLE_EXIF_TRUE@,$ENABLE_EXIF_TRUE,;t t --s,@ENABLE_EXIF_FALSE@,$ENABLE_EXIF_FALSE,;t t --s,@EXIF_CFLAGS@,$EXIF_CFLAGS,;t t --s,@EXIF_LIBS@,$EXIF_LIBS,;t t --s,@ENABLE_SPI_TRUE@,$ENABLE_SPI_TRUE,;t t --s,@ENABLE_SPI_FALSE@,$ENABLE_SPI_FALSE,;t t --s,@DLLLOADER_CFLAGS@,$DLLLOADER_CFLAGS,;t t --s,@DLLLOADER_LIBS@,$DLLLOADER_LIBS,;t t --s,@ENABLE_MPLAYER_TRUE@,$ENABLE_MPLAYER_TRUE,;t t --s,@ENABLE_MPLAYER_FALSE@,$ENABLE_MPLAYER_FALSE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@docdir@,$docdir,;t t --s,@gimv_datadir@,$gimv_datadir,;t t --s,@gimv_docdir@,$gimv_docdir,;t t --s,@gimv_icondir@,$gimv_icondir,;t t --s,@plugindir@,$plugindir,;t t --s,@ARCHIVER_PLUGIN_DIR@,$ARCHIVER_PLUGIN_DIR,;t t --s,@IMAGE_LOADER_PLUGIN_DIR@,$IMAGE_LOADER_PLUGIN_DIR,;t t --s,@IMAGE_SAVER_PLUGIN_DIR@,$IMAGE_SAVER_PLUGIN_DIR,;t t --s,@IO_STREAM_PLUGIN_DIR@,$IO_STREAM_PLUGIN_DIR,;t t --s,@IMAGE_VIEW_PLUGIN_DIR@,$IMAGE_VIEW_PLUGIN_DIR,;t t --s,@THUMBNAIL_VIEW_PLUGIN_DIR@,$THUMBNAIL_VIEW_PLUGIN_DIR,;t t --s,@THUMBNAIL_PLUGIN_DIR@,$THUMBNAIL_PLUGIN_DIR,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -+if test -n "$CONFIG_FILES"; then - - _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 -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+am__isrc!$am__isrc$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+CXX!$CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim -+ac_ct_CXX!$ac_ct_CXX$ac_delim -+CXXDEPMODE!$CXXDEPMODE$ac_delim -+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -+LN_S!$LN_S$ac_delim -+YACC!$YACC$ac_delim -+YFLAGS!$YFLAGS$ac_delim -+XMKMF!$XMKMF$ac_delim -+CPP!$CPP$ac_delim -+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -+MAINT!$MAINT$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim -+PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim -+WINDRES!$WINDRES$ac_delim -+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim -+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim -+SED!$SED$ac_delim -+GREP!$GREP$ac_delim -+EGREP!$EGREP$ac_delim -+ECHO!$ECHO$ac_delim -+AR!$AR$ac_delim -+RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim -+DLLTOOL!$DLLTOOL$ac_delim -+AS!$AS$ac_delim -+OBJDUMP!$OBJDUMP$ac_delim -+CXXCPP!$CXXCPP$ac_delim -+F77!$F77$ac_delim -+FFLAGS!$FFLAGS$ac_delim -+ac_ct_F77!$ac_ct_F77$ac_delim -+LIBTOOL!$LIBTOOL$ac_delim -+GLIB_REQUIRED!$GLIB_REQUIRED$ac_delim -+GTK_REQUIRED!$GTK_REQUIRED$ac_delim -+IMLIB_REQUIRED!$IMLIB_REQUIRED$ac_delim -+GDK_PIXBUF_REQUIRED!$GDK_PIXBUF_REQUIRED$ac_delim -+LIBRSVG_REQUIRED!$LIBRSVG_REQUIRED$ac_delim -+LIBWMF_REQUIRED!$LIBWMF_REQUIRED$ac_delim -+XINE_REQUIRED!$XINE_REQUIRED$ac_delim -+GLIB2_REQUIRED!$GLIB2_REQUIRED$ac_delim -+GMODULE2_REQUIRED!$GMODULE2_REQUIRED$ac_delim -+GTK2_REQUIRED!$GTK2_REQUIRED$ac_delim -+GDK_PIXBUF2_REQUIRED!$GDK_PIXBUF2_REQUIRED$ac_delim -+PKG_CONFIG!$PKG_CONFIG$ac_delim -+GTK_CFLAGS!$GTK_CFLAGS$ac_delim -+GTK_LIBS!$GTK_LIBS$ac_delim -+GTK_CONFIG!$GTK_CONFIG$ac_delim -+IMLIB_CONFIG!$IMLIB_CONFIG$ac_delim -+GDK_IMLIB_CFLAGS!$GDK_IMLIB_CFLAGS$ac_delim -+GDK_IMLIB_LIBS!$GDK_IMLIB_LIBS$ac_delim -+GDK_PIXBUF_CONFIG!$GDK_PIXBUF_CONFIG$ac_delim -+GDK_PIXBUF_CFLAGS!$GDK_PIXBUF_CFLAGS$ac_delim -+GDK_PIXBUF_LIBS!$GDK_PIXBUF_LIBS$ac_delim -+ENABLE_GDK_PIXBUF_TRUE!$ENABLE_GDK_PIXBUF_TRUE$ac_delim -+ENABLE_GDK_PIXBUF_FALSE!$ENABLE_GDK_PIXBUF_FALSE$ac_delim -+ENABLE_GDK_IMLIB_TRUE!$ENABLE_GDK_IMLIB_TRUE$ac_delim -+ENABLE_GDK_IMLIB_FALSE!$ENABLE_GDK_IMLIB_FALSE$ac_delim -+GIMV_IMAGELIB_CFLAGS!$GIMV_IMAGELIB_CFLAGS$ac_delim -+GIMV_IMAGELIB_LIBS!$GIMV_IMAGELIB_LIBS$ac_delim -+ZLIB_CFLAGS!$ZLIB_CFLAGS$ac_delim -+ZLIB_LIBS!$ZLIB_LIBS$ac_delim -+HAVE_BZLIB_TRUE!$HAVE_BZLIB_TRUE$ac_delim -+HAVE_BZLIB_FALSE!$HAVE_BZLIB_FALSE$ac_delim -+BZLIB_CFLAGS!$BZLIB_CFLAGS$ac_delim -+BZLIB_LIBS!$BZLIB_LIBS$ac_delim -+PNG_CFLAGS!$PNG_CFLAGS$ac_delim -+PNG_LIBS!$PNG_LIBS$ac_delim -+HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim -+HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim -+ENABLE_JPEG_TRUE!$ENABLE_JPEG_TRUE$ac_delim -+ENABLE_JPEG_FALSE!$ENABLE_JPEG_FALSE$ac_delim -+JPEG_CFLAGS!$JPEG_CFLAGS$ac_delim -+JPEG_LIBS!$JPEG_LIBS$ac_delim -+ENABLE_MNG_TRUE!$ENABLE_MNG_TRUE$ac_delim -+ENABLE_MNG_FALSE!$ENABLE_MNG_FALSE$ac_delim -+MNG_CFLAGS!$MNG_CFLAGS$ac_delim -+MNG_LIBS!$MNG_LIBS$ac_delim -+LIBRSVG_CFLAGS!$LIBRSVG_CFLAGS$ac_delim -+LIBRSVG_LIBS!$LIBRSVG_LIBS$ac_delim -+GNOME_CONFIG!$GNOME_CONFIG$ac_delim -+GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim -+GNOME_LIBS!$GNOME_LIBS$ac_delim -+GNOMEUI_CFLAGS!$GNOMEUI_CFLAGS$ac_delim -+GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim -+ZVT_LIBS!$ZVT_LIBS$ac_delim -+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -+GLIB_LIBS!$GLIB_LIBS$ac_delim -+OAF_CFLAGS!$OAF_CFLAGS$ac_delim -+OAF_LIBS!$OAF_LIBS$ac_delim -+GNORBA_CFLAGS!$GNORBA_CFLAGS$ac_delim -+GNORBA_LIBS!$GNORBA_LIBS$ac_delim -+ENABLE_LIBRSVG_TRUE!$ENABLE_LIBRSVG_TRUE$ac_delim -+ENABLE_LIBRSVG_FALSE!$ENABLE_LIBRSVG_FALSE$ac_delim -+XML_CFLAGS!$XML_CFLAGS$ac_delim -+XML_LIBS!$XML_LIBS$ac_delim -+LIBWMF_CONFIG!$LIBWMF_CONFIG$ac_delim -+LIBWMF_CFLAGS!$LIBWMF_CFLAGS$ac_delim -+LIBWMF_LIBS!$LIBWMF_LIBS$ac_delim -+ENABLE_WMF_TRUE!$ENABLE_WMF_TRUE$ac_delim -+ENABLE_WMF_FALSE!$ENABLE_WMF_FALSE$ac_delim -+X_CFLAGS!$X_CFLAGS$ac_delim -+X_PRE_LIBS!$X_PRE_LIBS$ac_delim -+X_LIBS!$X_LIBS$ac_delim -+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -+XINERAMA_LIBS!$XINERAMA_LIBS$ac_delim -+XINE_CONFIG!$XINE_CONFIG$ac_delim -+XINE_CFLAGS!$XINE_CFLAGS$ac_delim -+XINE_LIBS!$XINE_LIBS$ac_delim -+_ACEOF - -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b - _ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+XINE_ACFLAGS!$XINE_ACFLAGS$ac_delim -+ENABLE_XINE_TRUE!$ENABLE_XINE_TRUE$ac_delim -+ENABLE_XINE_FALSE!$ENABLE_XINE_FALSE$ac_delim -+ALLOCA!$ALLOCA$ac_delim -+GLIBC21!$GLIBC21$ac_delim -+LIBICONV!$LIBICONV$ac_delim -+LTLIBICONV!$LTLIBICONV$ac_delim -+USE_NLS!$USE_NLS$ac_delim -+MSGFMT!$MSGFMT$ac_delim -+GMSGFMT!$GMSGFMT$ac_delim -+XGETTEXT!$XGETTEXT$ac_delim -+INTLBISON!$INTLBISON$ac_delim -+BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim -+USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim -+CATALOGS!$CATALOGS$ac_delim -+CATOBJEXT!$CATOBJEXT$ac_delim -+GMOFILES!$GMOFILES$ac_delim -+INTLLIBS!$INTLLIBS$ac_delim -+INTLOBJS!$INTLOBJS$ac_delim -+POFILES!$POFILES$ac_delim -+POSUB!$POSUB$ac_delim -+DATADIRNAME!$DATADIRNAME$ac_delim -+INSTOBJEXT!$INSTOBJEXT$ac_delim -+GENCAT!$GENCAT$ac_delim -+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -+INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim -+LIBCHARSET!$LIBCHARSET$ac_delim -+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim -+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim -+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim -+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim -+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim -+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim -+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim -+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim -+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim -+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim -+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim -+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim -+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim -+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim -+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -+ENABLE_EXIF_TRUE!$ENABLE_EXIF_TRUE$ac_delim -+ENABLE_EXIF_FALSE!$ENABLE_EXIF_FALSE$ac_delim -+EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim -+EXIF_LIBS!$EXIF_LIBS$ac_delim -+ENABLE_SPI_TRUE!$ENABLE_SPI_TRUE$ac_delim -+ENABLE_SPI_FALSE!$ENABLE_SPI_FALSE$ac_delim -+DLLLOADER_CFLAGS!$DLLLOADER_CFLAGS$ac_delim -+DLLLOADER_LIBS!$DLLLOADER_LIBS$ac_delim -+ENABLE_MPLAYER_TRUE!$ENABLE_MPLAYER_TRUE$ac_delim -+ENABLE_MPLAYER_FALSE!$ENABLE_MPLAYER_FALSE$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+gimv_datadir!$gimv_datadir$ac_delim -+gimv_docdir!$gimv_docdir$ac_delim -+gimv_icondir!$gimv_icondir$ac_delim -+plugindir!$plugindir$ac_delim -+ARCHIVER_PLUGIN_DIR!$ARCHIVER_PLUGIN_DIR$ac_delim -+IMAGE_LOADER_PLUGIN_DIR!$IMAGE_LOADER_PLUGIN_DIR$ac_delim -+IMAGE_SAVER_PLUGIN_DIR!$IMAGE_SAVER_PLUGIN_DIR$ac_delim -+IO_STREAM_PLUGIN_DIR!$IO_STREAM_PLUGIN_DIR$ac_delim -+IMAGE_VIEW_PLUGIN_DIR!$IMAGE_VIEW_PLUGIN_DIR$ac_delim -+THUMBNAIL_VIEW_PLUGIN_DIR!$THUMBNAIL_VIEW_PLUGIN_DIR$ac_delim -+THUMBNAIL_PLUGIN_DIR!$THUMBNAIL_PLUGIN_DIR$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+:end -+s/|#_!!_#|//g -+CEOF$ac_eof -+_ACEOF -+ -+ -+# 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 -+ - 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 ;; -+fi # test -n "$CONFIG_FILES" -+ -+ -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done -+ -+ # 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. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ 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" -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ 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'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -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;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - 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 -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # 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_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - 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 ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# 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 $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -+ esac -+_ACEOF - -- 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 -- # 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." -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= - -- # 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; } -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub - $extrasub -@@ -21816,387 +33647,175 @@ - 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. --# -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;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&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+s&@MKDIR_P@&$ac_MKDIR_P&;t t -+$ac_datarootdir_hack -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out - --# 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' -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - 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 ;; -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - 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 -- -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # - _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 -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - --# This sed command replaces #undef with comments. This is necessary, for -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines -+ -+# Remove the space that was appended to ease matching. -+# Then replace #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 -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines - --# 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 -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' -+ -+while : - 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 -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_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 -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break - 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 -+rm -f conftest.defines conftest.tail - -+echo "ac_result=$ac_in" >>$CONFIG_STATUS - 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 "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ 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 -+ mv "$tmp/config.h" $ac_file - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi -+ rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`(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'`/stamp-h$_am_stamp_count --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 -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# 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 -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -22204,90 +33823,123 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`(dirname "$mf") 2>/dev/null || -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || - echo X"$mf" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - else - continue - fi -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -- fdir=`(dirname "$file") 2>/dev/null || -+ fdir=`$as_dirname -- "$file" || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$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 $dirpart/$fdir -- else -- as_dir=$dirpart/$fdir -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ 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'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 --echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; -- default-1 ) for ac_file in $CONFIG_FILES; do -+ "default-1":C) for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -@@ -22316,7 +33968,7 @@ - ;; - esac - done ;; -- default-2 ) -+ "default-2":C) - - sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out - if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then -@@ -22346,11 +33998,10 @@ - chmod u+w intltool-update - - ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - - { (exit 0); exit 0; } - _ACEOF -@@ -22382,7 +34033,7 @@ - - - --echo "$as_me:$LINENO: result: -+{ echo "$as_me:$LINENO: result: - Configure Result : - - C Compiler : ${CC} ${CFLAGS} -@@ -22413,4 +34064,4 @@ - EXIF : ${enable_exif} - Susie plugin : ${enable_spi} - Show splash : ${enable_splash} --" >&6 -+" >&6; } -diff -urNad gimageview-0.2.27~/ltmain.sh gimageview-0.2.27/ltmain.sh ---- gimageview-0.2.27~/ltmain.sh 2004-12-28 05:00:52.000000000 +0100 -+++ gimageview-0.2.27/ltmain.sh 2008-08-14 00:26:57.316230072 +0200 -@@ -1,8 +1,8 @@ - # 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 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008 Free Software Foundation, Inc. - # Originally by Gordon Matzigkeit , 1996 - # - # This program is free software; you can redistribute it and/or modify -@@ -17,13 +17,49 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+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.26 Debian 1.5.26-4" -+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" -+ -+# Be Bourne compatible (taken from Autoconf:_AS_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+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -36,7 +72,7 @@ - : - else - # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} - fi - - if test "X$1" = X--fallback-echo; then -@@ -45,22 +81,9 @@ - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Global variables. -@@ -115,41 +148,62 @@ - show="$echo" - show_help= - execute_dlfiles= -+duplicate_deps=no -+preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" -- --if test -z "$max_cmd_len"; then -- i=0 -- testring="ABCD" -- new_result= -- -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ -- = "XX$testring") >/dev/null 2>&1 && -- new_result=`expr "X$testring" : ".*" 2>&1` && -- max_cmd_len="$new_result" && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- testring="$testring$testring" -- done -- testring= -- # 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. -- max_cmd_len=`expr $max_cmd_len \/ 2` --fi -+extracted_archives= -+extracted_serial=0 - - ##################################### - # Shell function definitions: - # This seems to be the best place for them - -+# func_mktempdir [string] -+# Make a temporary directory that won't clash with other running -+# libtool processes, and avoids race conditions if possible. If -+# given, STRING is the basename for that directory. -+func_mktempdir () -+{ -+ my_template="${TMPDIR-/tmp}/${1-$progname}" -+ -+ if test "$run" = ":"; then -+ # Return a directory name, but don't create it in dry-run mode -+ my_tmpdir="${my_template}-$$" -+ else -+ -+ # If mktemp works, use that first and foremost -+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` -+ -+ if test ! -d "$my_tmpdir"; then -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" -+ -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $mkdir "$my_tmpdir" -+ umask $save_mktempdir_umask -+ fi -+ -+ # If we're not in dry-run mode, bomb out on failure -+ test -d "$my_tmpdir" || { -+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 -+ exit $EXIT_FAILURE -+ } -+ fi -+ -+ $echo "X$my_tmpdir" | $Xsed -+} -+ -+ -+# func_win32_libid arg -+# return the library type of file 'arg' -+# - # Need a lot of goo to handle *both* DLLs and import libs - # Has to be a shell function in order to 'eat' the argument - # that is supplied when $file_magic_command is called. --win32_libid () { -+func_win32_libid () -+{ - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in -@@ -158,17 +212,22 @@ - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ -- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ -- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` -- if test "X$win32_nmres" = "Ximport" ; then -- win32_libid_type="x86 archive import" -- else -- win32_libid_type="x86 archive static" -- fi -+ $SED -n -e '1,100{ -+ / I /{ -+ s,.*,import, -+ p -+ q -+ } -+ }'` -+ case $win32_nmres in -+ import*) win32_libid_type="x86 archive import";; -+ *) win32_libid_type="x86 archive static";; -+ esac - fi - ;; -- *DLL*) -+ *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... -@@ -182,9 +241,191 @@ - $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 -+} -+ -+ -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () -+{ -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" -+ -+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" -+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? -+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+} -+ -+# func_extract_archives gentop oldlib ... -+func_extract_archives () -+{ -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ my_status="" -+ -+ $show "${rm}r $my_gentop" -+ $run ${rm}r "$my_gentop" -+ $show "$mkdir $my_gentop" -+ $run $mkdir "$my_gentop" -+ my_status=$? -+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -+ exit $my_status -+ fi -+ -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ extracted_serial=`expr $extracted_serial + 1` -+ my_xlib_u=lt$extracted_serial-$my_xlib ;; -+ *) break ;; -+ esac -+ done -+ extracted_archives="$extracted_archives $my_xlib_u" -+ my_xdir="$my_gentop/$my_xlib_u" -+ -+ $show "${rm}r $my_xdir" -+ $run ${rm}r "$my_xdir" -+ $show "$mkdir $my_xdir" -+ $run $mkdir "$my_xdir" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then -+ exit $exit_status -+ fi -+ case $host in -+ *-darwin*) -+ $show "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ if test -z "$run"; then -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` -+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ $show "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ done # $darwin_arches -+ ## Okay now we have a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ lipo -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ ${rm}r unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd "$darwin_orig_dir" -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ fi # $run -+ ;; -+ *) -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ done -+ func_extract_archives_result="$my_oldobjs" -+} - # End of Shell function definitions - ##################################### - -+# Darwin sucks -+eval std_shrext=\"$shrext_cmds\" -+ -+disable_libs=no -+ - # Parse our command line options once, thoroughly. - while test "$#" -gt 0 - do -@@ -210,7 +451,7 @@ - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -220,10 +461,10 @@ - # not specially marked. - ;; - *) -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then -+ 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' < $0`" -+ 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 -@@ -247,21 +488,22 @@ - ;; - - --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 0 -+ echo "\ -+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -+ -+Copyright (C) 2008 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." -+ exit $? - ;; - - --config) -- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -+ ${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" < "$0" -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done -- exit 0 -+ exit $? - ;; - - --debug) -@@ -286,7 +528,7 @@ - else - $echo "disable static libraries" - fi -- exit 0 -+ exit $? - ;; - - --finish) mode="finish" ;; -@@ -301,7 +543,11 @@ - preserve_args="$preserve_args $arg" - ;; - -- --tag) prevopt="--tag" prev=tag ;; -+ --tag) -+ prevopt="--tag" -+ prev=tag -+ preserve_args="$preserve_args --tag" -+ ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift -@@ -317,7 +563,7 @@ - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - - *) -@@ -330,9 +576,21 @@ - if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - -+case $disable_libs in -+no) -+ ;; -+shared) -+ build_libtool_libs=no -+ build_old_libs=yes -+ ;; -+static) -+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+ ;; -+esac -+ - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. -@@ -343,7 +601,7 @@ - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 -- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 -+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link -@@ -386,7 +644,7 @@ - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. -@@ -409,7 +667,7 @@ - - for arg - do -- case "$arg_mode" in -+ case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" -@@ -428,7 +686,7 @@ - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - arg_mode=target - continue -@@ -453,7 +711,7 @@ - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' -- for arg in $args; do -+ for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. -@@ -491,7 +749,10 @@ - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -+ # in scan sets, and some SunOS ksh mistreat backslash-escaping -+ # in scan sets (worked around with variable expansion), -+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets -+ # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; -@@ -503,11 +764,11 @@ - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" -- exit 1 -+ exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. -@@ -529,9 +790,11 @@ - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; -- *.f90) xform=f90 ;; -+ *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; -+ *.obj) xform=obj ;; -+ *.sx) xform=sx ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -540,50 +803,11 @@ - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -- # 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. -- if test -n "$available_tags" && test -z "$tagname"; then -- case $base_compile 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` "*) ;; -- # 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$" < "$0" > /dev/null; then -- # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" -- case "$base_compile " in -- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) -- # 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 1 --# else --# $echo "$modename: using $tagname tagged configuration" -- fi -- ;; -- esac -- fi -+ func_infer_tag $base_compile - - for arg in $later; do - case $arg in -@@ -604,6 +828,14 @@ - esac - done - -+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` -+ case $qlibobj in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qlibobj="\"$qlibobj\"" ;; -+ esac -+ test "X$libobj" != "X$qlibobj" \ -+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then -@@ -616,7 +848,7 @@ - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. -@@ -627,7 +859,7 @@ - fi - - $run $rm $removelist -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ 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 -@@ -646,7 +878,7 @@ - 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 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no -@@ -656,7 +888,7 @@ - # 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 "$0" "$lockfile" 2>/dev/null; do -+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done -@@ -674,14 +906,19 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi -- $echo $srcfile > "$lockfile" -+ $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi -+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` -+ case $qsrcfile in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qsrcfile="\"$qsrcfile\"" ;; -+ esac - - $run $rm "$libobj" "${libobj}T" - -@@ -703,18 +940,18 @@ - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then -- command="$base_compile $srcfile $pic_flag" -+ command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code -- command="$base_compile $srcfile" -+ command="$base_compile $qsrcfile" - fi - - if test ! -d "${xdir}$objdir"; then - $show "$mkdir ${xdir}$objdir" - $run $mkdir ${xdir}$objdir -- status=$? -- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then -- exit $status -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then -+ exit $exit_status - fi - fi - -@@ -726,10 +963,10 @@ - $run $rm "$lobj" "$output_obj" - - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - test -n "$output_obj" && $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$need_locks" = warn && -@@ -749,7 +986,7 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one -@@ -786,9 +1023,9 @@ - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code -- command="$base_compile $srcfile" -+ command="$base_compile $qsrcfile" - else -- command="$base_compile $srcfile $pic_flag" -+ command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - command="$command -o $obj" -@@ -798,10 +1035,10 @@ - command="$command$suppress_output" - $run $rm "$obj" "$output_obj" - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$need_locks" = warn && -@@ -821,7 +1058,7 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed -@@ -859,7 +1096,7 @@ - $run $rm "$lockfile" - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool link mode -@@ -917,6 +1154,7 @@ - no_install=no - objs= - non_pic_objects= -+ notinst_path= # paths that contain not-installed libtool libraries - precious_files_regex= - prefer_static_libs=no - preload=no -@@ -930,68 +1168,40 @@ - thread_safe=no - vinfo= - vinfo_number=no -+ single_module="${wl}-single_module" - -- # 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 link -- # command doesn't match the default compiler. -- if test -n "$available_tags" && test -z "$tagname"; then -- case $base_compile 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` "*) ;; -- # 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$" < "$0" > /dev/null; then -- # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" -- case $base_compile in -- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) -- # The compiler in $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 1 --# else --# $echo "$modename: using $tagname tagged configuration" -- fi -- ;; -- esac -- fi -+ func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in -- -all-static | -static) -- if test "X$arg" = "X-all-static"; then -+ -all-static | -static | -static-libtool-libs) -+ case $arg in -+ -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi -- else -+ prefer_static_libs=yes -+ ;; -+ -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi -- fi -+ prefer_static_libs=built -+ ;; -+ -static-libtool-libs) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ esac - build_libtool_libs=no - build_old_libs=yes -- prefer_static_libs=yes - break - ;; - esac -@@ -1066,7 +1276,7 @@ - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" -- exit 1 -+ exit $EXIT_FAILURE - fi - prev= - continue -@@ -1118,7 +1328,7 @@ - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. -@@ -1166,12 +1376,17 @@ - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - else - # Dry-run case. - -@@ -1192,7 +1407,7 @@ - done - else - $echo "$modename: link input file \`$save_arg' does not exist" -- exit 1 -+ exit $EXIT_FAILURE - fi - arg=$save_arg - prev= -@@ -1204,7 +1419,7 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then -@@ -1244,6 +1459,18 @@ - finalize_command="$finalize_command $qarg" - continue - ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ darwin_framework|darwin_framework_skip) -+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ prev= -+ continue -+ ;; - *) - eval "$prev=\"\$arg\"" - prev= -@@ -1292,7 +1519,7 @@ - -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 1 -+ exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms -@@ -1302,6 +1529,18 @@ - continue - ;; - -+ -framework|-arch|-isysroot) -+ case " $CC " in -+ *" ${arg} ${1} "* | *" ${arg} ${1} "*) -+ prev=darwin_framework_skip ;; -+ *) compiler_flags="$compiler_flags $arg" -+ prev=darwin_framework ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ - -inst-prefix-dir) - prev=inst_prefix - continue -@@ -1328,7 +1567,8 @@ - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -- exit 1 -+ absdir="$dir" -+ notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; -@@ -1342,10 +1582,15 @@ - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - continue -@@ -1354,15 +1599,15 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; -- *-*-mingw* | *-*-os2*) -+ *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; -@@ -1370,10 +1615,19 @@ - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ test "X$arg" = "X-lc" && continue -+ ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1383,8 +1637,25 @@ - continue - ;; - -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -- deplibs="$deplibs $arg" -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ -model) -+ compile_command="$compile_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ finalize_command="$finalize_command $arg" -+ prev=xcompiler -+ continue -+ ;; -+ -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ -+ -multi_module) -+ single_module="${wl}-multi_module" - continue - ;; - -@@ -1393,13 +1664,20 @@ - continue - ;; - -- # gcc -m* arguments should be passed to the linker via $compiler_flags -- # in order to pass architecture information to the linker -- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo -- # but this is not reliable with gcc because gcc may use -mfoo to -- # select a different linker, different libraries, etc, while -- # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -+ # -r[0-9][0-9]* specifies the processor on the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -+ # +DA*, +DD* enable 64-bit mode on the HP compiler -+ # -q* pass through compiler args for the IBM compiler -+ # -m* pass through architecture-specific compiler args for GCC -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args for GCC -+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -+ # -F/path gives path to uninstalled frameworks, gcc on darwin -+ # @file GCC response files -+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ - # 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"` -@@ -1410,9 +1688,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then -- compiler_flags="$compiler_flags $arg" -- fi -+ compiler_flags="$compiler_flags $arg" - continue - ;; - -@@ -1428,9 +1704,9 @@ - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows -- # in order for the loader to find any dlls it needs. -+ # and Darwin 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 -@@ -1479,7 +1755,7 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in -@@ -1489,7 +1765,7 @@ - continue - ;; - -- -static) -+ -static | -static-libtool-libs) - # 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 -@@ -1565,11 +1841,6 @@ - continue - ;; - -- -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread ) -- compiler_flags="$compiler_flags $arg" -- continue -- ;; -- - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need -@@ -1607,7 +1878,7 @@ - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. -@@ -1655,12 +1926,17 @@ - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - else - # Dry-run case. - -@@ -1727,7 +2003,7 @@ - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1760,9 +2036,9 @@ - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir -- status=$? -- if test "$status" -ne 0 && test ! -d "$output_objdir"; then -- exit $status -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then -+ exit $exit_status - fi - fi - -@@ -1771,7 +2047,7 @@ - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; -@@ -1781,7 +2057,7 @@ - - case $host in - *cygwin* | *mingw* | *pw32*) -- # don't eliminate duplcations in $postdeps and $predeps -+ # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) -@@ -1825,7 +2101,6 @@ - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries -- notinst_path= # paths that contain not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" -@@ -1834,7 +2109,7 @@ - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -1860,7 +2135,10 @@ - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test "$pass" = dlopen; then -@@ -1872,12 +2150,12 @@ - lib= - found=no - case $deplib in -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- deplibs="$deplib $deplibs" -+ compiler_flags="$compiler_flags $deplib" - fi - continue - ;; -@@ -1886,13 +2164,14 @@ - $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 $shrext .so .a; do -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do -+ for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then -@@ -1968,11 +2247,11 @@ - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - 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 -@@ -2000,7 +2279,22 @@ - fi - case $linkmode in - lib) -- if test "$deplibs_check_method" != pass_all; then -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ if eval $echo \"$deplib\" 2>/dev/null \ -+ | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" -@@ -2050,15 +2344,15 @@ - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else -- $echo "$modename: cannot find the library \`$lib'" 1>&2 -- exit 1 -+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 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 1 -+ exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -@@ -2074,6 +2368,8 @@ - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no -+ avoidtemprpath= -+ - - # Read the .la file - case $lib in -@@ -2094,7 +2390,7 @@ - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" -@@ -2111,12 +2407,12 @@ - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit 1 -+ 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 -@@ -2124,16 +2420,18 @@ - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ 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 1 -+ exit $EXIT_FAILURE - fi -- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ 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 -@@ -2170,11 +2468,19 @@ - dir="$libdir" - absdir="$libdir" - fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - -@@ -2182,7 +2488,7 @@ - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). -@@ -2209,7 +2515,7 @@ - continue - fi - -- -+ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" -@@ -2245,14 +2551,16 @@ - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ { { test "$prefer_static_libs" = no || -+ test "$prefer_static_libs,$installed" = "built,yes"; } || -+ test -z "$old_library"; }; then - # We need to hardcode the library path -- if test -n "$shlibpath_var"; then -+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $dir" ;; -+ *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi - -@@ -2289,24 +2597,29 @@ - fi - - link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes ; then -+ use_static_libs=no -+ fi - if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - 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 -+ -+ # 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 -+ $echo "*** $linklib is not portable!" -+ fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. -@@ -2402,11 +2715,15 @@ - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in -- *-*-sco3.2v5* ) add_dir="-L$dir" ;; -+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -+ *-*-sysv4*uw2*) add_dir="-L$dir" ;; -+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -+ *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) -- # if the lib is a module then we can not link against it, someone -- # is ignoring the new warnings I added -- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then -+ # 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 -@@ -2414,7 +2731,7 @@ - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" -- fi -+ fi - fi - esac - elif test "$hardcode_minus_L" = no; then -@@ -2437,7 +2754,7 @@ - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then -- case "$libdir" in -+ case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; -@@ -2456,7 +2773,7 @@ - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then -@@ -2499,7 +2816,8 @@ - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; 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" -@@ -2509,7 +2827,7 @@ - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then -- case "$libdir" in -+ case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; -@@ -2570,8 +2888,6 @@ - fi - fi - else -- convenience="$convenience $dir/$old_library" -- old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi -@@ -2579,7 +2895,8 @@ - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= -@@ -2636,7 +2953,7 @@ - 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 1 -+ exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -@@ -2646,15 +2963,22 @@ - depdepl= - case $host in - *-*-darwin*) -- # we do not want to link against static libs, but need to link against shared -+ # 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` -+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done -- if test -f "$path/$depdepl" ; then -+ if test -f "$deplibdir/$depdepl" ; then -+ depdepl="$deplibdir/$depdepl" -+ elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" -- fi -+ else -+ # Can't find it, oh well... -+ depdepl= -+ fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; -@@ -2664,36 +2988,35 @@ - path="" - ;; - *) -- path="-L$path" -- ;; -- esac -- -+ path="-L$path" -+ ;; -+ esac - ;; -- -l*) -+ -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="" -+ # 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 -+ esac - ;; - *) continue ;; - esac - case " $deplibs " in -- *" $depdepl "*) ;; -- *) deplibs="$deplibs $depdepl" ;; -- esac -- case " $deplibs " in - *" $path "*) ;; -- *) deplibs="$deplibs $path" ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ case " $deplibs " in -+ *" $depdepl "*) ;; -+ *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no -@@ -2780,7 +3103,8 @@ - eval $var=\"$tmp_libs\" - done # for var - fi -- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) -+ # 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 -@@ -2801,9 +3125,10 @@ - - case $linkmode in - oldlib) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -@@ -2840,19 +3165,19 @@ - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -- eval shared_ext=\"$shrext\" -+ 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 1 -+ 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\" -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -@@ -2863,7 +3188,7 @@ - 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 1 -+ exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" -@@ -2911,13 +3236,13 @@ - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ 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" -@@ -2931,7 +3256,7 @@ - # which has an extra 1 added just for fun - # - case $version_type in -- darwin|linux|osf|windows) -+ darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" -@@ -2942,9 +3267,15 @@ - age="0" - ;; - irix|nonstopux) -- current=`expr $number_major + $number_minor - 1` -+ current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" -+ lt_irix_increment=no -+ ;; -+ *) -+ $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 - ;; -@@ -2957,36 +3288,36 @@ - - # Check that each of the things are valid numbers. - case $current in -- [0-9]*) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $revision in -- [0-9]*) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $age in -- [0-9]*) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ 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 1 -+ exit $EXIT_FAILURE - fi - - # Calculate the version variables. -@@ -3003,6 +3334,7 @@ - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` -+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - -@@ -3017,8 +3349,11 @@ - ;; - - irix | nonstopux) -- major=`expr $current - $age + 1` -- -+ if test "X$lt_irix_increment" = "Xno"; then -+ major=`expr $current - $age` -+ else -+ major=`expr $current - $age + 1` -+ fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; -@@ -3075,7 +3410,7 @@ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -3129,9 +3464,11 @@ - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -- then -- continue -+ 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" - ;; -@@ -3153,11 +3490,11 @@ - 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 -+ #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. -@@ -3207,9 +3544,14 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. -- test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. -@@ -3253,13 +3595,12 @@ - int main() { return 0; } - EOF - $rm conftest -- $LTCC -o conftest conftest.c $deplibs -- if test "$?" -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then - ldd_output=`ldd conftest` - for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -+ name=`expr $i : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. -- if test "$name" != "" && test "$name" -ne "0"; then -+ if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -@@ -3294,13 +3635,11 @@ - # Error occurred in the first compile. Let's try to salvage - # the situation: Compile a separate program for each library. - for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -+ name=`expr $i : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then - $rm conftest -- $LTCC -o conftest conftest.c $i -- # Did it work? -- if test "$?" -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in -@@ -3332,7 +3671,7 @@ - droppeddeps=yes - $echo - $echo "*** Warning! Library $i is needed by this library but I was not able to" -- $echo "*** make it link in! You will probably need to install it or some" -+ $echo "*** make it link in! You will probably need to install it or some" - $echo "*** library that it depends on before this library will be fully" - $echo "*** functional. Installing it before continuing would be even better." - fi -@@ -3346,7 +3685,7 @@ - set dummy $deplibs_check_method - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -@@ -3380,13 +3719,6 @@ - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done -- # It is ok to link against an archive when -- # building a shared library. -- if $AR -t $potlib > /dev/null 2>&1; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then -@@ -3422,7 +3754,7 @@ - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -@@ -3552,6 +3884,35 @@ - deplibs=$newdeplibs - fi - -+ -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ deplibs="$new_libs" -+ -+ - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= -@@ -3596,7 +3957,10 @@ - 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\" -+ case $archive_cmds in -+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; -+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; -+ esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi -@@ -3619,7 +3983,7 @@ - fi - - # Get the real and link names of the library. -- eval shared_ext=\"$shrext\" -+ eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" -@@ -3635,6 +3999,7 @@ - fi - - lib="$output_objdir/$realname" -+ linknames= - for link - do - linknames="$linknames $link" -@@ -3663,6 +4028,9 @@ - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: -+ # Break out early, otherwise skipped_export may be -+ # set to false by a later but shorter cmd. -+ break - fi - done - IFS="$save_ifs" -@@ -3683,12 +4051,12 @@ - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; -- *) -+ *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done -- deplibs="$tmp_deplibs" -+ deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -@@ -3696,67 +4064,13 @@ - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "$mkdir $gentop" -- $run $mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "$mkdir $xdir" -- $run $mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- # We will extract separately just the conflicting names and we will no -- # longer touch any unique names. It is faster to leave these extract -- # automatically by $AR in one run. -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then -- : -- else -- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 -- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 -- $AR t "$xabs" | sort | uniq -cd | while read -r count name -- do -- i=1 -- while test "$i" -le "$count" -- do -- # Put our $i before any first dot (extension) -- # Never overwrite any file -- name_to="$name" -- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" -- do -- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` -- done -- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" -- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? -- i=`expr $i + 1` -- done -- done -- fi -- -- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" - fi - fi -- -+ - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" -@@ -3786,7 +4100,8 @@ - fi - fi - -- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && -+ if test "X$skipped_export" != "X:" && -+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else -@@ -3805,6 +4120,7 @@ - save_libobjs=$libobjs - fi - save_output=$output -+ output_la=`$echo "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -3814,13 +4130,13 @@ - delfiles= - last_robj= - k=1 -- output=$output_objdir/$save_output-${k}.$objext -+ output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || -- { len=`expr "X$test_cmds" : ".*"` && -+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else -@@ -3834,9 +4150,9 @@ - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi -- last_robj=$output_objdir/$save_output-${k}.$objext -+ last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` -- output=$output_objdir/$save_output-${k}.$objext -+ output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi -@@ -3856,13 +4172,13 @@ - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - -- # Set up a command to remove the reloadale object files -+ # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` -- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" -+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done - - $echo "creating a temporary reloadable object file: $output" -@@ -3871,7 +4187,6 @@ - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" -- eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -3911,14 +4226,31 @@ - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -- exit 0 -+ -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ fi -+ fi -+ -+ exit $EXIT_SUCCESS - fi - - # Create links to the real library. -@@ -3938,9 +4270,10 @@ - ;; - - obj) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -@@ -3966,7 +4299,7 @@ - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` -@@ -3987,72 +4320,20 @@ - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "$mkdir $gentop" -- $run $mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "$mkdir $xdir" -- $run $mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- # We will extract separately just the conflicting names and we will no -- # longer touch any unique names. It is faster to leave these extract -- # automatically by $AR in one run. -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then -- : -- else -- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 -- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 -- $AR t "$xabs" | sort | uniq -cd | while read -r count name -- do -- i=1 -- while test "$i" -le "$count" -- do -- # Put our $i before any first dot (extension) -- # Never overwrite any file -- name_to="$name" -- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" -- do -- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` -- done -- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" -- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? -- i=`expr $i + 1` -- done -- done -- fi -- -- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -@@ -4077,7 +4358,7 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then -@@ -4090,7 +4371,7 @@ - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then -@@ -4113,7 +4394,7 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - prog) -@@ -4153,6 +4434,35 @@ - ;; - esac - -+ -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ compile_deplibs="$new_libs" -+ -+ - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - -@@ -4197,10 +4507,15 @@ - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - done -@@ -4314,13 +4629,25 @@ - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$output.exp" -+ export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols -- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - else -- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' -- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' -+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - fi - fi - -@@ -4371,7 +4698,26 @@ - #endif - - /* The mapping between symbol names and symbols. */ -+" -+ -+ case $host in -+ *cygwin* | *mingw* ) -+ $echo >> "$output_objdir/$dlsyms" "\ -+/* DATA imports from DLLs on WIN32 can't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs */ -+struct { -+" -+ ;; -+ * ) -+ $echo >> "$output_objdir/$dlsyms" "\ - const struct { -+" -+ ;; -+ esac -+ -+ -+ $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; - } -@@ -4418,20 +4764,33 @@ - esac - - # Now compile the dynamic symbol file. -- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ case $host in -+ *cygwin* | *mingw* ) -+ if test -f "$output_objdir/${outputname}.def" ; then -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ else -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ fi -+ ;; -+ * ) -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ ;; -+ esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - else -@@ -4440,19 +4799,19 @@ - # really was required. - - # Nullify the symbol file. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - 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'` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" -- status=$? -+ exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then -@@ -4460,7 +4819,7 @@ - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - -- exit $status -+ exit $exit_status - fi - - if test -n "$shlibpath_var"; then -@@ -4519,7 +4878,7 @@ - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then -@@ -4533,7 +4892,7 @@ - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= -@@ -4570,14 +4929,14 @@ - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. -- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then -- case $0 in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; -- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; -+ 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 -@@ -4600,10 +4959,12 @@ - esac - case $host in - *cygwin* | *mingw* ) -- cwrappersource=`$echo ${objdir}/lt-${output}.c` -- cwrapper=`$echo ${output}.exe` -- $rm $cwrappersource $cwrapper -- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 -+ output_name=`basename $output` -+ output_path=`dirname $output` -+ cwrappersource="$output_path/$objdir/lt-$output_name.c" -+ cwrapper="$output_path/$output_name.exe" -+ $rm $cwrappersource $cwrapper -+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource < - #include - #include -+#include -+#include -+#include - - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX -@@ -4638,15 +5002,19 @@ - #endif - - #ifndef DIR_SEPARATOR --#define DIR_SEPARATOR '/' -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' - #endif - - #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) --#define HAVE_DOS_BASED_FILE_SYSTEM --#ifndef DIR_SEPARATOR_2 --#define DIR_SEPARATOR_2 '\\' --#endif -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif - #endif - - #ifndef DIR_SEPARATOR_2 -@@ -4656,17 +5024,32 @@ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) - #endif /* DIR_SEPARATOR_2 */ - -+#ifndef PATH_SEPARATOR_2 -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -+#else /* PATH_SEPARATOR_2 */ -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -+#endif /* PATH_SEPARATOR_2 */ -+ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) - #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - -+/* -DDEBUG is fairly common in CFLAGS. */ -+#undef DEBUG -+#if defined DEBUGWRAPPER -+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -+#else -+# define DEBUG(format, ...) -+#endif -+ - const char *program_name = NULL; - - void * xmalloc (size_t num); - char * xstrdup (const char *string); --char * basename (const char *name); --char * fnqualify(const char *path); -+const char * base_name (const char *name); -+char * find_executable(const char *wrapper); -+int check_executable(const char *path); - char * strendzap(char *str, const char *pat); - void lt_fatal (const char *message, ...); - -@@ -4675,30 +5058,52 @@ - { - char **newargz; - int i; -- -- program_name = (char *) xstrdup ((char *) basename (argv[0])); -+ -+ program_name = (char *) xstrdup (base_name (argv[0])); -+ DEBUG("(main) argv[0] : %s\n",argv[0]); -+ DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); - EOF - -- cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" -- newargz[1] = fnqualify(argv[0]); -+ cat >> $cwrappersource <<"EOF" -+ newargz[1] = find_executable(argv[0]); -+ if (newargz[1] == NULL) -+ lt_fatal("Couldn't find %s", argv[0]); -+ DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ -- strendzap(newargz[1],".exe"); -+ strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; -+ -+ for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" -+ cat >> $cwrappersource <<"EOF" -+ return 127; - } - - void * -@@ -4711,59 +5116,159 @@ - return p; - } - --char * -+char * - xstrdup (const char *string) - { - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL - ; - } - --char * --basename (const char *name) -+const char * -+base_name (const char *name) - { - const char *base; - - #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ -- if (isalpha (name[0]) && name[1] == ':') -+ if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; - #endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; -- return (char *) base; -+ return base; - } - --char * --fnqualify(const char *path) -+int -+check_executable(const char * path) - { -- size_t size; -- char *p; -+ struct stat st; -+ -+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); -+ if ((!path) || (!*path)) -+ return 0; -+ -+ if ((stat (path, &st) >= 0) && -+ ( -+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -+#if defined (S_IXOTH) -+ ((st.st_mode & S_IXOTH) == S_IXOTH) || -+#endif -+#if defined (S_IXGRP) -+ ((st.st_mode & S_IXGRP) == S_IXGRP) || -+#endif -+ ((st.st_mode & S_IXUSR) == S_IXUSR)) -+ ) -+ return 1; -+ else -+ return 0; -+} -+ -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise */ -+char * -+find_executable (const char* wrapper) -+{ -+ int has_slash = 0; -+ const char* p; -+ const char* p_next; -+ /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; -+ int tmp_len; -+ char* concat_name; - -- assert(path != NULL); -+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - -- /* Is it qualified already? */ -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; -+ -+ /* Absolute path? */ - #if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- if (isalpha (path[0]) && path[1] == ':') -- return xstrdup (path); -+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ else -+ { -+#endif -+ if (IS_DIR_SEPARATOR (wrapper[0])) -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ } - #endif -- if (IS_DIR_SEPARATOR (path[0])) -- return xstrdup (path); - -- /* prepend the current directory */ -- /* doesn't handle '~' */ -+ for (p = wrapper; *p; p++) -+ if (*p == '/') -+ { -+ has_slash = 1; -+ break; -+ } -+ if (!has_slash) -+ { -+ /* no slashes; search PATH */ -+ const char* path = getenv ("PATH"); -+ if (path != NULL) -+ { -+ for (p = path; *p; p = p_next) -+ { -+ const char* q; -+ size_t p_len; -+ for (q = p; *q; q++) -+ if (IS_PATH_SEPARATOR(*q)) -+ break; -+ p_len = q - p; -+ p_next = (*q == '\0' ? q : q + 1); -+ if (p_len == 0) -+ { -+ /* empty path: current directory */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ } -+ else -+ { -+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, p, p_len); -+ concat_name[p_len] = '/'; -+ strcpy (concat_name + p_len + 1, wrapper); -+ } -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ } -+ /* not found in PATH; assume curdir */ -+ } -+ /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); -- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ -- p = XMALLOC(char, size); -- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); -- return p; -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ return NULL; - } - - char * --strendzap(char *str, const char *pat) -+strendzap(char *str, const char *pat) - { - size_t len, patlen; - -@@ -4783,7 +5288,7 @@ - } - - static void --lt_error_core (int exit_status, const char * mode, -+lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) - { - fprintf (stderr, "%s: %s: ", program_name, mode); -@@ -4803,16 +5308,16 @@ - va_end (ap); - } - EOF -- # we should really use a build-platform specific compiler -- # here, but OTOH, the wrappers (shell script and this C one) -- # are only useful if you want to execute the "real" binary. -- # Since the "real" binary is built for $host, then this -- # wrapper might as well be built for $host, too. -- $run $LTCC -s -o $cwrapper $cwrappersource -- ;; -- esac -- $rm $output -- trap "$rm $output; exit 1" 1 2 15 -+ # we should really use a build-platform specific compiler -+ # here, but OTOH, the wrappers (shell script and this C one) -+ # are only useful if you want to execute the "real" binary. -+ # Since the "real" binary is built for $host, then this -+ # wrapper might as well be built for $host, too. -+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource -+ ;; -+ esac -+ $rm $output -+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ - #! $SHELL -@@ -4831,9 +5336,23 @@ - Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - -+# Be Bourne compatible (taken from Autoconf:_AS_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+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - relink_command=\"$relink_command\" - -@@ -4912,7 +5431,7 @@ - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -4962,32 +5481,32 @@ - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ -- exec \$progdir\\\\\$program \${1+\"\$@\"} -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} - " - ;; - - *) - $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} - " - ;; - esac - $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -- exit 1 -+ \$echo \"\$0: cannot exec \$program \$*\" -+ exit $EXIT_FAILURE - fi - else - # The program doesn't exist. -- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 -+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi\ - " - chmod +x $output - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - esac - -@@ -5010,71 +5529,73 @@ - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "$mkdir $gentop" -- $run $mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- # Add in members from convenience archives. -- for xlib in $addlibs; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "$mkdir $xdir" -- $run $mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- # We will extract separately just the conflicting names and we will no -- # longer touch any unique names. It is faster to leave these extract -- # automatically by $AR in one run. -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then -- : -- else -- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 -- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 -- $AR t "$xabs" | sort | uniq -cd | while read -r count name -- do -- i=1 -- while test "$i" -le "$count" -- do -- # Put our $i before any first dot (extension) -- # Never overwrite any file -- name_to="$name" -- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" -- do -- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` -- done -- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" -- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? -- i=`expr $i + 1` -- done -- done -- fi -- -- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else -+ # POSIX demands no paths to be encoded in archives. We have -+ # to avoid creating archives with duplicate basenames if we -+ # might have to extract them afterwards, e.g., when creating a -+ # static archive out of a convenience library, or when linking -+ # the entirety of a libtool archive into another (currently -+ # not supported by libtool). -+ if (for obj in $oldobjs -+ do -+ $echo "X$obj" | $Xsed -e 's%^.*/%%' -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "copying selected object files to avoid basename conflicts..." -+ -+ if test -z "$gentop"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" -+ -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "$mkdir $gentop" -+ $run $mkdir "$gentop" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then -+ exit $exit_status -+ fi -+ fi -+ -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ counter=`expr $counter + 1` -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ $run ln "$obj" "$gentop/$newobj" || -+ $run cp "$obj" "$gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" -+ ;; -+ *) oldobjs="$oldobjs $obj" ;; -+ esac -+ done -+ fi -+ - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && -@@ -5088,31 +5609,18 @@ - 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 -+ 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" : ".*"` && -+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : - else -@@ -5120,7 +5628,7 @@ - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB -- fi -+ fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= -@@ -5169,11 +5677,13 @@ - fi - done - # Quote the link command for shipping. -- relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then -- relink_command= -- fi -+ relink_command= -+ fi -+ -+ - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do -@@ -5191,48 +5701,11 @@ - 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 1 -- fi -- # We do not want portage's install root ($D) present. Check only for -- # this if the .la is being installed. -- if test "$installed" = yes && test "$D"; then -- eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`" -- else -- mynewdependency_lib="$libdir/$name" -- fi -- # Do not add duplicates -- if test "$mynewdependency_lib"; then -- if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then -- newdependency_libs="$newdependency_libs $mynewdependency_lib" -- fi -- fi -- ;; -- *) -- if test "$installed" = yes; then -- # Rather use S=WORKDIR if our version of portage supports it. -- # This is because some ebuild (gcc) do not use $S as buildroot. -- if test "$PWORKDIR"; then -- S="$PWORKDIR" -- fi -- # We do not want portage's build root ($S) present. -- if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then -- mynewdependency_lib="" -- # We do not want portage's install root ($D) present. -- elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then -- eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" -- else -- mynewdependency_lib="$deplib" -- fi -- else -- mynewdependency_lib="$deplib" -- fi -- # Do not add duplicates -- if test "$mynewdependency_lib"; then -- if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then -- newdependency_libs="$newdependency_libs $mynewdependency_lib" -- fi -+ exit $EXIT_FAILURE - fi -+ newdependency_libs="$newdependency_libs $libdir/$name" - ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -5242,7 +5715,7 @@ - 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 1 -+ exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done -@@ -5253,7 +5726,7 @@ - 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 1 -+ exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done -@@ -5261,7 +5734,7 @@ - else - newdlfiles= - for lib in $dlfiles; do -- case $lib in -+ case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -@@ -5270,7 +5743,7 @@ - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do -- case $lib in -+ case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -@@ -5284,10 +5757,6 @@ - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac -- # Do not add duplicates -- if test "$installed" = yes && test "$D"; then -- install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" -- fi - $echo > $output "\ - # $outputname - a libtool library file - # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -@@ -5337,7 +5806,7 @@ - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool install mode -@@ -5348,11 +5817,11 @@ - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then -+ $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -5361,14 +5830,14 @@ - shift - else - install_prog= -- arg="$nonopt" -+ arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -5386,28 +5855,31 @@ - do - if test -n "$dest"; then - files="$files $dest" -- dest="$arg" -+ dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; -- -f) prev="-f" ;; -- -g) prev="-g" ;; -- -m) prev="-m" ;; -- -o) prev="-o" ;; -+ -f) -+ case " $install_prog " in -+ *[\\\ /]cp\ *) ;; -+ *) prev=$arg ;; -+ esac -+ ;; -+ -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; -- -*) ;; -- -+ -*) -+ ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else -- dest="$arg" -+ dest=$arg - continue - fi - ;; -@@ -5416,7 +5888,7 @@ - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -5426,13 +5898,13 @@ - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -z "$files"; then -@@ -5442,7 +5914,7 @@ - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. -@@ -5463,7 +5935,7 @@ - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - case $destdir in -@@ -5475,7 +5947,7 @@ - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -5504,7 +5976,7 @@ - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - library_names= -@@ -5546,14 +6018,14 @@ - # 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 1 -+ 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%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` - else -- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 -@@ -5561,7 +6033,7 @@ - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -5585,11 +6057,14 @@ - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. -+ # Try `ln -sf' first, because the `ln' binary might depend on -+ # the symlink we replace! Solaris /bin/ln does not understand -f, -+ # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then -- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi -@@ -5602,7 +6077,16 @@ - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - fi -@@ -5640,7 +6124,7 @@ - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -5658,7 +6142,7 @@ - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - *) -@@ -5696,23 +6180,21 @@ - notinst_deplibs= - relink_command= - -- # To insure that "foo" is sourced, and not "foo.exe", -- # finese the cygwin/MSYS system by explicitly sourcing "foo." -- # which disallows the automatic-append-.exe behavior. -- case $build in -- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; -- *) wrapperdot=${wrapper} ;; -- esac -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . ${wrapperdot} ;; -- *) . ./${wrapperdot} ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - finalize=yes -@@ -5734,34 +6216,25 @@ - done - - relink_command= -- # To insure that "foo" is sourced, and not "foo.exe", -- # finese the cygwin/MSYS system by explicitly sourcing "foo." -- # which disallows the automatic-append-.exe behavior. -- case $build in -- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; -- *) wrapperdot=${wrapper} ;; -- esac -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . ${wrapperdot} ;; -- *) . ./${wrapperdot} ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then -- tmpdir="/tmp" -- test -n "$TMPDIR" && tmpdir="$TMPDIR" -- tmpdir="$tmpdir/libtool-$$" -- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : -- else -- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 -- continue -- fi -+ tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` - - $show "$relink_command" - if $run eval "$relink_command"; then : -@@ -5781,7 +6254,7 @@ - fi - - # remove .exe since cygwin /usr/bin/install will append another -- # one anyways -+ # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in -@@ -5837,9 +6310,9 @@ - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs' -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -5879,9 +6352,9 @@ - fi - - # Exit here if they wanted silent mode. -- test "$show" = : && exit 0 -+ test "$show" = : && exit $EXIT_SUCCESS - -- $echo "----------------------------------------------------------------------" -+ $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" -@@ -5914,8 +6387,8 @@ - $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 0 -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ exit $EXIT_SUCCESS - ;; - - # libtool execute mode -@@ -5927,7 +6400,7 @@ - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. -@@ -5935,7 +6408,7 @@ - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - dir= -@@ -5946,7 +6419,7 @@ - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Read the libtool library. -@@ -5972,8 +6445,10 @@ - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else -- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -- exit 1 -+ if test ! -f "$dir/$dlname"; then -+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -+ exit $EXIT_FAILURE -+ fi - fi - ;; - -@@ -6037,12 +6512,12 @@ - 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 -+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+ do -+ eval "if test \"\${save_$lt_var+set}\" = set; then -+ $lt_var=\$save_$lt_var; export $lt_var -+ fi" -+ done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" -@@ -6053,7 +6528,7 @@ - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -6081,7 +6556,7 @@ - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - rmdirs= -@@ -6131,9 +6606,17 @@ - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - -- if test "$mode" = uninstall; then -+ case "$mode" in -+ clean) -+ case " $library_names " in -+ # " " in the beginning catches empty $dlname -+ *" $dlname "*) ;; -+ *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ esac -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ ;; -+ uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds -@@ -6166,7 +6649,8 @@ - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. -- fi -+ ;; -+ esac - fi - ;; - -@@ -6195,7 +6679,7 @@ - if test "$mode" = clean ; then - noexename=$name - case $file in -- *.exe) -+ *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, -@@ -6240,20 +6724,20 @@ - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi # test -z "$show_help" - - if test -n "$exec_cmd"; then - eval exec $exec_cmd -- exit 1 -+ exit $EXIT_FAILURE - fi - - # We need to display help for each of the modes. -@@ -6289,7 +6773,7 @@ - a more detailed description of MODE. - - Report bugs to ." -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - clean) -@@ -6390,9 +6874,9 @@ - -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 -+ try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX -- try to export only the symbols matching 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 -@@ -6406,9 +6890,11 @@ - -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 -+ -static do not do any dynamic linking of uninstalled libtool libraries -+ -static-libtool-libs -+ do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] -- specify library version info [each variable defaults to 0] -+ specify library version info [each variable defaults to 0] - - All other options (arguments beginning with \`-') are ignored. - -@@ -6444,14 +6930,14 @@ - *) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - $echo - $echo "Try \`$modename --help' for more information about other modes." - --exit 0 -+exit $? - - # The TAGs below are defined such that we never get into a situation - # in which we disable both kinds of libraries. Given conflicting -@@ -6465,12 +6951,11 @@ - # configuration. But we'll never go from static-only to shared-only. - - # ### BEGIN LIBTOOL TAG CONFIG: disable-shared --build_libtool_libs=no --build_old_libs=yes -+disable_libs=shared - # ### END LIBTOOL TAG CONFIG: disable-shared - - # ### BEGIN LIBTOOL TAG CONFIG: disable-static --build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` -+disable_libs=static - # ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: -diff -urNad gimageview-0.2.27~/m4/libtool.m4 gimageview-0.2.27/m4/libtool.m4 ---- gimageview-0.2.27~/m4/libtool.m4 2004-06-11 11:40:02.000000000 +0200 -+++ gimageview-0.2.27/m4/libtool.m4 2008-08-14 00:26:57.324230530 +0200 -@@ -1,38 +1,67 @@ --# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- --## Copyright 1996, 1997, 1998, 1999, 2000, 2001 --## Free Software Foundation, Inc. -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, -+## 2008 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. -+## This file is free software; the Free Software Foundation gives -+## unlimited permission to copy and/or distribute it, with or without -+## modifications, as long as this notice is preserved. - --## 2003-05-21 Takuro Ashie --## --## * Added "/lib/w32api" in sys_lib_search_path_spec --## -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - --# serial 46 AC_PROG_LIBTOOL - --builtin([undefine],[symbols]) -+# 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" -@@ -43,10 +72,13 @@ - - # Prevent multiple expansion - define([AC_PROG_LIBTOOL], []) --]) -+])# _AC_PROG_LIBTOOL - -+ -+# AC_LIBTOOL_SETUP -+# ---------------- - AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.13)dnl -+[AC_PREREQ(2.50)dnl - AC_REQUIRE([AC_ENABLE_SHARED])dnl - AC_REQUIRE([AC_ENABLE_STATIC])dnl - AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -@@ -56,318 +88,314 @@ - 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 --# 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 -+ -+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 - --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - --ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - --AC_ARG_ENABLE(libtool-lock, -- [ --disable-libtool-lock avoid locking (might break parallel builds)]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- 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 -- rm -rf conftest* -- ;; -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' - --*-*-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_SAVE -- AC_LANG_C -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_RESTORE]) -- 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 -- ;; -+# Constants: -+rm="rm -f" - --ifdef([AC_PROVIDE_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) -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes - -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one -- AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, -- [AC_TRY_LINK([], -- [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); -- DllMain (0, 0, 0);], -- [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" - -- case $host/$CC in -- *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) -- # old mingw systems require "-dll" to link a DLL, while more recent ones -- # require "-mdll" -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -mdll" -- AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, -- [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) -- CFLAGS="$SAVE_CFLAGS" ;; -- *-*-cygwin* | *-*-pw32*) -- # cygwin systems need to pass --dll to the linker, and not link -- # crt.o which will require a WinMain@16 definition. -- lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; -- esac -- ;; -- ]) --esac -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) - --_LT_AC_LTCONFIG_HACK -+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 "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+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 - --# _LT_AC_CHECK_DLFCN --# -------------------- --AC_DEFUN(_LT_AC_CHECK_DLFCN, --[AC_CHECK_HEADERS(dlfcn.h) --])# _LT_AC_CHECK_DLFCN -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= - --# 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]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi - --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+_LT_CC_BASENAME([$compiler]) - --# Character class describing NM global symbol codes. --[symcode='[BCDEGRST]'] -+# 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 - --# Regexp to match symbols that can be accessed directly from C. --[sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] -+_LT_REQUIRED_DARWIN_CHECKS - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -+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) - --# Transform an extracted symbol line into a proper C declaration --lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+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 - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+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 - --# Define system-specific variables. --case $host_os in --aix*) -- [symcode='[BCDT]'] -- ;; --cygwin* | mingw* | pw32*) -- [symcode='[ABCDGISTW]'] -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- [symcode='[BCDEGRST]'] -- ;; --solaris* | sysv5*) -- [symcode='[BDT]'] -- ;; --sysv4) -- [symcode='[DFNSTU]'] -- ;; --esac -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP - --# Handle CRLF in mingw tool chain --opt_cr= --case $host_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. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- [symcode='[ABCDGISTW]'] --fi -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -- # 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'"] -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -- # 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 egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --[lt_preloaded_symbols[] =] --{ --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; - --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if AC_TRY_EVAL(ac_link) && test -s conftest; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AC_FD_CC -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AC_FD_CC -- fi -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" - fi -- else -- echo "$progname: failed program was:" >&AC_FD_CC -- 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 "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac - ]) --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= --else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" --fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - --# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR --# --------------------------------- --AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], --[# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac --fi --])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+# _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_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _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. -+# will find an echo command which doesn't interpret backslashes. - AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -- -+[_LT_AC_SHELL_INIT([ - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - -@@ -385,7 +413,7 @@ - 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 -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : - else -@@ -397,22 +425,22 @@ - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -431,8 +459,9 @@ - # - # So, first we look for a working echo in the user's PATH. - -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -+ 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` && -@@ -441,7 +470,7 @@ - break - fi - done -- IFS="$save_ifs" -+ IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. -@@ -514,17 +543,380 @@ - fi - - AC_SUBST(ECHO) --AC_DIVERT_POP --])# _LT_AC_PROG_ECHO_BACKSLASH -+])])# _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-*kfreebsd*-gnu|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-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ 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-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ 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 -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+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]) -+ echo "$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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$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 other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $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_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $rm -r 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; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ 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` -+ fi -+ ;; -+ 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, --[if test "$cross_compiling" = yes; then : -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : - [$4] - else -- AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext </dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; -- x$lt_unknown|x*) $3 ;; -+ x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed -@@ -605,10 +999,12 @@ - rm -fr conftest* - ])# _LT_AC_TRY_DLOPEN_SELF - -+ - # AC_LIBTOOL_DLOPEN_SELF --# ------------------- --AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, --[if test "x$enable_dlopen" != xyes; then -+# ---------------------- -+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 -@@ -623,24 +1019,39 @@ - lt_cv_dlopen_self=yes - ;; - -- cygwin* | mingw* | pw32*) -+ 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"], -+ [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) -@@ -658,11 +1069,10 @@ - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" -- AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" -@@ -675,7 +1085,7 @@ - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( -@@ -702,422 +1112,67 @@ - fi - ])# AC_LIBTOOL_DLOPEN_SELF - --AC_DEFUN([_LT_AC_LTCONFIG_HACK], --[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl --# 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' -- --# 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" --need_locks="$enable_libtool_lock" -- --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 "$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 "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -- --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi -- --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac -- --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 - --# 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 -- --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="[$]2" -- --## FIXME: this should be a separate macro --## --AC_MSG_CHECKING([for objdir]) --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs --fi --rmdir .libs 2>/dev/null --AC_MSG_RESULT($objdir) --## --## END FIXME -- -- --## FIXME: this should be a separate macro --## --AC_ARG_WITH(pic, --[ --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 -- --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. --AC_MSG_CHECKING([for $compiler option to produce PIC]) --AC_CACHE_VAL(lt_cv_prog_cc_pic, --[ lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared -- -- if test "$GCC" = yes; then -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -- -- case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -- ;; -- 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_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -- ;; -- cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -- fi -- ;; -- *) -- lt_cv_prog_cc_pic='-fPIC' -- ;; -- esac -- else -- # PORTME Check for PIC flags for the system compiler. -- case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -- else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- -- hpux9* | hpux10* | hpux11*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -- ;; -- -- irix5* | irix6*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- # PIC (with -KPIC) is the default. -- ;; -- -- cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -- -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -- -- osf3* | osf4* | osf5*) -- # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- ;; -- -- sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -- ;; -- -- solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -- ;; -- -- sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -- ;; -- -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -- else -- lt_cv_prog_cc_wl='-Wl,' -- fi -- ;; -- -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -- fi -- ;; -- -- *) -- lt_cv_prog_cc_can_build_shared=no -- ;; -- esac -- fi --]) --if test -z "$lt_cv_prog_cc_pic"; then -- AC_MSG_RESULT([none]) --else -- AC_MSG_RESULT([$lt_cv_prog_cc_pic]) -- -- # Check to make sure the pic_flag actually works. -- AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works]) -- AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- AC_TRY_COMPILE([], [], [dnl -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -- esac -- ], [dnl -- lt_cv_prog_cc_pic_works=no -- ]) -- CFLAGS="$save_CFLAGS" -- ]) -- -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -- -- AC_MSG_RESULT([$lt_cv_prog_cc_pic_works]) --fi --## --## END FIXME -- --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) -- if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : -- else -- AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) -- lt_cv_prog_cc_can_build_shared=no -- fi --fi -+# 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_PROG_SED])dnl -+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 -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --## FIXME: this should be a separate macro --## --AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works]) --AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes]) -- LDFLAGS="$save_LDFLAGS" -+ 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}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$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 -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $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 - --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --AC_MSG_RESULT([$lt_cv_prog_cc_static_works]) -- --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" --## --## END FIXME -- -- --## FIXME: this should be a separate macro --## --# Check to see if options -o and -c are simultaneously supported by compiler --AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext]) --AC_CACHE_VAL([lt_cv_compiler_c_o], [ --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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_compiler_c_o=no -- else -- lt_cv_compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&AC_FD_CC -- lt_cv_compiler_c_o=no --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null --]) --compiler_c_o=$lt_cv_compiler_c_o --AC_MSG_RESULT([$compiler_c_o]) - --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- AC_MSG_CHECKING([if $compiler supports -c -o file.lo]) -- AC_CACHE_VAL([lt_cv_compiler_o_lo], [ -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # 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_compiler_o_lo=no -- else -- lt_cv_compiler_o_lo=yes -- fi -- ]) -- ac_objext="$save_objext" -- CFLAGS="$save_CFLAGS" -- ]) -- compiler_o_lo=$lt_cv_compiler_o_lo -- AC_MSG_RESULT([$compiler_o_lo]) --else -- compiler_o_lo=no --fi --## --## END FIXME -- --## FIXME: this should be a separate macro --## -+# 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 "$compiler_c_o" = no && test "$need_locks" != no; then -+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 -@@ -1128,737 +1183,77 @@ - 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]) -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi - else - need_locks=no - fi --## --## END FIXME -- --## FIXME: this should be a separate macro --## --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions]) -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # 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 -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -- ]) -- CFLAGS="$save_CFLAGS" -- AC_MSG_RESULT([$compiler_rtti_exceptions]) -- -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -- else -- no_builtin_flag=' -fno-builtin' -- fi --fi --## --## END FIXME -- --## FIXME: this should be a separate macro --## --# See if the linker supports building shared libraries. --AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries]) -- --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --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_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --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 egrep regular expression 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, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- 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 -- ;; -- -- 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 use -- # them. -- ld_shlibs=no -- ;; -- -- beos*) -- if $LD --help 2>&1 | egrep ': 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*) -- # 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=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ -- ;; -- esac -- -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -- else -- ltdll_obj= -- ltdll_cmds= -- fi -- -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' -- -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \[$]# in -- 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -- ;; -- -- netbsd*) -- 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 -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $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 | egrep '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 | egrep ': 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 -- ;; -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - -- *) -- if $LD --help 2>&1 | egrep ': 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' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- ;; -- esac -- fi -+# 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 -- # 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 -- 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. -- -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- 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 -- shared_flag='${wl}-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 can do strange things, 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' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- 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 ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -- else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but 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 ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $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 -- ;; -- -- 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 -- # 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"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; -- -- 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*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -- -- irix5* | irix6*) -- 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' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -- -- netbsd*) -- 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 $linker_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 $linker_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 "-exported_symbol " >> $lib.exp; echo "\$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 -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -- -- solaris*) -- no_undefined_flag=' -z defs' -- # $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='-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) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- else -- 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 -- fi -- 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' -- ;; -- -- 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 -- ;; -- -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- 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 -- ;; -- -- sysv5uw7* | 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 -- ;; -- -- *) -- ld_shlibs=no -- ;; -- esac -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs - fi --AC_MSG_RESULT([$ld_shlibs]) --test "$ld_shlibs" = no && can_build_shared=no --## --## END FIXME -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR - --## FIXME: this should be a separate macro --## -+ -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- - # Check hardcoding attributes. --AC_MSG_CHECKING([how to hardcode library paths into programs]) --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -+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 "$hardcode_direct" != no && -+ 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 "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -+ ## 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. -- hardcode_action=relink -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi - else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. -- hardcode_action=unsupported -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported - fi --AC_MSG_RESULT([$hardcode_action]) --## --## END FIXME -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - --## FIXME: this should be a separate macro --## --striplib= -+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 -@@ -1866,21 +1261,35 @@ - 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" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else - AC_MSG_RESULT([no]) - fi --## --## END FIXME -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+])# AC_LIBTOOL_SYS_LIB_STRIP - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown - --## FIXME: this should be a separate macro --## -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- - # PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - AC_MSG_CHECKING([dynamic linker characteristics]) - library_names_spec= - libname_spec='lib$name' - soname_spec= -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -1890,23 +1299,83 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" -+m4_if($1,[],[ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+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}.so$versuffix $libname.a' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - 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}.so$major ${libname}${release}.so$versuffix $libname.so' -+ 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 -@@ -1915,7 +1384,7 @@ - # 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].*)] -+ 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 -@@ -1925,20 +1394,19 @@ - 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. -+ # 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}.so$versuffix ${libname}${release}.so$major $libname.so' -+ 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}.so$major' -+ soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -1947,25 +1415,24 @@ - 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' -+ 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}.so' -+ library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[[45]]*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic - # 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 -@@ -1973,29 +1440,56 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no -+ - case $GCC,$host_os in -- yes,cygwin*) -+ yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -+ # 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 .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -+ 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 - ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- ;; -+ - *) -- library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -2008,30 +1502,49 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -+ 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`' -+ m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ 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 - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ 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}.so$versuffix $libname.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac -@@ -2040,10 +1553,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- *) -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -2051,8 +1573,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -2060,33 +1582,87 @@ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -- dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -+ 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*) -- version_type=irix -+interix[[3-9]]*) -+ version_type=linux - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) - case $host_os in -- irix5*) -+ 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 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *-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 - ;; -@@ -2095,20 +1671,21 @@ - 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-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -+linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -2117,6 +1694,12 @@ - # 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=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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, -@@ -2126,17 +1709,29 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -2146,63 +1741,77 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ 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 -+ sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no -- need_version=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac - else - shlibpath_overrides_runpath=yes - fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH - ;; - - os2*) - libname_spec='$name' -+ shrext_cmds=".dll" - need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -+ 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}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ 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}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -2212,7 +1821,7 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -2222,14 +1831,20 @@ - need_version=yes - ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+sysv4 | sysv4.3*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - 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 -@@ -2240,29 +1855,43 @@ - esac - ;; - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -+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 - ;; - --dgux*) -- version_type=linux -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' - ;; - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$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 - ;; - - *) -@@ -2271,25 +1900,945 @@ - esac - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no --## --## END FIXME - --## FIXME: this should be a separate macro --## --# Report the final consequences. -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+ -+ -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+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 -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ 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" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; 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 DLLs -+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 recognize 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 recognize 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 variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi -+ ;; -+ -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ 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 -+ ;; -+ -+interix[[3-9]]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-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* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ 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*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; -+ -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ 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 -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | 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_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ 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" -+ done -+ 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 -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ 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 -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ 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([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX -+ -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP -+ -+# AC_LIBTOOL_F77 -+# -------------- -+# 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;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+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 -+ -+# Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) --## --## END FIXME - --## FIXME: this should be a separate macro --## - 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 -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -2298,136 +2847,1523 @@ - fi - ;; - --aix4*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -- ;; -+ ;; - esac - AC_MSG_RESULT([$enable_shared]) --## --## END FIXME - --## FIXME: this should be a separate macro --## - 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]) --## --## END FIXME - --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 -+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([_LT_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_shlibpath_var, $1)=unsupported -+_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)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# 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;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+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 -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD - fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - --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" -+# 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 - --AC_LIBTOOL_DLOPEN_SELF -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - --## FIXME: this should be a separate macro --## --if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -+ 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 - ;; -- '$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]) -- AC_CACHE_VAL([lt_cv_archive_cmds_need_lc], -- [$rm conftest* -- echo 'static int dummy;' > conftest.$ac_ext -+ aix[[4-9]]*) -+ 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 - -- if AC_TRY_EVAL(ac_compile); then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- lt_cv_archive_cmds_need_lc=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]].*|aix[[5-9]]*) -+ 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 -- lt_cv_archive_cmds_need_lc=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi - fi -- allow_undefined_flag=$save_allow_undefined_flag -+ 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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _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' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach 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 -- cat conftest.err 1>&5 -- fi]) -- AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc]) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi - ;; -- esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} --## --## END FIXME - --## FIXME: this should be a separate macro --## --# The second 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 -- : -+ 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ 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* | dragonfly*) -+ # 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 -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_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*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ 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 -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # 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 ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # 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}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ 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* | k*bsd*-gnu) -+ 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 -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(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' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ 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' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # 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' -+ ;; -+ esac -+ ;; -+ 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) -+ 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::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ 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 ${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # 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}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # 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 ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_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}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # 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 -+ ;; -+ 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(archive_cmds_need_lc,$1)=yes -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -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} ${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 compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # 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 -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # 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' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # 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" -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+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_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], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+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 <&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) -+case " $_LT_AC_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+])# AC_LIBTOOL_POSTDEP_PREDEP -+ -+# AC_LIBTOOL_LANG_F77_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -+AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -+[AC_REQUIRE([AC_PROG_F77]) -+AC_LANG_PUSH(Fortran 77) -+ -+_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 -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+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 -+ ;; -+aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+AC_MSG_RESULT([$enable_shared]) -+ -+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]) -+ -+_LT_AC_TAGVAR(GCC, $1)="$G77" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+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_CONFIG($1) -+ -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_F77_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_GCJ_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_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+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_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_GCJ_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_RC_CONFIG -+# ------------------------- -+# Ensure that the configuration vars for the Windows resource compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -+AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_RC_CONFIG -+ -+ -+# AC_LIBTOOL_CONFIG([TAGNAME]) -+# ---------------------------- -+# If TAGNAME is not passed, then create an initial libtool script -+# with a default configuration from the untagged config vars. Otherwise -+# add code to config.status for appending the configuration named by -+# TAGNAME from the matching tagged config vars. -+AC_DEFUN([AC_LIBTOOL_CONFIG], -+[# 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 CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+ old_postinstall_cmds old_postuninstall_cmds \ -+ _LT_AC_TAGVAR(compiler, $1) \ -+ _LT_AC_TAGVAR(CC, $1) \ -+ _LT_AC_TAGVAR(LD, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -+ _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) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ -+ _LT_AC_TAGVAR(archive_cmds, $1) \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(no_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $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_automatic, $1) \ -+ _LT_AC_TAGVAR(module_cmds, $1) \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ -+ _LT_AC_TAGVAR(exclude_expsyms, $1) \ -+ _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ 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\"\`\\\"" - ;; -@@ -2437,14 +4373,31 @@ - esac - done - -- cat <<__EOF__ > "${ofile}T" --#! $SHELL -+ case $lt_echo in -+ *'\[$]0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -+ ;; -+ esac - --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+ifelse([$1], [], -+ [cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ AC_MSG_NOTICE([creating $ofile])], -+ [cfgfile="$ofile"]) -+ -+ cat <<__EOF__ >> "$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-2000 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# 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 -@@ -2459,21 +4412,28 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+# 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//" -+Xsed="$SED -e 1s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --# ### BEGIN LIBTOOL CONFIG -+# 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`: - -@@ -2487,7 +4447,10 @@ - build_old_libs=$enable_static - - # Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+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 -@@ -2495,6 +4458,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -2503,14 +4472,23 @@ - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - --# The default C compiler. --CC=$lt_CC -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - - # Is the compiler the GNU C compiler? --with_gcc=$GCC -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) -+ -+# An ERE matcher. -+EGREP=$lt_EGREP - - # The linker used to build libraries. --LD=$lt_LD -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - - # Whether we need hard or soft links. - LN_S=$lt_LN_S -@@ -2519,7 +4497,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -2541,7 +4519,7 @@ - reload_cmds=$lt_reload_cmds - - # How to pass a linker flag through the compiler. --wl=$lt_wl -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - - # Object file suffix (normally "o"). - objext="$ac_objext" -@@ -2549,20 +4527,23 @@ - # 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_pic_flag -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - pic_mode=$pic_mode - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -2581,19 +4562,19 @@ - dlopen_self_static=$enable_dlopen_self_static - - # Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - - # Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+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_export_dynamic_flag_spec -+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_whole_archive_flag_spec -+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_thread_safe_flag_spec -+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - - # Library versioning type. - version_type=$version_type -@@ -2610,26 +4591,54 @@ - - # Commands used to build and install an old-style archive. - RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds -+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_old_archive_from_new_cmds -+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_old_archive_from_expsyms_cmds -+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_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds -+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 directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $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 - -@@ -2637,10 +4646,10 @@ - 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 -+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - - # Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+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 -@@ -2649,13 +4658,13 @@ - finish_eval=$lt_finish_eval - - # Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe -+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_global_symbol_to_cdecl -+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_global_symbol_to_c_name_address -+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 -@@ -2667,36 +4676,45 @@ - shlibpath_overrides_runpath=$shlibpath_overrides_runpath - - # How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+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_hardcode_libdir_flag_spec -+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_hardcode_libdir_separator -+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the - # resulting binary. --hardcode_direct=$hardcode_direct -+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=$hardcode_minus_L -+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=$hardcode_shlibpath_var -+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=$link_all_deplibs -+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 -@@ -2705,30 +4723,33 @@ - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - - # The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+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_exclude_expsyms -+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - - # Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - --# ### END LIBTOOL CONFIG -+ifelse([$1],[], -+[# ### END LIBTOOL CONFIG], -+[# ### END LIBTOOL TAG CONFIG: $tagname]) - - __EOF__ - -+ifelse([$1],[], [ - case $host_os in - aix3*) -- cat <<\EOF >> "${ofile}T" -+ 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 -@@ -2741,779 +4762,1803 @@ - ;; - esac - -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* 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 */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# 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 /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ --# --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif --# --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } --# --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; --# --# filename = argv[1]; --# --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; --# --# dll_name = filename; --# --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; --# --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); --# --# if (num_entries < 1) /* no exports */ --# return 1; --# --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); --# --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } --# --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; --# --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); --# --# printf ("EXPORTS\n"); --# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -+ 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 --## --## END FIXME -- --])# _LT_AC_LTCONFIG_HACK -+])# AC_LIBTOOL_CONFIG - --# AC_LIBTOOL_DLOPEN - enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - --# 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_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - --# AC_ENABLE_SHARED - implement the --enable-shared flag --# Usage: AC_ENABLE_SHARED[(DEFAULT)] --# Where 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, --changequote(<<, >>)dnl --<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], --changequote([, ])dnl --[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. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl --]) -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - --# 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)]) -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - --# AC_ENABLE_STATIC - implement the --enable-static flag --# Usage: AC_ENABLE_STATIC[(DEFAULT)] --# Where 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, --changequote(<<, >>)dnl --<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], --changequote([, ])dnl --[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. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_static=AC_ENABLE_STATIC_DEFAULT)dnl --]) -+ 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_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_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) -+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?!! ;)] - --# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag --# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] --# Where 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, --changequote(<<, >>)dnl --<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], --changequote([, ])dnl --[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. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl --]) -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' - --# 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)]) -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - --# AC_LIBTOOL_PICMODE - implement the --with-pic flag --# Usage: AC_LIBTOOL_PICMODE[(MODE)] --# Where 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)]) -+# 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'" - --# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library --AC_DEFUN([AC_PATH_TOOL_PREFIX], --[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. -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' - ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' - ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" --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 -- 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 -+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'" -+ ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac - --*** 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 -+# 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 - -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ -+ # 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 -- break -+ -+ # 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 -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -rf 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(no) -+ AC_MSG_RESULT(ok) - fi --]) -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - --# AC_PATH_MAGIC - find a file program which can recognise a shared library --AC_DEFUN([AC_PATH_MAGIC], --[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl --AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$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) -+# 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* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_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)= -+ ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ 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 -- MAGIC_CMD=: -+ case $host_os in -+ aix[[4-9]]*) -+ # 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 -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _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* | dragonfly*) -+ # 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)='${wl}-a ${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)='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _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* | k*bsd*-gnu) -+ 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* | ecpc*) -+ # Intel C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _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 ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-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*) -+ ;; -+ 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 -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac - fi --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 -+ ;; - --# AC_PROG_LD - find the path to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH(gnu-ld, --[ --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([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 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" -+ 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' - ;; -- "") -- # 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 -- 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 -- 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. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -- test "$with_gnu_ld" != no && break -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_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' -+ ;; -+ -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _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 -- test "$with_gnu_ld" != yes && break -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi -- fi -- done -- IFS="$ac_save_ifs" --else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$lt_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_PROG_LD_GNU --]) -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - --# AC_PROG_LD_GNU - --AC_DEFUN([AC_PROG_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -- lt_cv_prog_gnu_ld=yes --else -- lt_cv_prog_gnu_ld=no --fi]) --with_gnu_ld=$lt_cv_prog_gnu_ld --]) -+ mingw* | cygwin* | 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). -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - --# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker --# -- PORTME Some linkers may need a different reload flag. --AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], --[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, --[lt_cv_ld_reload_flag='-r']) --reload_flag=$lt_cv_ld_reload_flag --test -n "$reload_flag" && reload_flag=" $reload_flag" --]) -+ 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' -+ ;; - --# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies --# -- PORTME fill in with the dynamic library characteristics --AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], --[AC_CACHE_CHECK([how to recognise dependant libraries], --lt_cv_deplibs_check_method, --[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 egrep 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. -+ 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' -+ ;; - --case $host_os in --aix4* | aix5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _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)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _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)='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; - --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 -- ;; -+ 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' -+ ;; - --cygwin* | mingw* | pw32*) -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -- ;; -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; - --freebsd*) -- 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.*` -+ 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*) -+ _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 -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac -- else -- lt_cv_deplibs_check_method=pass_all - fi -- ;; -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# -+# 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_cv_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 - --hpux10.20*|hpux11*) -- [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_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+]) - --irix5* | irix6*) -+ -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ -+# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+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 -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -+ aix[[4-9]]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ 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 '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+],[ -+ 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_|_GLOBAL__F[ID]_.*'] -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # 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. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no - ;; - esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -- lt_cv_deplibs_check_method=pass_all -- ;; - --# This must be Linux ELF. --linux-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -- ;; -+ _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}' - --netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] -- else -- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] -- fi -- ;; -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - --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 -- ;; -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[[3-9]]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 - --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 -- ;; -+*** 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. - --osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so -- lt_cv_deplibs_check_method=pass_all -- ;; -+EOF -+ fi -+ ;; - --sco3.2v5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ 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 - --solaris*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -+ # 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 -+ ;; - --[sysv5uw[78]* | sysv4*uw2*)] -- lt_cv_deplibs_check_method=pass_all -- ;; -+ 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 -+ ;; - --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 -- ;; -- esac -- ;; --esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --]) -+ 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 '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# AC_PROG_NM - find the path to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_MSG_CHECKING([for BSD-compatible nm]) --AC_CACHE_VAL(lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -- 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 -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -- lt_cv_path_NM="$tmp_nm -B" -- break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else -- lt_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 -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-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*) -+ 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 -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ 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)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi -- done -- IFS="$ac_save_ifs" -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm --fi]) --NM="$lt_cv_path_NM" --AC_MSG_RESULT([$NM]) -+ 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 "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; -+ -+ aix[[4-9]]*) -+ 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]].*|aix[[5-9]]*) -+ 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 -+ : -+ 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' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ 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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _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' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ 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 -+ ;; -+ -+ bsdi[[45]]*) -+ _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' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ 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* | dragonfly*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ 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*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _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) -+ 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*) -+ if test -f /usr/libexec/ld.so; then -+ _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(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ 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 -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ 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 ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ 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]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ 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*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ _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 - --# 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*) -- # These system don't have libm -- ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") -- ;; --*) -- AC_CHECK_LIB(m, main, LIBM="-lm") -+# -+# 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* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $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 - --# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl convenience library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-convenience to the --# configure arguments. Note that LIBLTDL and INCLTDL are not --# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not --# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed --# with '${top_builddir}/' and INCLTDL 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 -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) --]) - --# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl installable library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-install to the configure --# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is --# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed --# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will --# be prefixed with '${top_builddir}/' and INCLTDL 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, main, -- [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 -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- INCLTDL= -- fi --]) -+# _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]) -@@ -3526,3 +6571,102 @@ - - # 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) -+]) -+ -+ -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. -+ -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE -+ -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ -+############################################################ -+# 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 -+IFS=$as_save_IFS -+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 && continue -+ 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_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) diff -Nru gimageview-0.2.27/debian/patches/40_bts389071_german_translation.dpatch gimageview-0.3.0-0.20101117/debian/patches/40_bts389071_german_translation.dpatch --- gimageview-0.2.27/debian/patches/40_bts389071_german_translation.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/40_bts389071_german_translation.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4133 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_bts389071_german_translation.dpatch by Holger Wansing -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: German translation - -@DPATCH@ -diff -urNad gimageview-0.2.27~/po/de.po gimageview-0.2.27/po/de.po ---- gimageview-0.2.27~/po/de.po 1970-01-01 01:00:00.000000000 +0100 -+++ gimageview-0.2.27/po/de.po 2008-08-14 08:40:43.080506163 +0200 -@@ -0,0 +1,4122 @@ -+# German translation of gimageview. -+# Copyright (C) 2006 THE gimageview'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the gimageview package. -+# Holger Wansing , 2006. -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: gimageview 0.2.27-1\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2004-12-28 13:33+0900\n" -+"PO-Revision-Date: 2006-09-23 20:35+0200\n" -+"Last-Translator: Holger Wansing \n" -+"Language-Team: German \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit" -+ -+#: etc/gimageview.desktop.in.h:1 plugins/thumbnail/gimv_thumb.c:84 -+msgid "GImageView" -+msgstr "GImageView" -+ -+#: etc/gimageview.desktop.in.h:2 -+msgid "Image Viewer" -+msgstr "Bildbetrachter" -+ -+#. file load -+#: src/argparse.c:39 -+msgid "Scan directory at start up" -+msgstr "Verzeichnis beim Start durchsuchen" -+ -+#: src/argparse.c:40 -+msgid "Scan directory recursively (use with \"-d\")" -+msgstr "Verzeichnis rekursiv durchsuchen (zusammen mit »-d« benutzen)" -+ -+#: src/argparse.c:41 -+msgid "Read dotfile when scanning directory (use with \"-d\")" -+msgstr "Mit einem Punkt beginnende Dateien auslesen beim Durchsuchen des " -+"Verzeichnisses (zusammen mit »-d« benutzen)" -+ -+#. Ignore filename extension or not -+#: src/argparse.c:42 src/prefs_ui/prefs_ui_common.c:809 -+msgid "Ignore file name extension" -+msgstr "Dateinamenerweiterungen ignorieren" -+ -+#. image window -+#: src/argparse.c:45 -+msgid "Specify image scale on image window [%]" -+msgstr "Skalierung des Bildes im Fenster angeben [%]" -+ -+#: src/argparse.c:46 -+msgid "Keep original image on memory or not" -+msgstr "Originalbild im Speicher halten oder nicht" -+ -+#: src/argparse.c:47 -+msgid "Show menu bar on image view window" -+msgstr "Menüleiste im Bildansichtsfenster anzeigen" -+ -+#: src/argparse.c:48 -+msgid "Show tool bar on image view window" -+msgstr "Werkzeugleiste im Bildansichtsfenster anzeigen" -+ -+#. -+#: src/argparse.c:51 -+msgid "Open empty image window at start up" -+msgstr "Beim Start leeres Bildansichtsfenster öffnen" -+ -+#: src/argparse.c:52 -+msgid "Open thumbnail window at start up" -+msgstr "Beim Start Vorschaufenster öffnen" -+ -+#. default window -+#: src/argparse.c:55 -+msgid "Open all images in imageview window" -+msgstr "Alle Bilder im Bildansichtsfenster öffnen" -+ -+#: src/argparse.c:56 -+msgid "Open all images in thumbnail window" -+msgstr "Alle Bilder im Vorschaufenster öffnen" -+ -+#: src/argparse.c:57 -+msgid "Open images files in slide show" -+msgstr "Bilddateien in Diashow öffnen" -+ -+#: src/argparse.c:58 -+msgid "Interval of slideshow (use with \"-S\") [sec]" -+msgstr "Intervall der Diashow (zusammen mit »-S« benutzen) [Sek.]" -+ -+#. etc -+#: src/argparse.c:61 -+msgid "Print version infomation" -+msgstr "Versionsinformationen anzeigen" -+ -+#: src/argparse.c:62 -+msgid "Show this message" -+msgstr "Diesen Hilfetext anzeigen" -+ -+#: src/argparse.c:141 -+#, c-format -+msgid "Unknown option: \"-%s\"\n" -+msgstr "Unbekannte Option: »-%s«\n" -+ -+#: src/argparse.c:161 -+msgid "" -+"Copyright (C) 2001 Takuro Ashie\n" -+"This is free software; see the source for copying conditions. There is NO\n" -+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -+msgstr "" -+"Copyright (C) 2001 Takuro Ashie\n" -+"Dies ist freie Software; der Quelltext enthält Informationen zu\n" -+"den Kopierbedingungen.\n" -+"Es gibt KEINE GARANTIE, nicht einmal die der MARKTREIFE oder\n" -+"der VERWENDBARKEIT FÃœR EINEN BESTIMMTEN ZWECK.\n" -+ -+#: src/argparse.c:186 -+#, c-format -+msgid "" -+"Copyright (C) 2001 Takuro Ashie\n" -+"\n" -+"Usage: %s [OPTION...] [Image Files...]\n" -+"\n" -+msgstr "" -+"Copyright (C) 2001 Takuro Ashie\n" -+"\n" -+"Aufruf: %s [Option...] [Grafikdateien...]\n" -+"\n" -+ -+#. error -+#: src/argparse.c:261 -+#, c-format -+msgid "Unknown option: \"--%s\"\n" -+msgstr "Unbekannte Option: »--%s«\n" -+ -+#: src/argparse.c:317 -+#, c-format -+msgid "Unknown option: \"-%c\"\n" -+msgstr "Unbekannte Option: »-%c«\n" -+ -+#: src/charset.c:145 src/prefs_ui/prefs_ui_imagewin.c:138 -+#: src/prefs_ui/prefs_ui_thumbwin.c:135 src/prefs_ui/prefs_ui_thumbwin.c:144 -+#: src/prefs_ui/prefs_ui_thumbwin.c:154 src/prefs_ui/prefs_ui_thumbwin.c:168 -+#: src/prefs_ui/prefs_ui_thumbwin.c:179 -+msgid "None" -+msgstr "Keine" -+ -+#: src/charset.c:146 -+msgid "Japanese" -+msgstr "Japanisch" -+ -+#: src/compare_filesize.c:60 -+msgid "File Size" -+msgstr "Dateigröße" -+ -+#: src/compare_md5.c:152 -+msgid "md5sum" -+msgstr "md5sum" -+ -+#: src/compare_similar.c:305 -+msgid "Similarity" -+msgstr "Ähnlichkeit" -+ -+#: src/dirview.c:212 -+msgid "/_Load Thumbnail" -+msgstr "/_Lade Vorschaubild" -+ -+#: src/dirview.c:213 -+msgid "/Load Thumbnail re_cursively" -+msgstr "/Lade Vorschaubild re_kursiv" -+ -+#: src/dirview.c:214 -+msgid "/Load Thumbnail recursively in _one tab" -+msgstr "/Lade Vorschaubild rekursiv in einem _Tab" -+ -+#: src/dirview.c:215 src/dirview.c:218 src/dirview.c:220 src/dnd.c:64 -+#: src/dnd.c:68 src/gimv_image_view.c:281 src/gimv_image_view.c:283 -+#: src/gimv_image_view.c:286 src/gimv_image_view.c:303 -+#: src/gimv_image_view.c:337 src/gimv_image_view.c:339 -+#: src/gimv_image_win.c:308 src/gimv_image_win.c:318 src/gimv_image_win.c:320 -+#: src/gimv_thumb_win.c:467 src/gimv_thumb_win.c:483 src/gimv_thumb_win.c:498 -+#: src/gimv_thumb_win.c:518 src/gimv_thumb_win.c:520 src/gimv_thumb_view.c:185 -+#: src/gimv_thumb_view.c:188 src/gimv_thumb_view.c:194 -+msgid "/---" -+msgstr "/---" -+ -+#: src/dirview.c:216 -+msgid "/_Go to here" -+msgstr "/_Gehe hierher" -+ -+#: src/dirview.c:217 -+msgid "/_Refresh Tree" -+msgstr "/_Baumstruktur auffrischen" -+ -+#: src/dirview.c:219 src/gimv_thumb_view.c:189 -+msgid "/_Property..." -+msgstr "/_Eigenschaften..." -+ -+#: src/dirview.c:221 -+msgid "/_Make Directory..." -+msgstr "/Erstelle _Verzeichnis..." -+ -+#: src/dirview.c:222 -+msgid "/Re_name Directory..." -+msgstr "/Benenne Verzeichnis _um..." -+ -+#: src/dirview.c:223 -+msgid "/_Delete Directory..." -+msgstr "/L_ösche Verzeichnis..." -+ -+#: src/dirview.c:1526 src/fileload.c:442 src/gimv_thumb_view.c:1079 -+#, c-format -+msgid "Permission denied: %s" -+msgstr "Zugriff verweigert: %s" -+ -+#. gtk_object_remove_data (GTK_OBJECT (archive), "progress-bar"); -+#: src/dirview.c:1529 src/exif_view.c:246 src/exif_view.c:253 -+#: src/fileload.c:444 src/fileload.c:587 src/fileload.c:597 src/fileload.c:718 -+#: src/gfileutil.c:463 src/gfileutil.c:477 src/gfileutil.c:499 -+#: src/gfileutil.c:546 src/gfileutil.c:676 src/gfileutil.c:698 -+#: src/gfileutil.c:729 src/gfileutil.c:740 src/gfileutil.c:751 -+#: src/gfileutil.c:792 src/gfileutil.c:803 src/gfileutil.c:987 -+#: src/gfileutil.c:1003 src/gfileutil.c:1055 src/gfileutil.c:1067 -+#: src/gfileutil.c:1082 src/gfileutil.c:1148 src/gfileutil.c:1200 -+#: src/gfileutil.c:1214 src/gfileutil.c:1233 src/gfileutil.c:1247 -+#: src/gfileutil.c:1483 src/gfileutil.c:1490 src/gfileutil.c:1631 -+#: src/gfileutil.c:1721 src/gfileutil.c:1725 src/gfileutil.c:1808 -+#: src/gfileutil.c:1828 src/gfileutil.c:1866 src/gfileutil.c:1888 -+#: src/gfileutil.c:1897 src/gfileutil.c:1927 src/gfileutil.c:1952 -+#: src/gtkutils.c:460 src/prefs_ui/prefs_ui_common.c:182 -+#: src/prefs_ui/prefs_ui_etc.c:194 src/prefs_ui/prefs_ui_etc.c:200 -+#: src/prefs_ui/prefs_ui_etc.c:401 src/gimv_thumb_view.c:1016 -+#: src/gimv_thumb_view.c:1081 src/gimv_thumb_view.c:2435 -+#: plugins/image_view/image_view_xine.c:725 -+#: plugins/image_view/image_view_xine.c:737 -+#: plugins/image_view/image_view_xine.c:763 -+msgid "Error!!" -+msgstr "Fehler!!" -+ -+#: src/dirview.c:1988 src/dirview.c:1989 src/dirview.c:1990 -+msgid "Home" -+msgstr "Home" -+ -+#: src/dirview.c:1998 src/dirview.c:1999 src/dirview.c:2000 -+#: src/gimv_elist.c:985 -+msgid "Up" -+msgstr "Hoch" -+ -+#: src/dirview.c:2008 src/dirview.c:2009 src/dirview.c:2010 -+msgid "Refresh" -+msgstr "Auffrischen" -+ -+#: src/dirview.c:2018 -+msgid "Dotfile" -+msgstr "Mit ».« beginnende Dateien" -+ -+#: src/dirview.c:2019 src/dirview.c:2020 -+msgid "Show/Hide dotfile" -+msgstr "Mit ».« beginnende Dateien anzeigen/verstecken" -+ -+#: src/dnd.c:63 -+msgid "/Open in new tab" -+msgstr "/In neuem Tab öffnen" -+ -+#: src/dnd.c:65 -+msgid "/Move" -+msgstr "/Verschieben" -+ -+#: src/dnd.c:66 -+msgid "/Copy" -+msgstr "/Kopieren" -+ -+#: src/dnd.c:67 -+msgid "/Symbolic Link" -+msgstr "/Symbolische Verknüpfung" -+ -+#: src/dnd.c:69 -+msgid "/Cancel" -+msgstr "/Abbrechen" -+ -+#: src/exif_view.c:147 -+#, c-format -+msgid "%s EXIF data" -+msgstr "%s EXIF-Daten" -+ -+#. button -+#. -+#. * 2004-06-17 Takuro Ashie -+#. * This code causes clash on latest Gtk+2. -+#. -+#. -+#. * Change the Cancel buttons caption to Close. -+#. -+#: src/exif_view.c:159 src/fileload.c:1079 -+msgid "Close" -+msgstr "Schließen" -+ -+#: src/exif_view.c:239 -+msgid "Tag" -+msgstr "Markierung" -+ -+#: src/exif_view.c:239 src/gimv_comment_view.c:531 -+msgid "Value" -+msgstr "Wert" -+ -+#: src/exif_view.c:246 src/exif_view.c:253 -+msgid "EXIF data not found." -+msgstr "EXIF-Daten nicht gefunden." -+ -+#. Thumbnail page -+#. radio button -+#. ********************************************* -+#. * Thumbnail Frame -+#. ********************************************* -+#: src/exif_view.c:344 src/gimv_dupl_win.c:281 -+#: plugins/image_view/prefs_mplayer.c:303 plugins/image_view/prefs_xine.c:256 -+msgid "Thumbnail" -+msgstr "Vorschaubilder" -+ -+#: src/fileload.c:204 -+msgid "*Loading Image Files* - GImageView - " -+msgstr "*Lade Grafikdateien* - GImageView - " -+ -+#. label -+#: src/fileload.c:210 -+msgid "Now Opening Image Files..." -+msgstr "Öffne jetzt die Grafikdateien ..." -+ -+#. cancel button -+#: src/fileload.c:223 src/gimv_thumb_win.c:1609 src/gtk_prop.c:223 -+#: src/gtkutils.c:671 -+msgid "Skip" -+msgstr "Ãœberspringen" -+ -+#. stop button -+#. close button -+#: src/fileload.c:230 src/gimv_image_view.c:2192 src/gimv_image_view.c:2193 -+#: src/gimv_image_win.c:1008 src/gimv_thumb_win.c:1621 src/gimv_dupl_win.c:306 -+msgid "Stop" -+msgstr "Stop" -+ -+#: src/fileload.c:311 src/gfileutil.c:185 src/gfileutil.c:187 -+#, c-format -+msgid "filename = %s\n" -+msgstr "Dateiname = %s\n" -+ -+#: src/fileload.c:315 -+#, c-format -+msgid "The file is archive: %s\n" -+msgstr "Die Datei ist ein Archiv: %s\n" -+ -+#: src/fileload.c:496 -+#, c-format -+msgid "No image files in this directory: %s\n" -+msgstr "Keine Grafikdateien in diesem Verzeichnis: %s\n" -+ -+#: src/fileload.c:588 -+msgid "Command not found!!\n" -+msgstr "Befehl nicht gefunden!!\n" -+ -+#: src/fileload.c:591 -+msgid "Canceled" -+msgstr "Abgebrochen" -+ -+#: src/fileload.c:592 -+msgid "" -+"Processing the archive file was\n" -+"canceled by user." -+msgstr "" -+"Verarbeitung der Archivdatei wurde\n" -+"vom Benutzer abgebrochen." -+ -+#: src/fileload.c:596 -+msgid "An error occured while processing archive file...\n" -+msgstr "Bei der Verarbeitung der Archivdatei ist ein Fehler aufgetreten ...\n" -+ -+#: src/fileload.c:598 -+msgid "" -+"An error occured while processing\n" -+"archive file..." -+msgstr "" -+"Bei der Verarbeitung der Archivdatei\n" -+"ist ein Fehler aufgetreten ..." -+ -+#: src/fileload.c:719 -+msgid "Cannot load this archive file.\n" -+msgstr "Kann diese Archivdatei nicht laden.\n" -+ -+#: src/fileload.c:952 -+msgid "File name not specified!!\n" -+msgstr "Dateiname nicht angegeben!!\n" -+ -+#: src/fileload.c:974 -+msgid "Not an image (or unsupported) file!!\n" -+msgstr "Keine Grafikdatei (oder nicht-unterstütztes Format)!!\n" -+ -+#: src/fileload.c:1013 -+msgid "Load file(s)" -+msgstr "Lade Datei(en)" -+ -+#: src/fileload.c:1056 -+msgid "Open selected files" -+msgstr "Öffne ausgewählte Dateien" -+ -+#: src/fileload.c:1063 -+msgid "Thumbnail for selected files" -+msgstr "Vorschaubilder für ausgewählte Dateien" -+ -+#: src/gfileutil.c:152 src/gfileutil.c:154 -+#, c-format -+msgid "scandir = %s\n" -+msgstr "Zu durchsuchendes Verzeichnis = %s\n" -+ -+#: src/gfileutil.c:200 src/gfileutil.c:202 -+#, c-format -+msgid "dirname = %s\n" -+msgstr "Verzeichnisname =%s\n" -+ -+#: src/gfileutil.c:461 src/gfileutil.c:738 src/gfileutil.c:985 -+#: src/gfileutil.c:1198 -+#, c-format -+msgid "" -+"Can't find source file :\n" -+"%s" -+msgstr "" -+"Kann Quelldatei nicht finden: \n" -+"%s" -+ -+#: src/gfileutil.c:474 src/gfileutil.c:496 -+#, c-format -+msgid "" -+"Can't move file : %s\n" -+"Permission denied: %s\n" -+msgstr "" -+"Kann Datei nicht verschieben: %s\n" -+"Zugriff verweigert: %s\n" -+ -+#: src/gfileutil.c:545 src/gfileutil.c:1001 -+#, c-format -+msgid "" -+"Same file :\n" -+"%s" -+msgstr "" -+"Identische Datei:\n" -+"%s" -+ -+#: src/gfileutil.c:553 src/gfileutil.c:1231 src/gfileutil.c:1887 -+#, c-format -+msgid "File exist : %s" -+msgstr "Datei existiert: %s" -+ -+#: src/gfileutil.c:554 -+msgid "ERROR!!" -+msgstr "FEHLER!!" -+ -+#: src/gfileutil.c:558 src/gfileutil.c:1009 -+#, c-format -+msgid "" -+"The file exists : %s\n" -+"Overwrite?" -+msgstr "" -+"Die Datei existiert bereits: %s\n" -+"Ãœberschreiben?" -+ -+#: src/gfileutil.c:561 src/gfileutil.c:1012 src/gimv_thumb_view.c:2413 -+msgid "File exist!!" -+msgstr "Datei existiert bereits!!" -+ -+#: src/gfileutil.c:673 -+#, c-format -+msgid "" -+"Faild to remove file :\n" -+"%s" -+msgstr "" -+"Entfernen von Datei fehlgeschlagen:\n" -+"%s" -+ -+#: src/gfileutil.c:694 -+#, c-format -+msgid "" -+"Faild to move file :\n" -+"From : %s\n" -+"To : %s" -+msgstr "" -+"Verschieben von Datei fehlgeschlagen:\n" -+"Von: %s\n" -+"Nach: %s" -+ -+#: src/gfileutil.c:727 -+#, c-format -+msgid "%s is link!!.\n" -+msgstr "%s ist eine Verknüpfung!!\n" -+ -+#: src/gfileutil.c:749 -+#, c-format -+msgid "%s is not directory!!.\n" -+msgstr "%s ist kein Verzeichnis!!\n" -+ -+#: src/gfileutil.c:788 -+#, c-format -+msgid "" -+"Can't copy directory : %s\n" -+"Permission denied: %s\n" -+msgstr "" -+"Kann Verzeichnis nicht kopieren: %s\n" -+"Zugriff verweigert: %s\n" -+ -+#: src/gfileutil.c:801 -+#, c-format -+msgid "File exists!! : %s\n" -+msgstr "Datei existiert bereits!! %s\n" -+ -+#: src/gfileutil.c:872 -+msgid "Copy directory" -+msgstr "Verzeichnis kopieren" -+ -+#: src/gfileutil.c:895 src/gfileutil.c:1389 -+#, c-format -+msgid "Copying %s ..." -+msgstr "Kopiere %s ..." -+ -+#: src/gfileutil.c:901 -+msgid "Copying directory" -+msgstr "Kopiere Verzeichnis" -+ -+#: src/gfileutil.c:1053 -+#, c-format -+msgid "" -+"Can't open file for read :\n" -+"%s" -+msgstr "" -+"Kann Datei nicht zum Lesen öffnen:\n" -+"%s" -+ -+#: src/gfileutil.c:1065 -+#, c-format -+msgid "" -+"Can't open file for write :\n" -+"%s" -+msgstr "" -+"Kann Datei nicht zum Schreiben öffnen:\n" -+"%s" -+ -+#: src/gfileutil.c:1080 -+#, c-format -+msgid "" -+"An error occured while copying file :\n" -+"%s" -+msgstr "" -+"Beim Kopieren einer Datei trat ein Fehler auf:\n" -+"%s" -+ -+#: src/gfileutil.c:1144 -+#, c-format -+msgid "" -+"Can't copy file : %s\n" -+"Permission denied: %s\n" -+msgstr "" -+"Kann Datei nicht kopieren: %s\n" -+"Zugriff verweigert: %s\n" -+ -+#: src/gfileutil.c:1211 -+#, c-format -+msgid "" -+"Can't create link : %s\n" -+"Permission denied: %s\n" -+msgstr "" -+"Kann Verknüpfung nicht erzeugen: %s\n" -+"Zugriff verweigert: %s\n" -+ -+#: src/gfileutil.c:1243 -+#, c-format -+msgid "" -+"Faild to create link :\n" -+"From : %s\n" -+"To : %s" -+msgstr "" -+"Erzeugen des Links fehlgeschlagen:\n" -+"Von: %s\n" -+"Nach: %s" -+ -+#: src/gfileutil.c:1368 -+#, c-format -+msgid "Moving %s ..." -+msgstr "Verschiebe %s ..." -+ -+#: src/gfileutil.c:1369 -+msgid "Moving files" -+msgstr "Verschiebe Dateien" -+ -+#: src/gfileutil.c:1390 -+msgid "Copying files" -+msgstr "Kopiere Dateien" -+ -+#: src/gfileutil.c:1424 -+#, c-format -+msgid "Creating Link %s ..." -+msgstr "Erzeuge Verknüpfung %s ..." -+ -+#: src/gfileutil.c:1425 -+msgid "Creating Links" -+msgstr "Erzeuge Verknüpfungen" -+ -+#: src/gfileutil.c:1481 -+#, c-format -+msgid "Directory doesn't exist!!: %s" -+msgstr "Verzeichnis existiert nicht!! %s" -+ -+#: src/gfileutil.c:1488 -+#, c-format -+msgid "Permission denied!!: %s" -+msgstr "Zugriff verweigert!! %s" -+ -+#: src/gfileutil.c:1559 -+msgid "Move files to..." -+msgstr "Verschiebe Dateien nach..." -+ -+#: src/gfileutil.c:1560 -+msgid "Move files to: " -+msgstr "Verschiebe Dateien nach: " -+ -+#: src/gfileutil.c:1563 -+msgid "Copy files to..." -+msgstr "Kopiere Dateien nach..." -+ -+#: src/gfileutil.c:1564 -+msgid "Copy files to: " -+msgstr "Kopiere Dateien nach: " -+ -+#: src/gfileutil.c:1567 -+msgid "Link files to..." -+msgstr "Erzeuge Dateiverknüpfung nach..." -+ -+#: src/gfileutil.c:1568 -+msgid "Link files to: " -+msgstr "Erzeuge Dateiverknüpfung nach: " -+ -+#: src/gfileutil.c:1630 -+#, c-format -+msgid "Directory not exist : %s" -+msgstr "Verzeichnis existiert nicht: %s" -+ -+#: src/gfileutil.c:1638 -+#, c-format -+msgid "" -+"%s is symbolic link.\n" -+"Remove link ?" -+msgstr "" -+"%s ist eine symbolische Verknüpfung.\n" -+"Verknüpfung entfernen?" -+ -+#: src/gfileutil.c:1640 src/gfileutil.c:1652 src/gfileutil.c:1663 -+msgid "Confirm Deleting Directory" -+msgstr "Löschen des Verzeichnisses bestätigen" -+ -+#: src/gfileutil.c:1650 -+#, c-format -+msgid "" -+"Delete %s\n" -+"OK?" -+msgstr "" -+"Lösche %s.\n" -+"OK?" -+ -+#: src/gfileutil.c:1660 -+#, c-format -+msgid "" -+"%s is not empty\n" -+"Delete all files under %s ?" -+msgstr "" -+"%s ist nicht leer.\n" -+"Lösche alle Dateien unterhalb von %s?" -+ -+#: src/gfileutil.c:1692 src/gfileutil.c:1793 -+#, c-format -+msgid "Deleting %s ..." -+msgstr "Lösche %s ..." -+ -+#: src/gfileutil.c:1719 -+#, c-format -+msgid "" -+"Faild to remove directory :\n" -+"%s is not empty." -+msgstr "" -+"Entfernen des Verzeichnisses fehlgeschlagen:\n" -+"%s ist nicht leer." -+ -+#: src/gfileutil.c:1724 -+#, c-format -+msgid "Faild to remove directory : %s" -+msgstr "Entfernen des Verzeichnisses fehlgeschlagen: %s" -+ -+#: src/gfileutil.c:1757 -+#, c-format -+msgid "" -+"Delete these %d files.\n" -+"OK?" -+msgstr "" -+"Lösche diese %d Dateien.\n" -+"OK?" -+ -+#: src/gfileutil.c:1760 -+msgid "Confirm Deleting Files" -+msgstr "Löschen von Dateien bestätigen" -+ -+#: src/gfileutil.c:1769 -+msgid "Delete File" -+msgstr "Datei löschen" -+ -+#: src/gfileutil.c:1770 -+msgid "Deleting Files" -+msgstr "Lösche Dateien" -+ -+#: src/gfileutil.c:1807 src/gfileutil.c:1865 -+#, c-format -+msgid "Permission denied : %s" -+msgstr "Zugriff verweigert: %s" -+ -+#: src/gfileutil.c:1826 -+#, c-format -+msgid "" -+"Faild to delete file :\n" -+"%s" -+msgstr "" -+"Löschen von Datei fehlgeschlagen:\n" -+"%s" -+ -+#: src/gfileutil.c:1870 -+msgid "Make directory" -+msgstr "Verzeichnis erstellen" -+ -+#: src/gfileutil.c:1871 src/gfileutil.c:1937 -+msgid "New directory name: " -+msgstr "Name des neuen Verzeichnisses: " -+ -+#: src/gfileutil.c:1884 -+#, c-format -+msgid "Directory exist : %s" -+msgstr "Verzeichnis existiert: %s" -+ -+#: src/gfileutil.c:1896 -+#, c-format -+msgid "Faild to create directory : %s" -+msgstr "Erstellen von Verzeichnis fehlgeschlagen: %s" -+ -+#: src/gfileutil.c:1926 -+#, c-format -+msgid "Directory not exist :%s" -+msgstr "Verzeichnis existiert nicht: %s" -+ -+#: src/gfileutil.c:1936 -+msgid "Rename directory" -+msgstr "Verzeichnis umbenennen" -+ -+#: src/gfileutil.c:1951 -+#, c-format -+msgid "Faild to rename directory : %s" -+msgstr "Umbennen von Verzeichnis fehlgeschlagen: %s" -+ -+#: src/gimageview.c:230 -+msgid "No image file is specified!!" -+msgstr "Keine Grafikdatei angegeben!!" -+ -+#: src/gimageview.c:232 -+msgid "If you want to scan directory, use \"-d\" option." -+msgstr "Wenn Sie Verzeichnisse durchsuchen möchten, benutzen Sie die Option »-d«." -+ -+#: src/gimageview.c:237 -+msgid "No window is opened!! Quiting..." -+msgstr "Es ist kein Fenster geöffnet!! Programmausführung wird beendet ..." -+ -+#: src/gimv_comment.c:74 -+msgid "Subject" -+msgstr "Betreff" -+ -+#: src/gimv_comment.c:75 -+msgid "Date" -+msgstr "Datum" -+ -+#: src/gimv_comment.c:76 -+msgid "Location" -+msgstr "Ort" -+ -+#: src/gimv_comment.c:77 -+msgid "Model" -+msgstr "Modell" -+ -+#: src/gimv_comment.c:78 -+msgid "Comment Time" -+msgstr "Zeitpunkt der Kommentarerstellung" -+ -+#: src/gimv_comment.c:79 -+msgid "URL" -+msgstr "URL" -+ -+#: src/gimv_comment.c:80 -+msgid "Path in Archive" -+msgstr "Pfad im Archiv" -+ -+#: src/gimv_comment.c:81 src/gimv_dupl_win.c:124 -+msgid "Modification Time" -+msgstr "Modifikationszeit" -+ -+#: src/gimv_comment.c:82 -+msgid "Image Type" -+msgstr "Bildtyp" -+ -+#: src/gimv_comment.c:83 -+msgid "Image Size" -+msgstr "Bildgröße" -+ -+#: src/gimv_comment.c:417 -+msgid "Can't open comment file for read." -+msgstr "Kann Kommentardatei nicht zum Lesen öffnen." -+ -+#: src/gimv_comment.c:788 plugins/thumbnail/gimv_thumb.c:261 -+msgid "cannot make dir\n" -+msgstr "Kann Verzeichnis nicht erstellen\n" -+ -+#: src/gimv_comment.c:794 -+msgid "Can't open comment file for write." -+msgstr "Kann Kommentardatei nicht zum Schreiben öffnen." -+ -+#: src/gimv_comment_view.c:531 -+msgid "Key" -+msgstr "Schlüssel" -+ -+#: src/gimv_comment_view.c:533 -+msgid "Data" -+msgstr "Daten" -+ -+#: src/gimv_comment_view.c:618 -+msgid "Key: " -+msgstr "Schlüssel: " -+ -+#: src/gimv_comment_view.c:630 -+msgid "Value: " -+msgstr "Wert: " -+ -+#. "Note" page -+#: src/gimv_comment_view.c:674 -+msgid "Note" -+msgstr "Kommentar" -+ -+#: src/gimv_comment_view.c:1101 src/gimv_comment_view.c:1104 -+msgid "_Save" -+msgstr "_Speichern" -+ -+#. GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); -+#: src/gimv_comment_view.c:1112 src/gimv_comment_view.c:1115 -+msgid "_Reset" -+msgstr "_Zurücksetzen" -+ -+#. GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); -+#: src/gimv_comment_view.c:1123 src/gimv_comment_view.c:1126 -+msgid "_Delete" -+msgstr "_Löschen" -+ -+#: src/gimv_comment_view.c:1174 -+#, c-format -+msgid "Edit Comment (%s)" -+msgstr "Bildkommentar bearbeiten (%s)" -+ -+#: src/gimv_comment_view.c:1213 src/gimv_comment_view.c:1216 -+msgid "_Prev" -+msgstr "_Vorheriger" -+ -+#: src/gimv_comment_view.c:1224 src/gimv_comment_view.c:1227 -+msgid "_Next" -+msgstr "_Nächster" -+ -+#: src/gimv_image_view.c:277 src/gimv_image_view.c:296 -+#: src/gimv_image_view.c:320 src/gimv_image_view.c:331 -+#: src/gimv_image_win.c:304 -+msgid "/tear" -+msgstr "/ziehen" -+ -+#: src/gimv_image_view.c:278 src/gimv_image_win.c:305 -+msgid "/_Zoom" -+msgstr "/_Zoom" -+ -+#: src/gimv_image_view.c:279 src/gimv_image_win.c:306 -+msgid "/_Rotate" -+msgstr "/_Rotieren" -+ -+#: src/gimv_image_view.c:280 src/gimv_image_win.c:307 -+msgid "/Ignore _Alpha Channel" -+msgstr "/Alpha-_Kanal ignorieren" -+ -+#: src/gimv_image_view.c:282 src/gimv_image_win.c:294 -+msgid "/M_ovie" -+msgstr "/_Video" -+ -+#: src/gimv_image_view.c:284 src/gimv_image_win.c:319 -+msgid "/_View modes" -+msgstr "/_Betrachtungsmodi" -+ -+#: src/gimv_image_view.c:285 -+msgid "/Show _Scrollbar" -+msgstr "/_Scroll-Leiste anzeigen" -+ -+#: src/gimv_image_view.c:287 -+msgid "/Create _Thumbnail" -+msgstr "/Vorschaubild _erstellen" -+ -+#: src/gimv_image_view.c:288 -+msgid "/Memory _Buffer" -+msgstr "/_Pufferspeicher" -+ -+#: src/gimv_image_view.c:297 -+msgid "/Zoom _In" -+msgstr "/Herein_zoomen" -+ -+#: src/gimv_image_view.c:298 -+msgid "/Zoom _Out" -+msgstr "/Herausz_oomen" -+ -+#: src/gimv_image_view.c:299 -+msgid "/_Fit to Window" -+msgstr "/An Fenster _anpassen" -+ -+#: src/gimv_image_view.c:300 -+msgid "/_Fit _Width" -+msgstr "/An Fenster_breite anpassen" -+ -+#: src/gimv_image_view.c:301 -+msgid "/_Fit _Height" -+msgstr "/An Fenster_höhe anpassen" -+ -+#: src/gimv_image_view.c:302 -+msgid "/Keep _aspect ratio" -+msgstr "/_Seitenverhältnis beibehalten" -+ -+#: src/gimv_image_view.c:304 -+msgid "/10%(_1)" -+msgstr "/10% (_1)" -+ -+#: src/gimv_image_view.c:305 -+msgid "/25%(_2)" -+msgstr "/25% (_2)" -+ -+#: src/gimv_image_view.c:306 -+msgid "/50%(_3)" -+msgstr "/50% (_3)" -+ -+#: src/gimv_image_view.c:307 -+msgid "/75%(_4)" -+msgstr "/75% (_4)" -+ -+#: src/gimv_image_view.c:308 -+msgid "/100%(_5)" -+msgstr "/100% (_5)" -+ -+#: src/gimv_image_view.c:309 -+msgid "/125%(_6)" -+msgstr "/125% (_6)" -+ -+#: src/gimv_image_view.c:310 -+msgid "/150%(_7)" -+msgstr "/150% (_7)" -+ -+#: src/gimv_image_view.c:311 -+msgid "/175%(_8)" -+msgstr "/175% (_8)" -+ -+#: src/gimv_image_view.c:312 -+msgid "/200%(_9)" -+msgstr "/200% (_9)" -+ -+#: src/gimv_image_view.c:321 -+msgid "/Rotate 90 degrees CW" -+msgstr "/Um 90 Grad im Uhrzeigersinn drehen" -+ -+#: src/gimv_image_view.c:322 -+msgid "/Rotate 90 degrees CCW" -+msgstr "/Um 90 Grad gegen den Uhrzeigersinn drehen" -+ -+#: src/gimv_image_view.c:323 -+msgid "/Rotate 180 degrees" -+msgstr "/Um 180 Grad drehen" -+ -+#: src/gimv_image_view.c:332 -+msgid "/_Play" -+msgstr "/_Abspielen" -+ -+#: src/gimv_image_view.c:333 -+msgid "/_Stop" -+msgstr "/_Stop" -+ -+#: src/gimv_image_view.c:334 -+msgid "/P_ause" -+msgstr "/_Pause" -+ -+#: src/gimv_image_view.c:335 -+msgid "/_Forward" -+msgstr "/_Vorwärts" -+ -+#: src/gimv_image_view.c:336 -+msgid "/_Reverse" -+msgstr "/_Rückwärts" -+ -+#: src/gimv_image_view.c:338 -+msgid "/_Continuance" -+msgstr "/_Wiederholen" -+ -+#: src/gimv_image_view.c:340 -+msgid "/_Eject" -+msgstr "/A_uswerfen" -+ -+#: src/gimv_image_view.c:2106 -+#, c-format -+msgid "File not exist: %s\n" -+msgstr "Datei existiert nicht: %s\n" -+ -+#: src/gimv_image_view.c:2108 -+#, c-format -+msgid "Not an image (or unsupported) file: %s\n" -+msgstr "Keine Grafikdatei (oder nicht-unterstütztes Format): %s\n" -+ -+#: src/gimv_image_view.c:2171 -+msgid "RW" -+msgstr "RW" -+ -+#: src/gimv_image_view.c:2172 -+msgid "Reverse" -+msgstr "Rückwärts" -+ -+#: src/gimv_image_view.c:2181 src/gimv_image_view.c:2182 -+#: src/gimv_image_win.c:999 -+msgid "Play" -+msgstr "Abspielen" -+ -+#: src/gimv_image_view.c:2202 -+msgid "FF" -+msgstr "FF" -+ -+#: src/gimv_image_view.c:2203 -+msgid "Forward" -+msgstr "Vorwärts" -+ -+#: src/gimv_image_view.c:2212 src/gimv_image_view.c:2213 -+msgid "Eject" -+msgstr "Auswerfen" -+ -+#: src/gimv_image_view.h:40 -+msgid "Default Image Viewer" -+msgstr "Standard-Bildbetrachter" -+ -+#: src/gimv_image_win.c:273 src/gimv_thumb_win.c:380 -+msgid "/_File" -+msgstr "/_Datei" -+ -+#: src/gimv_image_win.c:274 src/gimv_thumb_win.c:381 -+msgid "/_File/_Open..." -+msgstr "/_Datei/Ö_ffnen..." -+ -+#: src/gimv_image_win.c:275 -+msgid "/_File/Open _Image Window" -+msgstr "/_Datei/Öffne _Bildansichtsfenster" -+ -+#: src/gimv_image_win.c:276 -+msgid "/_File/Open _Thumbnail Window" -+msgstr "/_Datei/Öffne _Vorschaubildfenster" -+ -+#: src/gimv_image_win.c:277 src/gimv_image_win.c:279 src/gimv_thumb_win.c:385 -+msgid "/_File/---" -+msgstr "/_Datei/---" -+ -+#: src/gimv_image_win.c:278 -+msgid "/_File/Memory _Buffer" -+msgstr "/_Datei/_Pufferspeicher" -+ -+#: src/gimv_image_win.c:280 -+msgid "/_File/_Close" -+msgstr "/_Datei/S_chließen" -+ -+#: src/gimv_image_win.c:281 src/gimv_thumb_win.c:388 -+msgid "/_File/_Quit" -+msgstr "/_Datei/_Beenden" -+ -+#: src/gimv_image_win.c:283 src/gimv_thumb_win.c:390 -+msgid "/_Edit" -+msgstr "/_Bearbeiten" -+ -+#: src/gimv_image_win.c:284 -+msgid "/_Edit/Edit _Comment..." -+msgstr "/_Bearbeiten/Bild_kommentar bearbeiten..." -+ -+#: src/gimv_image_win.c:285 -+msgid "/_Edit/Scan E_XIF Data..." -+msgstr "/_Bearbeiten/E_XIF-Daten abfragen..." -+ -+#: src/gimv_image_win.c:286 -+msgid "/_Edit/Create _Thumbnail" -+msgstr "/_Bearbeiten/_Vorschaubild erzeugen" -+ -+#: src/gimv_image_win.c:287 src/gimv_thumb_win.c:393 src/gimv_thumb_win.c:397 -+#: src/gimv_thumb_win.c:406 -+msgid "/_Edit/---" -+msgstr "/_Bearbeiten/---" -+ -+#: src/gimv_image_win.c:288 src/gimv_thumb_win.c:407 -+msgid "/_Edit/_Options..." -+msgstr "/_Bearbeiten/_Einstellungen..." -+ -+#: src/gimv_image_win.c:290 src/gimv_thumb_win.c:409 -+msgid "/_View" -+msgstr "/_Ansicht" -+ -+#: src/gimv_image_win.c:292 -+# dies ist ein Menü im Bildansichtsfenster, das Befehle Next, Prev, First + Last enhält. -+msgid "/_Move" -+msgstr "/_Navigation" -+ -+#: src/gimv_image_win.c:296 src/gimv_thumb_win.c:448 -+msgid "/_Help" -+msgstr "/_Hilfe" -+ -+#: src/gimv_image_win.c:309 src/gimv_thumb_win.c:487 -+msgid "/_Menu Bar" -+msgstr "/_Menüleiste" -+ -+#: src/gimv_image_win.c:310 -+msgid "/_Tool Bar" -+msgstr "/_Werkzeugleiste" -+ -+#: src/gimv_image_win.c:311 -+msgid "/Slide Show _Player" -+msgstr "/_Diashow-Player" -+ -+#: src/gimv_image_win.c:312 src/gimv_thumb_win.c:490 -+msgid "/St_atus Bar" -+msgstr "/St_atusleiste" -+ -+#: src/gimv_image_win.c:313 -+msgid "/_Scroll Bar" -+msgstr "/_Scroll-Leiste" -+ -+#: src/gimv_image_win.c:314 src/gimv_thumb_win.c:493 -+msgid "/_Player" -+msgstr "/Video-_Player" -+ -+#: src/gimv_image_win.c:315 src/gimv_thumb_win.c:494 -+msgid "/_Player/_Show" -+msgstr "/Video-_Player/_Zeigen" -+ -+#: src/gimv_image_win.c:316 src/gimv_thumb_win.c:495 -+msgid "/_Player/_Hide" -+msgstr "/Video-_Player/_Verstecken" -+ -+#: src/gimv_image_win.c:317 src/gimv_thumb_win.c:496 -+msgid "/_Player/_Auto" -+msgstr "/Video-_Player/_Automatisch" -+ -+#: src/gimv_image_win.c:321 -+msgid "/_Fit to Image" -+msgstr "/_Nach Bildgröße" -+ -+#: src/gimv_image_win.c:322 src/gimv_thumb_win.c:500 -+msgid "/Ma_ximize" -+msgstr "/Ma_ximieren" -+ -+#: src/gimv_image_win.c:323 -+msgid "/F_ull Screen" -+msgstr "/_Vollbild" -+ -+#: src/gimv_image_win.c:330 -+msgid "/_Next" -+msgstr "/_Nächstes" -+ -+#: src/gimv_image_win.c:331 -+msgid "/_Previous" -+msgstr "/_Vorheriges" -+ -+#: src/gimv_image_win.c:332 -+msgid "/_First" -+msgstr "/_Erstes" -+ -+#: src/gimv_image_win.c:333 -+msgid "/_Last" -+msgstr "/_Letztes" -+ -+#: src/gimv_image_win.c:577 src/gimv_thumb_win.c:751 -+msgid "New Window" -+msgstr "Neues Fenster" -+ -+#: src/gimv_image_win.c:789 src/prefs_ui/prefs_ui_imagewin.c:60 -+msgid "90 degrees CCW" -+msgstr "90 Grad gegen den Uhrzeigersinn" -+ -+#: src/gimv_image_win.c:790 src/prefs_ui/prefs_ui_imagewin.c:59 -+msgid "0 degrees" -+msgstr "0 Grad" -+ -+#: src/gimv_image_win.c:791 src/prefs_ui/prefs_ui_imagewin.c:62 -+msgid "90 degrees CW" -+msgstr "90 Grad mit dem Uhrzeigersinn" -+ -+#: src/gimv_image_win.c:792 src/prefs_ui/prefs_ui_imagewin.c:61 -+msgid "180 degrees" -+msgstr "180 Grad" -+ -+#: src/gimv_image_win.c:802 src/gimv_thumb_win.c:1550 -+msgid "Open" -+msgstr "Öffnen" -+ -+#: src/gimv_image_win.c:803 src/gimv_image_win.c:804 src/gimv_thumb_win.c:1551 -+#: src/gimv_thumb_win.c:1552 -+msgid "File Open" -+msgstr "Datei öffnen" -+ -+#: src/gimv_image_win.c:812 src/gimv_thumb_win.c:1561 -+msgid "Prefs" -+msgstr "Einstellungen" -+ -+#: src/gimv_image_win.c:813 src/gimv_image_win.c:814 src/gimv_prefs_win.c:810 -+#: src/gimv_thumb_win.c:1562 src/gimv_thumb_win.c:1563 -+#: src/prefs_ui/prefs_ui_etc.c:582 -+msgid "Preference" -+msgstr "Eigenschaften" -+ -+#: src/gimv_image_win.c:824 src/gimv_image_win.c:990 src/gimv_thumb_win.c:1574 -+msgid "Prev" -+msgstr "Vorh." -+ -+#: src/gimv_image_win.c:825 src/gimv_image_win.c:826 -+msgid "Previous Image" -+msgstr "Vorheriges Bild" -+ -+#: src/gimv_image_win.c:836 src/gimv_image_win.c:1017 -+#: src/gimv_image_win.c:1018 src/gimv_thumb_win.c:1585 -+msgid "Next" -+msgstr "Näch." -+ -+#: src/gimv_image_win.c:837 src/gimv_image_win.c:838 -+msgid "Next Image" -+msgstr "Nächstes Bild" -+ -+#: src/gimv_image_win.c:850 src/gimv_image_win.c:851 src/gimv_image_win.c:852 -+msgid "No Zoom" -+msgstr "Kein Zoom" -+ -+#: src/gimv_image_win.c:860 src/gimv_image_win.c:861 src/gimv_image_win.c:862 -+#: src/prefs_ui/prefs_ui_imagewin.c:142 src/prefs_ui/prefs_ui_thumbwin.c:185 -+msgid "Zoom in" -+msgstr "Heranzoomen" -+ -+#: src/gimv_image_win.c:870 src/gimv_image_win.c:871 src/gimv_image_win.c:872 -+#: src/prefs_ui/prefs_ui_imagewin.c:143 src/prefs_ui/prefs_ui_thumbwin.c:186 -+msgid "Zoom out" -+msgstr "Herauszoomen" -+ -+#: src/gimv_image_win.c:880 src/gimv_image_win.c:881 src/gimv_image_win.c:882 -+msgid "Zoom fit" -+msgstr "Zoom anpassen" -+ -+#: src/gimv_image_win.c:900 -+msgid "X Scale" -+msgstr "X-Skalierung" -+ -+#: src/gimv_image_win.c:915 -+msgid "Y Scale" -+msgstr "Y-Skalierung" -+ -+#: src/gimv_image_win.c:921 src/gimv_image_win.c:922 src/gimv_image_win.c:923 -+msgid "Zoom" -+msgstr "Zoom" -+ -+#: src/gimv_image_win.c:936 -+msgid "Rotate" -+msgstr "Rotieren" -+ -+#: src/gimv_image_win.c:936 -+msgid "Rotate the image" -+msgstr "Das Bild rotieren" -+ -+#: src/gimv_image_win.c:944 -+msgid "Resize" -+msgstr "Größe verändern" -+ -+#: src/gimv_image_win.c:945 src/gimv_image_win.c:946 -+msgid "Fit Window Size to Image" -+msgstr "Fenstergröße an Bild anpassen" -+ -+#: src/gimv_image_win.c:955 -+msgid "Full" -+msgstr "Voll" -+ -+#: src/gimv_image_win.c:956 src/gimv_image_win.c:957 -+msgid "Fullscreen" -+msgstr "Vollbild" -+ -+#: src/gimv_image_win.c:981 src/gimv_image_win.c:982 -+msgid "First" -+msgstr "Erstes" -+ -+#: src/gimv_image_win.c:991 -+msgid "Previous" -+msgstr "Vorheriges" -+ -+#: src/gimv_image_win.c:1000 -+msgid "Play Slide Show" -+msgstr "Diashow abspielen" -+ -+#: src/gimv_image_win.c:1009 -+msgid "Stop Slide Show" -+msgstr "Diashow stoppen" -+ -+#: src/gimv_image_win.c:1026 src/gimv_image_win.c:1027 -+msgid "Last" -+msgstr "Letztes" -+ -+#: src/gimv_image_win.c:1138 -+#, c-format -+msgid "%s (%s) - %s - " -+msgstr "%s (%s) - %s - " -+ -+#: src/gimv_image_win.c:1141 -+#, c-format -+msgid "* %s (%s) - %s - *" -+msgstr "* %s (%s) - %s - *" -+ -+#: src/gimv_image_win.c:1146 -+#, c-format -+msgid "- %s -" -+msgstr "- %s -" -+ -+#: src/gimv_image_win.c:1148 -+#, c-format -+msgid "* - %s - *" -+msgstr "* - %s - *" -+ -+#: src/gimv_image_win.c:1162 -+msgid "NONE" -+msgstr "KEINE" -+ -+#: src/gimv_image_win.c:1163 -+msgid "UNKNOWN" -+msgstr "UNBEKANNT" -+ -+#: src/gimv_image_win.c:1189 -+#, c-format -+msgid "%s (Buffer ON)" -+msgstr "%s (Puffer EIN)" -+ -+#: src/gimv_image_win.c:1191 -+#, c-format -+msgid "%s (Buffer OFF)" -+msgstr "%s (Puffer AUS)" -+ -+#: src/gimv_image_win.c:1196 -+msgid "(Buffer ON)" -+msgstr "(Puffer EIN)" -+ -+#: src/gimv_image_win.c:1198 -+msgid "(Buffer OFF)" -+msgstr "(Puffer AUS)" -+ -+#: src/gimv_prefs_ui_utils.c:124 -+msgid "Normal" -+msgstr "Normal" -+ -+#: src/gimv_prefs_ui_utils.c:125 -+msgid "Shift" -+msgstr "Umschalt" -+ -+#: src/gimv_prefs_ui_utils.c:126 -+msgid "Control" -+msgstr "Strg" -+ -+#: src/gimv_prefs_ui_utils.c:127 -+msgid "Mod1" -+msgstr "Mod1" -+ -+#: src/gimv_prefs_ui_utils.c:189 -+#, c-format -+msgid "Mouse Button %d (Wheel up)" -+msgstr "Maustaste %d (Rad hoch)" -+ -+#: src/gimv_prefs_ui_utils.c:191 -+#, c-format -+msgid "Mouse Button %d (Wheel down)" -+msgstr "Maustaste %d (Rad herunter)" -+ -+#: src/gimv_prefs_ui_utils.c:193 -+#, c-format -+msgid "Mouse Button %d Double Click" -+msgstr "Maustaste %d Doppelklick" -+ -+#: src/gimv_prefs_ui_utils.c:196 src/prefs_ui/prefs_ui_thumbwin.c:125 -+msgid "Left" -+msgstr "Links" -+ -+#: src/gimv_prefs_ui_utils.c:196 -+msgid "Middle" -+msgstr "Mitte" -+ -+#: src/gimv_prefs_ui_utils.c:196 src/prefs_ui/prefs_ui_thumbwin.c:126 -+msgid "Right" -+msgstr "Rechts" -+ -+#: src/gimv_prefs_ui_utils.c:198 -+#, c-format -+msgid "Mouse Button %d (%s)" -+msgstr "Maustaste %d (%s)" -+ -+#: src/gimv_prefs_ui_utils.c:243 -+msgid "Pressed" -+msgstr "Drücken" -+ -+#: src/gimv_prefs_ui_utils.c:246 -+msgid "Released" -+msgstr "Loslassen" -+ -+#: src/gimv_prefs_ui_utils.c:386 -+msgid "Select directory" -+msgstr "Verzeichnis wählen" -+ -+#. show directory -+#: src/gimv_prefs_ui_utils.c:420 src/prefs_ui/prefs_ui_thumbwin.c:746 -+msgid "Directory" -+msgstr "Verzeichnis" -+ -+#: src/gimv_prefs_ui_utils.c:454 -+msgid "Directory to add : " -+msgstr "Hinzuzufügendes Verzeichnis: " -+ -+#: src/gimv_prefs_ui_utils.c:463 -+msgid "Select" -+msgstr "Wählen" -+ -+#: src/gimv_prefs_win.c:65 -+msgid "/Infomation" -+msgstr "/Informationen" -+ -+#: src/gimv_prefs_win.c:66 -+msgid "/Common" -+msgstr "/Allgemein" -+ -+#: src/gimv_prefs_win.c:67 -+msgid "/Common/Filtering" -+msgstr "/Allgemein/Filter" -+ -+#: src/gimv_prefs_win.c:68 -+msgid "/Common/Character set" -+msgstr "/Allgemein/Zeichensatz" -+ -+#: src/gimv_prefs_win.c:70 -+msgid "/Image Window" -+msgstr "/Bildansichtsfenster" -+ -+#: src/gimv_prefs_win.c:71 -+msgid "/Image Window/Image" -+msgstr "/Bildansichtsfenster/Bild" -+ -+#: src/gimv_prefs_win.c:72 -+msgid "/Image Window/Mouse Buttton" -+msgstr "/Bildansichtsfenster/Maustasten" -+ -+#: src/gimv_prefs_win.c:74 -+msgid "/Thumbnail Window" -+msgstr "/Vorschaubildfenster" -+ -+#. -+#. {N_("/Thumbnail Window/Toolbar"), 0, NULL, NULL, prefs_thumbview_toolbar_page, NULL}, -+#. -+#: src/gimv_prefs_win.c:78 -+msgid "/Thumbnail Window/Tab" -+msgstr "/Vorschaubildfenster/Tab" -+ -+#: src/gimv_prefs_win.c:79 -+msgid "/Thumbnail Window/Thumbnail View" -+msgstr "/Vorschaubildfenster/Vorschauansicht" -+ -+#: src/gimv_prefs_win.c:80 -+msgid "/Thumbnail Window/Thumbnail View/Mouse Buttton" -+msgstr "/Vorschaubildfenster/Vorschauansicht/Maustasten" -+ -+#: src/gimv_prefs_win.c:81 -+msgid "/Thumbnail Window/Thumbnail View/Album" -+msgstr "/Vorschaubildfenster/Vorschauansicht/Album" -+ -+#: src/gimv_prefs_win.c:83 -+msgid "/Thumbnail Window/Directory View" -+msgstr "/Vorschaubildfenster/Verzeichnisansicht" -+ -+#: src/gimv_prefs_win.c:84 -+msgid "/Thumbnail Window/Directory View/Mouse Buttton" -+msgstr "/Vorschaubildfenster/Verzeichnisansicht/Maustasten" -+ -+#: src/gimv_prefs_win.c:85 -+msgid "/Thumbnail Window/Preview" -+msgstr "/Vorschaubildfenster/Vorschau" -+ -+#: src/gimv_prefs_win.c:86 -+msgid "/Thumbnail Window/Preview/Mouse Buttton" -+msgstr "/Vorschaubildfenster/Vorschau/Maustasten" -+ -+#: src/gimv_prefs_win.c:88 -+msgid "/Movie and Audio" -+msgstr "/Video und Audio" -+ -+#: src/gimv_prefs_win.c:90 -+msgid "/Slide Show" -+msgstr "/Diashow" -+ -+#: src/gimv_prefs_win.c:91 -+msgid "/Thumbnail Cache" -+msgstr "/Vorschaubildpuffer" -+ -+#: src/gimv_prefs_win.c:92 -+msgid "/Comment" -+msgstr "/Bildkommentar" -+ -+#: src/gimv_prefs_win.c:93 -+msgid "/Search" -+msgstr "/Suche" -+ -+#: src/gimv_prefs_win.c:94 -+msgid "/Drag and Drop" -+msgstr "/Drag and Drop" -+ -+#: src/gimv_prefs_win.c:95 -+msgid "/External Program" -+msgstr "/Externe Programme" -+ -+#: src/gimv_prefs_win.c:96 -+msgid "/External Program/Scripts" -+msgstr "/Externe Programme/Skripte" -+ -+#: src/gimv_prefs_win.c:98 -+msgid "/Plugin" -+msgstr "/Plugins" -+ -+#: src/gimv_prefs_win.c:99 -+msgid "/Plugin/Image Loader" -+msgstr "/Plugins/Grafik-Lademodule" -+ -+#: src/gimv_prefs_win.c:100 -+msgid "/Plugin/Image Saver" -+msgstr "/Plugins/Grafik-Speichermodule" -+ -+#: src/gimv_prefs_win.c:101 -+msgid "/Plugin/IO Stream" -+msgstr "/Plugins/IO-Datenstrom" -+ -+#: src/gimv_prefs_win.c:102 -+msgid "/Plugin/Archiver" -+msgstr "/Plugins/Archivmodule" -+ -+#: src/gimv_prefs_win.c:103 -+msgid "/Plugin/Thumbnail" -+msgstr "/Plugins/Bildvorschau" -+ -+#: src/gimv_prefs_win.c:104 -+msgid "/Plugin/Image View" -+msgstr "/Plugins/Bildansicht" -+ -+#: src/gimv_prefs_win.c:105 -+msgid "/Plugin/Thumbnail View" -+msgstr "/Plugins/Bildvorschauansicht" -+ -+#. dialog buttons -+#. button -+#. OK Button -+#. ok buttons -+#: src/gimv_prefs_win.c:863 src/gtkutils.c:763 src/gtkutils.c:1062 -+#: src/help.c:728 src/prefs_ui/prefs_ui_etc.c:149 -+msgid "OK" -+msgstr "OK" -+ -+#: src/gimv_prefs_win.c:874 -+msgid "Apply" -+msgstr "Anwenden" -+ -+#. cancel button -+#: src/gimv_prefs_win.c:883 src/gtk_prop.c:204 src/gtkutils.c:375 -+#: src/gtkutils.c:688 src/gtkutils.c:865 src/gtkutils.c:1070 -+msgid "Cancel" -+msgstr "Abbrechen" -+ -+#: src/gimv_thumb_win.c:382 -+msgid "/_File/New _Image Window" -+msgstr "/_Datei/_Neues Bildansichtsfenster" -+ -+#: src/gimv_thumb_win.c:383 -+msgid "/_File/New _Window" -+msgstr "/_Datei/N_eues Fenster" -+ -+#: src/gimv_thumb_win.c:384 -+msgid "/_File/New _Tab" -+msgstr "/_Datei/Ne_uer Tab" -+ -+#: src/gimv_thumb_win.c:386 -+msgid "/_File/Close Ta_b" -+msgstr "/_Datei/_Tab schließen" -+ -+#: src/gimv_thumb_win.c:387 -+msgid "/_File/_Close Window" -+msgstr "/_Datei/Fenster S_chließen" -+ -+#: src/gimv_thumb_win.c:391 -+msgid "/_Edit/_Select All" -+msgstr "/_Bearbeiten/Alles _markieren" -+ -+#: src/gimv_thumb_win.c:392 -+msgid "/_Edit/U_nselect All" -+msgstr "/_Bearbeiten/_Nichts markieren" -+ -+#: src/gimv_thumb_win.c:394 -+msgid "/_Edit/_Refresh List" -+msgstr "/_Bearbeiten/Liste _auffrischen" -+ -+#: src/gimv_thumb_win.c:395 -+msgid "/_Edit/Reload _Cache" -+msgstr "/_Bearbeiten/_Puffer neu laden" -+ -+#: src/gimv_thumb_win.c:396 -+msgid "/_Edit/_Update All Thumbnail" -+msgstr "/_Bearbeiten/Alle V_orschaubilder aktualisieren" -+ -+#. -+#. {N_("/_Edit/Clear cache for _this tab"), NULL, cb_clear_cache, CLEAR_CACHE_TAB, NULL}, -+#. -+#: src/gimv_thumb_win.c:401 -+msgid "/_Edit/R_ename..." -+msgstr "/_Bearbeiten/_Umbenennen..." -+ -+#: src/gimv_thumb_win.c:402 -+msgid "/_Edit/Co_py Files To..." -+msgstr "/_Bearbeiten/Datei _kopieren nach..." -+ -+#: src/gimv_thumb_win.c:403 -+msgid "/_Edit/_Move Files To..." -+msgstr "/_Bearbeiten/Dateien _verschieben nach..." -+ -+#: src/gimv_thumb_win.c:404 -+msgid "/_Edit/_Link Files To..." -+msgstr "/_Bearbeiten/Dateien verkn_üpfen mit..." -+ -+#: src/gimv_thumb_win.c:405 -+msgid "/_Edit/Remo_ve file..." -+msgstr "/_Bearbeiten/Dateien ent_fernen..." -+ -+#: src/gimv_thumb_win.c:411 src/gimv_thumb_win.c:491 -+msgid "/_Tab" -+msgstr "/_Tab" -+ -+#: src/gimv_thumb_win.c:412 -+msgid "/_Tab/_Tab Position" -+msgstr "/_Tab/Tab-_Position" -+ -+#: src/gimv_thumb_win.c:413 -+msgid "/_Tab/_Tab Position/_Top" -+msgstr "/_Tab/Tab-_Position/_Oben" -+ -+#: src/gimv_thumb_win.c:414 -+msgid "/_Tab/_Tab Position/_Bottom" -+msgstr "/_Tab/Tab-_Position/_Unten" -+ -+#: src/gimv_thumb_win.c:415 -+msgid "/_Tab/_Tab Position/_Left" -+msgstr "/_Tab/Tab-_Position/_Links" -+ -+#: src/gimv_thumb_win.c:416 -+msgid "/_Tab/_Tab Position/_Right" -+msgstr "/_Tab/Tab-_Position/_Rechts" -+ -+#: src/gimv_thumb_win.c:417 src/gimv_thumb_win.c:422 -+msgid "/_Tab/---" -+msgstr "/_Tab/---" -+ -+#: src/gimv_thumb_win.c:418 -+msgid "/_Tab/_First Page" -+msgstr "/_Tab/_Erste Seite" -+ -+#: src/gimv_thumb_win.c:419 -+msgid "/_Tab/_Last Page" -+msgstr "/_Tab/_Letzte Seite" -+ -+#: src/gimv_thumb_win.c:420 -+msgid "/_Tab/_Next Page" -+msgstr "/_Tab/_Nächste Seite" -+ -+#: src/gimv_thumb_win.c:421 -+msgid "/_Tab/_Previous Page" -+msgstr "/_Tab/_Vorherige Seite" -+ -+#: src/gimv_thumb_win.c:423 -+msgid "/_Tab/Move tab for_ward" -+msgstr "/_Tab/Tab einen Platz v_or schieben" -+ -+#: src/gimv_thumb_win.c:424 -+msgid "/_Tab/Move tab _backward" -+msgstr "/_Tab/Tab einen Platz _zurück schieben" -+ -+#: src/gimv_thumb_win.c:425 -+msgid "/_Tab/_Detach tab" -+msgstr "/_Tab/Tab _herauslösen" -+ -+#: src/gimv_thumb_win.c:427 -+msgid "/_Action" -+msgstr "/A_ktion" -+ -+#: src/gimv_thumb_win.c:428 -+msgid "/_Action/_Focus" -+msgstr "/_Aktion/_Fokus" -+ -+#: src/gimv_thumb_win.c:429 -+msgid "/_Action/_Focus/_Directory View" -+msgstr "/_Aktion/_Fokus/_Verzeichnisansicht" -+ -+#: src/gimv_thumb_win.c:430 -+msgid "/_Action/_Focus/_Thumbnail View" -+msgstr "/_Aktion/_Fokus/V_orschaubildansicht" -+ -+#: src/gimv_thumb_win.c:431 -+msgid "/_Action/_Focus/_Preview" -+msgstr "/_Aktion/_Fokus/_Bildvorschau" -+ -+#: src/gimv_thumb_win.c:432 -+msgid "/_Action/_Focus/_Location Entry" -+msgstr "/_Aktion/_Fokus/_Pfadeingabefeld" -+ -+#: src/gimv_thumb_win.c:434 -+msgid "/_Action/_Directory View" -+msgstr "/_Aktion/_Verzeichnisansicht" -+ -+#: src/gimv_thumb_win.c:435 -+msgid "/_Action/_Thumbnail View" -+msgstr "/_Aktion/V_orschaubildansicht" -+ -+#: src/gimv_thumb_win.c:436 -+msgid "/_Action/_Preview" -+msgstr "/_Aktion/_Bildvorschau" -+ -+#: src/gimv_thumb_win.c:437 -+msgid "/_Action/_Preview/_Next" -+msgstr "/_Aktion/_Bildvorschau/_Nächste" -+ -+#: src/gimv_thumb_win.c:438 -+msgid "/_Action/_Preview/_Previous" -+msgstr "/_Aktion/_Bildvorschau/_Vorherige" -+ -+#: src/gimv_thumb_win.c:441 -+msgid "/Too_l" -+msgstr "/Hilfs_mittel" -+ -+#: src/gimv_thumb_win.c:442 -+msgid "/Too_l/_Clear all cache" -+msgstr "/Hilfs_mittel/_Alle Puffer leeren" -+ -+#: src/gimv_thumb_win.c:443 src/gimv_thumb_win.c:445 -+msgid "/Too_l/---" -+msgstr "/Hilfs_mittel/---" -+ -+#: src/gimv_thumb_win.c:444 -+msgid "/Too_l/_Find duplicates" -+msgstr "/Hilfs_mittel/_Duplikate finden" -+ -+#: src/gimv_thumb_win.c:446 -+msgid "/Too_l/_Wallpaper setting" -+msgstr "/Hilfs_mittel/_Einstellungen Hintergrundbild" -+ -+#: src/gimv_thumb_win.c:456 -+msgid "/_Sort File List" -+msgstr "/_Dateiliste sortieren" -+ -+#: src/gimv_thumb_win.c:457 -+msgid "/_Layout" -+msgstr "/_Layout" -+ -+#: src/gimv_thumb_win.c:458 -+msgid "/_Layout/Layout_0" -+msgstr "/_Layout/Layout_0" -+ -+#: src/gimv_thumb_win.c:459 -+msgid "/_Layout/Layout_1" -+msgstr "/_Layout/Layout _1" -+ -+#: src/gimv_thumb_win.c:460 -+msgid "/_Layout/Layout_2" -+msgstr "/_Layout/Layout _2" -+ -+#: src/gimv_thumb_win.c:461 -+msgid "/_Layout/Layout_3" -+msgstr "/_Layout/Layout _3" -+ -+#: src/gimv_thumb_win.c:462 -+msgid "/_Layout/Layout_4" -+msgstr "/_Layout/Layout _4" -+ -+#: src/gimv_thumb_win.c:463 -+msgid "/_Layout/_Custom" -+msgstr "/_Layout/_Benutzerdefiniertes Layout" -+ -+#: src/gimv_thumb_win.c:464 -+msgid "/_Layout/---" -+msgstr "/_Layout/---" -+ -+#: src/gimv_thumb_win.c:465 -+msgid "/_Layout/Window _Composition" -+msgstr "/_Layout/_Fensteranordnung" -+ -+#: src/gimv_thumb_win.c:469 -+msgid "/S_lideshow" -+msgstr "/Dia_show" -+ -+#: src/gimv_thumb_win.c:470 -+msgid "/Slideshow Opt_ions" -+msgstr "/Diashow _Einstellungen" -+ -+#: src/gimv_thumb_win.c:471 -+msgid "/Slideshow Opt_ions/Start from the _first" -+msgstr "/Diashow _Einstellungen/Beim _ersten beginnen" -+ -+#: src/gimv_thumb_win.c:472 -+msgid "/Slideshow Opt_ions/Start from the se_lected" -+msgstr "/Diashow _Einstellungen/Beim _markierten beginnen" -+ -+#: src/gimv_thumb_win.c:474 -+msgid "/Slideshow Opt_ions/_Random order" -+msgstr "/Diashow _Einstellungen/_Zufällige Reihenfolge" -+ -+#: src/gimv_thumb_win.c:476 src/gimv_thumb_win.c:478 -+msgid "/Slideshow Opt_ions/---" -+msgstr "/Diashow _Einstellungen/---" -+ -+#: src/gimv_thumb_win.c:477 -+msgid "/Slideshow Opt_ions/_Selected only" -+msgstr "/Diashow _Einstellungen/_Nur die markierten" -+ -+#: src/gimv_thumb_win.c:479 -+msgid "/Slideshow Opt_ions/Images _and movies" -+msgstr "/Diashow _Einstellungen/Bilder _und Videos" -+ -+#: src/gimv_thumb_win.c:480 -+msgid "/Slideshow Opt_ions/_Images only" -+msgstr "/Diashow _Einstellungen/Nur _Bilder" -+ -+#: src/gimv_thumb_win.c:481 -+msgid "/Slideshow Opt_ions/_Movies only" -+msgstr "/Diashow _Einstellungen/Nur _Videos" -+ -+#: src/gimv_thumb_win.c:485 -+msgid "/_Directory View" -+msgstr "/_Verzeichnisansicht" -+ -+#: src/gimv_thumb_win.c:486 -+msgid "/_Preview" -+msgstr "/V_orschau" -+ -+#: src/gimv_thumb_win.c:488 -+msgid "/T_ool Bar" -+msgstr "/_Werkzeugleiste" -+ -+#: src/gimv_thumb_win.c:489 -+msgid "/Dir_View Tool Bar" -+msgstr "/Werk_zeugleiste für Verzeichnisansicht" -+ -+#: src/gimv_thumb_win.c:492 -+msgid "/Ta_b (Preview)" -+msgstr "/Ta_b (Vorschau)" -+ -+#: src/gimv_thumb_win.c:509 -+msgid "/by _Name" -+msgstr "/nach _Name" -+ -+#: src/gimv_thumb_win.c:510 -+msgid "/by _Access Time" -+msgstr "/nach _Zugriffszeit" -+ -+#: src/gimv_thumb_win.c:511 -+msgid "/by _Modification Time" -+msgstr "/nach _Modifikationszeit" -+ -+#: src/gimv_thumb_win.c:512 -+msgid "/by _Change Time" -+msgstr "/nach _Änderungszeit" -+ -+#: src/gimv_thumb_win.c:513 -+msgid "/by _Size" -+msgstr "/nach _Größe" -+ -+#: src/gimv_thumb_win.c:514 -+msgid "/by _Type" -+msgstr "/nach _Typ" -+ -+#: src/gimv_thumb_win.c:515 -+msgid "/by Image _Width" -+msgstr "/nach _Breite der Grafik" -+ -+#: src/gimv_thumb_win.c:516 -+msgid "/by Image _Height" -+msgstr "/nach _Höhe der Grafik" -+ -+#: src/gimv_thumb_win.c:517 -+msgid "/by Image Ar_ea" -+msgstr "/nach _Flächeninhalt der Grafik" -+ -+#: src/gimv_thumb_win.c:519 -+msgid "/_Reverse Order" -+msgstr "/_Umgekehrte Reihenfolge" -+ -+#: src/gimv_thumb_win.c:521 -+msgid "/Case _insensitive" -+msgstr "/Gr_oß-/Kleinschreibung ignorieren" -+ -+#: src/gimv_thumb_win.c:522 -+msgid "/_Directory insensitive" -+msgstr "/_Verzeichnisse ignorieren" -+ -+#: src/gimv_thumb_win.c:654 -+msgid " -Thumbnail Window-" -+msgstr " -Vorschaubildfenster-" -+ -+#: src/gimv_thumb_win.c:935 -+#, c-format -+msgid "Composition %d" -+msgstr "Anordnung %d" -+ -+#: src/gimv_thumb_win.c:1575 src/gimv_thumb_win.c:1576 -+msgid "Go to previous page" -+msgstr "Zu vorheriger Seite gehen" -+ -+#: src/gimv_thumb_win.c:1586 src/gimv_thumb_win.c:1587 -+msgid "Go to next page" -+msgstr "Zu nächster Seite gehen" -+ -+#: src/gimv_thumb_win.c:1598 -+msgid "Reload" -+msgstr "Neu laden" -+ -+#: src/gimv_thumb_win.c:1599 src/gimv_thumb_win.c:1600 -+msgid "Reload Cache" -+msgstr "Puffer neu laden" -+ -+#: src/gimv_thumb_win.c:1610 src/gimv_thumb_win.c:1611 -+msgid "Skip creating current thumbnail table" -+msgstr "Erstellen der aktuellen Vorschaubilder überspringen" -+ -+#: src/gimv_thumb_win.c:1622 src/gimv_thumb_win.c:1623 -+msgid "Stop creating thumbnails" -+msgstr "Erstellen der Vorschaubilder stoppen" -+ -+#: src/gimv_thumb_win.c:1639 -+msgid "Thumbnail Size" -+msgstr "Größe der Vorschaubilder" -+ -+#: src/gimv_thumb_win.c:1649 -+msgid "Quit" -+msgstr "Beenden" -+ -+#: src/gimv_thumb_win.c:1650 src/gimv_thumb_win.c:1651 -+msgid "Exit this program" -+msgstr "Dieses Programm beenden" -+ -+#. create image view and attach to comment view notebook -+#. Show Preview or not -+#: src/gimv_thumb_win.c:2078 src/prefs_ui/prefs_ui_thumbwin.c:468 -+msgid "Preview" -+msgstr "Vorschau" -+ -+#: src/gimv_thumb_win.c:3521 -+msgid "Empty" -+msgstr "Leer" -+ -+#: src/gimv_thumb_win.c:3528 src/gimv_thumb_win.c:3631 -+#, c-format -+msgid "%d/%d files" -+msgstr "%d/%d Dateien" -+ -+#: src/gimv_thumb_win.c:3562 -+#, c-format -+msgid "Dir View: %s" -+msgstr "Verzeichnisansicht: %s" -+ -+#: src/gimv_thumb_win.c:3564 -+#, c-format -+msgid "Archive View: %s" -+msgstr "Archivansicht: %s" -+ -+#: src/gimv_thumb_win.c:3579 -+msgid "Collection View" -+msgstr "Kollektionsansicht" -+ -+#: src/gimv_thumb_win.c:3589 -+msgid "Loading in another tab..." -+msgstr "In einem anderen Tab laden..." -+ -+#: src/gimv_thumb_win.c:3597 -+#, c-format -+msgid "%d/%d page %d/%d files %ld/%ld kB" -+msgstr "%d/%d Seiten %d/%d Dateien %ld/%ld kB" -+ -+#: src/gimv_thumb_win.c:3830 -+msgid "New Tab" -+msgstr "Neuer Tab" -+ -+#: src/gimv_thumb_win.c:3872 -+#, c-format -+msgid "NewTab %d" -+msgstr "Neuer Tab %d" -+ -+#: src/gtk_prop.c:191 -+msgid "Properties" -+msgstr "Eigenschaften" -+ -+#. ok and cancel buttons -+#: src/gtk_prop.c:203 -+msgid "Ok" -+msgstr "Ok" -+ -+#: src/gtk_prop.c:224 -+msgid "All" -+msgstr "Alle" -+ -+#. date and size page -+#: src/gtk_prop.c:241 -+msgid "Info" -+msgstr "Info" -+ -+#: src/gtk_prop.c:246 -+msgid "Name :" -+msgstr "Name:" -+ -+#: src/gtk_prop.c:283 -+msgid "Type :" -+msgstr "Typ:" -+ -+#: src/gtk_prop.c:305 -+#, c-format -+msgid "%ld Bytes" -+msgstr "%ld Byte" -+ -+#: src/gtk_prop.c:307 -+msgid "Size :" -+msgstr "Größe:" -+ -+#: src/gtk_prop.c:319 -+msgid "Access Time :" -+msgstr "Zugriffszeit:" -+ -+#: src/gtk_prop.c:331 -+msgid "Modification Time :" -+msgstr "Modifikationszeit:" -+ -+#: src/gtk_prop.c:343 -+msgid "Change Time :" -+msgstr "Änderungszeit:" -+ -+#: src/gtk_prop.c:352 -+msgid "Permissions" -+msgstr "Rechte" -+ -+#: src/gtk_prop.c:356 src/gtk_prop.c:483 -+msgid "Owner :" -+msgstr "Eigentümer:" -+ -+#: src/gtk_prop.c:357 src/gtk_prop.c:389 src/gtk_prop.c:420 -+msgid "Read" -+msgstr "Lesen" -+ -+#: src/gtk_prop.c:363 src/gtk_prop.c:395 src/gtk_prop.c:426 -+msgid "Write" -+msgstr "Schreiben" -+ -+#: src/gtk_prop.c:369 src/gtk_prop.c:401 src/gtk_prop.c:432 -+msgid "Execute" -+msgstr "Ausführen" -+ -+#: src/gtk_prop.c:375 -+msgid "Set UID" -+msgstr "Setze UID" -+ -+#: src/gtk_prop.c:388 src/gtk_prop.c:494 -+msgid "Group :" -+msgstr "Gruppe:" -+ -+#: src/gtk_prop.c:407 -+msgid "Set GID" -+msgstr "Setze GID" -+ -+#: src/gtk_prop.c:419 -+msgid "Other :" -+msgstr "Andere:" -+ -+#: src/gtk_prop.c:438 -+msgid "Sticky" -+msgstr "Klebrig" -+ -+#: src/gtk_prop.c:472 -+msgid "Owner" -+msgstr "Eigentümer" -+ -+#: src/gtk_prop.c:477 src/gtk_prop.c:488 -+msgid "unknown" -+msgstr "unbekannt" -+ -+#. buttons -+#: src/gtkutils.c:344 src/gtkutils.c:652 -+msgid "Yes" -+msgstr "Ja" -+ -+#: src/gtkutils.c:355 src/gtkutils.c:662 -+msgid "Yes to All" -+msgstr "Ja für alle" -+ -+#: src/gtkutils.c:365 -+msgid "No" -+msgstr "Nein" -+ -+#: src/gtkutils.c:458 -+#, c-format -+msgid "The file exists : %s" -+msgstr "Die Datei existiert bereits: %s" -+ -+#: src/gtkutils.c:550 -+msgid "Show destination" -+msgstr "Zeige Zieldatei" -+ -+#: src/gtkutils.c:557 -+msgid "Show both images" -+msgstr "Zeige beide Grafiken" -+ -+#: src/gtkutils.c:565 -+msgid "Show source" -+msgstr "Zeige Quelldatei" -+ -+#: src/gtkutils.c:638 -+msgid "Rename" -+msgstr "Umbenennen" -+ -+#: src/gtkutils.c:679 -+msgid "Skip all" -+msgstr "Alle überspringen" -+ -+#: src/gtkutils.c:1200 src/prefs_ui/prefs_ui_etc.c:989 -+#: src/prefs_ui/prefs_ui_imagewin.c:351 src/prefs_ui/prefs_ui_imagewin.c:366 -+msgid "Choose Color" -+msgstr "Farbe wählen" -+ -+#: src/help.c:78 -+#, c-format -+# The following string contains the old address of the FSF in english, which is -+# no longer correct; german already contains the new address. HW -+msgid "" -+"Copyright (C) 2001 %s <%s>\n" -+"\n" -+"This program is free software; you can redistribute it and/or modify\n" -+"it under the terms of the GNU General Public License as published by\n" -+"the Free Software Foundation; either version 2, or (at your option)\n" -+"any later version.\n" -+"\n" -+"This program is distributed in the hope that it will be useful,\n" -+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -+"See the GNU General Public License for more details.\n" -+"\n" -+"You should have received a copy of the GNU General Public License\n" -+"along with this program; if not, write to the Free Software\n" -+"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" -+"MA 02111-1307, USA." -+msgstr "" -+"Copyright (C) 2001 %s <%s>\n" -+"Dieses Programm ist freie Software. Es kann unter den\n" -+"Bedingungen der GNU General Public License, wie von der\n" -+"Free Software Foundation veröffentlicht, weitergegeben und/\n" -+"oder modifiziert werden, entweder gemäß Version 2 der\n" -+"Lizenz oder (nach Ihrer Option) jeder späteren Version.\n" -+"\n" -+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung,\n" -+"dass es von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE,\n" -+"sogar ohne die implizite Garantie der MARKTREIFE oder der\n" -+"VERWENDBARKEIT FÃœR EINEN BESTIMMTEN ZWECK.\n" -+"Details finden Sie in der GNU General Public License.\n" -+"\n" -+"Sie sollten ein Exemplar der GNU General Public License\n" -+"zusammen mit diesem Programm erhalten haben. Falls nicht,\n" -+"schreiben Sie an die Free Software Foundation, Inc., 51 Franklin\n" -+"Street, Fifth Floor, Boston, MA 02110-1301, USA." -+ -+#: src/help.c:95 -+msgid "" -+"Main Program :\n" -+" Takuro Ashie \n" -+"Document :\n" -+" Nyan2 \n" -+"Logo :\n" -+" eins \n" -+"Translate :\n" -+"\n" -+"Special Thanks :\n" -+" horam\n" -+" TAM\n" -+" Hiroyuki Komatsu\n" -+" Kazuki Iwamoto\n" -+" katsu\n" -+" kourin\n" -+" jissama\n" -+" shitamori\n" -+" knee\n" -+" matsu\n" -+" Shlomi Fish\n" -+" Jin Suh\n" -+" sheepman\n" -+" MINAMI Hirokazu\n" -+" Brent Baccala\n" -+" Christian Hammers\n" -+" And all GImageView users" -+msgstr "" -+"Hauptprogramm:\n" -+" Takuro Ashie \n" -+"Dokument:\n" -+" Nyan2 \n" -+"Logo:\n" -+" eins \n" -+"Ãœbersetzungen:\n" -+" Holger Wansing (deutsch)\n" -+"Speziellen Dank an:\n" -+" horam\n" -+" TAM\n" -+" Hiroyuki Komatsu\n" -+" Kazuki Iwamoto\n" -+" katsu\n" -+" kourin\n" -+" jissama\n" -+" shitamori\n" -+" knee\n" -+" matsu\n" -+" Shlomi Fish\n" -+" Jin Suh\n" -+" sheepman\n" -+" MINAMI Hirokazu\n" -+" Brent Baccala\n" -+" Christian Hammers\n" -+" und alle GImageView-Nutzer" -+ -+#: src/help.c:128 -+msgid "/_Manual" -+msgstr "/_Handbuch" -+ -+#: src/help.c:129 -+msgid "/_Document" -+msgstr "/_Dokument" -+ -+#: src/help.c:130 -+msgid "/_Document/_HTML" -+msgstr "/_Dokument/_HTML" -+ -+#: src/help.c:131 -+msgid "/_Document/Plain _Text" -+msgstr "/_Dokument/Einfacher _Text" -+ -+#: src/help.c:132 -+msgid "/_About" -+msgstr "/I_nfo" -+ -+#: src/help.c:446 -+#, c-format -+msgid "" -+"Plugin Name : %s\n" -+"Version : %s\n" -+"Author : %s\n" -+"\n" -+msgstr "" -+"Plugin-Name: %s\n" -+"Version: %s\n" -+"Autor: %s\n" -+"\n" -+ -+#: src/help.c:524 -+#, c-format -+msgid "" -+"Operating System : %s %s %s\n" -+"GTK+ version : %d.%d.%d\n" -+msgstr "" -+"Betriebssystem: %s %s %s\n" -+"GTK+-Version: %d.%d.%d\n" -+ -+#: src/help.c:533 -+#, c-format -+msgid "libmng version : %s\n" -+msgstr "libmng-Version: %s\n" -+ -+#: src/help.c:539 -+#, c-format -+msgid "gdk-pixbuf version : %s\n" -+msgstr "gdk-pixbuf-Version: %s\n" -+ -+#: src/help.c:545 -+#, c-format -+msgid "librsvg version : %s\n" -+msgstr "librsvg-Version: %s\n" -+ -+#: src/help.c:619 -+msgid "Web Site: " -+msgstr "Webseite: " -+ -+#: src/help.c:673 -+msgid "License" -+msgstr "Lizenz" -+ -+#: src/help.c:680 -+msgid "Authors" -+msgstr "Autoren" -+ -+#: src/help.c:688 -+msgid "System Info" -+msgstr "Systeminformationen" -+ -+#: src/help.c:695 plugins/image_loader/prefs_spi.c:225 -+msgid "Plugin Info" -+msgstr "Plugin-Informationen" -+ -+#: src/help.c:716 -+#, c-format -+msgid "About %s" -+msgstr "Ãœber %s" -+ -+#: src/prefs.c:523 -+#, c-format -+msgid "" -+"Can't open rc file: %s\n" -+"Use default setting ..." -+msgstr "" -+"Kann rc-Datei nicht öffnen: %s\n" -+"Benutze Standardeinstellungen ..." -+ -+#: src/prefs.c:591 -+#, c-format -+msgid "Directory \"%s\" not found. Created it ..." -+msgstr "Verzeichnis »%s« nicht gefunden. Habe es erstellt ..." -+ -+#: src/prefs.c:594 -+#, c-format -+msgid "\"%s\" found, but it's not directory. Abort creating ..." -+msgstr "»%s« gefunden, ist aber kein Verzeichnis. Erstellen abgebrochen ..." -+ -+#: src/prefs.c:603 -+msgid "Can't open rc file for write." -+msgstr "Kann rc-Datei nicht zum Schreiben öffnen." -+ -+#: src/prefs_ui/prefs_ui_common.c:71 -+msgid "Image View" -+msgstr "Bildansicht" -+ -+#: src/prefs_ui/prefs_ui_common.c:72 -+msgid "Thumbnail View" -+msgstr "Bildvorschauansicht" -+ -+#: src/prefs_ui/prefs_ui_common.c:79 -+msgid "Nearest" -+msgstr "Sparsam" -+ -+#: src/prefs_ui/prefs_ui_common.c:80 -+msgid "Tiles" -+msgstr "Gekachelt" -+ -+#: src/prefs_ui/prefs_ui_common.c:81 -+msgid "Bilinear" -+msgstr "Bilinear" -+ -+#: src/prefs_ui/prefs_ui_common.c:82 -+msgid "Hyperbolic" -+msgstr "Hyper-bolisch" -+ -+#: src/prefs_ui/prefs_ui_common.c:89 -+msgid "Never convert" -+msgstr "Nicht konvertieren" -+ -+#: src/prefs_ui/prefs_ui_common.c:90 -+msgid "Locale" -+msgstr "Locale" -+ -+#: src/prefs_ui/prefs_ui_common.c:91 -+msgid "Auto detect" -+msgstr "Automatische Erkennung" -+ -+#: src/prefs_ui/prefs_ui_common.c:92 -+msgid "Any" -+msgstr "Alle" -+ -+#: src/prefs_ui/prefs_ui_common.c:139 src/prefs_ui/prefs_ui_common.c:147 -+#: src/prefs_ui/prefs_ui_common.c:154 src/prefs_ui/prefs_ui_etc.c:171 -+#: src/prefs_ui/prefs_ui_etc.c:179 src/prefs_ui/prefs_ui_etc.c:186 -+msgid "Error" -+msgstr "Fehler" -+ -+#: src/prefs_ui/prefs_ui_common.c:140 -+msgid "" -+"String includes invalid character!\n" -+"Only ASCII is available." -+msgstr "" -+"Zeichenkette enthält ungültiges Zeichen!\n" -+"Es ist nur ASCII verfügbar." -+ -+#: src/prefs_ui/prefs_ui_common.c:148 src/prefs_ui/prefs_ui_etc.c:180 -+msgid "Sorry, cannot include \",\" character!" -+msgstr "Entschuldigung, das Zeichen »,« darf nicht enthalten sein!" -+ -+#: src/prefs_ui/prefs_ui_common.c:155 src/prefs_ui/prefs_ui_etc.c:187 -+msgid "Sorry, cannot include \";\" character!" -+msgstr "Entschuldigung, das Zeichen »;« darf nicht enthalten sein!" -+ -+#: src/prefs_ui/prefs_ui_common.c:181 src/prefs_ui/prefs_ui_etc.c:400 -+#, c-format -+msgid "\"%s\" is already defined." -+msgstr "»%s« wurde bereits festgelegt." -+ -+#: src/prefs_ui/prefs_ui_common.c:243 src/prefs_ui/prefs_ui_common.c:281 -+#: src/prefs_ui/prefs_ui_common.c:775 src/prefs_ui/prefs_ui_etc.c:682 -+msgid "Enable" -+msgstr "Aktiv" -+ -+#: src/prefs_ui/prefs_ui_common.c:243 src/prefs_ui/prefs_ui_common.c:284 -+#: src/prefs_ui/prefs_ui_common.c:774 src/prefs_ui/prefs_ui_common.c:775 -+msgid "Disable" -+msgstr "Inaktiv" -+ -+#: src/prefs_ui/prefs_ui_common.c:244 src/prefs_ui/prefs_ui_common.c:427 -+#: src/prefs_ui/prefs_ui_etc.c:261 src/prefs_ui/prefs_ui_etc.c:430 -+msgid "System defined" -+msgstr "Per Systemeinstellung definiert" -+ -+#: src/prefs_ui/prefs_ui_common.c:288 src/prefs_ui/prefs_ui_common.c:430 -+#: src/prefs_ui/prefs_ui_etc.c:259 src/prefs_ui/prefs_ui_etc.c:433 -+msgid "User defined" -+msgstr "Benutzerdefiniert" -+ -+#. ********************************************* -+#. * Default Open Window Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:549 -+msgid "Default Open Window" -+msgstr "Standardmässig zu öffnende Fenster" -+ -+#. File Open Window Selection -+#: src/prefs_ui/prefs_ui_common.c:561 -+msgid "File Open Window" -+msgstr "Öffne Fenster über Datei" -+ -+#. Directory Open Window Selection -+#: src/prefs_ui/prefs_ui_common.c:573 -+msgid "Directory Open Window" -+msgstr "Öffne Fenster über Verzeichnis" -+ -+#. Archive Open Window Selection -+#: src/prefs_ui/prefs_ui_common.c:585 -+msgid "Archive Open Window" -+msgstr "Öffne Fenster über Archiv" -+ -+#. ********************************************* -+#. * Scan Directory Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:601 -+msgid "Directory scan" -+msgstr "Durchsuchen von Verzeichnissen" -+ -+#. Ignore filename extension or not -+#: src/prefs_ui/prefs_ui_common.c:604 -+msgid "Scan directories recursively" -+msgstr "Verzeichnisse rekursiv durchsuchen" -+ -+#. follow symbolic link -+#: src/prefs_ui/prefs_ui_common.c:611 -+msgid "Follow symbolic link" -+msgstr "Symbolischen Verknüpfungen folgen" -+ -+#: src/prefs_ui/prefs_ui_common.c:615 -+msgid "Do not follow symbolic link" -+msgstr "Symbolischen Verknüpfungen nicht folgen" -+ -+#: src/prefs_ui/prefs_ui_common.c:624 -+msgid "Do not follow link to parent directory" -+msgstr "Verknüpfungen zu übergeordneten Verzeichnissen nicht folgen" -+ -+#. ********************************************* -+#. * Image Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:652 src/prefs_ui/prefs_ui_etc.c:907 -+#: src/prefs_ui/prefs_ui_imagewin.c:397 src/prefs_ui/prefs_ui_thumbwin.c:1024 -+msgid "Image" -+msgstr "Grafik" -+ -+#: src/prefs_ui/prefs_ui_common.c:658 -+msgid "Interpolation type for scaling" -+msgstr "Typ der Interpolation beim Skalieren" -+ -+#. ********************************************* -+#. * Start up Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:669 -+msgid "Start up" -+msgstr "Start" -+ -+#. Open thumbnail window or not -+#: src/prefs_ui/prefs_ui_common.c:672 -+msgid "Open thumbnail window" -+msgstr "Öffne Bildvorschaufenster" -+ -+#. Scan (or not) Directory -+#: src/prefs_ui/prefs_ui_common.c:679 -+msgid "Ignore directory" -+msgstr "Verzeichnis ignorieren" -+ -+#. No warning -+#: src/prefs_ui/prefs_ui_common.c:686 -+msgid "No warning" -+msgstr "Keine Warnungen" -+ -+#: src/prefs_ui/prefs_ui_common.c:710 -+msgid "Extension" -+msgstr "Dateiendung" -+ -+#: src/prefs_ui/prefs_ui_common.c:710 -+msgid "File Type" -+msgstr "Dateityp" -+ -+#: src/prefs_ui/prefs_ui_common.c:710 src/prefs_ui/prefs_ui_etc.c:613 -+msgid "Status" -+msgstr "Status" -+ -+#. ********************************************* -+#. * Image Types Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:719 -+msgid "File Types" -+msgstr "Dateitypen" -+ -+#: src/prefs_ui/prefs_ui_common.c:740 -+msgid "Extension: " -+msgstr "Dateiendung: " -+ -+#: src/prefs_ui/prefs_ui_common.c:758 -+msgid "File Type: " -+msgstr "Dateityp: " -+ -+#. Ignore filename extension or not -+#: src/prefs_ui/prefs_ui_common.c:801 -+msgid "Read dotfiles" -+msgstr "Mit ».« beginnende Dateien lesen" -+ -+#. ********************************************* -+#. * Common Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:838 -+msgid "Common" -+msgstr "Allgemein" -+ -+#: src/prefs_ui/prefs_ui_common.c:849 -+msgid "Locale character set: " -+msgstr "Lokaler Zeichensatz: " -+ -+#: src/prefs_ui/prefs_ui_common.c:866 -+msgid "Internal character set: " -+msgstr "Interner Zeichensatz: " -+ -+#: src/prefs_ui/prefs_ui_common.c:882 -+msgid "Language for auto detecting" -+msgstr "Sprache für automatische Erkennung" -+ -+#. ********************************************* -+#. * Filename Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_common.c:893 -+msgid "File name" -+msgstr "Dateiname" -+ -+#: src/prefs_ui/prefs_ui_common.c:898 -+msgid "Character set of file name" -+msgstr "Zeichensatz für Dateinamen" -+ -+#: src/prefs_ui/prefs_ui_etc.c:140 -+msgid "Preference - Cache Writing -" -+msgstr "Einstellung - Zwischenspeicher schreiben -" -+ -+#: src/prefs_ui/prefs_ui_etc.c:172 -+msgid "" -+"Key string includes invalid character!\n" -+"Only ASCII (except space) is available." -+msgstr "" -+"Schlüssel enthält ungültiges Zeichen!\n" -+"Es ist nur ASCII (außer Leertaste) verfügbar." -+ -+#: src/prefs_ui/prefs_ui_etc.c:193 -+msgid "\"Key name\" must be defined." -+msgstr "»Schlüsselname« muss angegeben werden." -+ -+#: src/prefs_ui/prefs_ui_etc.c:199 -+msgid "\"Display name\" must be defined." -+msgstr "»Angezeigter Name« muss angegeben werden." -+ -+#: src/prefs_ui/prefs_ui_etc.c:539 -+msgid "Cache reading" -+msgstr "Zwischenspeicher lesen" -+ -+#: src/prefs_ui/prefs_ui_etc.c:540 -+msgid "Available cache type" -+msgstr "Verfügbare Zwischenspeicher-Typen" -+ -+#: src/prefs_ui/prefs_ui_etc.c:541 -+msgid "Cache type to use" -+msgstr "Zu nutzende Zwischenspeicher-Typen" -+ -+#. ********************************************* -+#. * Cache writing frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:553 -+msgid "Cache writing" -+msgstr "Zwischenspeicher schreiben" -+ -+#: src/prefs_ui/prefs_ui_etc.c:562 -+msgid "Cache type for save" -+msgstr "Zwischenspeicher-Typ zum Speichern" -+ -+#: src/prefs_ui/prefs_ui_etc.c:611 -+msgid "Key Name" -+msgstr "Schlüsselname" -+ -+#: src/prefs_ui/prefs_ui_etc.c:612 -+msgid "Displayed Name" -+msgstr "Angezeigter Name" -+ -+#: src/prefs_ui/prefs_ui_etc.c:614 src/prefs_ui/prefs_ui_etc.c:690 -+#: src/prefs_ui/prefs_ui_imagewin.c:315 src/prefs_ui/prefs_ui_thumbwin.c:536 -+msgid "Auto" -+msgstr "Automatisch" -+ -+#: src/prefs_ui/prefs_ui_etc.c:615 src/prefs_ui/prefs_ui_etc.c:698 -+msgid "Display" -+msgstr "Anzeige" -+ -+#. ********************************************* -+#. * Key Name definition frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:626 -+msgid "Key Name Definition" -+msgstr "Schlüsselnamen-Definition" -+ -+#: src/prefs_ui/prefs_ui_etc.c:650 -+msgid "Key Name: " -+msgstr "Schlüsselname: " -+ -+#: src/prefs_ui/prefs_ui_etc.c:667 -+msgid "Displayed Name: " -+msgstr "Angezeigter Name: " -+ -+#: src/prefs_ui/prefs_ui_etc.c:683 src/prefs_ui/prefs_ui_etc.c:691 -+#: src/prefs_ui/prefs_ui_etc.c:699 src/prefs_ui/prefs_ui_progs.c:66 -+#: src/prefs_ui/prefs_ui_progs.c:104 src/prefs_ui/prefs_ui_progs.c:259 -+msgid "TRUE" -+msgstr "JA" -+ -+#: src/prefs_ui/prefs_ui_etc.c:683 src/prefs_ui/prefs_ui_etc.c:691 -+#: src/prefs_ui/prefs_ui_etc.c:699 src/prefs_ui/prefs_ui_progs.c:68 -+#: src/prefs_ui/prefs_ui_progs.c:259 -+msgid "FALSE" -+msgstr "NEIN" -+ -+#. ********************************************* -+#. * Charset Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:726 -+msgid "Character set" -+msgstr "Zeichensatz" -+ -+#: src/prefs_ui/prefs_ui_etc.c:732 -+msgid "Character set: " -+msgstr "Zeichensatz: " -+ -+#. ********************************************* -+#. * Find duplicates -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:768 -+msgid "Find duplicates" -+msgstr "Duplikate finden" -+ -+#: src/prefs_ui/prefs_ui_etc.c:775 src/gimv_dupl_win.c:122 -+msgid "Accuracy" -+msgstr "Genauigkeit" -+ -+#. ********************************************* -+#. * Behabior of selecting -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:790 -+msgid "Behabior when select thumbnail on result window" -+msgstr "Verhalten, wenn Vorschaubild im Ergebnisfenster ausgewählt wird" -+ -+#: src/prefs_ui/prefs_ui_etc.c:797 -+msgid "Select the thumbnail on thumbnail view" -+msgstr "Wähle Vorschaubild in der Vorschaubildansicht" -+ -+#: src/prefs_ui/prefs_ui_etc.c:803 -+msgid "Show the image in preview" -+msgstr "Zeige Grafik in Vorschauansicht" -+ -+#: src/prefs_ui/prefs_ui_etc.c:809 -+msgid "Show the image in new window" -+msgstr "Zeige Grafik in neuem Fenster" -+ -+#: src/prefs_ui/prefs_ui_etc.c:815 -+msgid "Show the image in shared window" -+msgstr "Zeige Grafik in gemeinsam genutztem Fenster" -+ -+#: src/prefs_ui/prefs_ui_etc.c:851 -+msgid "Image change interval" -+msgstr "Bildwechselintervall" -+ -+#: src/prefs_ui/prefs_ui_etc.c:863 plugins/image_view/prefs_xine.c:311 -+msgid "[sec]" -+msgstr "[Sek.]" -+ -+#. repeat -+#: src/prefs_ui/prefs_ui_etc.c:867 -+msgid "Repeat slide show" -+msgstr "Diashow wiederholen" -+ -+#. ********************************************* -+#. * Show/Hide Frame -+#. ********************************************* -+#. Show/Hide frame -+#. ********************************************* -+#. * Show/Hide Frame -+#. ********************************************* -+#. ********************************************* -+#. * Shoe/Hide Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:877 src/prefs_ui/prefs_ui_imagewin.c:240 -+#: src/prefs_ui/prefs_ui_thumbwin.c:445 src/prefs_ui/prefs_ui_thumbwin.c:740 -+#: src/prefs_ui/prefs_ui_thumbwin.c:848 -+msgid "Show/Hide" -+msgstr "Anzeigen/verstecken" -+ -+#. Show Menubar or not -+#: src/prefs_ui/prefs_ui_etc.c:880 -+msgid "Show menubar" -+msgstr "Zeige Menüleiste" -+ -+#. Show Toolbar or not -+#. show/hide toolbar -+#: src/prefs_ui/prefs_ui_etc.c:886 src/prefs_ui/prefs_ui_thumbwin.c:851 -+msgid "Show toolbar" -+msgstr "Zeige Werkzeugleiste" -+ -+#. Show Player toolbar or not -+#: src/prefs_ui/prefs_ui_etc.c:892 -+msgid "Show player toolbar" -+msgstr "Zeige Player-Werkzeugleiste" -+ -+#. Show Statusbar or not -+#: src/prefs_ui/prefs_ui_etc.c:898 -+msgid "Show statusbar" -+msgstr "Zeige Statusleiste" -+ -+#. Zoom menu -+#. Default zoom action menu -+#. Zoom menu -+#: src/prefs_ui/prefs_ui_etc.c:916 src/prefs_ui/prefs_ui_imagewin.c:406 -+#: src/prefs_ui/prefs_ui_thumbwin.c:1033 -+msgid "Zoom:" -+msgstr "Zoom:" -+ -+#. Rotate menu -+#. Rotate on image change -+#. Rotate menu -+#: src/prefs_ui/prefs_ui_etc.c:931 src/prefs_ui/prefs_ui_imagewin.c:421 -+#: src/prefs_ui/prefs_ui_thumbwin.c:1048 -+msgid "Rotation:" -+msgstr "Drehung:" -+ -+#. Keep Aspect Ratio -+#: src/prefs_ui/prefs_ui_etc.c:946 -+msgid "Keep aspect rario" -+msgstr "Seitenverhältnis beibehalten" -+ -+#: src/prefs_ui/prefs_ui_etc.c:956 src/prefs_ui/prefs_ui_imagewin.c:446 -+#: src/prefs_ui/prefs_ui_thumbwin.c:1076 -+msgid "Default Image Scale" -+msgstr "Standard-Grafikskalierung" -+ -+#: src/prefs_ui/prefs_ui_etc.c:967 src/prefs_ui/prefs_ui_imagewin.c:457 -+#: src/prefs_ui/prefs_ui_thumbwin.c:1086 -+msgid "%" -+msgstr "%" -+ -+#. ********************************************* -+#. * Back Ground Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:977 src/prefs_ui/prefs_ui_imagewin.c:338 -+msgid "Back Ground" -+msgstr "Hintergrund" -+ -+#: src/prefs_ui/prefs_ui_etc.c:983 -+msgid "Use specified color" -+msgstr "Nutze angegebene Farbe" -+ -+#. ********************************************* -+#. * File Operation frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_etc.c:1019 -+msgid "File operation" -+msgstr "Dateioperation" -+ -+#. Drag and Drop to external proccess -+#: src/prefs_ui/prefs_ui_etc.c:1022 -+msgid "Enable DnD to external proccess (Experimental)" -+msgstr "Aktiviere Drag and Drop (Ziehen und Fallenlassen mit der Maus) zu " -+"externem Prozess (Experimentell)" -+ -+#. Drag and Drop from external proccess -+#: src/prefs_ui/prefs_ui_etc.c:1029 -+msgid "Enable DnD from extenal proccess (Experimental)" -+msgstr "Aktiviere Drag and Drop (Ziehen und Fallenlassen mit der Maus) von " -+"externem Prozess (Experimentell)" -+ -+#. Always refresh list when DnD end -+#: src/prefs_ui/prefs_ui_etc.c:1036 -+msgid "Always refresh list when DnD end" -+msgstr "Liste immer auffrischen, wenn Drag and Drop beendet ist" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:63 src/prefs_ui/prefs_ui_imagewin.c:72 -+msgid "Do not change" -+msgstr "Nicht ändern" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:65 -+msgid "Automatic EXIF" -+msgstr "Automatisch per EXIF" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:71 -+msgid "Default image scale" -+msgstr "Standard-Grafikskalierung" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:73 -+msgid "Fit image to window" -+msgstr "Grafik an Fenster anpassen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:74 -+msgid "Fit image to window (zoom out only)" -+msgstr "Grafik an Fenster anpassen (nur Herauszoomen)" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:75 -+msgid "Fit image to width" -+msgstr "Grafik an Fensterbreite anpassen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:76 -+msgid "Fit image to height" -+msgstr "Grafik an Fensterhöhe anpassen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:139 src/prefs_ui/prefs_ui_thumbwin.c:180 -+msgid "Next image" -+msgstr "Nächstes Bild" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:140 src/prefs_ui/prefs_ui_thumbwin.c:181 -+msgid "Previous image" -+msgstr "Vorheriges Bild" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:141 src/prefs_ui/prefs_ui_thumbwin.c:155 -+#: src/prefs_ui/prefs_ui_thumbwin.c:171 src/prefs_ui/prefs_ui_thumbwin.c:184 -+msgid "Popup menu" -+msgstr "Pop-Up-Menü" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:144 src/prefs_ui/prefs_ui_thumbwin.c:187 -+msgid "Fit image size to frame" -+msgstr "Grafik an Rahmen anpassen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:145 src/prefs_ui/prefs_ui_thumbwin.c:188 -+msgid "Rotate CCW" -+msgstr "Gegen den Uhrzeigersinn drehen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:146 src/prefs_ui/prefs_ui_thumbwin.c:189 -+msgid "Rotate CW" -+msgstr "Mit dem Uhrzeigersinn drehen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:147 src/prefs_ui/prefs_ui_thumbwin.c:190 -+msgid "Open navigate window" -+msgstr "Navigationsfenster öffnen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:148 src/prefs_ui/prefs_ui_thumbwin.c:191 -+msgid "Scroll up" -+msgstr "Hoch scrollen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:149 src/prefs_ui/prefs_ui_thumbwin.c:192 -+msgid "Scroll down" -+msgstr "Herunter scrollen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:150 src/prefs_ui/prefs_ui_thumbwin.c:193 -+msgid "Scroll left" -+msgstr "Nach links scrollen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:151 src/prefs_ui/prefs_ui_thumbwin.c:194 -+msgid "Scroll right" -+msgstr "Nach rechts scrollen" -+ -+#. ********************************************* -+#. * Window Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_imagewin.c:175 src/prefs_ui/prefs_ui_thumbwin.c:399 -+msgid "Window" -+msgstr "Fenster" -+ -+#. Save window state on exit -+#: src/prefs_ui/prefs_ui_imagewin.c:178 src/prefs_ui/prefs_ui_thumbwin.c:402 -+msgid "Save window state on exit" -+msgstr "Fenstereigenschaften beim Beenden speichern" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:189 -+msgid "Initial window size: " -+msgstr "Fenstergröße beim Start: " -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:192 src/prefs_ui/prefs_ui_thumbwin.c:412 -+msgid "width" -+msgstr "Breite" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:204 src/prefs_ui/prefs_ui_thumbwin.c:423 -+msgid "height" -+msgstr "Höhe" -+ -+#. Auto resize window to image size -+#: src/prefs_ui/prefs_ui_imagewin.c:217 -+msgid "Auto resize to image size" -+msgstr "Automatisch an Grafik anpassen" -+ -+#. Open New Window or not -+#: src/prefs_ui/prefs_ui_imagewin.c:224 -+msgid "Open each file in separate window" -+msgstr "Jede Datei in separatem Fenster öffnen" -+ -+#. Raise window or not -+#: src/prefs_ui/prefs_ui_imagewin.c:231 -+msgid "Raise window when open image in shared window" -+msgstr "Fenster in den Vordergrund heben, wenn Grafik in gemeinsam genutztem " -+"Fenster geöffnet wird" -+ -+#. Show Menubar or not -+#: src/prefs_ui/prefs_ui_imagewin.c:255 src/prefs_ui/prefs_ui_thumbwin.c:484 -+msgid "Menubar" -+msgstr "Menüleiste" -+ -+#. Show Toolbar or not -+#: src/prefs_ui/prefs_ui_imagewin.c:263 src/prefs_ui/prefs_ui_thumbwin.c:492 -+msgid "Toolbar" -+msgstr "Werkzeugleiste" -+ -+#. Show Player toolbar or not -+#: src/prefs_ui/prefs_ui_imagewin.c:271 -+msgid "Slide show player" -+msgstr "Diashow-Player" -+ -+#. Show Statusbar or not -+#: src/prefs_ui/prefs_ui_imagewin.c:279 src/prefs_ui/prefs_ui_thumbwin.c:500 -+msgid "Statusbar" -+msgstr "Statusleiste" -+ -+#. Show Scrollbar or not -+#: src/prefs_ui/prefs_ui_imagewin.c:287 -+msgid "Scrollbar" -+msgstr "Scroll-Leiste" -+ -+#. player -+#: src/prefs_ui/prefs_ui_imagewin.c:295 src/prefs_ui/prefs_ui_thumbwin.c:516 -+msgid "Player toolbar :" -+msgstr "Player-Werkzeugleiste:" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:299 src/prefs_ui/prefs_ui_thumbwin.c:520 -+msgid "Show" -+msgstr "Anzeigen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:307 src/prefs_ui/prefs_ui_thumbwin.c:528 -+msgid "Hide" -+msgstr "Verstecken" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:345 -+msgid "Specify back ground color" -+msgstr "Hintergrundfarbe festlegen" -+ -+#: src/prefs_ui/prefs_ui_imagewin.c:360 -+msgid "Specify back ground color of fullscreen" -+msgstr "Hintergrundfarbe bei Vollbildansicht festlegen" -+ -+#. Keep Aspect Ratio -+#: src/prefs_ui/prefs_ui_imagewin.c:436 src/prefs_ui/prefs_ui_thumbwin.c:1066 -+msgid "Keep aspect ratio" -+msgstr "Seitenverhältnis beibehalten" -+ -+#. keep original image on memory or not -+#: src/prefs_ui/prefs_ui_imagewin.c:461 src/prefs_ui/prefs_ui_thumbwin.c:1098 -+msgid "Keep original image on memory" -+msgstr "Originalgrafik im Speicher halten" -+ -+#: src/prefs_ui/prefs_ui_movie.c:91 -+msgid "Default view mode for movie and audio: " -+msgstr "Standard-Ansichtsmodus für Video und Audio: " -+ -+#: src/prefs_ui/prefs_ui_movie.c:108 -+msgid "No movie plugins are available." -+msgstr "Es sind keine Video-Plugins verfügbar." -+ -+#: src/prefs_ui/prefs_ui_plugin.c:70 -+msgid "Directories list to search plugins" -+msgstr "Verzeichnisliste zur Suche nach Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:71 -+msgid "Select plugin directory" -+msgstr "Plugin-Verzeichnis wählen" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:75 -+msgid "Use default directories list to search plugins" -+msgstr "Nutze Standardverzeichnisliste zur Suche nach Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:104 -+msgid "Plugin Name" -+msgstr "Plugin-Name" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:104 -+msgid "Version" -+msgstr "Version" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:104 -+msgid "Module Name" -+msgstr "Modulname" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:219 -+msgid "Image Loader Plugins" -+msgstr "Grafik-Lade-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:225 -+msgid "Image Saver Plugins" -+msgstr "Grafik-Speicher-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:231 -+msgid "IO Stream Plugins" -+msgstr "E/A-Datenstrom-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:237 -+msgid "Archiver Plugins" -+msgstr "Archiv-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:243 -+msgid "Thumbnail Cache Plugins" -+msgstr "Vorschaubild-Zwischenspeicher-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:249 -+msgid "Image View Embeder Plugins" -+msgstr "Grafikansicht Embedder-Plugins" -+ -+#: src/prefs_ui/prefs_ui_plugin.c:255 -+msgid "Thumbnail View Embeder Plugins" -+msgstr "Vorschaubildansicht Embedder-Plugins" -+ -+#: src/prefs_ui/prefs_ui_progs.c:192 -+msgid "Program Name" -+msgstr "Programmname" -+ -+#: src/prefs_ui/prefs_ui_progs.c:193 -+msgid "Command" -+msgstr "Befehl" -+ -+#: src/prefs_ui/prefs_ui_progs.c:194 src/prefs_ui/prefs_ui_progs.c:258 -+msgid "Dialog" -+msgstr "Dialog" -+ -+#. ********************************************* -+#. * Viewer/Editor frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_progs.c:209 -+msgid "Graphic Viewer/Editor" -+msgstr "Grafikanzeigeprogramme/-bearbeitungsprogramme" -+ -+#: src/prefs_ui/prefs_ui_progs.c:230 -+msgid "Program Name: " -+msgstr "Programmname: " -+ -+#: src/prefs_ui/prefs_ui_progs.c:245 src/prefs_ui/prefs_ui_progs.c:272 -+#: src/prefs_ui/prefs_ui_progs.c:300 -+msgid "Command: " -+msgstr "Befehl: " -+ -+#. ********************************************* -+#. * Web Browser frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_progs.c:266 -+msgid "Web Browser" -+msgstr "Webbrowser" -+ -+#. ********************************************* -+#. * Text Viewer frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_progs.c:287 -+msgid "Text Viewer" -+msgstr "Textbetrachter" -+ -+#. use internal text viewer or not -+#: src/prefs_ui/prefs_ui_progs.c:291 -+msgid "Use internal viewer" -+msgstr "Benutze internen Betrachter" -+ -+#: src/prefs_ui/prefs_ui_progs.c:334 -+msgid "Directories list to search scripts" -+msgstr "Verzeichnisliste zur Suche nach Skripten" -+ -+#: src/prefs_ui/prefs_ui_progs.c:335 -+msgid "Select scripts directory" -+msgstr "Skriptverzeichnis wählen" -+ -+#: src/prefs_ui/prefs_ui_progs.c:339 -+msgid "Use default directories list to search scripts" -+msgstr "Nutze Standardverzeichnisliste zur Suche nach Skripten" -+ -+#. Show dialog -+#: src/prefs_ui/prefs_ui_progs.c:348 -+msgid "Show dialog befor execute script" -+msgstr "Zeige Dialog vor Ausführung des Skripts" -+ -+#. ********************************************* -+#. * Thumbnail Album Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_thumbalbum.c:47 src/thumbnail_view_album.c:70 -+msgid "Album" -+msgstr "Album" -+ -+#. Row Spacing spinner -+#: src/prefs_ui/prefs_ui_thumbalbum.c:60 -+msgid "Row Spacing" -+msgstr "Zwischenraum zwischen Zeilen" -+ -+#. Column Spacing spinner -+#: src/prefs_ui/prefs_ui_thumbalbum.c:74 -+msgid "Column Spacing" -+msgstr "Zwischenraum zwischen Spalten" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:106 -+msgid "Layout0" -+msgstr "Layout 0" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:107 -+msgid "Layout1" -+msgstr "Layout 1" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:108 -+msgid "Layout2" -+msgstr "Layout 2" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:109 -+msgid "Layout3" -+msgstr "Layout 3" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:110 -+msgid "Layout4" -+msgstr "Layout 4" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:111 -+msgid "Custom" -+msgstr "Benutzerdefiniertes Layout" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:117 src/gimv_dupl_win.c:288 -+msgid "Icon" -+msgstr "Icon" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:118 -+msgid "Text" -+msgstr "Text" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:119 -+msgid "Both" -+msgstr "Beides" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:127 -+msgid "Top" -+msgstr "Oben" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:128 -+msgid "Bottom" -+msgstr "Unten" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:136 -+msgid "Solid" -+msgstr "Solide" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:137 -+msgid "Dotted" -+msgstr "Gepunktet" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:138 -+msgid "Tabbed" -+msgstr "In Tabs angeordnet" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:145 -+msgid "Square" -+msgstr "Quadratisch" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:146 -+msgid "Triangle" -+msgstr "Dreieckig" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:147 -+msgid "Circular" -+msgstr "Rund" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:156 -+msgid "Open (Auto select window)" -+msgstr "Öffnen (Automatisch wählen)" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:157 -+msgid "Open (Auto & Force)" -+msgstr "Öffnen (Automatisch & erzwingen)" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:158 -+msgid "Open in preview" -+msgstr "In Vorschau öffnen" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:159 -+msgid "Open in preview (Force)" -+msgstr "In Vorschau öffnen (Erzwingen)" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:160 src/prefs_ui/prefs_ui_thumbwin.c:183 -+msgid "Open in new window" -+msgstr "In neuem Fenster öffnen" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:161 src/prefs_ui/prefs_ui_thumbwin.c:182 -+msgid "Open in shared window" -+msgstr "In gemeinsam genutztem Fenster öffnen" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:162 -+msgid "Open in shared window (Force)" -+msgstr "In gemeinsam genutztem Fenster öffnen (Erzwingen)" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:169 -+msgid "Load thumbnails" -+msgstr "Vorschaubilder laden" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:170 -+msgid "Load thumbnails recursively" -+msgstr "Vorschaubilder rekursiv laden" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:172 -+msgid "Change top directory" -+msgstr "Als oberste Verzeichnisebene verwenden" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:173 -+msgid "Load recursively in a tab" -+msgstr "Rekursiv in einem Tab laden" -+ -+#. Toolbar Style -+#: src/prefs_ui/prefs_ui_thumbwin.c:435 -+msgid "Default Layout" -+msgstr "Standard-Layout" -+ -+#. Show Directory or not -+#: src/prefs_ui/prefs_ui_thumbwin.c:460 -+msgid "Directory view" -+msgstr "Verzeichnisansicht" -+ -+#. Show Preview Tab or not -+#: src/prefs_ui/prefs_ui_thumbwin.c:476 -+msgid "Preview Tab" -+msgstr "Vorschau-Tab" -+ -+#. Show Tab or not -+#. ********************************************* -+#. * Tab Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_thumbwin.c:508 src/prefs_ui/prefs_ui_thumbwin.c:660 -+msgid "Tab" -+msgstr "Tab" -+ -+#. Raise window or not -+#: src/prefs_ui/prefs_ui_thumbwin.c:557 -+msgid "Raise window when opening thumbnails" -+msgstr "Fenster in den Vordergrund heben, wenn Vorschaubilder geöffnet werden" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:570 -+msgid "Toolbar Style" -+msgstr "Stil der Werkzeugleiste" -+ -+#. "Loading" frame -+#: src/prefs_ui/prefs_ui_thumbwin.c:580 -+msgid "Loading" -+msgstr "Laden" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:587 -+msgid "GUI redraw interval while loading: Every" -+msgstr "GUI neu zeichnen beim Laden: Nach jeweils" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:598 -+msgid "files" -+msgstr "Dateien" -+ -+#. show detail of progress -+#: src/prefs_ui/prefs_ui_thumbwin.c:602 -+msgid "Show detail of loading progress" -+msgstr "Details zum Ladeprozess anzeigen" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:627 -+msgid "Not implemented yet." -+msgstr "Noch nicht implementiert." -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:665 -+msgid "Tab Position" -+msgstr "Tab-Position" -+ -+#. Move to new tab automatically or not -+#: src/prefs_ui/prefs_ui_thumbwin.c:678 -+msgid "Move to new tab automatically" -+msgstr "Automatisch zum neuen Tab springen" -+ -+#. show tab close button -+#: src/prefs_ui/prefs_ui_thumbwin.c:685 -+msgid "Show close button" -+msgstr "Schließen-Knopf anzeigen" -+ -+#. show full path in tab -+#: src/prefs_ui/prefs_ui_thumbwin.c:695 -+msgid "Show full path" -+msgstr "Komplette Pfadangabe" -+ -+#. force open tab -+#: src/prefs_ui/prefs_ui_thumbwin.c:705 -+msgid "Open new tab whether image is exist or not in the directory" -+msgstr "Neuen Tab öffnen, selbst wenn sich keine Grafikdateien im Verzeichnis befinden" -+ -+#. show archive -+#: src/prefs_ui/prefs_ui_thumbwin.c:753 -+msgid "Archive" -+msgstr "Archiv" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:766 -+msgid "Default display mode" -+msgstr "Standard-Anzeigemodus" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:782 -+msgid "Thumnail Size" -+msgstr "Größe der Vorschaubilder" -+ -+#. show/hide dot file -+#: src/prefs_ui/prefs_ui_thumbwin.c:858 -+msgid "Show dot file" -+msgstr "Zeige Dateien, die mit ».« beginnen" -+ -+#. show/hide dot file -+#: src/prefs_ui/prefs_ui_thumbwin.c:865 -+msgid "Show \".\" directory whether hide dotfile or not." -+msgstr "Zeige ».«-Verzeichnis, selbst wenn mit Punkt beginnende Dateien " -+"eigentlich nicht angezeigt werden" -+ -+#. show/hide dot file -+#: src/prefs_ui/prefs_ui_thumbwin.c:872 -+msgid "Show \"..\" directory whether hide dotfile or not." -+msgstr "Zeige »..«-Verzeichnis, selbst wenn mit Punkt beginnende Dateien " -+"eigentlich nicht angezeigt werden" -+ -+#. ********************************************* -+#. * Style Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_thumbwin.c:889 -+msgid "Style" -+msgstr "Stil" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:895 -+msgid "Tree line style" -+msgstr "Baumstil eingerollt" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:907 -+msgid "Tree expander style" -+msgstr "Baumstil entfaltet" -+ -+#. ********************************************* -+#. * Drag and Drop Frame -+#. ********************************************* -+#: src/prefs_ui/prefs_ui_thumbwin.c:919 -+msgid "Drag and Drop" -+msgstr "Drag und Drop " -+ -+#. auto scroll -+#: src/prefs_ui/prefs_ui_thumbwin.c:922 -+msgid "Enable auto scroll." -+msgstr "Automatisches Scrollen aktivieren" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:932 -+msgid "Auto scroll interval" -+msgstr "Intervall für automatisches Scrollen" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:944 src/prefs_ui/prefs_ui_thumbwin.c:970 -+msgid "[ms]" -+msgstr "[ms]" -+ -+#. auto expand -+#: src/prefs_ui/prefs_ui_thumbwin.c:948 -+msgid "Enable auto expand directory tree." -+msgstr "Automatisches Entfalten des Verzeichnisbaums aktivieren" -+ -+#: src/prefs_ui/prefs_ui_thumbwin.c:958 -+msgid "Lag time for auto expand" -+msgstr "Verzögerungszeit für automatisches Entfalten" -+ -+#. Show Scrollbar or not -+#: src/prefs_ui/prefs_ui_thumbwin.c:1090 -+msgid "Show scrollbar" -+msgstr "Zeige Scroll-Leiste" -+ -+#: src/gimv_dupl_win.c:121 src/thumbnail_view_album.c:790 -+#: plugins/thumbnail_view/detailview.c:121 -+msgid "Name" -+msgstr "Name" -+ -+#: src/gimv_dupl_win.c:123 plugins/thumbnail_view/detailview.c:122 -+msgid "Size (byte)" -+msgstr "Größe (Byte)" -+ -+#. window -+#: src/gimv_dupl_win.c:181 -+msgid "Find Duplicates - result" -+msgstr "Doppelte Dateien finden - Ergebnis" -+ -+#. Select All -+#: src/gimv_dupl_win.c:297 -+msgid "Select All" -+msgstr "Alle auswählen" -+ -+#: src/gimv_dupl_win.c:409 -+msgid "Finding similar images..." -+msgstr "Finde ähnliche Grafiken..." -+ -+#: src/gimv_dupl_win.c:426 -+msgid "Completed" -+msgstr "Abgeschlossen" -+ -+#: src/text_viewer.c:71 -+#, c-format -+msgid "Can't open text file: %s\n" -+msgstr "Kann Textdatei nicht öffnen: %s\n" -+ -+#: src/text_viewer.c:117 -+msgid "File Name: " -+msgstr "Dateiname: " -+ -+#: src/gimv_thumb_view.c:180 -+msgid "/_Open" -+msgstr "/Ö_ffnen" -+ -+#: src/gimv_thumb_view.c:181 -+msgid "/Open in New _Window" -+msgstr "/In _neuem Fenster öffnen" -+ -+#: src/gimv_thumb_view.c:182 -+msgid "/Open in S_hared Window" -+msgstr "/In _gemeinsam genutztem Fenster öffnen" -+ -+#: src/gimv_thumb_view.c:183 -+msgid "/Open in E_xternal Program" -+msgstr "/Mit e_xternem Programm öffnen" -+ -+#: src/gimv_thumb_view.c:184 -+msgid "/_Scripts" -+msgstr "/_Skripte" -+ -+#: src/gimv_thumb_view.c:186 -+msgid "/_Update Thumbnail" -+msgstr "/V_orschaubilder aktualisieren" -+ -+#: src/gimv_thumb_view.c:187 -+msgid "/Remo_ve from List" -+msgstr "/Aus _Liste entfernen" -+ -+#: src/gimv_thumb_view.c:191 -+msgid "/Scan E_XIF Data..." -+msgstr "/EXIF-_Daten abfragen..." -+ -+#: src/gimv_thumb_view.c:193 -+msgid "/_Edit Comment..." -+msgstr "/Bildko_mmentar bearbeiten" -+ -+#: src/gimv_thumb_view.c:195 -+msgid "/Re_name..." -+msgstr "/_Umbenennen..." -+ -+#: src/gimv_thumb_view.c:196 -+msgid "/_Copy Files To..." -+msgstr "/Dateien _kopieren nach..." -+ -+#: src/gimv_thumb_view.c:197 -+msgid "/_Move Files To..." -+msgstr "/Dateien _verschieben nach..." -+ -+#: src/gimv_thumb_view.c:198 -+msgid "/_Link Files To..." -+msgstr "/Dateien verkn_üpfen nach..." -+ -+#: src/gimv_thumb_view.c:199 -+msgid "/_Remove file..." -+msgstr "/Dateien ent_fernen..." -+ -+#: src/gimv_thumb_view.c:478 -+msgid "Execute command" -+msgstr "Befehl ausführen" -+ -+#: src/gimv_thumb_view.c:479 src/gimv_thumb_view.c:548 -+msgid "Please enter options:" -+msgstr "Bitte Optionen eingeben:" -+ -+#: src/gimv_thumb_view.c:547 -+msgid "Execute script" -+msgstr "Skript ausführen" -+ -+#: src/gimv_thumb_view.c:1016 -+msgid "No files specified!!" -+msgstr "Keine Dateien angegeben!!" -+ -+#: src/gimv_thumb_view.c:2378 -+msgid "Rename a file" -+msgstr "Eine Datei umbenennen" -+ -+#: src/gimv_thumb_view.c:2379 -+msgid "New file name: " -+msgstr "Neuer Dateiname: " -+ -+#: src/gimv_thumb_view.c:2407 -+#, c-format -+msgid "" -+"File exist : %s\n" -+"\n" -+"Overwrite?" -+msgstr "" -+"Datei existiert bereits: %s\n" -+"\n" -+"Ãœberschreiben?" -+ -+#: src/gimv_thumb_view.c:2429 -+#, c-format -+msgid "" -+"Faild to rename file :\n" -+"%s" -+msgstr "" -+"Umbenennen der Datei fehlgeschlagen:\n" -+"%s" -+ -+#: src/gimv_thumb_view.c:2448 -+#, c-format -+msgid "Faild to rename cache file :%s\n" -+msgstr "Umbenennen der Zwischenspeicherdatei fehlgeschlagen: %s\n" -+ -+#: src/gimv_thumb_view.c:2458 -+#, c-format -+msgid "Faild to rename comment file :%s\n" -+msgstr "Umbenennen der Kommentardatei fehlgeschlagen: %s\n" -+ -+#: src/gimv_thumb_view.c:3659 src/gimv_thumb_view.c:3735 -+#, c-format -+msgid "Collection %d" -+msgstr "Kollektion %d" -+ -+#: src/gimv_thumb_view.c:3729 -+#, c-format -+msgid "%s (Collection)" -+msgstr "%s (Kollektion)" -+ -+#: src/thumbnail_view_album.c:86 -+msgid "Album 2" -+msgstr "Album 2" -+ -+#: src/thumbnail_view_album.c:102 -+msgid "Album 3" -+msgstr "Album 3" -+ -+#: src/thumbnail_view_album.c:716 -+#, c-format -+msgid "Name : %s" -+msgstr "Name: %s" -+ -+#: src/thumbnail_view_album.c:735 -+#, c-format -+msgid "Size : %s bytes" -+msgstr "Größe: %s Byte" -+ -+#: src/thumbnail_view_album.c:737 -+#, c-format -+msgid "%s bytes" -+msgstr "%s Byte" -+ -+#: src/thumbnail_view_album.c:753 -+msgid "Time : " -+msgstr "Zeit: " -+ -+#: src/thumbnail_view_album.c:772 -+#, c-format -+msgid "Type: %s" -+msgstr "Typ: %s" -+ -+#: src/thumbnail_view_album.c:791 -+msgid "Size" -+msgstr "Größe" -+ -+#: src/thumbnail_view_album.c:792 -+msgid "Time" -+msgstr "Zeit" -+ -+#: src/thumbnail_view_album.c:793 plugins/thumbnail_view/detailview.c:123 -+msgid "Type" -+msgstr "Typ" -+ -+#: plugins/archiver/lha-ext.c:52 -+msgid "LHA archive support" -+msgstr "Unterstützung für LHA-Archive" -+ -+#: plugins/archiver/lha-ext.c:54 plugins/archiver/rar-ext.c:54 -+#: plugins/archiver/tar-ext.c:89 plugins/archiver/zip-ext.c:57 -+#: plugins/image_loader/bmp.c:130 plugins/image_loader/imlib_loader.c:176 -+#: plugins/image_loader/mag.c:93 plugins/image_loader/mng.c:136 -+#: plugins/image_loader/pcx.c:92 plugins/image_loader/pixbuf_loader.c:255 -+#: plugins/image_loader/png_loader.c:76 -+#: plugins/image_loader/spi_image_loader.c:53 plugins/image_loader/svg.c:80 -+#: plugins/image_loader/tga.c:112 plugins/image_loader/wmf.c:80 -+#: plugins/image_loader/xbm.c:92 plugins/image_loader/xcf.c:270 -+#: plugins/image_loader/xvpics.c:50 plugins/image_saver/png_saver.c:49 -+#: plugins/image_saver/pnm_saver.c:51 plugins/image_saver/xvpics_saver.c:49 -+#: plugins/image_view/image_view_mplayer.c:240 -+#: plugins/image_view/image_view_xine.c:265 plugins/io_stream/gimv_bz_io.c:59 -+#: plugins/io_stream/gimv_gzip_io.c:66 plugins/thumbnail/ee.c:109 -+#: plugins/thumbnail/gimv_thumb.c:99 plugins/thumbnail/gqview.c:107 -+#: plugins/thumbnail/konqueror-old.c:105 plugins/thumbnail/nautilus.c:78 -+#: plugins/thumbnail/nautilus-2.0.c:80 plugins/thumbnail/xvpics.c:83 -+#: plugins/thumbnail_view/detailview.c:96 -+msgid "Takuro Ashie" -+msgstr "Takuro Ashie" -+ -+#: plugins/archiver/rar-ext.c:52 -+msgid "RAR archive support" -+msgstr "Unterstützung für RAR-Archive" -+ -+#: plugins/archiver/tar-ext.c:87 -+msgid "TAR archive support" -+msgstr "Unterstützung für TAR-Archive" -+ -+#: plugins/archiver/zip-ext.c:55 -+msgid "ZIP archive support" -+msgstr "Unterstützung für ZIP-Archive" -+ -+#: plugins/image_loader/bmp.c:101 plugins/image_loader/bmp.c:108 -+#: plugins/image_loader/bmp.c:115 -+msgid "Windows Bitmap Image" -+msgstr "Windows-Bitmap-Grafik" -+ -+#: plugins/image_loader/bmp.c:128 -+msgid "Windows Bitmap Image Loader" -+msgstr "Lademodul für Windows-Bitmap-Grafik" -+ -+#: plugins/image_loader/imlib_loader.c:84 -+#: plugins/image_loader/imlib_loader.c:91 -+#: plugins/image_loader/imlib_loader.c:98 -+#: plugins/image_loader/pixbuf_loader.c:121 -+#: plugins/image_loader/pixbuf_loader.c:128 -+#: plugins/image_loader/pixbuf_loader.c:135 -+msgid "The BMP image format" -+msgstr "Das BMP-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:105 -+#: plugins/image_loader/pixbuf_loader.c:142 -+msgid "The GIF image format" -+msgstr "Das GIF-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:112 -+#: plugins/image_loader/pixbuf_loader.c:156 -+msgid "The JPEG image format" -+msgstr "Das JPEG-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:119 -+#: plugins/image_loader/pixbuf_loader.c:163 -+msgid "The PNG image format" -+msgstr "Das PNG-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:126 -+#: plugins/image_loader/pixbuf_loader.c:170 -+msgid "Portable Any Map Image" -+msgstr "Portable Any-Map-Grafik" -+ -+#: plugins/image_loader/imlib_loader.c:133 -+#: plugins/image_loader/pixbuf_loader.c:177 -+msgid "The PBM image format" -+msgstr "Das PBM-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:140 -+#: plugins/image_loader/pixbuf_loader.c:184 -+msgid "The PGM image format" -+msgstr "Das PGM-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:147 -+#: plugins/image_loader/pixbuf_loader.c:191 -+msgid "The PPM image format" -+msgstr "Das PPM-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:154 -+#: plugins/image_loader/pixbuf_loader.c:219 -+msgid "The TIFF image format" -+msgstr "Das TIFF-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:161 -+#: plugins/image_loader/pixbuf_loader.c:240 -+msgid "The XPM image format" -+msgstr "Das XPM-Grafikformat" -+ -+#: plugins/image_loader/imlib_loader.c:174 -+msgid "Imlib1 Image Loader" -+msgstr "Lademodul für Imlib1-Grafik" -+ -+#: plugins/image_loader/mag.c:91 -+msgid "MAG Image Loader" -+msgstr "Lademodul für MAG-Grafik" -+ -+#: plugins/image_loader/mng.c:134 -+msgid "MNG Image Loader" -+msgstr "Lademodul für MNG-Grafik" -+ -+#: plugins/image_loader/pcx.c:90 -+msgid "PCX Image Loader" -+msgstr "Lademodul für PCX-Grafik" -+ -+#: plugins/image_loader/pixbuf_loader.c:114 -+msgid "The ANI image format" -+msgstr "Das ANI-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:149 -+msgid "The ICO image format" -+msgstr "Das ICO-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:198 -+#: plugins/image_loader/pixbuf_loader.c:205 -+msgid "The Sun raster image format" -+msgstr "Das Sun-Raster-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:212 -+msgid "The Targa image format" -+msgstr "Das Targa-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:226 -+msgid "The WBMP image format" -+msgstr "Das WBMP-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:233 -+msgid "The XBM image format" -+msgstr "Das XBM-Grafikformat" -+ -+#: plugins/image_loader/pixbuf_loader.c:253 -+msgid "GdkPixbuf Image Loader" -+msgstr "Lademodul für GdkPixbuf-Grafik" -+ -+#: plugins/image_loader/png_loader.c:74 -+msgid "PNG Image Loader" -+msgstr "Lademodul für PNG-Grafik" -+ -+#: plugins/image_loader/prefs_spi.c:60 -+msgid "/Plugin/Susie plugin" -+msgstr "/Plugin/Susie-Plugin" -+ -+#: plugins/image_loader/prefs_spi.c:68 -+msgid "/Plugin/Susie plugin/Import filter" -+msgstr "/Plugin/Susie-Plugin/Importfilter" -+ -+#: plugins/image_loader/prefs_spi.c:76 -+msgid "/Plugin/Susie plugin/Archive extractor" -+msgstr "/Plugin/Susie-Plugin/Archiv-Extrahier-Plugin" -+ -+#: plugins/image_loader/prefs_spi.c:192 -+msgid "Directories list to search susie plugins" -+msgstr "Verzeichnisliste zur Suche nach Susie-Plugins" -+ -+#: plugins/image_loader/prefs_spi.c:193 -+msgid "Select susie plugin directory" -+msgstr "Susie-Plugin-Verzeichnis wählen" -+ -+#: plugins/image_loader/prefs_spi.c:197 -+msgid "Use default directories list to search susie plugins" -+msgstr "Nutze Standardverzeichnisliste zur Suche nach Susie-Plugins" -+ -+#: plugins/image_loader/prefs_spi.c:225 -+msgid "File Name" -+msgstr "Dateiname" -+ -+#: plugins/image_loader/prefs_spi.c:316 -+msgid "Import filters" -+msgstr "Importfilter" -+ -+#: plugins/image_loader/prefs_spi.c:339 -+msgid "Archive Extractor" -+msgstr "Archiv-Extrahier-Plugin" -+ -+#: plugins/image_loader/spi_image_loader.c:51 -+msgid "Susie Plugin Image Loader" -+msgstr "Lademodul für Susie-Plugin-Grafik" -+ -+#: plugins/image_loader/svg.c:78 -+msgid "SVG Image Loader" -+msgstr "Lademodul für SVG-Grafik" -+ -+#: plugins/image_loader/tga.c:110 -+msgid "TGA Image Loader" -+msgstr "Lademodul für TGA-Grafik" -+ -+#: plugins/image_loader/wmf.c:78 -+msgid "WMF Image Loader" -+msgstr "Lademodul für WMF-Grafik" -+ -+#: plugins/image_loader/xbm.c:90 -+msgid "XBM Image Loader" -+msgstr "Lademodul für XBM-Grafik" -+ -+#: plugins/image_loader/xcf.c:268 -+msgid "XCF Image Loader" -+msgstr "Lademodul für XCF-Grafik" -+ -+#: plugins/image_loader/xvpics.c:48 -+msgid "XV thumbnail Image Loader" -+msgstr "Lademodul für XV-Vorschaugrafik" -+ -+#: plugins/image_saver/png_saver.c:47 -+msgid "PNG Image Saver" -+msgstr "Speichermodul für PNG-Grafik" -+ -+#: plugins/image_saver/pnm_saver.c:49 -+msgid "PNM Image Saver" -+msgstr "Speichermodul für PNM-Grafik" -+ -+#: plugins/image_saver/xvpics_saver.c:47 -+msgid "XVPICS Image Saver" -+msgstr "Speichermodul für XVPICS-Grafik" -+ -+#: plugins/image_view/image_view_mplayer.c:77 -+msgid "Movie Player (MPlayer)" -+msgstr "Video-Player (MPlayer)" -+ -+#: plugins/image_view/image_view_mplayer.c:238 -+msgid "MPlayer Embeder & Movie Frame Loader" -+msgstr "MPlayer Embedder & Video-Frame-Lademodul" -+ -+#: plugins/image_view/image_view_xine.c:102 -+msgid "Movie Player (Xine)" -+msgstr "Video-Player (Xine)" -+ -+#: plugins/image_view/image_view_xine.c:263 -+msgid "Xine Embeder & Movie Frame Loader" -+msgstr "Xine Embedder & Video-Frame-Lademodul" -+ -+#: plugins/image_view/image_view_xine.c:725 -+msgid "Please stop first." -+msgstr "Bitte vorher stoppen." -+ -+#: plugins/image_view/image_view_xine.c:737 -+msgid "No available plugin found." -+msgstr "Kein verfügbares Plugin gefunden." -+ -+#: plugins/image_view/image_view_xine.c:742 -+msgid "Available plugins" -+msgstr "Verfügbare Plugins" -+ -+#: plugins/image_view/image_view_xine.c:742 -+msgid "Plugin: " -+msgstr "Plugin: " -+ -+#: plugins/image_view/image_view_xine.c:763 -+msgid "No available MRL found." -+msgstr "Keine verfügbare MRL gefunden." -+ -+#: plugins/image_view/prefs_mplayer.c:69 -+msgid "/Movie and Audio/MPlayer" -+msgstr "/Video und Audio/MPlayer" -+ -+#. ********************************************* -+#. * Driver Frame -+#. ********************************************* -+#: plugins/image_view/prefs_mplayer.c:253 -+msgid "Driver" -+msgstr "Treiber" -+ -+#. video driver combo -+#: plugins/image_view/prefs_mplayer.c:264 plugins/image_view/prefs_xine.c:187 -+#: plugins/image_view/prefs_xine.c:215 -+msgid "Video driver : " -+msgstr "Video-Treiber: " -+ -+#. audio driver combo -+#: plugins/image_view/prefs_mplayer.c:282 plugins/image_view/prefs_xine.c:197 -+#: plugins/image_view/prefs_xine.c:233 -+msgid "Audio driver : " -+msgstr "Audio-Treiber: " -+ -+#. use this feature or not -+#: plugins/image_view/prefs_mplayer.c:306 -+msgid "Enable creating thumbnail of movie using MPlayer" -+msgstr "Erstellung eines Vorschaubildes vom Video mit MPlayer aktivieren" -+ -+#: plugins/image_view/prefs_mplayer.c:318 plugins/image_view/prefs_xine.c:273 -+msgid "Stream position : " -+msgstr "Position im Datenstrom: " -+ -+#: plugins/image_view/prefs_mplayer.c:332 plugins/image_view/prefs_xine.c:287 -+msgid "[%]" -+msgstr "[%]" -+ -+#: plugins/image_view/prefs_xine.c:45 -+msgid "/Movie and Audio/Xine" -+msgstr "/Video und Audio/Xine" -+ -+#. ********************************************* -+#. * Driver Frame -+#. ********************************************* -+#: plugins/image_view/prefs_xine.c:177 -+msgid "Driver (Not implemented yet)" -+msgstr "Treiber (noch nicht implementiert)" -+ -+#. use this feature or not -+#: plugins/image_view/prefs_xine.c:260 -+msgid "Enable creating thumbnail of movie using Xine" -+msgstr "Erstellung eines Vorschaubildes vom Video mit Xine aktivieren" -+ -+#: plugins/image_view/prefs_xine.c:297 -+msgid "Delay time to create thumbnail from starting play : " -+msgstr "Verzögerungszeit vom Abspielstart bis zur Erstellung des Vorschaubildes: " -+ -+#: plugins/io_stream/gimv_bz_io.c:57 -+msgid "BZIP2 Compressed Stream Support" -+msgstr "Unterstützung für BZIP2-komprimierten Datenstrom" -+ -+#: plugins/io_stream/gimv_gzip_io.c:64 -+msgid "GZIP Compressed Stream Support" -+msgstr "Unterstützung für GZIP-komprimierten Datenstrom" -+ -+#: plugins/thumbnail/ee.c:83 -+msgid "Electric Eyes (Preview)" -+msgstr "Electric Eyes (Vorschau)" -+ -+#: plugins/thumbnail/ee.c:89 -+msgid "Electric Eyes (Icon)" -+msgstr "Electric Eyes (Icon)" -+ -+#: plugins/thumbnail/ee.c:95 -+msgid "Electric Eyes (Mini)" -+msgstr "Electric Eyes (Mini)" -+ -+#: plugins/thumbnail/ee.c:107 -+msgid "Electric Eyes thumbnail support" -+msgstr "Unterstützung für Electric Eyes-Vorschaubilder" -+ -+#: plugins/thumbnail/ee.c:187 plugins/thumbnail/gqview.c:242 -+#: plugins/thumbnail/konqueror-old.c:189 -+#, c-format -+msgid "save cache: %s\n" -+msgstr "Pufferspeicher sichern: %s\n" -+ -+#: plugins/thumbnail/gimv_thumb.c:97 -+msgid "GImageView thumbnail support" -+msgstr "Unterstützung für GImageView-Vorschaubilder" -+ -+#: plugins/thumbnail/gimv_thumb.c:247 -+msgid "image size invalid\n" -+msgstr "Ungültige Bildgröße\n" -+ -+#: plugins/thumbnail/gimv_thumb.c:254 -+msgid "cache size invalid\n" -+msgstr "Ungültige Pufferspeichergröße\n" -+ -+#: plugins/thumbnail/gimv_thumb.c:380 -+msgid "GImageVIew thumbnail size" -+msgstr "Größe der GImageView-Vorschaubilder" -+ -+#: plugins/thumbnail/gqview.c:93 -+msgid "GQview" -+msgstr "GQview" -+ -+#: plugins/thumbnail/gqview.c:105 -+msgid "GQview thumbnail support" -+msgstr "Unterstützung für GQview-Vorschaubilder" -+ -+#: plugins/thumbnail/gqview.c:326 -+msgid "GQview thumbnail size" -+msgstr "Größe der GQview-Vorschaubilder" -+ -+#: plugins/thumbnail/konqueror-old.c:79 -+msgid "Konqueror old (Large)" -+msgstr "Konqueror alt (groß)" -+ -+#: plugins/thumbnail/konqueror-old.c:85 -+msgid "Konqueror old (Medium)" -+msgstr "Konqueror alt (mittel)" -+ -+#: plugins/thumbnail/konqueror-old.c:91 -+msgid "Konqueror old (Small)" -+msgstr "Konqueror alt (klein)" -+ -+#: plugins/thumbnail/konqueror-old.c:103 -+msgid "Konqueror(KDE2.1.x or belower) thumbnail support" -+msgstr "Unterstützung für Konqueror- (KDE2.1.x oder niedriger) Vorschaubilder" -+ -+#: plugins/thumbnail/konqueror.c:81 -+msgid "Konqueror (Large)" -+msgstr "Konqueror (groß)" -+ -+#: plugins/thumbnail/konqueror.c:87 -+msgid "Konqueror (Medium)" -+msgstr "Konqueror (mittel)" -+ -+#: plugins/thumbnail/konqueror.c:93 -+msgid "Konqueror (Small)" -+msgstr "Konqueror (klein)" -+ -+#: plugins/thumbnail/konqueror.c:106 -+msgid "Konqueror(KDE2.2 or higher) thumbnail support" -+msgstr "Unterstützung für Konqueror- (KDE2.2 oder höher) Vorschaubilder" -+ -+#: plugins/thumbnail/nautilus.c:65 -+msgid "Nautilus" -+msgstr "Nautilus" -+ -+#: plugins/thumbnail/nautilus.c:76 -+msgid "Nautilus thumbnail support" -+msgstr "Unterstützung für Nautilus-Vorschaubilder" -+ -+#: plugins/thumbnail/nautilus-2.0.c:67 -+msgid "Nautilus-2.0" -+msgstr "Nautilus 2.0" -+ -+#: plugins/thumbnail/nautilus-2.0.c:78 -+msgid "Nautilus-2.0 thumbnail support" -+msgstr "Unterstützung für Nautilus 2.0-Vorschaubilder" -+ -+#: plugins/thumbnail/xvpics.c:70 -+msgid "XV thumbnail" -+msgstr "XV Thumbnail" -+ -+#: plugins/thumbnail/xvpics.c:81 -+msgid "XV thumbnail support" -+msgstr "Unterstützung für XV-Vorschaubilder" -+ -+#: plugins/thumbnail_view/detailview.c:41 -+msgid "Detail" -+msgstr "Detail" -+ -+#: plugins/thumbnail_view/detailview.c:57 -+msgid "Detail + Icon" -+msgstr "Detail + Icon" -+ -+#: plugins/thumbnail_view/detailview.c:73 -+msgid "Detail + Thumbnail" -+msgstr "Detail + Vorschaubild" -+ -+#: plugins/thumbnail_view/detailview.c:94 -+msgid "Thumbnail View Detail Mode" -+msgstr "Detailansichtsmodus für Vorschaubilder" -+ -+#: plugins/thumbnail_view/detailview.c:124 -+msgid "Cache type" -+msgstr "Pufferspeichertyp" -+ -+#: plugins/thumbnail_view/detailview.c:125 -+msgid "Access time" -+msgstr "Zugriffszeit" -+ -+#: plugins/thumbnail_view/detailview.c:126 -+msgid "Modification time" -+msgstr "Modifikationszeit" -+ -+#: plugins/thumbnail_view/detailview.c:127 -+msgid "Change time" -+msgstr "Änderungszeit" -+ -+#: plugins/thumbnail_view/detailview.c:128 -+msgid "User" -+msgstr "Benutzer" -+ -+#: plugins/thumbnail_view/detailview.c:129 -+msgid "Group" -+msgstr "Gruppe" -+ -+#: plugins/thumbnail_view/detailview.c:130 -+msgid "Mode" -+msgstr "Modus" -+ -+#: plugins/thumbnail_view/detailview.c:131 -+msgid "Image size" -+msgstr "Bildgröße" -+ -+#: plugins/thumbnail_view/detailview.c:335 -+msgid "Unknwon" -+msgstr "Unbekannt" -+ -+#: plugins/thumbnail_view/detailview_prefs.c:56 -+msgid "/Thumbnail Window/Thumbnail View/Detail View" -+msgstr "/Vorschaubildfenster/Vorschauansicht/Detailansicht" -+ -+#: plugins/thumbnail_view/detailview_prefs.c:108 -+msgid "Column Order" -+msgstr "Spaltenreihenfolge" -+ -+#: plugins/thumbnail_view/detailview_prefs.c:109 -+msgid "Possible columns" -+msgstr "Verfügbare Spalten" -+ -+#: plugins/thumbnail_view/detailview_prefs.c:110 -+msgid "Displayed columns" -+msgstr "Angezeigte Spalten" -+ -+#. show/hide column title -+#: plugins/thumbnail_view/detailview_prefs.c:121 -+msgid "Show Column Title" -+msgstr "Zeige Spaltentitel" -+ -+#: src/gimv_elist.c:997 -+msgid "Down" -+msgstr "Herunter" -+ -+#: src/gimv_elist.c:1024 -+msgid "New" -+msgstr "Neu" -+ -+#: src/gimv_elist.c:1028 -+msgid "Add" -+msgstr "Hinzufügen" -+ -+#: src/gimv_elist.c:1032 -+msgid "Change" -+msgstr "Ändern" -+ -+#: src/gimv_elist.c:1036 -+msgid "Delete" -+msgstr "Löschen" -+ diff -Nru gimageview-0.2.27/debian/patches/50_bts243584_returncode_on_exit.dpatch gimageview-0.3.0-0.20101117/debian/patches/50_bts243584_returncode_on_exit.dpatch --- gimageview-0.2.27/debian/patches/50_bts243584_returncode_on_exit.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/50_bts243584_returncode_on_exit.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50_bts243584_returncode_on_exit.dpatch by Sandro Tosi -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use correctly the return code in case of error at opening - -@DPATCH@ -diff -urNad gimageview-0.2.27~/src/gimageview.c gimageview-0.2.27/src/gimageview.c ---- gimageview-0.2.27~/src/gimageview.c 2004-05-23 16:07:55.000000000 +0200 -+++ gimageview-0.2.27/src/gimageview.c 2008-08-15 13:47:32.585259454 +0200 -@@ -244,8 +244,10 @@ - /* reset config */ - prefs_load_config (); - -- if (quit_main) -+ if (quit_main) { - gtk_main_quit (); -+ exit(-1); -+ } - - return FALSE; - } diff -Nru gimageview-0.2.27/debian/patches/60_bts527692_gtk_headers.dpatch gimageview-0.3.0-0.20101117/debian/patches/60_bts527692_gtk_headers.dpatch --- gimageview-0.2.27/debian/patches/60_bts527692_gtk_headers.dpatch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/60_bts527692_gtk_headers.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 60_bts527692_clist_header.dpatch by Filippo Giunchedi -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gimageview-0.2.27~/src/auto_completion.c gimageview-0.2.27/src/auto_completion.c ---- gimageview-0.2.27~/src/auto_completion.c 2009-06-27 12:25:44.000000000 +0200 -+++ gimageview-0.2.27/src/auto_completion.c 2009-06-27 14:26:03.000000000 +0200 -@@ -34,12 +34,7 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include -+#include - - #include "auto_completion.h" - #include "charset.h" diff -Nru gimageview-0.2.27/debian/patches/gimageview-0.3.0-0.20101117-installicon.patch gimageview-0.3.0-0.20101117/debian/patches/gimageview-0.3.0-0.20101117-installicon.patch --- gimageview-0.2.27/debian/patches/gimageview-0.3.0-0.20101117-installicon.patch 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/gimageview-0.3.0-0.20101117-installicon.patch 2011-04-17 12:30:00.000000000 +0000 @@ -0,0 +1,11 @@ +diff -ur gimageview-0.3.0-0.20101117.orig/src/pixmaps/Makefile.am gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.am +--- gimageview-0.3.0-0.20101117.orig/src/pixmaps/Makefile.am ++++ gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.am +@@ -40,7 +40,6 @@ + small_up.xpm \ + up.xpm \ + stop.xpm \ +- up.xpm \ + zoom.xpm \ + zoom_fit.xpm \ + zoom_in.xpm \ diff -Nru gimageview-0.2.27/debian/patches/series gimageview-0.3.0-0.20101117/debian/patches/series --- gimageview-0.2.27/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/patches/series 2011-04-17 12:30:00.000000000 +0000 @@ -0,0 +1 @@ +gimageview-0.3.0-0.20101117-installicon.patch diff -Nru gimageview-0.2.27/debian/README.source gimageview-0.3.0-0.20101117/debian/README.source --- gimageview-0.2.27/debian/README.source 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -This package uses dpatch as patch system, you can find some information -about it at: - - /usr/share/doc/dpatch/README.source.gz diff -Nru gimageview-0.2.27/debian/rules gimageview-0.3.0-0.20101117/debian/rules --- gimageview-0.2.27/debian/rules 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/rules 2011-04-17 12:30:00.000000000 +0000 @@ -5,27 +5,30 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +# This is the debhelper compatability version to use. +#export DH_COMPAT=3 configure: configure-stamp -configure-stamp: patch +configure-stamp: dh_testdir - cp /usr/share/misc/config.sub config.sub - cp /usr/share/misc/config.guess config.guess +# cp /usr/share/misc/config.sub config.sub +# cp /usr/share/misc/config.guess config.guess + + ./autogen.sh ./configure \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ + --enable-mplayer \ --enable-exif \ --disable-splash \ --with-xine \ --with-gtk2 \ --with-librsvg \ --with-libmng \ - --with-pic \ - --enable-mplayer + --with-pic touch configure-stamp @@ -39,26 +42,25 @@ touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - [ ! -f Makefile ] || $(MAKE) distclean + -$(MAKE) distclean - dh_clean config.sub config.guess po/.intltool-merge-cache + -rm -f config.sub config.guess + -rm po/.intltool-merge-cache - dh_clean po/*.gmo debian/gimv.1 config.log intltool-extract intltool-merge - dh_clean intltool-update libtool xml-i18n-extract xml-i18n-merge xml-i18n-update - dh_clean etc/gimageview.desktop + dh_clean po/*.gmo debian/gimv.1 install: build dh_testdir dh_testroot - dh_clean -k + dh_clean dh_installdirs - $(MAKE) install prefix=$(CURDIR)/debian/gimageview/usr desktopdir=$(CURDIR)/debian/gimageview/usr/share/applications/ + $(MAKE) install prefix=$(CURDIR)/debian/gimageview/usr # Build architecture-independent files here. binary-indep: build install @@ -70,7 +72,6 @@ dh_testroot dh_installdocs dh_installexamples - dh_desktop dh_installmenu dh_installman debian/gimv.1 dh_installchangelogs ChangeLog @@ -78,8 +79,6 @@ dh_strip dh_installmime dh_compress - rm -f $(CURDIR)/debian/gimageview/usr/share/doc/gimageview/text/C/COPYING.gz - rm -f $(CURDIR)/debian/gimageview/usr/share/doc/gimageview/text/ja/COPYING.ja.gz dh_fixperms dh_installdeb dh_shlibdeps diff -Nru gimageview-0.2.27/debian/source/format gimageview-0.3.0-0.20101117/debian/source/format --- gimageview-0.2.27/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/source/format 2011-04-30 13:12:39.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru gimageview-0.2.27/debian/watch gimageview-0.3.0-0.20101117/debian/watch --- gimageview-0.2.27/debian/watch 2011-04-30 13:12:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -version=3 -http://sf.net/gtkmmviewer/gimageview-(.*)\.tar\.gz - diff -Nru gimageview-0.2.27/depcomp gimageview-0.3.0-0.20101117/depcomp --- gimageview-0.2.27/depcomp 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/depcomp 1970-01-01 00:00:00.000000000 +0000 @@ -1,423 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 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 -# 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 Alexandre Oliva . - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi - -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" - "$@" -Wc,-MD - else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. We will use -o /dev/null later, - # however we can't do the remplacement now because - # `-o $object' might simply not be used - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 diff -Nru gimageview-0.2.27/doc/ja/ChangeLog.ja gimageview-0.3.0-0.20101117/doc/ja/ChangeLog.ja --- gimageview-0.2.27/doc/ja/ChangeLog.ja 2004-12-28 04:29:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/doc/ja/ChangeLog.ja 2010-11-17 06:10:11.000000000 +0000 @@ -1,3 +1,16 @@ +2005-01-28 Takuro Ashie + + * plugins/image_view/gimv_xine.c, plugins/image_view/gimv_xine.h, + plugins/image_view/gimv_xine_priv.c, + plugins/image_view/gimv_xine_priv.h, + plugins/image_view/prefs_xine.c: + Xine¥Ó¥å¡¼¤Î¥ª¡¼¥Ç¥£¥ª & ¥Ó¥Ç¥ª¥É¥é¥¤¥Ð¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿¡¥ + +2005-01-07 Takuro Ashie + + * src/gimv_thumb_win.c: Gtk+-1.2¤Ç¤Î¥³¥ó¥Ñ¥¤¥ë¥¨¥é¡¼¤ò½¤Àµ¡¥ + ¸æÊó¹ð¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹ > ¤·¤Ã¤Ý¤µ¤ó + 2004-12-29 Takuro Ashie * Version-0.2.27 diff -Nru gimageview-0.2.27/doc/ja/Makefile.in gimageview-0.3.0-0.20101117/doc/ja/Makefile.in --- gimageview-0.2.27/doc/ja/Makefile.in 2004-12-28 04:01:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/doc/ja/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,536 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = doc/ja -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(jahtmldir)" "$(DESTDIR)$(jatextdir)" -jahtmlDATA_INSTALL = $(INSTALL_DATA) -jatextDATA_INSTALL = $(INSTALL_DATA) -DATA = $(jahtml_DATA) $(jatext_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -jahtmldir = $(DESTDIR)$(gimv_docdir)/html/ja -jahtml_DATA = \ - gimageview.css \ - index.html \ - 01.html \ - 02.html \ - 03.html \ - 04.html \ - 05.html \ - 06.html \ - 07.html \ - gimv_faq.html \ - gimv_tips.html \ - gimv_history.html \ - todo.html \ - document.html \ - changelog.html - -jatextdir = $(DESTDIR)$(gimv_docdir)/text/ja -jatext_DATA = \ - COPYING.ja \ - ChangeLog.ja \ - README.ja \ - INSTALL.ja \ - NEWS.ja \ - TODO.ja \ - gimageview.txt - -EXTRA_DIST = \ - $(jahtml_DATA) \ - $(jatext_DATA) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ja/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/ja/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-jahtmlDATA: $(jahtml_DATA) - @$(NORMAL_INSTALL) - test -z "$(jahtmldir)" || $(mkdir_p) "$(DESTDIR)$(jahtmldir)" - @list='$(jahtml_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(jahtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jahtmldir)/$$f'"; \ - $(jahtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jahtmldir)/$$f"; \ - done - -uninstall-jahtmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(jahtml_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(jahtmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(jahtmldir)/$$f"; \ - done -install-jatextDATA: $(jatext_DATA) - @$(NORMAL_INSTALL) - test -z "$(jatextdir)" || $(mkdir_p) "$(DESTDIR)$(jatextdir)" - @list='$(jatext_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(jatextDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jatextdir)/$$f'"; \ - $(jatextDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jatextdir)/$$f"; \ - done - -uninstall-jatextDATA: - @$(NORMAL_UNINSTALL) - @list='$(jatext_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(jatextdir)/$$f'"; \ - rm -f "$(DESTDIR)$(jatextdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(jahtmldir)" "$(DESTDIR)$(jatextdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-jahtmlDATA install-jatextDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-jahtmlDATA \ - uninstall-jatextDATA - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-jahtmlDATA \ - install-jatextDATA install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-jahtmlDATA uninstall-jatextDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/doc/Makefile.in gimageview-0.3.0-0.20101117/doc/Makefile.in --- gimageview-0.2.27/doc/Makefile.in 2004-12-28 04:01:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/doc/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,600 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = ja -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# 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. -$(RECURSIVE_TARGETS): - @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; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - 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 -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/etc/gimageview.desktop gimageview-0.3.0-0.20101117/etc/gimageview.desktop --- gimageview-0.2.27/etc/gimageview.desktop 2004-12-28 04:33:40.000000000 +0000 +++ gimageview-0.3.0-0.20101117/etc/gimageview.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=GImageView -Name[fr]=GImageView -Name[ja]=GImageView -Comment=Image Viewer -Comment[fr]=Visualiseur d'image -Comment[ja]=ç”»åƒé–²è¦§ã‚½ãƒ•ãƒˆ -Exec=gimv -wd -Terminal=0 -Type=Application -Icon=gimv.png diff -Nru gimageview-0.2.27/etc/gimageview.desktop.in gimageview-0.3.0-0.20101117/etc/gimageview.desktop.in --- gimageview-0.2.27/etc/gimageview.desktop.in 2004-05-23 14:07:34.000000000 +0000 +++ gimageview-0.3.0-0.20101117/etc/gimageview.desktop.in 2010-11-17 06:10:11.000000000 +0000 @@ -1,7 +1,10 @@ [Desktop Entry] _Name=GImageView _Comment=Image Viewer +Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography; +Encoding=UTF-8 Exec=gimv -wd -Terminal=0 +Icon=gimv +MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml; +Terminal=false Type=Application -Icon=gimv.png diff -Nru gimageview-0.2.27/etc/Makefile.am gimageview-0.3.0-0.20101117/etc/Makefile.am --- gimageview-0.2.27/etc/Makefile.am 2004-05-23 14:07:34.000000000 +0000 +++ gimageview-0.3.0-0.20101117/etc/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -desktopdir = $(DESTDIR)$(datadir)/gnome/apps/Graphics +desktopdir = $(DESTDIR)$(datadir)/applications desktop_in_files = gimageview.desktop.in #desktop_DATA = gimageview.desktop desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff -Nru gimageview-0.2.27/etc/Makefile.in gimageview-0.3.0-0.20101117/etc/Makefile.in --- gimageview-0.2.27/etc/Makefile.in 2004-12-28 04:01:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/etc/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,567 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = etc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(mplayerrcdir)" "$(DESTDIR)$(prefsdir)" -desktopDATA_INSTALL = $(INSTALL_DATA) -iconDATA_INSTALL = $(INSTALL_DATA) -mplayerrcDATA_INSTALL = $(INSTALL_DATA) -prefsDATA_INSTALL = $(INSTALL_DATA) -DATA = $(desktop_DATA) $(icon_DATA) $(mplayerrc_DATA) $(prefs_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -desktopdir = $(DESTDIR)$(datadir)/gnome/apps/Graphics -desktop_in_files = gimageview.desktop.in -#desktop_DATA = gimageview.desktop -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -icondir = $(datadir)/pixmaps -icon_DATA = gimv.png -prefsdir = $(DESTDIR)$(gimv_datadir) -prefs_DATA = \ - gtkrc - -mplayerrcdir = $(DESTDIR)$(gimv_datadir) -mplayerrc_DATA = \ - mplayerrc - -EXTRA_DIST = \ - $(desktop_in_files) \ - $(desktop_DATA) \ - $(icon_DATA) \ - $(prefs_DATA) \ - $(mplayerrc_DATA) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign etc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-desktopDATA: $(desktop_DATA) - @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" - @list='$(desktop_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ - $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ - done - -uninstall-desktopDATA: - @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ - rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ - done -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)" - @list='$(icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ - $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ - rm -f "$(DESTDIR)$(icondir)/$$f"; \ - done -install-mplayerrcDATA: $(mplayerrc_DATA) - @$(NORMAL_INSTALL) - test -z "$(mplayerrcdir)" || $(mkdir_p) "$(DESTDIR)$(mplayerrcdir)" - @list='$(mplayerrc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(mplayerrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mplayerrcdir)/$$f'"; \ - $(mplayerrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mplayerrcdir)/$$f"; \ - done - -uninstall-mplayerrcDATA: - @$(NORMAL_UNINSTALL) - @list='$(mplayerrc_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(mplayerrcdir)/$$f'"; \ - rm -f "$(DESTDIR)$(mplayerrcdir)/$$f"; \ - done -install-prefsDATA: $(prefs_DATA) - @$(NORMAL_INSTALL) - test -z "$(prefsdir)" || $(mkdir_p) "$(DESTDIR)$(prefsdir)" - @list='$(prefs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(prefsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(prefsdir)/$$f'"; \ - $(prefsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(prefsdir)/$$f"; \ - done - -uninstall-prefsDATA: - @$(NORMAL_UNINSTALL) - @list='$(prefs_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(prefsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(prefsdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(mplayerrcdir)" "$(DESTDIR)$(prefsdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-desktopDATA install-iconDATA \ - install-mplayerrcDATA install-prefsDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-desktopDATA uninstall-iconDATA \ - uninstall-info-am uninstall-mplayerrcDATA uninstall-prefsDATA - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-desktopDATA install-exec \ - install-exec-am install-iconDATA install-info install-info-am \ - install-man install-mplayerrcDATA install-prefsDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-desktopDATA \ - uninstall-iconDATA uninstall-info-am uninstall-mplayerrcDATA \ - uninstall-prefsDATA - -@INTLTOOL_DESKTOP_RULE@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/gimageview.spec gimageview-0.3.0-0.20101117/gimageview.spec --- gimageview-0.2.27/gimageview.spec 2004-12-28 04:02:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/gimageview.spec 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -%define name gimageview -%define version 0.2.27 -%define rel 1 -# %define prefix /usr - -Summary: a GTK+ based image viewer -Name: %{name} -Version: %{version} -Release: %{rel} -Copyright: GPL -Group: Applications/Multimedia -URL: http://www.homa.ne.jp/~ashie/gimageview/ -Source0: http://prdownloads.sourceforge.net/gtkmmviewer/%{name}-%{version}.tar.gz -Requires: glib >= 1.2.6, gtk+ >= 1.2.6, gdk-pixbuf >= 0.8.0 -BuildRequires: gtk+-devel gdk-pixbuf-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root -# NoSource: 0 - -%description -GImageView is a GTK+ based image viewer. -It support tabbed browsing, thumbnail table views, directory tree views, -drag and drop, reading thumbnail cache of other famous image viewers, -and flexible user interface. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -q - -%build -if [ ! -f configure ]; then - ./autogen.sh -fi - -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} -%{__make} - -%install -%{__rm} -rf $RPM_BUILD_ROOT -#%{__make} install prefix=$RPM_BUILD_ROOT%{_prefix} -%{makeinstall} - -%find_lang %{name} - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%files -%defattr(-, root, root) -%doc %{_docdir}/%{name} -%{_bindir}/gimv -%{_datadir}/pixmaps/gimv.png -%{_datadir}/gnome/apps/Graphics/gimageview.desktop -%{_datadir}/%{name}/gtkrc -%{_datadir}/%{name}/mplayerrc -%{_datadir}/%{name}/pixmaps/default/*.xpm -%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo -%{_libdir}/%{name}/*/*.so -%{_libdir}/%{name}/*/*.la - - -%changelog -* Tue Aug 10 2004 Takuro Ashie -- add %{_libdir}/%{name}/*/*.la - -* Mon May 19 2003 Takuro Ashie -- add mplayerrc - -* Sat Aug 31 2002 Takuro Ashie -- moved document directory under %_docdir. - -* Wed Aug 28 2002 Takuro Ashie -- added japanese HTML files. - -* Sun May 21 2002 Takuro Ashie -- added gtkrc and gimageview.desktop files. - -* Sun Feb 23 2002 Takuro Ashie -- Modified to use gdk-pixbuf instead of imlib. -- Replaced "gimageview" directory to %{name} - -* Sun Feb 17 2002 Takuro Ashie -- Bug fix. - -* Thu Feb 12 2002 Takuro Ashie -- Update to 0.1.97 - -* Thu Jan 3 2002 ARAKI Manabu -- 0.1.7-0vl1 - -* Tue Dec 25 2001 ARAKI Manabu -- 0.1.6-0vl1 - -* Mon Dec 10 2001 ARAKI Manabu -- 0.1.5-0vl1 -- change Source0 - -* Thu Nov 15 2001 ARAKI Manabu -- 0.1.3-0vl1 -- build for Vine Linux 2.1.* -- modify spec file (base: 0.1.2-3k.nosrc.rpm) -- add Japanese summary and description. - -* Sat Nov 02 2001 Ogawa Youhei -- for version 0.1.2 - -* Sat Nov 02 2001 Ogawa Youhei -- change files section for 2001-11-01 nightly - -* Sat Oct 15 2001 Ogawa Youhei -- for nightly - -* Sat Oct 12 2001 Ogawa Youhei -- for version 0.1.1 - -* Sat Sep 08 2001 Ogawa Youhei -- for version 0.1.0 - -* Sat Sep 08 2001 Ogawa Youhei -- Initial build. diff -Nru gimageview-0.2.27/HACKING gimageview-0.3.0-0.20101117/HACKING --- gimageview-0.2.27/HACKING 2004-10-15 02:43:57.000000000 +0000 +++ gimageview-0.3.0-0.20101117/HACKING 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -############################################################################### -# # -# Object List (A to Z) # -# # -############################################################################### - - -Objects without "Gimv" prefix will be replaced to new implementation. - - -* Model objects - - FilesLoader : Load file list and select window type to open it. - (will be replaced to GimvFilesLoader or GimvDir) - FRArchive : Base class of Archiver. - (will be replaced to GimvArchive (inherits GimvDir?)) - FRCommand : Command arguments manager to execute external - command. - FRProccess : External process manager. - (will be replaced to GimvProcess which will be - developed at testgimvmplayer package) - GimvAnim : Animation image which inherits GimvImage. - GimvComment : Additional comments for an image. - (known as files under ~/.gimv/comment/) - GimvDuplFinder : Duplicated images finder. - GimvImage : Wrapper object for backend image library. - GimvImageInfo : Information about image. In the feature, this class - may inherit GimvFile class. - GimvImageLoader : Image loader. - GimvImageSaver : Image saver. - GimvIO : Base class of I/O streamer. - GimvThumb : Thumbnail. - GimvSlideShow : Slidshow. - Prefs : Contain whole application preference. - - -* Model objects (embeded modules) - - GimvIOFile : UNIX file stream. - GimvIOMem : Wrapper for memory. - - -* Common widgets - - GimvCellRendererPixmap : Cell renderer for GdkPixmap mainly used by - GtkTreeView (for Gtk+2 only). - GimvDList : Double stack list widget. - (The code is still durty) - GimvEList : Editable list widget. - (The code is still durty) - GimvHPaned : Special horizontal paned widget. - GimvNavWin : Navigate window for large image. - GimvPaned : Special paned widget. - GimvScrolled : Base container widget for scrollable widget. - GimvVPaned : Special vertical widget. - GimvZAlbum : Thumbnail table widget which inherits GimvZList. - GimvZList : Base class for simple icon list widget. - - -* Special purpose widgets. - - DirView : Directory tree viewer. - ExifViewer : EXIF viewer (will be replaced to libexif-gtk). - GimvCommentView : Viewer and editor for GimvComment. - GimvDuplWin : Viewer for duplicated images. - GimvImageView : Contaienr widget for content viewer. - GimvImageWin : Image window which contains GimvImageView. - GimvThumbWin : Thumbnail window which contains DirView, - GimvCommentView, GimvImageView, ThumbView. - GtkProp : File property dialog. - TextViewer : Text vier (will be integrated to GimvImageView). - ThumbnailView : Container object for thumbnail view. - - - - -############################################################################### -# # -# Function groups / Resources groups (Singleton?) # -# # -############################################################################### - - -* misc utilities - - ArgumentParser : Command line argument parser. - (will be reimplemeted as object) - AutoCompl : For auto completion of filename. - Charset : Character set conversion. - Cursor : Cursor collection. - Dither : Dithering (will be integrated to GimvImage). - DnD : Drag and Drop related functions. - FileUtil : File related utility. - GFileUtil : File related utility depended on GTK+. - GimvIconStock : Icon collection. - GimvMimeTypes : Mime type collection. - GimvMarshal : Custom signal marshallers. - GimvPlugin : Plugin related functions. - GimvPrefsUIUtils : Utility for preference UI. - GimvThumbCache : Thumbnail cache manager. - Gtk2Compat : For compatibilty between Gtk+-1.2 and Gtk+-2.0. - GtkUtils : Misc utilities depended on GTK+. - GimvHelp : Infomation widget adn help related functions. - (Will be reimplemented as object) - Intl : Gettext related macros. - Menu : Convinient functions for GtkMenu and related classes. - MD5 : MD5 support functions. - PixbufUtils : GdkPixbuf utilities. - (will be integrated to GimvImage) - Utils : Misc utilities - - -* Embeded modules - - CompareFileSize : Compare file size of image (for GimvDuplFinder). - CompareMD5 : Compare images by MD5 (for GimcDuplFinder). - CompareSimilar : Compare similarity of images (for GimvDuplFinder). - ImageViewDraw : GdkPixmap viewer. - Japanese : Japanese related functions used by Charset. - ThumbnailViewAlbum : Default thumbnail view mode. - - - -############################################################################### -# # -# Included libraries # -# # -############################################################################### - - -libintl : Gettext (message translation). -libexif : EXIF support. -dllloader: Win32 DLL(Dynamic Link Library) support. - - - -############################################################################### -# # -# Loadable Modules # -# # -############################################################################### - - -* Archiver - - LhaExt: External LHA arcvhier. - RarExt: External RAR archiver. - TarExt: External Tar archiver. - ZipExt: External ZIP arcvhier. - - -* Image Loader - - ImlibLoader: Imlib image loader. - JPEGLoader: JPEG - MagLoader: MAG. - PCXLoader: PCX. - PixbufLoader: GdkPixbuf image loader. - PNGLoader: PNG - SPILoader: Susie plugin support (include archiver). - SVGLoader: SVG. - TGALoader: Targa. - WMFLoader: Windows Meta File. - XBMLoader: XBM. - XCFLoader: Image format of GIMP. - XVPICSLoader: XV thumbnail image. - - -* Image Saver - - PNGSaver: PNG. - PNMSaver: PNM. - XVPICSSaver: XV thumbnail image. - - -* Image View Embeder - - ImageViewXine: Xine movie viewer. - ImageViewMPlayer: MPlayer movie viewer and image loader. - - -* I/O Streamer - - GimvBZIO: BZIP streamer. - GimvGZipIO: GZIP streamer. - - -* Thumbnail Cache Loader - - EE: Electric Eyes. - Thumb: GImageView. - GQview: GQview. - KonqOld: Old konqueror. - Konq: Konqeror. - Nautilus: Nautilus-1.x - Nautilus2: Nautilus-2.0 - XVPICS: XV - - -* Thumbnail View Embeder - - DetailView: Detailed list view. - ListView: Icon list view. - ThumbTable: Old thumbnail view. diff -Nru gimageview-0.2.27/install-sh gimageview-0.3.0-0.20101117/install-sh --- gimageview-0.2.27/install-sh 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/install-sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - : - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - : - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff -Nru gimageview-0.2.27/intl/bindtextdom.c gimageview-0.3.0-0.20101117/intl/bindtextdom.c --- gimageview-0.2.27/intl/bindtextdom.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/bindtextdom.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,369 +0,0 @@ -/* Implementation of the bindtextdomain(3) function - Copyright (C) 1995-1998, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_rwlock_define(CLASS, NAME) -# define __libc_rwlock_wrlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ -#endif - -/* Some compilers, like SunOS4 cc, don't have offsetof in . */ -#ifndef offsetof -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) -#endif - -/* @@ end of prolog @@ */ - -/* Contains the default location of the message catalogs. */ -extern const char _nl_default_dirname[]; - -/* List with bindings of specific domains. */ -extern struct binding *_nl_domain_bindings; - -/* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define BINDTEXTDOMAIN __bindtextdomain -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# define BINDTEXTDOMAIN bindtextdomain__ -# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__ -#endif - -/* Prototypes for local functions. */ -static void set_binding_values PARAMS ((const char *domainname, - const char **dirnamep, - const char **codesetp)); - -/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP - to be used for the DOMAINNAME message catalog. - If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not - modified, only the current value is returned. - If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither - modified nor returned. */ -static void -set_binding_values (domainname, dirnamep, codesetp) - const char *domainname; - const char **dirnamep; - const char **codesetp; -{ - struct binding *binding; - int modified; - - /* Some sanity checks. */ - if (domainname == NULL || domainname[0] == '\0') - { - if (dirnamep) - *dirnamep = NULL; - if (codesetp) - *codesetp = NULL; - return; - } - - __libc_rwlock_wrlock (_nl_state_lock); - - modified = 0; - - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding != NULL) - { - if (dirnamep) - { - const char *dirname = *dirnamep; - - if (dirname == NULL) - /* The current binding has be to returned. */ - *dirnamep = binding->dirname; - else - { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->dirname; - if (strcmp (dirname, result) != 0) - { - if (strcmp (dirname, _nl_default_dirname) == 0) - result = (char *) _nl_default_dirname; - else - { -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (dirname); -#else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result != NULL, 1)) - memcpy (result, dirname, len); -#endif - } - - if (__builtin_expect (result != NULL, 1)) - { - if (binding->dirname != _nl_default_dirname) - free (binding->dirname); - - binding->dirname = result; - modified = 1; - } - } - *dirnamep = result; - } - } - - if (codesetp) - { - const char *codeset = *codesetp; - - if (codeset == NULL) - /* The current binding has be to returned. */ - *codesetp = binding->codeset; - else - { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->codeset; - if (result == NULL || strcmp (codeset, result) != 0) - { -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (codeset); -#else - size_t len = strlen (codeset) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result != NULL, 1)) - memcpy (result, codeset, len); -#endif - - if (__builtin_expect (result != NULL, 1)) - { - if (binding->codeset != NULL) - free (binding->codeset); - - binding->codeset = result; - binding->codeset_cntr++; - modified = 1; - } - } - *codesetp = result; - } - } - } - else if ((dirnamep == NULL || *dirnamep == NULL) - && (codesetp == NULL || *codesetp == NULL)) - { - /* Simply return the default values. */ - if (dirnamep) - *dirnamep = _nl_default_dirname; - if (codesetp) - *codesetp = NULL; - } - else - { - /* We have to create a new binding. */ - size_t len = strlen (domainname) + 1; - struct binding *new_binding = - (struct binding *) malloc (offsetof (struct binding, domainname) + len); - - if (__builtin_expect (new_binding == NULL, 0)) - goto failed; - - memcpy (new_binding->domainname, domainname, len); - - if (dirnamep) - { - const char *dirname = *dirnamep; - - if (dirname == NULL) - /* The default value. */ - dirname = _nl_default_dirname; - else - { - if (strcmp (dirname, _nl_default_dirname) == 0) - dirname = _nl_default_dirname; - else - { - char *result; -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (dirname); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; -#else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; - memcpy (result, dirname, len); -#endif - dirname = result; - } - } - *dirnamep = dirname; - new_binding->dirname = (char *) dirname; - } - else - /* The default value. */ - new_binding->dirname = (char *) _nl_default_dirname; - - new_binding->codeset_cntr = 0; - - if (codesetp) - { - const char *codeset = *codesetp; - - if (codeset != NULL) - { - char *result; - -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (codeset); - if (__builtin_expect (result == NULL, 0)) - goto failed_codeset; -#else - size_t len = strlen (codeset) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result == NULL, 0)) - goto failed_codeset; - memcpy (result, codeset, len); -#endif - codeset = result; - new_binding->codeset_cntr++; - } - *codesetp = codeset; - new_binding->codeset = (char *) codeset; - } - else - new_binding->codeset = NULL; - - /* Now enqueue it. */ - if (_nl_domain_bindings == NULL - || strcmp (domainname, _nl_domain_bindings->domainname) < 0) - { - new_binding->next = _nl_domain_bindings; - _nl_domain_bindings = new_binding; - } - else - { - binding = _nl_domain_bindings; - while (binding->next != NULL - && strcmp (domainname, binding->next->domainname) > 0) - binding = binding->next; - - new_binding->next = binding->next; - binding->next = new_binding; - } - - modified = 1; - - /* Here we deal with memory allocation failures. */ - if (0) - { - failed_codeset: - if (new_binding->dirname != _nl_default_dirname) - free (new_binding->dirname); - failed_dirname: - free (new_binding); - failed: - if (dirnamep) - *dirnamep = NULL; - if (codesetp) - *codesetp = NULL; - } - } - - /* If we modified any binding, we flush the caches. */ - if (modified) - ++_nl_msg_cat_cntr; - - __libc_rwlock_unlock (_nl_state_lock); -} - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -char * -BINDTEXTDOMAIN (domainname, dirname) - const char *domainname; - const char *dirname; -{ - set_binding_values (domainname, &dirname, NULL); - return (char *) dirname; -} - -/* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -char * -BIND_TEXTDOMAIN_CODESET (domainname, codeset) - const char *domainname; - const char *codeset; -{ - set_binding_values (domainname, NULL, &codeset); - return (char *) codeset; -} - -#ifdef _LIBC -/* Aliases for function names in GNU C Library. */ -weak_alias (__bindtextdomain, bindtextdomain); -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); -#endif diff -Nru gimageview-0.2.27/intl/ChangeLog gimageview-0.3.0-0.20101117/intl/ChangeLog --- gimageview-0.2.27/intl/ChangeLog 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/ChangeLog 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -2001-09-13 GNU - - * Version 0.10.40 released. - diff -Nru gimageview-0.2.27/intl/config.charset gimageview-0.3.0-0.20101117/intl/config.charset --- gimageview-0.2.27/intl/config.charset 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/config.charset 1970-01-01 00:00:00.000000000 +0000 @@ -1,437 +0,0 @@ -#! /bin/sh -# Output a system dependent table of character encoding aliases. -# -# Copyright (C) 2000-2001 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 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. -# -# The table consists of lines of the form -# ALIAS CANONICAL -# -# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". -# ALIAS is compared in a case sensitive way. -# -# CANONICAL is the GNU canonical name for this character encoding. -# It must be an encoding supported by libiconv. Support by GNU libc is -# also desirable. CANONICAL is case insensitive. Usually an upper case -# MIME charset name is preferred. -# The current list of GNU canonical charset names is as follows. -# -# name used by which systems a MIME name? -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd -# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-3 glibc yes -# ISO-8859-4 osf solaris freebsd yes -# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-6 glibc aix hpux solaris yes -# ISO-8859-7 glibc aix hpux irix osf solaris yes -# ISO-8859-8 glibc aix hpux osf solaris yes -# ISO-8859-9 glibc aix hpux irix osf solaris yes -# ISO-8859-13 glibc -# ISO-8859-15 glibc aix osf solaris freebsd -# KOI8-R glibc solaris freebsd yes -# KOI8-U glibc freebsd yes -# CP437 dos -# CP775 dos -# CP850 aix osf dos -# CP852 dos -# CP855 dos -# CP856 aix -# CP857 dos -# CP861 dos -# CP862 dos -# CP864 dos -# CP865 dos -# CP866 freebsd dos -# CP869 dos -# CP874 win32 dos -# CP922 aix -# CP932 aix win32 dos -# CP943 aix -# CP949 osf win32 dos -# CP950 win32 dos -# CP1046 aix -# CP1124 aix -# CP1129 aix -# CP1250 win32 -# CP1251 glibc win32 -# CP1252 aix win32 -# CP1253 win32 -# CP1254 win32 -# CP1255 win32 -# CP1256 win32 -# CP1257 win32 -# GB2312 glibc aix hpux irix solaris freebsd yes -# EUC-JP glibc aix hpux irix osf solaris freebsd yes -# EUC-KR glibc aix hpux irix osf solaris freebsd yes -# EUC-TW glibc aix hpux irix osf solaris -# BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5-HKSCS glibc -# GBK aix osf win32 dos -# GB18030 glibc -# SHIFT_JIS hpux osf solaris freebsd yes -# JOHAB glibc win32 -# TIS-620 glibc aix hpux osf solaris -# VISCII glibc yes -# HP-ROMAN8 hpux -# HP-ARABIC8 hpux -# HP-GREEK8 hpux -# HP-HEBREW8 hpux -# HP-TURKISH8 hpux -# HP-KANA8 hpux -# DEC-KANJI osf -# DEC-HANYU osf -# UTF-8 glibc aix hpux osf solaris yes -# -# Note: Names which are not marked as being a MIME name should not be used in -# Internet protocols for information interchange (mail, news, etc.). -# -# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications -# must understand both names and treat them as equivalent. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - -host="$1" -os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` -echo "# This file contains a table of character encoding aliases," -echo "# suitable for operating system '${os}'." -echo "# It was automatically generated from config.charset." -# List of references, updated during installation: -echo "# Packages using this file: " -case "$os" in - linux* | *-gnu*) - # With glibc-2.1 or newer, we don't need any canonicalization, - # because glibc has iconv and both glibc and libiconv support all - # GNU canonical names directly. Therefore, the Makefile does not - # need to install the alias file at all. - # The following applies only to glibc-2.0.x and older libcs. - echo "ISO_646.IRV:1983 ASCII" - ;; - aix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "IBM-850 CP850" - echo "IBM-856 CP856" - echo "IBM-921 ISO-8859-13" - echo "IBM-922 CP922" - echo "IBM-932 CP932" - echo "IBM-943 CP943" - echo "IBM-1046 CP1046" - echo "IBM-1124 CP1124" - echo "IBM-1129 CP1129" - echo "IBM-1252 CP1252" - echo "IBM-eucCN GB2312" - echo "IBM-eucJP EUC-JP" - echo "IBM-eucKR EUC-KR" - echo "IBM-eucTW EUC-TW" - echo "big5 BIG5" - echo "GBK GBK" - echo "TIS-620 TIS-620" - echo "UTF-8 UTF-8" - ;; - hpux*) - echo "iso88591 ISO-8859-1" - echo "iso88592 ISO-8859-2" - echo "iso88595 ISO-8859-5" - echo "iso88596 ISO-8859-6" - echo "iso88597 ISO-8859-7" - echo "iso88598 ISO-8859-8" - echo "iso88599 ISO-8859-9" - echo "iso885915 ISO-8859-15" - echo "roman8 HP-ROMAN8" - echo "arabic8 HP-ARABIC8" - echo "greek8 HP-GREEK8" - echo "hebrew8 HP-HEBREW8" - echo "turkish8 HP-TURKISH8" - echo "kana8 HP-KANA8" - echo "tis620 TIS-620" - echo "big5 BIG5" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "hp15CN GB2312" - #echo "ccdc ?" # what is this? - echo "SJIS SHIFT_JIS" - echo "utf8 UTF-8" - ;; - irix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-9 ISO-8859-9" - echo "eucCN GB2312" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - ;; - osf*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "cp850 CP850" - echo "big5 BIG5" - echo "dechanyu DEC-HANYU" - echo "dechanzi GB2312" - echo "deckanji DEC-KANJI" - echo "deckorean EUC-KR" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "GBK GBK" - echo "KSC5601 CP949" - echo "sdeckanji EUC-JP" - echo "SJIS SHIFT_JIS" - echo "TACTIS TIS-620" - echo "UTF-8 UTF-8" - ;; - solaris*) - echo "646 ASCII" - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "koi8-r KOI8-R" - echo "BIG5 BIG5" - echo "gb2312 GB2312" - echo "cns11643 EUC-TW" - echo "5601 EUC-KR" - echo "eucJP EUC-JP" - echo "PCK SHIFT_JIS" - echo "TIS620.2533 TIS-620" - #echo "sun_eu_greek ?" # what is this? - echo "UTF-8 UTF-8" - ;; - freebsd*) - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "C ASCII" - echo "US-ASCII ASCII" - for l in la_LN lt_LN; do - echo "$l.ASCII ASCII" - done - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ - lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do - echo "$l.ISO_8859-1 ISO-8859-1" - echo "$l.DIS_8859-15 ISO-8859-15" - done - for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do - echo "$l.ISO_8859-2 ISO-8859-2" - done - for l in la_LN lt_LT; do - echo "$l.ISO_8859-4 ISO-8859-4" - done - for l in ru_RU ru_SU; do - echo "$l.KOI8-R KOI8-R" - echo "$l.ISO_8859-5 ISO-8859-5" - echo "$l.CP866 CP866" - done - echo "uk_UA.KOI8-U KOI8-U" - echo "zh_TW.BIG5 BIG5" - echo "zh_TW.Big5 BIG5" - echo "zh_CN.EUC GB2312" - echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SHIFT_JIS" - echo "ja_JP.Shift_JIS SHIFT_JIS" - echo "ko_KR.EUC EUC-KR" - ;; - beos*) - # BeOS has a single locale, and it has UTF-8 encoding. - echo "* UTF-8" - ;; - msdosdjgpp*) - # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "#" - echo "# The encodings given here may not all be correct." - echo "# If you find that the encoding given for your language and" - echo "# country is not the one your DOS machine actually uses, just" - echo "# correct it in this file, and send a mail to" - echo "# Juan Manuel Guerrero " - echo "# and Bruno Haible ." - echo "#" - echo "C ASCII" - # ISO-8859-1 languages - echo "ca CP850" - echo "ca_ES CP850" - echo "da CP865" # not CP850 ?? - echo "da_DK CP865" # not CP850 ?? - echo "de CP850" - echo "de_AT CP850" - echo "de_CH CP850" - echo "de_DE CP850" - echo "en CP850" - echo "en_AU CP850" # not CP437 ?? - echo "en_CA CP850" - echo "en_GB CP850" - echo "en_NZ CP437" - echo "en_US CP437" - echo "en_ZA CP850" # not CP437 ?? - echo "es CP850" - echo "es_AR CP850" - echo "es_BO CP850" - echo "es_CL CP850" - echo "es_CO CP850" - echo "es_CR CP850" - echo "es_CU CP850" - echo "es_DO CP850" - echo "es_EC CP850" - echo "es_ES CP850" - echo "es_GT CP850" - echo "es_HN CP850" - echo "es_MX CP850" - echo "es_NI CP850" - echo "es_PA CP850" - echo "es_PY CP850" - echo "es_PE CP850" - echo "es_SV CP850" - echo "es_UY CP850" - echo "es_VE CP850" - echo "et CP850" - echo "et_EE CP850" - echo "eu CP850" - echo "eu_ES CP850" - echo "fi CP850" - echo "fi_FI CP850" - echo "fr CP850" - echo "fr_BE CP850" - echo "fr_CA CP850" - echo "fr_CH CP850" - echo "fr_FR CP850" - echo "ga CP850" - echo "ga_IE CP850" - echo "gd CP850" - echo "gd_GB CP850" - echo "gl CP850" - echo "gl_ES CP850" - echo "id CP850" # not CP437 ?? - echo "id_ID CP850" # not CP437 ?? - echo "is CP861" # not CP850 ?? - echo "is_IS CP861" # not CP850 ?? - echo "it CP850" - echo "it_CH CP850" - echo "it_IT CP850" - echo "lt CP775" - echo "lt_LT CP775" - echo "lv CP775" - echo "lv_LV CP775" - echo "nb CP865" # not CP850 ?? - echo "nb_NO CP865" # not CP850 ?? - echo "nl CP850" - echo "nl_BE CP850" - echo "nl_NL CP850" - echo "nn CP865" # not CP850 ?? - echo "nn_NO CP865" # not CP850 ?? - echo "no CP865" # not CP850 ?? - echo "no_NO CP865" # not CP850 ?? - echo "pt CP850" - echo "pt_BR CP850" - echo "pt_PT CP850" - echo "sv CP850" - echo "sv_SE CP850" - # ISO-8859-2 languages - echo "cs CP852" - echo "cs_CZ CP852" - echo "hr CP852" - echo "hr_HR CP852" - echo "hu CP852" - echo "hu_HU CP852" - echo "pl CP852" - echo "pl_PL CP852" - echo "ro CP852" - echo "ro_RO CP852" - echo "sk CP852" - echo "sk_SK CP852" - echo "sl CP852" - echo "sl_SI CP852" - echo "sq CP852" - echo "sq_AL CP852" - echo "sr CP852" # CP852 or CP866 or CP855 ?? - echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? - # ISO-8859-3 languages - echo "mt CP850" - echo "mt_MT CP850" - # ISO-8859-5 languages - echo "be CP866" - echo "be_BE CP866" - echo "bg CP866" # not CP855 ?? - echo "bg_BG CP866" # not CP855 ?? - echo "mk CP866" # not CP855 ?? - echo "mk_MK CP866" # not CP855 ?? - echo "ru KOI8-R" # not CP866 ?? - echo "ru_RU KOI8-R" # not CP866 ?? - # ISO-8859-6 languages - echo "ar CP864" - echo "ar_AE CP864" - echo "ar_DZ CP864" - echo "ar_EG CP864" - echo "ar_IQ CP864" - echo "ar_IR CP864" - echo "ar_JO CP864" - echo "ar_KW CP864" - echo "ar_MA CP864" - echo "ar_OM CP864" - echo "ar_QA CP864" - echo "ar_SA CP864" - echo "ar_SY CP864" - # ISO-8859-7 languages - echo "el CP869" - echo "el_GR CP869" - # ISO-8859-8 languages - echo "he CP862" - echo "he_IL CP862" - # ISO-8859-9 languages - echo "tr CP857" - echo "tr_TR CP857" - # Japanese - echo "ja CP932" - echo "ja_JP CP932" - # Chinese - echo "zh_CN GBK" - echo "zh_TW CP950" # not CP938 ?? - # Korean - echo "kr CP949" # not CP934 ?? - echo "kr_KR CP949" # not CP934 ?? - # Thai - echo "th CP874" - echo "th_TH CP874" - # Other - echo "eo CP850" - echo "eo_EO CP850" - ;; -esac diff -Nru gimageview-0.2.27/intl/dcgettext.c gimageview-0.3.0-0.20101117/intl/dcgettext.c --- gimageview-0.2.27/intl/dcgettext.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/dcgettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* Implementation of the dcgettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCGETTEXT __dcgettext -# define DCIGETTEXT __dcigettext -#else -# define DCGETTEXT dcgettext__ -# define DCIGETTEXT dcigettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -char * -DCGETTEXT (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dcgettext, dcgettext); -#endif diff -Nru gimageview-0.2.27/intl/dcigettext.c gimageview-0.3.0-0.20101117/intl/dcigettext.c --- gimageview-0.2.27/intl/dcigettext.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/dcigettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1259 +0,0 @@ -/* Implementation of the internal dcigettext function. - Copyright (C) 1995-1999, 2000, 2001 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 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. -*/ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(val) errno = (val) -#endif - -#include -#include - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include - -#if defined HAVE_SYS_PARAM_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "hash-string.h" - -/* Thread safetyness. */ -#ifdef _LIBC -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_lock_define_initialized(CLASS, NAME) -# define __libc_lock_lock(NAME) -# define __libc_lock_unlock(NAME) -# define __libc_rwlock_define_initialized(CLASS, NAME) -# define __libc_rwlock_rdlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* Alignment of types. */ -#if defined __GNUC__ && __GNUC__ >= 2 -# define alignof(TYPE) __alignof__ (TYPE) -#else -# define alignof(TYPE) \ - ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ -#endif - -/* Some compilers, like SunOS4 cc, don't have offsetof in . */ -#ifndef offsetof -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define getcwd __getcwd -# ifndef stpcpy -# define stpcpy __stpcpy -# endif -# define tfind __tfind -#else -# if !defined HAVE_GETCWD -char *getwd (); -# define getcwd(buf, max) getwd (buf) -# else -char *getcwd (); -# endif -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -# ifndef HAVE_MEMPCPY -static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); -# endif -#endif - -/* Amount to increase buffer size by in each try. */ -#define PATH_INCR 32 - -/* The following is from pathmax.h. */ -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define - PATH_MAX but might cause redefinition warnings when sys/param.h is - later included (as on MORE/BSD 4.3). */ -#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) -# include -#endif - -#ifndef _POSIX_PATH_MAX -# define _POSIX_PATH_MAX 255 -#endif - -#if !defined PATH_MAX && defined _PC_PATH_MAX -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -#endif - -/* Don't include sys/param.h if it already has been. */ -#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN -# include -#endif - -#if !defined PATH_MAX && defined MAXPATHLEN -# define PATH_MAX MAXPATHLEN -#endif - -#ifndef PATH_MAX -# define PATH_MAX _POSIX_PATH_MAX -#endif - -/* Pathname support. - ISSLASH(C) tests whether C is a directory separator character. - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, - it may be concatenated to a directory pathname. - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. - */ -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -# define HAS_DEVICE(P) \ - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ - && (P)[1] == ':') -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) -# define IS_PATH_WITH_DIR(P) \ - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) -#else - /* Unix */ -# define ISSLASH(C) ((C) == '/') -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) -#endif - -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. Neither do SUSV2 and - ISO C 99. So we can use this feature only on selected systems (e.g. - those using GNU C Library). */ -#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) -# define HAVE_LOCALE_NULL -#endif - -/* This is the type used for the search tree where known translations - are stored. */ -struct known_translation_t -{ - /* Domain in which to search. */ - char *domainname; - - /* The category. */ - int category; - - /* State of the catalog counter at the point the string was found. */ - int counter; - - /* Catalog where the string was found. */ - struct loaded_l10nfile *domain; - - /* And finally the translation. */ - const char *translation; - size_t translation_length; - - /* Pointer to the string in question. */ - char msgid[ZERO]; -}; - -/* Root of the search tree with known translations. We can use this - only if the system provides the `tsearch' function family. */ -#if defined HAVE_TSEARCH || defined _LIBC -# include - -static void *root; - -# ifdef _LIBC -# define tsearch __tsearch -# endif - -/* Function to compare two entries in the table of known translations. */ -static int transcmp PARAMS ((const void *p1, const void *p2)); -static int -transcmp (p1, p2) - const void *p1; - const void *p2; -{ - const struct known_translation_t *s1; - const struct known_translation_t *s2; - int result; - - s1 = (const struct known_translation_t *) p1; - s2 = (const struct known_translation_t *) p2; - - result = strcmp (s1->msgid, s2->msgid); - if (result == 0) - { - result = strcmp (s1->domainname, s2->domainname); - if (result == 0) - /* We compare the category last (though this is the cheapest - operation) since it is hopefully always the same (namely - LC_MESSAGES). */ - result = s1->category - s2->category; - } - - return result; -} -#endif - -/* Name of the default domain used for gettext(3) prior any call to - textdomain(3). The default value for this is "messages". */ -const char _nl_default_default_domain[] = "messages"; - -/* Value used as the default domain for gettext(3). */ -const char *_nl_current_default_domain = _nl_default_default_domain; - -/* Contains the default location of the message catalogs. */ -const char _nl_default_dirname[] = LOCALEDIR; - -/* List with bindings of specific domains created by bindtextdomain() - calls. */ -struct binding *_nl_domain_bindings; - -/* Prototypes for local functions. */ -static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain, - unsigned long int n, - const char *translation, - size_t translation_len)) - internal_function; -static unsigned long int plural_eval PARAMS ((struct expression *pexp, - unsigned long int n)) - internal_function; -static const char *category_to_name PARAMS ((int category)) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) - internal_function; - - -/* For those loosing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ -#else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ - - -#ifdef _LIBC -/* List of blocks allocated for translations. */ -typedef struct transmem_list -{ - struct transmem_list *next; - char data[ZERO]; -} transmem_block_t; -static struct transmem_list *transmem_list; -#else -typedef unsigned char transmem_block_t; -#endif - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCIGETTEXT __dcigettext -#else -# define DCIGETTEXT dcigettext__ -#endif - -/* Lock variable to protect the global data in the gettext implementation. */ -#ifdef _LIBC -__libc_rwlock_define_initialized (, _nl_state_lock) -#endif - -/* Checking whether the binaries runs SUID must be done and glibc provides - easier methods therefore we make a difference here. */ -#ifdef _LIBC -# define ENABLE_SECURE __libc_enable_secure -# define DETERMINE_SECURE -#else -# ifndef HAVE_GETUID -# define getuid() 0 -# endif -# ifndef HAVE_GETGID -# define getgid() 0 -# endif -# ifndef HAVE_GETEUID -# define geteuid() getuid() -# endif -# ifndef HAVE_GETEGID -# define getegid() getgid() -# endif -static int enable_secure; -# define ENABLE_SECURE (enable_secure == 1) -# define DETERMINE_SECURE \ - if (enable_secure == 0) \ - { \ - if (getuid () != geteuid () || getgid () != getegid ()) \ - enable_secure = 1; \ - else \ - enable_secure = -1; \ - } -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current - CATEGORY locale and, if PLURAL is nonzero, search over string - depending on the plural form determined by N. */ -char * -DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - int plural; - unsigned long int n; - int category; -{ -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif - struct loaded_l10nfile *domain; - struct binding *binding; - const char *categoryname; - const char *categoryvalue; - char *dirname, *xdomainname; - char *single_locale; - char *retval; - size_t retlen; - int saved_errno; -#if defined HAVE_TSEARCH || defined _LIBC - struct known_translation_t *search; - struct known_translation_t **foundp = NULL; - size_t msgid_len; -#endif - size_t domainname_len; - - /* If no real MSGID is given return NULL. */ - if (msgid1 == NULL) - return NULL; - - __libc_rwlock_rdlock (_nl_state_lock); - - /* If DOMAINNAME is NULL, we are interested in the default domain. If - CATEGORY is not LC_MESSAGES this might not make much sense but the - definition left this undefined. */ - if (domainname == NULL) - domainname = _nl_current_default_domain; - -#if defined HAVE_TSEARCH || defined _LIBC - msgid_len = strlen (msgid1) + 1; - - /* Try to find the translation among those which we found at - some time. */ - search = (struct known_translation_t *) - alloca (offsetof (struct known_translation_t, msgid) + msgid_len); - memcpy (search->msgid, msgid1, msgid_len); - search->domainname = (char *) domainname; - search->category = category; - - foundp = (struct known_translation_t **) tfind (search, &root, transcmp); - if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) - { - /* Now deal with plural. */ - if (plural) - retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation, - (*foundp)->translation_length); - else - retval = (char *) (*foundp)->translation; - - __libc_rwlock_unlock (_nl_state_lock); - return retval; - } -#endif - - /* Preserve the `errno' value. */ - saved_errno = errno; - - /* See whether this is a SUID binary or not. */ - DETERMINE_SECURE; - - /* First find matching binding. */ - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding == NULL) - dirname = (char *) _nl_default_dirname; - else if (IS_ABSOLUTE_PATH (binding->dirname)) - dirname = binding->dirname; - else - { - /* We have a relative path. Make it absolute now. */ - size_t dirname_len = strlen (binding->dirname) + 1; - size_t path_max; - char *ret; - - path_max = (unsigned int) PATH_MAX; - path_max += 2; /* The getcwd docs say to do this. */ - - for (;;) - { - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - - __set_errno (0); - ret = getcwd (dirname, path_max); - if (ret != NULL || errno != ERANGE) - break; - - path_max += path_max / 2; - path_max += PATH_INCR; - } - - if (ret == NULL) - { - /* We cannot get the current working directory. Don't signal an - error but simply return the default string. */ - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } - - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); - } - - /* Now determine the symbolic name of CATEGORY and its value. */ - categoryname = category_to_name (category); - categoryvalue = guess_category_value (category, categoryname); - - domainname_len = strlen (domainname); - xdomainname = (char *) alloca (strlen (categoryname) - + domainname_len + 5); - ADD_BLOCK (block_list, xdomainname); - - stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), - domainname, domainname_len), - ".mo"); - - /* Creating working area. */ - single_locale = (char *) alloca (strlen (categoryvalue) + 1); - ADD_BLOCK (block_list, single_locale); - - - /* Search for the given string. This is a loop because we perhaps - got an ordered list of languages to consider for the translation. */ - while (1) - { - /* Make CATEGORYVALUE point to the next element of the list. */ - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') - ++categoryvalue; - if (categoryvalue[0] == '\0') - { - /* The whole contents of CATEGORYVALUE has been searched but - no valid entry has been found. We solve this situation - by implicitly appending a "C" entry, i.e. no translation - will take place. */ - single_locale[0] = 'C'; - single_locale[1] = '\0'; - } - else - { - char *cp = single_locale; - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') - *cp++ = *categoryvalue++; - *cp = '\0'; - - /* When this is a SUID binary we must not allow accessing files - outside the dedicated directories. */ - if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) - /* Ingore this entry. */ - continue; - } - - /* If the current locale value is C (or POSIX) we don't load a - domain. Return the MSGID. */ - if (strcmp (single_locale, "C") == 0 - || strcmp (single_locale, "POSIX") == 0) - { - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } - - - /* Find structure describing the message catalog matching the - DOMAINNAME and CATEGORY. */ - domain = _nl_find_domain (dirname, single_locale, xdomainname, binding); - - if (domain != NULL) - { - retval = _nl_find_msg (domain, binding, msgid1, &retlen); - - if (retval == NULL) - { - int cnt; - - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) - { - retval = _nl_find_msg (domain->successor[cnt], binding, - msgid1, &retlen); - - if (retval != NULL) - { - domain = domain->successor[cnt]; - break; - } - } - } - - if (retval != NULL) - { - /* Found the translation of MSGID1 in domain DOMAIN: - starting at RETVAL, RETLEN bytes. */ - FREE_BLOCKS (block_list); - __set_errno (saved_errno); -#if defined HAVE_TSEARCH || defined _LIBC - if (foundp == NULL) - { - /* Create a new entry and add it to the search tree. */ - struct known_translation_t *newp; - - newp = (struct known_translation_t *) - malloc (offsetof (struct known_translation_t, msgid) - + msgid_len + domainname_len + 1); - if (newp != NULL) - { - newp->domainname = - mempcpy (newp->msgid, msgid1, msgid_len); - memcpy (newp->domainname, domainname, domainname_len + 1); - newp->category = category; - newp->counter = _nl_msg_cat_cntr; - newp->domain = domain; - newp->translation = retval; - newp->translation_length = retlen; - - /* Insert the entry in the search tree. */ - foundp = (struct known_translation_t **) - tsearch (newp, &root, transcmp); - if (foundp == NULL - || __builtin_expect (*foundp != newp, 0)) - /* The insert failed. */ - free (newp); - } - } - else - { - /* We can update the existing entry. */ - (*foundp)->counter = _nl_msg_cat_cntr; - (*foundp)->domain = domain; - (*foundp)->translation = retval; - (*foundp)->translation_length = retlen; - } -#endif - /* Now deal with plural. */ - if (plural) - retval = plural_lookup (domain, n, retval, retlen); - - __libc_rwlock_unlock (_nl_state_lock); - return retval; - } - } - } - /* NOTREACHED */ -} - - -char * -internal_function -_nl_find_msg (domain_file, domainbinding, msgid, lengthp) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; - const char *msgid; - size_t *lengthp; -{ - struct loaded_domain *domain; - size_t act; - char *result; - size_t resultlen; - - if (domain_file->decided == 0) - _nl_load_domain (domain_file, domainbinding); - - if (domain_file->data == NULL) - return NULL; - - domain = (struct loaded_domain *) domain_file->data; - - /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) - { - /* Use the hashing table. */ - nls_uint32 len = strlen (msgid); - nls_uint32 hash_val = hash_string (msgid); - nls_uint32 idx = hash_val % domain->hash_size; - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); - - while (1) - { - nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); - - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - /* Compare msgid with the original string at index nstr-1. - We compare the lengths with >=, not ==, because plural entries - are represented by strings with an embedded NUL. */ - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len - && (strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) - == 0)) - { - act = nstr - 1; - goto found; - } - - if (idx >= domain->hash_size - incr) - idx -= domain->hash_size - incr; - else - idx += incr; - } - /* NOTREACHED */ - } - else - { - /* Try the default method: binary search in the sorted array of - messages. */ - size_t top, bottom; - - bottom = 0; - top = domain->nstrings; - while (bottom < top) - { - int cmp_val; - - act = (bottom + top) / 2; - cmp_val = strcmp (msgid, (domain->data - + W (domain->must_swap, - domain->orig_tab[act].offset))); - if (cmp_val < 0) - top = act; - else if (cmp_val > 0) - bottom = act + 1; - else - goto found; - } - /* No translation was found. */ - return NULL; - } - - found: - /* The translation was found at index ACT. If we have to convert the - string to use a different character set, this is the time. */ - result = ((char *) domain->data - + W (domain->must_swap, domain->trans_tab[act].offset)); - resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; - -#if defined _LIBC || HAVE_ICONV - if (domain->codeset_cntr - != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) - { - /* The domain's codeset has changed through bind_textdomain_codeset() - since the message catalog was initialized or last accessed. We - have to reinitialize the converter. */ - _nl_free_domain_conv (domain); - _nl_init_domain_conv (domain_file, domain, domainbinding); - } - - if ( -# ifdef _LIBC - domain->conv != (__gconv_t) -1 -# else -# if HAVE_ICONV - domain->conv != (iconv_t) -1 -# endif -# endif - ) - { - /* We are supposed to do a conversion. First allocate an - appropriate table with the same structure as the table - of translations in the file, where we can put the pointers - to the converted strings in. - There is a slight complication with plural entries. They - are represented by consecutive NUL terminated strings. We - handle this case by converting RESULTLEN bytes, including - NULs. */ - - if (domain->conv_tab == NULL - && ((domain->conv_tab = (char **) calloc (domain->nstrings, - sizeof (char *))) - == NULL)) - /* Mark that we didn't succeed allocating a table. */ - domain->conv_tab = (char **) -1; - - if (__builtin_expect (domain->conv_tab == (char **) -1, 0)) - /* Nothing we can do, no more memory. */ - goto converted; - - if (domain->conv_tab[act] == NULL) - { - /* We haven't used this string so far, so it is not - translated yet. Do this now. */ - /* We use a bit more efficient memory handling. - We allocate always larger blocks which get used over - time. This is faster than many small allocations. */ - __libc_lock_define_initialized (static, lock) -# define INITIAL_BLOCK_SIZE 4080 - static unsigned char *freemem; - static size_t freemem_size; - - const unsigned char *inbuf; - unsigned char *outbuf; - int malloc_count; -# ifndef _LIBC - transmem_block_t *transmem_list = NULL; -# endif - - __libc_lock_lock (lock); - - inbuf = (const unsigned char *) result; - outbuf = freemem + sizeof (size_t); - - malloc_count = 0; - while (1) - { - transmem_block_t *newmem; -# ifdef _LIBC - size_t non_reversible; - int res; - - if (freemem_size < sizeof (size_t)) - goto resize_freemem; - - res = __gconv (domain->conv, - &inbuf, inbuf + resultlen, - &outbuf, - outbuf + freemem_size - sizeof (size_t), - &non_reversible); - - if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT) - break; - - if (res != __GCONV_FULL_OUTPUT) - { - __libc_lock_unlock (lock); - goto converted; - } - - inbuf = result; -# else -# if HAVE_ICONV - const char *inptr = (const char *) inbuf; - size_t inleft = resultlen; - char *outptr = (char *) outbuf; - size_t outleft; - - if (freemem_size < sizeof (size_t)) - goto resize_freemem; - - outleft = freemem_size - sizeof (size_t); - if (iconv (domain->conv, - (ICONV_CONST char **) &inptr, &inleft, - &outptr, &outleft) - != (size_t) (-1)) - { - outbuf = (unsigned char *) outptr; - break; - } - if (errno != E2BIG) - { - __libc_lock_unlock (lock); - goto converted; - } -# endif -# endif - - resize_freemem: - /* We must allocate a new buffer or resize the old one. */ - if (malloc_count > 0) - { - ++malloc_count; - freemem_size = malloc_count * INITIAL_BLOCK_SIZE; - newmem = (transmem_block_t *) realloc (transmem_list, - freemem_size); -# ifdef _LIBC - if (newmem != NULL) - transmem_list = transmem_list->next; - else - { - struct transmem_list *old = transmem_list; - - transmem_list = transmem_list->next; - free (old); - } -# endif - } - else - { - malloc_count = 1; - freemem_size = INITIAL_BLOCK_SIZE; - newmem = (transmem_block_t *) malloc (freemem_size); - } - if (__builtin_expect (newmem == NULL, 0)) - { - freemem = NULL; - freemem_size = 0; - __libc_lock_unlock (lock); - goto converted; - } - -# ifdef _LIBC - /* Add the block to the list of blocks we have to free - at some point. */ - newmem->next = transmem_list; - transmem_list = newmem; - - freemem = newmem->data; - freemem_size -= offsetof (struct transmem_list, data); -# else - transmem_list = newmem; - freemem = newmem; -# endif - - outbuf = freemem + sizeof (size_t); - } - - /* We have now in our buffer a converted string. Put this - into the table of conversions. */ - *(size_t *) freemem = outbuf - freemem - sizeof (size_t); - domain->conv_tab[act] = (char *) freemem; - /* Shrink freemem, but keep it aligned. */ - freemem_size -= outbuf - freemem; - freemem = outbuf; - freemem += freemem_size & (alignof (size_t) - 1); - freemem_size = freemem_size & ~ (alignof (size_t) - 1); - - __libc_lock_unlock (lock); - } - - /* Now domain->conv_tab[act] contains the translation of all - the plural variants. */ - result = domain->conv_tab[act] + sizeof (size_t); - resultlen = *(size_t *) domain->conv_tab[act]; - } - - converted: - /* The result string is converted. */ - -#endif /* _LIBC || HAVE_ICONV */ - - *lengthp = resultlen; - return result; -} - - -/* Look up a plural variant. */ -static char * -internal_function -plural_lookup (domain, n, translation, translation_len) - struct loaded_l10nfile *domain; - unsigned long int n; - const char *translation; - size_t translation_len; -{ - struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; - unsigned long int index; - const char *p; - - index = plural_eval (domaindata->plural, n); - if (index >= domaindata->nplurals) - /* This should never happen. It means the plural expression and the - given maximum value do not match. */ - index = 0; - - /* Skip INDEX strings at TRANSLATION. */ - p = translation; - while (index-- > 0) - { -#ifdef _LIBC - p = __rawmemchr (p, '\0'); -#else - p = strchr (p, '\0'); -#endif - /* And skip over the NUL byte. */ - p++; - - if (p >= translation + translation_len) - /* This should never happen. It means the plural expression - evaluated to a value larger than the number of variants - available for MSGID1. */ - return (char *) translation; - } - return (char *) p; -} - - -/* Function to evaluate the plural expression and return an index value. */ -static unsigned long int -internal_function -plural_eval (pexp, n) - struct expression *pexp; - unsigned long int n; -{ - switch (pexp->nargs) - { - case 0: - switch (pexp->operation) - { - case var: - return n; - case num: - return pexp->val.num; - default: - break; - } - /* NOTREACHED */ - break; - case 1: - { - /* pexp->operation must be lnot. */ - unsigned long int arg = plural_eval (pexp->val.args[0], n); - return ! arg; - } - case 2: - { - unsigned long int leftarg = plural_eval (pexp->val.args[0], n); - if (pexp->operation == lor) - return leftarg || plural_eval (pexp->val.args[1], n); - else if (pexp->operation == land) - return leftarg && plural_eval (pexp->val.args[1], n); - else - { - unsigned long int rightarg = plural_eval (pexp->val.args[1], n); - - switch (pexp->operation) - { - case mult: - return leftarg * rightarg; - case divide: - return leftarg / rightarg; - case module: - return leftarg % rightarg; - case plus: - return leftarg + rightarg; - case minus: - return leftarg - rightarg; - case less_than: - return leftarg < rightarg; - case greater_than: - return leftarg > rightarg; - case less_or_equal: - return leftarg <= rightarg; - case greater_or_equal: - return leftarg >= rightarg; - case equal: - return leftarg == rightarg; - case not_equal: - return leftarg != rightarg; - default: - break; - } - } - /* NOTREACHED */ - break; - } - case 3: - { - /* pexp->operation must be qmop. */ - unsigned long int boolarg = plural_eval (pexp->val.args[0], n); - return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); - } - } - /* NOTREACHED */ - return 0; -} - - -/* Return string representation of locale CATEGORY. */ -static const char * -internal_function -category_to_name (category) - int category; -{ - const char *retval; - - switch (category) - { -#ifdef LC_COLLATE - case LC_COLLATE: - retval = "LC_COLLATE"; - break; -#endif -#ifdef LC_CTYPE - case LC_CTYPE: - retval = "LC_CTYPE"; - break; -#endif -#ifdef LC_MONETARY - case LC_MONETARY: - retval = "LC_MONETARY"; - break; -#endif -#ifdef LC_NUMERIC - case LC_NUMERIC: - retval = "LC_NUMERIC"; - break; -#endif -#ifdef LC_TIME - case LC_TIME: - retval = "LC_TIME"; - break; -#endif -#ifdef LC_MESSAGES - case LC_MESSAGES: - retval = "LC_MESSAGES"; - break; -#endif -#ifdef LC_RESPONSE - case LC_RESPONSE: - retval = "LC_RESPONSE"; - break; -#endif -#ifdef LC_ALL - case LC_ALL: - /* This might not make sense but is perhaps better than any other - value. */ - retval = "LC_ALL"; - break; -#endif - default: - /* If you have a better idea for a default value let me know. */ - retval = "LC_XXX"; - } - - return retval; -} - -/* Guess value of current locale from value of the environment variables. */ -static const char * -internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; -{ - const char *language; - const char *retval; - - /* The highest priority value is the `LANGUAGE' environment - variable. But we don't use the value if the currently selected - locale is the C locale. This is a GNU extension. */ - language = getenv ("LANGUAGE"); - if (language != NULL && language[0] == '\0') - language = NULL; - - /* We have to proceed with the POSIX methods of looking to `LC_ALL', - `LC_xxx', and `LANG'. On some systems this can be done by the - `setlocale' function itself. */ -#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL) - retval = setlocale (category, NULL); -#else - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval == NULL || retval[0] == '\0') - { - /* Next comes the name of the desired category. */ - retval = getenv (categoryname); - if (retval == NULL || retval[0] == '\0') - { - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval == NULL || retval[0] == '\0') - /* We use C as the default domain. POSIX says this is - implementation defined. */ - return "C"; - } - } -#endif - - return language != NULL && strcmp (retval, "C") != 0 ? language : retval; -} - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif - -#if !_LIBC && !HAVE_MEMPCPY -static void * -mempcpy (dest, src, n) - void *dest; - const void *src; - size_t n; -{ - return (void *) ((char *) memcpy (dest, src, n) + n); -} -#endif - - -#ifdef _LIBC -/* If we want to free all resources we have to do some work at - program's end. */ -static void __attribute__ ((unused)) -free_mem (void) -{ - void *old; - - while (_nl_domain_bindings != NULL) - { - struct binding *oldp = _nl_domain_bindings; - _nl_domain_bindings = _nl_domain_bindings->next; - if (oldp->dirname != _nl_default_dirname) - /* Yes, this is a pointer comparison. */ - free (oldp->dirname); - free (oldp->codeset); - free (oldp); - } - - if (_nl_current_default_domain != _nl_default_default_domain) - /* Yes, again a pointer comparison. */ - free ((char *) _nl_current_default_domain); - - /* Remove the search tree with the known translations. */ - __tdestroy (root, free); - root = NULL; - - while (transmem_list != NULL) - { - old = transmem_list; - transmem_list = transmem_list->next; - free (old); - } -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff -Nru gimageview-0.2.27/intl/dcngettext.c gimageview-0.3.0-0.20101117/intl/dcngettext.c --- gimageview-0.2.27/intl/dcngettext.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/dcngettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* Implementation of the dcngettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCNGETTEXT __dcngettext -# define DCIGETTEXT __dcigettext -#else -# define DCNGETTEXT dcngettext__ -# define DCIGETTEXT dcigettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -char * -DCNGETTEXT (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; -{ - return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dcngettext, dcngettext); -#endif diff -Nru gimageview-0.2.27/intl/dgettext.c gimageview-0.3.0-0.20101117/intl/dgettext.c --- gimageview-0.2.27/intl/dgettext.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/dgettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DGETTEXT __dgettext -# define DCGETTEXT __dcgettext -#else -# define DGETTEXT dgettext__ -# define DCGETTEXT dcgettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog of the current - LC_MESSAGES locale. */ -char * -DGETTEXT (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return DCGETTEXT (domainname, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dgettext, dgettext); -#endif diff -Nru gimageview-0.2.27/intl/dngettext.c gimageview-0.3.0-0.20101117/intl/dngettext.c --- gimageview-0.2.27/intl/dngettext.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/dngettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/* Implementation of the dngettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DNGETTEXT __dngettext -# define DCNGETTEXT __dcngettext -#else -# define DNGETTEXT dngettext__ -# define DCNGETTEXT dcngettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog of the current - LC_MESSAGES locale and skip message according to the plural form. */ -char * -DNGETTEXT (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dngettext, dngettext); -#endif diff -Nru gimageview-0.2.27/intl/explodename.c gimageview-0.3.0-0.20101117/intl/explodename.c --- gimageview-0.2.27/intl/explodename.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/explodename.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,192 +0,0 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#endif - -/* @@ end of prolog @@ */ - -char * -_nl_find_language (name) - const char *name; -{ - while (name[0] != '\0' && name[0] != '_' && name[0] != '@' - && name[0] != '+' && name[0] != ',') - ++name; - - return (char *) name; -} - - -int -_nl_explode_name (name, language, modifier, territory, codeset, - normalized_codeset, special, sponsor, revision) - char *name; - const char **language; - const char **modifier; - const char **territory; - const char **codeset; - const char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; -{ - enum { undecided, xpg, cen } syntax; - char *cp; - int mask; - - *modifier = NULL; - *territory = NULL; - *codeset = NULL; - *normalized_codeset = NULL; - *special = NULL; - *sponsor = NULL; - *revision = NULL; - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = 0; - syntax = undecided; - *language = cp = name; - cp = _nl_find_language (*language); - - if (*language == cp) - /* This does not make sense: language has to be specified. Use - this entry as it is without exploding. Perhaps it is an alias. */ - cp = strchr (*language, '\0'); - else if (cp[0] == '_') - { - /* Next is the territory. */ - cp[0] = '\0'; - *territory = ++cp; - - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' - && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= TERRITORY; - - if (cp[0] == '.') - { - /* Next is the codeset. */ - syntax = xpg; - cp[0] = '\0'; - *codeset = ++cp; - - while (cp[0] != '\0' && cp[0] != '@') - ++cp; - - mask |= XPG_CODESET; - - if (*codeset != cp && (*codeset)[0] != '\0') - { - *normalized_codeset = _nl_normalize_codeset (*codeset, - cp - *codeset); - if (strcmp (*codeset, *normalized_codeset) == 0) - free ((char *) *normalized_codeset); - else - mask |= XPG_NORM_CODESET; - } - } - } - - if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) - { - /* Next is the modifier. */ - syntax = cp[0] == '@' ? xpg : cen; - cp[0] = '\0'; - *modifier = ++cp; - - while (syntax == cen && cp[0] != '\0' && cp[0] != '+' - && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= XPG_MODIFIER | CEN_AUDIENCE; - } - - if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) - { - syntax = cen; - - if (cp[0] == '+') - { - /* Next is special application (CEN syntax). */ - cp[0] = '\0'; - *special = ++cp; - - while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= CEN_SPECIAL; - } - - if (cp[0] == ',') - { - /* Next is sponsor (CEN syntax). */ - cp[0] = '\0'; - *sponsor = ++cp; - - while (cp[0] != '\0' && cp[0] != '_') - ++cp; - - mask |= CEN_SPONSOR; - } - - if (cp[0] == '_') - { - /* Next is revision (CEN syntax). */ - cp[0] = '\0'; - *revision = ++cp; - - mask |= CEN_REVISION; - } - } - - /* For CEN syntax values it might be important to have the - separator character in the file name, not for XPG syntax. */ - if (syntax == xpg) - { - if (*territory != NULL && (*territory)[0] == '\0') - mask &= ~TERRITORY; - - if (*codeset != NULL && (*codeset)[0] == '\0') - mask &= ~XPG_CODESET; - - if (*modifier != NULL && (*modifier)[0] == '\0') - mask &= ~XPG_MODIFIER; - } - - return mask; -} diff -Nru gimageview-0.2.27/intl/finddomain.c gimageview-0.3.0-0.20101117/intl/finddomain.c --- gimageview-0.2.27/intl/finddomain.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/finddomain.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,198 +0,0 @@ -/* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ -/* List of already loaded domains. */ -static struct loaded_l10nfile *_nl_loaded_domains; - - -/* Return a data structure describing the message catalog described by - the DOMAINNAME and CATEGORY parameters with respect to the currently - established bindings. */ -struct loaded_l10nfile * -internal_function -_nl_find_domain (dirname, locale, domainname, domainbinding) - const char *dirname; - char *locale; - const char *domainname; - struct binding *domainbinding; -{ - struct loaded_l10nfile *retval; - const char *language; - const char *modifier; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *special; - const char *sponsor; - const char *revision; - const char *alias_value; - int mask; - - /* LOCALE can consist of up to four recognized parts for the XPG syntax: - - language[_territory[.codeset]][@modifier] - - and six parts for the CEN syntax: - - language[_territory][+audience][+special][,[sponsor][_revision]] - - Beside the first part all of them are allowed to be missing. If - the full specified locale is not found, the less specific one are - looked for. The various parts will be stripped off according to - the following order: - (1) revision - (2) sponsor - (3) special - (4) codeset - (5) normalized codeset - (6) territory - (7) audience/modifier - */ - - /* If we have already tested for this locale entry there has to - be one data set in the list of loaded domains. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, domainname, 0); - if (retval != NULL) - { - /* We know something about this locale. */ - int cnt; - - if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); - - if (retval->data != NULL) - return retval; - - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) - { - if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt], domainbinding); - - if (retval->successor[cnt]->data != NULL) - break; - } - return cnt >= 0 ? retval : NULL; - /* NOTREACHED */ - } - - /* See whether the locale value is an alias. If yes its value - *overwrites* the alias name. No test for the original value is - done. */ - alias_value = _nl_expand_alias (locale); - if (alias_value != NULL) - { -#if defined _LIBC || defined HAVE_STRDUP - locale = strdup (alias_value); - if (locale == NULL) - return NULL; -#else - size_t len = strlen (alias_value) + 1; - locale = (char *) malloc (len); - if (locale == NULL) - return NULL; - - memcpy (locale, alias_value, len); -#endif - } - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = _nl_explode_name (locale, &language, &modifier, &territory, - &codeset, &normalized_codeset, &special, - &sponsor, &revision); - - /* Create all possible locale entries which might be interested in - generalization. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, mask, language, territory, - codeset, normalized_codeset, modifier, special, - sponsor, revision, domainname, 1); - if (retval == NULL) - /* This means we are out of core. */ - return NULL; - - if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); - if (retval->data == NULL) - { - int cnt; - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) - { - if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt], domainbinding); - if (retval->successor[cnt]->data != NULL) - break; - } - } - - /* The room for an alias was dynamically allocated. Free it now. */ - if (alias_value != NULL) - free (locale); - - /* The space for normalized_codeset is dynamically allocated. Free it. */ - if (mask & XPG_NORM_CODESET) - free ((void *) normalized_codeset); - - return retval; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - struct loaded_l10nfile *runp = _nl_loaded_domains; - - while (runp != NULL) - { - struct loaded_l10nfile *here = runp; - if (runp->data != NULL) - _nl_unload_domain ((struct loaded_domain *) runp->data); - runp = runp->next; - free ((char *) here->filename); - free (here); - } -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff -Nru gimageview-0.2.27/intl/gettext.c gimageview-0.3.0-0.20101117/intl/gettext.c --- gimageview-0.2.27/intl/gettext.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/gettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 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 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. -*/ -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define GETTEXT __gettext -# define DCGETTEXT __dcgettext -#else -# define GETTEXT gettext__ -# define DCGETTEXT dcgettext__ -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -char * -GETTEXT (msgid) - const char *msgid; -{ - return DCGETTEXT (NULL, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__gettext, gettext); -#endif diff -Nru gimageview-0.2.27/intl/gettext.h gimageview-0.3.0-0.20101117/intl/gettext.h --- gimageview-0.2.27/intl/gettext.h 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/gettext.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -/* Description of GNU message catalog format: general file layout. - Copyright (C) 1995, 1997, 2000, 2001 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 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. -*/ - -#ifndef _GETTEXT_H -#define _GETTEXT_H 1 - -#if HAVE_LIMITS_H || _LIBC -# include -#endif - -/* @@ end of prolog @@ */ - -/* The magic number of the GNU message catalog format. */ -#define _MAGIC 0x950412de -#define _MAGIC_SWAPPED 0xde120495 - -/* Revision number of the currently used .mo (binary) file format. */ -#define MO_REVISION_NUMBER 0 - -/* The following contortions are an attempt to use the C preprocessor - to determine an unsigned integral type that is 32 bits wide. An - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but - as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work - when cross-compiling. */ - -#if __STDC__ -# define UINT_MAX_32_BITS 4294967295U -#else -# define UINT_MAX_32_BITS 0xFFFFFFFF -#endif - -/* If UINT_MAX isn't defined, assume it's a 32-bit type. - This should be valid for all systems GNU cares about because - that doesn't include 16-bit systems, and only modern systems - (that certainly have ) have 64+-bit integral types. */ - -#ifndef UINT_MAX -# define UINT_MAX UINT_MAX_32_BITS -#endif - -#if UINT_MAX == UINT_MAX_32_BITS -typedef unsigned nls_uint32; -#else -# if USHRT_MAX == UINT_MAX_32_BITS -typedef unsigned short nls_uint32; -# else -# if ULONG_MAX == UINT_MAX_32_BITS -typedef unsigned long nls_uint32; -# else - /* The following line is intended to throw an error. Using #error is - not portable enough. */ - "Cannot determine unsigned 32-bit data type." -# endif -# endif -#endif - - -/* Header for binary .mo file format. */ -struct mo_file_header -{ - /* The magic number. */ - nls_uint32 magic; - /* The revision number of the file format. */ - nls_uint32 revision; - /* The number of strings pairs. */ - nls_uint32 nstrings; - /* Offset of table with start offsets of original strings. */ - nls_uint32 orig_tab_offset; - /* Offset of table with start offsets of translation strings. */ - nls_uint32 trans_tab_offset; - /* Size of hashing table. */ - nls_uint32 hash_tab_size; - /* Offset of first hashing entry. */ - nls_uint32 hash_tab_offset; -}; - -struct string_desc -{ - /* Length of addressed string. */ - nls_uint32 length; - /* Offset of string in file. */ - nls_uint32 offset; -}; - -/* @@ begin of epilog @@ */ - -#endif /* gettext.h */ diff -Nru gimageview-0.2.27/intl/gettextP.h gimageview-0.3.0-0.20101117/intl/gettextP.h --- gimageview-0.2.27/intl/gettextP.h 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/gettextP.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,252 +0,0 @@ -/* Header describing internals of libintl library. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - 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. -*/ - -#ifndef _GETTEXTP_H -#define _GETTEXTP_H - -#include /* Get size_t. */ - -#ifdef _LIBC -# include "../iconv/gconv_int.h" -#else -# if HAVE_ICONV -# include -# endif -#endif - -#include "loadinfo.h" - -#include "gettext.h" /* Get nls_uint32. */ - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* Tell the compiler when a conditional or integer expression is - almost always true or almost always false. */ -#ifndef HAVE_BUILTIN_EXPECT -# define __builtin_expect(expr, val) (expr) -#endif - -#ifndef W -# define W(flag, data) ((flag) ? SWAP (data) : (data)) -#endif - - -#ifdef _LIBC -# include -# define SWAP(i) bswap_32 (i) -#else -static inline nls_uint32 -SWAP (i) - nls_uint32 i; -{ - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -} -#endif - - -/* This is the representation of the expressions to determine the - plural form. */ -struct expression -{ - int nargs; /* Number of arguments. */ - enum operator - { - /* Without arguments: */ - var, /* The variable "n". */ - num, /* Decimal number. */ - /* Unary operators: */ - lnot, /* Logical NOT. */ - /* Binary operators: */ - mult, /* Multiplication. */ - divide, /* Division. */ - module, /* Module operation. */ - plus, /* Addition. */ - minus, /* Subtraction. */ - less_than, /* Comparison. */ - greater_than, /* Comparison. */ - less_or_equal, /* Comparison. */ - greater_or_equal, /* Comparison. */ - equal, /* Comparision for equality. */ - not_equal, /* Comparision for inequality. */ - land, /* Logical AND. */ - lor, /* Logical OR. */ - /* Ternary operators: */ - qmop /* Question mark operator. */ - } operation; - union - { - unsigned long int num; /* Number value for `num'. */ - struct expression *args[3]; /* Up to three arguments. */ - } val; -}; - -/* This is the data structure to pass information to the parser and get - the result in a thread-safe way. */ -struct parse_args -{ - const char *cp; - struct expression *res; -}; - - -/* The representation of an opened message catalog. */ -struct loaded_domain -{ - const char *data; - int use_mmap; - size_t mmap_size; - int must_swap; - nls_uint32 nstrings; - struct string_desc *orig_tab; - struct string_desc *trans_tab; - nls_uint32 hash_size; - nls_uint32 *hash_tab; - int codeset_cntr; -#ifdef _LIBC - __gconv_t conv; -#else -# if HAVE_ICONV - iconv_t conv; -# endif -#endif - char **conv_tab; - - struct expression *plural; - unsigned long int nplurals; -}; - -/* We want to allocate a string at the end of the struct. But ISO C - doesn't allow zero sized arrays. */ -#ifdef __GNUC__ -# define ZERO 0 -#else -# define ZERO 1 -#endif - -/* A set of settings bound to a message domain. Used to store settings - from bindtextdomain() and bind_textdomain_codeset(). */ -struct binding -{ - struct binding *next; - char *dirname; - int codeset_cntr; /* Incremented each time codeset changes. */ - char *codeset; - char domainname[ZERO]; -}; - -/* A counter which is incremented each time some previous translations - become invalid. - This variable is part of the external ABI of the GNU libintl. */ -extern int _nl_msg_cat_cntr; - -struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, - char *__locale, - const char *__domainname, - struct binding *__domainbinding)) - internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, - struct binding *__domainbinding)) - internal_function; -void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) - internal_function; -const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, - struct loaded_domain *__domain, - struct binding *__domainbinding)) - internal_function; -void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) - internal_function; - -char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, - struct binding *domainbinding, - const char *msgid, size_t *lengthp)) - internal_function; - -#ifdef _LIBC -extern char *__gettext PARAMS ((const char *__msgid)); -extern char *__dgettext PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *__dcgettext PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *__dngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int n)); -extern char *__dcngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *__dcigettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *__textdomain PARAMS ((const char *__domainname)); -extern char *__bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); -#else -extern char *gettext__ PARAMS ((const char *__msgid)); -extern char *dgettext__ PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *dcgettext__ PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dcngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *dcigettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *textdomain__ PARAMS ((const char *__domainname)); -extern char *bindtextdomain__ PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname, - const char *__codeset)); -#endif - -#ifdef _LIBC -extern void __gettext_free_exp PARAMS ((struct expression *exp)) - internal_function; -extern int __gettextparse PARAMS ((void *arg)); -#else -extern void gettext_free_exp__ PARAMS ((struct expression *exp)) - internal_function; -extern int gettextparse__ PARAMS ((void *arg)); -#endif - -/* @@ begin of epilog @@ */ - -#endif /* gettextP.h */ diff -Nru gimageview-0.2.27/intl/hash-string.h gimageview-0.3.0-0.20101117/intl/hash-string.h --- gimageview-0.2.27/intl/hash-string.h 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/hash-string.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* Description of GNU message catalog format: string hashing function. - Copyright (C) 1995, 1997, 1998, 2000, 2001 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 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. -*/ - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -/* We assume to have `unsigned long int' value with at least 32 bits. */ -#define HASHWORDBITS 32 - - -/* Defines the so called `hashpjw' function by P.J. Weinberger - [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, - 1986, 1987 Bell Telephone Laboratories, Inc.] */ -static unsigned long int hash_string PARAMS ((const char *__str_param)); - -static inline unsigned long int -hash_string (str_param) - const char *str_param; -{ - unsigned long int hval, g; - const char *str = str_param; - - /* Compute the hash value for the given string. */ - hval = 0; - while (*str != '\0') - { - hval <<= 4; - hval += (unsigned long int) *str++; - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); - if (g != 0) - { - hval ^= g >> (HASHWORDBITS - 8); - hval ^= g; - } - } - return hval; -} diff -Nru gimageview-0.2.27/intl/intl-compat.c gimageview-0.3.0-0.20101117/intl/intl-compat.c --- gimageview-0.2.27/intl/intl-compat.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/intl-compat.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -/* intl-compat.c - Stub functions to call gettext functions from GNU gettext - Library. - Copyright (C) 1995, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "libgnuintl.h" -#include "gettextP.h" - -/* @@ end of prolog @@ */ - -/* This file redirects the gettext functions (without prefix or suffix) to - those defined in the included GNU gettext library (with "__" suffix). - It is compiled into libintl when the included GNU gettext library is - configured --with-included-gettext. - - This redirection works also in the case that the system C library or - the system libintl library contain gettext/textdomain/... functions. - If it didn't, we would need to add preprocessor level redirections to - libgnuintl.h of the following form: - -# define gettext gettext__ -# define dgettext dgettext__ -# define dcgettext dcgettext__ -# define ngettext ngettext__ -# define dngettext dngettext__ -# define dcngettext dcngettext__ -# define textdomain textdomain__ -# define bindtextdomain bindtextdomain__ -# define bind_textdomain_codeset bind_textdomain_codeset__ - - How does this redirection work? There are two cases. - A. When libintl.a is linked into an executable, it works because - functions defined in the executable always override functions in - the shared libraries. - B. When libintl.so is used, it works because - 1. those systems defining gettext/textdomain/... in the C library - (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are - ELF systems and define these symbols as weak, thus explicitly - letting other shared libraries override it. - 2. those systems defining gettext/textdomain/... in a standalone - libintl.so library (namely, Solaris 2.3 and newer) have this - shared library in /usr/lib, and the linker will search /usr/lib - *after* the directory where the GNU gettext library is installed. - - A third case, namely when libintl.a is linked into a shared library - whose name is not libintl.so, is not supported. In this case, on - Solaris, when -lintl precedes the linker option for the shared library - containing GNU gettext, the system's gettext would indeed override - the GNU gettext. Anyone doing this kind of stuff must be clever enough - to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker - command line. */ - - -#undef gettext -#undef dgettext -#undef dcgettext -#undef ngettext -#undef dngettext -#undef dcngettext -#undef textdomain -#undef bindtextdomain -#undef bind_textdomain_codeset - - -char * -gettext (msgid) - const char *msgid; -{ - return gettext__ (msgid); -} - - -char * -dgettext (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return dgettext__ (domainname, msgid); -} - - -char * -dcgettext (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - return dcgettext__ (domainname, msgid, category); -} - - -char * -ngettext (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return ngettext__ (msgid1, msgid2, n); -} - - -char * -dngettext (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return dngettext__ (domainname, msgid1, msgid2, n); -} - - -char * -dcngettext (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; -{ - return dcngettext__ (domainname, msgid1, msgid2, n, category); -} - - -char * -textdomain (domainname) - const char *domainname; -{ - return textdomain__ (domainname); -} - - -char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; -{ - return bindtextdomain__ (domainname, dirname); -} - - -char * -bind_textdomain_codeset (domainname, codeset) - const char *domainname; - const char *codeset; -{ - return bind_textdomain_codeset__ (domainname, codeset); -} diff -Nru gimageview-0.2.27/intl/l10nflist.c gimageview-0.3.0-0.20101117/intl/l10nflist.c --- gimageview-0.2.27/intl/l10nflist.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/l10nflist.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,405 +0,0 @@ -/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - 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. -*/ - -/* Tell glibc's to provide a prototype for stpcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined _LIBC || defined HAVE_ARGZ_H -# include -#endif -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# ifndef stpcpy -# define stpcpy(dest, src) __stpcpy(dest, src) -# endif -#else -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -#endif - -/* Define function which are usually not available. */ - -#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -/* Returns the number of strings in ARGZ. */ -static size_t argz_count__ PARAMS ((const char *argz, size_t len)); - -static size_t -argz_count__ (argz, len) - const char *argz; - size_t len; -{ - size_t count = 0; - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len + 1; - len -= part_len + 1; - count++; - } - return count; -} -# undef __argz_count -# define __argz_count(argz, len) argz_count__ (argz, len) -#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ - -#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's - except the last into the character SEP. */ -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); - -static void -argz_stringify__ (argz, len, sep) - char *argz; - size_t len; - int sep; -{ - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len; - len -= part_len + 1; - if (len > 0) - *argz++ = sep; - } -} -# undef __argz_stringify -# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ - -#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, - const char *entry)); - -static char * -argz_next__ (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; -{ - if (entry) - { - if (entry < argz + argz_len) - entry = strchr (entry, '\0') + 1; - - return entry >= argz + argz_len ? NULL : (char *) entry; - } - else - if (argz_len > 0) - return argz; - else - return 0; -} -# undef __argz_next -# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ - - -/* Return number of bits set in X. */ -static int pop PARAMS ((int x)); - -static inline int -pop (x) - int x; -{ - /* We assume that no more than 16 bits are used. */ - x = ((x & ~0x5555) >> 1) + (x & 0x5555); - x = ((x & ~0x3333) >> 2) + (x & 0x3333); - x = ((x >> 4) + x) & 0x0f0f; - x = ((x >> 8) + x) & 0xff; - - return x; -} - - -struct loaded_l10nfile * -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, - territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, do_allocate) - struct loaded_l10nfile **l10nfile_list; - const char *dirlist; - size_t dirlist_len; - int mask; - const char *language; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *modifier; - const char *special; - const char *sponsor; - const char *revision; - const char *filename; - int do_allocate; -{ - char *abs_filename; - struct loaded_l10nfile *last = NULL; - struct loaded_l10nfile *retval; - char *cp; - size_t entries; - int cnt; - - /* Allocate room for the full file name. */ - abs_filename = (char *) malloc (dirlist_len - + strlen (language) - + ((mask & TERRITORY) != 0 - ? strlen (territory) + 1 : 0) - + ((mask & XPG_CODESET) != 0 - ? strlen (codeset) + 1 : 0) - + ((mask & XPG_NORM_CODESET) != 0 - ? strlen (normalized_codeset) + 1 : 0) - + (((mask & XPG_MODIFIER) != 0 - || (mask & CEN_AUDIENCE) != 0) - ? strlen (modifier) + 1 : 0) - + ((mask & CEN_SPECIAL) != 0 - ? strlen (special) + 1 : 0) - + (((mask & CEN_SPONSOR) != 0 - || (mask & CEN_REVISION) != 0) - ? (1 + ((mask & CEN_SPONSOR) != 0 - ? strlen (sponsor) + 1 : 0) - + ((mask & CEN_REVISION) != 0 - ? strlen (revision) + 1 : 0)) : 0) - + 1 + strlen (filename) + 1); - - if (abs_filename == NULL) - return NULL; - - retval = NULL; - last = NULL; - - /* Construct file name. */ - memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); - cp = abs_filename + (dirlist_len - 1); - *cp++ = '/'; - cp = stpcpy (cp, language); - - if ((mask & TERRITORY) != 0) - { - *cp++ = '_'; - cp = stpcpy (cp, territory); - } - if ((mask & XPG_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, codeset); - } - if ((mask & XPG_NORM_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, normalized_codeset); - } - if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) - { - /* This component can be part of both syntaces but has different - leading characters. For CEN we use `+', else `@'. */ - *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; - cp = stpcpy (cp, modifier); - } - if ((mask & CEN_SPECIAL) != 0) - { - *cp++ = '+'; - cp = stpcpy (cp, special); - } - if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) - { - *cp++ = ','; - if ((mask & CEN_SPONSOR) != 0) - cp = stpcpy (cp, sponsor); - if ((mask & CEN_REVISION) != 0) - { - *cp++ = '_'; - cp = stpcpy (cp, revision); - } - } - - *cp++ = '/'; - stpcpy (cp, filename); - - /* Look in list of already loaded domains whether it is already - available. */ - last = NULL; - for (retval = *l10nfile_list; retval != NULL; retval = retval->next) - if (retval->filename != NULL) - { - int compare = strcmp (retval->filename, abs_filename); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It's not in the list. */ - retval = NULL; - break; - } - - last = retval; - } - - if (retval != NULL || do_allocate == 0) - { - free (abs_filename); - return retval; - } - - retval = (struct loaded_l10nfile *) - malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) - * (1 << pop (mask)) - * sizeof (struct loaded_l10nfile *))); - if (retval == NULL) - return NULL; - - retval->filename = abs_filename; - retval->decided = (__argz_count (dirlist, dirlist_len) != 1 - || ((mask & XPG_CODESET) != 0 - && (mask & XPG_NORM_CODESET) != 0)); - retval->data = NULL; - - if (last == NULL) - { - retval->next = *l10nfile_list; - *l10nfile_list = retval; - } - else - { - retval->next = last->next; - last->next = retval; - } - - entries = 0; - /* If the DIRLIST is a real list the RETVAL entry corresponds not to - a real file. So we have to use the DIRLIST separation mechanism - of the inner loop. */ - cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; - for (; cnt >= 0; --cnt) - if ((cnt & ~mask) == 0 - && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) - && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) - { - /* Iterate over all elements of the DIRLIST. */ - char *dir = NULL; - - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) - != NULL) - retval->successor[entries++] - = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, - language, territory, codeset, - normalized_codeset, modifier, special, - sponsor, revision, filename, 1); - } - retval->successor[entries] = NULL; - - return retval; -} - -/* Normalize codeset name. There is no standard for the codeset - names. Normalization allows the user to use any of the common - names. The return value is dynamically allocated and has to be - freed by the caller. */ -const char * -_nl_normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; -{ - int len = 0; - int only_digit = 1; - char *retval; - char *wp; - size_t cnt; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum (codeset[cnt])) - { - ++len; - - if (isalpha (codeset[cnt])) - only_digit = 0; - } - - retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); - - if (retval != NULL) - { - if (only_digit) - wp = stpcpy (retval, "iso"); - else - wp = retval; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalpha (codeset[cnt])) - *wp++ = tolower (codeset[cnt]); - else if (isdigit (codeset[cnt])) - *wp++ = codeset[cnt]; - - *wp = '\0'; - } - - return (const char *) retval; -} - - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif diff -Nru gimageview-0.2.27/intl/libgettext.h gimageview-0.3.0-0.20101117/intl/libgettext.h --- gimageview-0.2.27/intl/libgettext.h 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/libgettext.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000, 2001 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 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. -*/ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include - -#else - -# define gettext(Msgid) (Msgid) -# define dgettext(Domainname, Msgid) (Msgid) -# define dcgettext(Domainname, Msgid, Category) (Msgid) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define textdomain(Domainname) ((char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset)) - -#endif - -/* For automatical extraction of messages sometimes no real - translation is needed. Instead the string itself is the result. */ -#define gettext_noop(Str) (Str) - -#endif /* _LIBGETTEXT_H */ diff -Nru gimageview-0.2.27/intl/libgnuintl.h gimageview-0.3.0-0.20101117/intl/libgnuintl.h --- gimageview-0.2.27/intl/libgnuintl.h 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/libgnuintl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -/* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000, 2001 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 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. -*/ - -#ifndef _LIBINTL_H -#define _LIBINTL_H 1 - -#include - -/* The LC_MESSAGES locale category is the category used by the functions - gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. - On systems that don't define it, use an arbitrary value instead. - On Solaris, defines __LOCALE_H then includes (i.e. - this file!) and then only defines LC_MESSAGES. To avoid a redefinition - warning, don't define LC_MESSAGES in this case. */ -#if !defined LC_MESSAGES && !defined __LOCALE_H -# define LC_MESSAGES 1729 -#endif - -/* We define an additional symbol to signal that we use the GNU - implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -/* Resolve a platform specific conflict on DJGPP. GNU gettext takes - precedence over _conio_gettext. */ -#ifdef __DJGPP__ -# undef gettext -# define gettext gettext -#endif - -#ifndef PARAMS -# if __STDC__ || defined __cplusplus -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -extern char *gettext PARAMS ((const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, - int __category)); - - -/* Similar to `gettext' but select the plural form corresponding to the - number N. */ -extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); - -/* Similar to `dgettext' but select the plural form corresponding to the - number N. */ -extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n)); - -/* Similar to `dcgettext' but select the plural form corresponding to the - number N. */ -extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n, - int __category)); - - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -extern char *textdomain PARAMS ((const char *__domainname)); - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -extern char *bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); - -/* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -extern char *bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); - - -/* Optimized version of the functions above. */ -#if defined __OPTIMIZED -/* These are macros, but could also be inline functions. */ - -# define gettext(msgid) \ - dgettext (NULL, msgid) - -# define dgettext(domainname, msgid) \ - dcgettext (domainname, msgid, LC_MESSAGES) - -# define ngettext(msgid1, msgid2, n) \ - dngettext (NULL, msgid1, msgid2, n) - -# define dngettext(domainname, msgid1, msgid2, n) \ - dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES) - -#endif /* Optimizing. */ - - -#ifdef __cplusplus -} -#endif - -#endif /* libintl.h */ diff -Nru gimageview-0.2.27/intl/loadinfo.h gimageview-0.3.0-0.20101117/intl/loadinfo.h --- gimageview-0.2.27/intl/loadinfo.h 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/loadinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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. -*/ - -#ifndef _LOADINFO_H -#define _LOADINFO_H 1 - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* Tell the compiler when a conditional or integer expression is - almost always true or almost always false. */ -#ifndef HAVE_BUILTIN_EXPECT -# define __builtin_expect(expr, val) (expr) -#endif - -/* Separator in PATH like lists of pathnames. */ -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ -# define PATH_SEPARATOR ';' -#else - /* Unix */ -# define PATH_SEPARATOR ':' -#endif - -/* Encoding of locale name parts. */ -#define CEN_REVISION 1 -#define CEN_SPONSOR 2 -#define CEN_SPECIAL 4 -#define XPG_NORM_CODESET 8 -#define XPG_CODESET 16 -#define TERRITORY 32 -#define CEN_AUDIENCE 64 -#define XPG_MODIFIER 128 - -#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) - - -struct loaded_l10nfile -{ - const char *filename; - int decided; - - const void *data; - - struct loaded_l10nfile *next; - struct loaded_l10nfile *successor[1]; -}; - - -/* Normalize codeset name. There is no standard for the codeset - names. Normalization allows the user to use any of the common - names. The return value is dynamically allocated and has to be - freed by the caller. */ -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, - size_t name_len)); - -extern struct loaded_l10nfile * -_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, int mask, - const char *language, const char *territory, - const char *codeset, - const char *normalized_codeset, - const char *modifier, const char *special, - const char *sponsor, const char *revision, - const char *filename, int do_allocate)); - - -extern const char *_nl_expand_alias PARAMS ((const char *name)); - -/* normalized_codeset is dynamically allocated and has to be freed by - the caller. */ -extern int _nl_explode_name PARAMS ((char *name, const char **language, - const char **modifier, - const char **territory, - const char **codeset, - const char **normalized_codeset, - const char **special, - const char **sponsor, - const char **revision)); - -extern char *_nl_find_language PARAMS ((const char *name)); - -#endif /* loadinfo.h */ diff -Nru gimageview-0.2.27/intl/loadmsgcat.c gimageview-0.3.0-0.20101117/intl/loadmsgcat.c --- gimageview-0.2.27/intl/loadmsgcat.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/loadmsgcat.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,567 +0,0 @@ -/* Load needed message catalogs. - Copyright (C) 1995-1999, 2000, 2001 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 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. -*/ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#ifdef _LIBC -# include -# include -#endif - -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || (defined _LIBC && defined _POSIX_MAPPED_FILES) -# include -# undef HAVE_MMAP -# define HAVE_MMAP 1 -#else -# undef HAVE_MMAP -#endif - -#include "gettext.h" -#include "gettextP.h" - -#ifdef _LIBC -# include "../locale/localeinfo.h" -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ISO C functions. This is required by the standard - because some ISO C functions will require linking with this object - file and the name space must not be polluted. */ -# define open __open -# define close __close -# define read __read -# define mmap __mmap -# define munmap __munmap -#endif - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define PLURAL_PARSE __gettextparse -#else -# define PLURAL_PARSE gettextparse__ -#endif - -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif - -/* For systems that distinguish between text and binary I/O. - O_BINARY is usually declared in . */ -#if !defined O_BINARY && defined _O_BINARY - /* For MSC-compatible compilers. */ -# define O_BINARY _O_BINARY -# define O_TEXT _O_TEXT -#endif -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ -# undef O_BINARY -# undef O_TEXT -#endif -/* On reasonable systems, binary I/O is the default. */ -#ifndef O_BINARY -# define O_BINARY 0 -#endif - -/* We need a sign, whether a new catalog was loaded, which can be associated - with all translations. This is important if the translations are - cached by one of GCC's features. */ -int _nl_msg_cat_cntr; - -#if (defined __GNUC__ && !defined __APPLE_CC__) \ - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) - -/* These structs are the constant expression for the germanic plural - form determination. It represents the expression "n != 1". */ -static const struct expression plvar = -{ - .nargs = 0, - .operation = var, -}; -static const struct expression plone = -{ - .nargs = 0, - .operation = num, - .val = - { - .num = 1 - } -}; -static struct expression germanic_plural = -{ - .nargs = 2, - .operation = not_equal, - .val = - { - .args = - { - [0] = (struct expression *) &plvar, - [1] = (struct expression *) &plone - } - } -}; - -# define INIT_GERMANIC_PLURAL() - -#else - -/* For compilers without support for ISO C 99 struct/union initializers: - Initialization at run-time. */ - -static struct expression plvar; -static struct expression plone; -static struct expression germanic_plural; - -static void -init_germanic_plural () -{ - if (plone.val.num == 0) - { - plvar.nargs = 0; - plvar.operation = var; - - plone.nargs = 0; - plone.operation = num; - plone.val.num = 1; - - germanic_plural.nargs = 2; - germanic_plural.operation = not_equal; - germanic_plural.val.args[0] = &plvar; - germanic_plural.val.args[1] = &plone; - } -} - -# define INIT_GERMANIC_PLURAL() init_germanic_plural () - -#endif - - -/* Initialize the codeset dependent parts of an opened message catalog. - Return the header entry. */ -const char * -internal_function -_nl_init_domain_conv (domain_file, domain, domainbinding) - struct loaded_l10nfile *domain_file; - struct loaded_domain *domain; - struct binding *domainbinding; -{ - /* Find out about the character set the file is encoded with. - This can be found (in textual form) in the entry "". If this - entry does not exist or if this does not contain the `charset=' - information, we will assume the charset matches the one the - current locale and we don't have to perform any conversion. */ - char *nullentry; - size_t nullentrylen; - - /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ - domain->codeset_cntr = - (domainbinding != NULL ? domainbinding->codeset_cntr : 0); -#ifdef _LIBC - domain->conv = (__gconv_t) -1; -#else -# if HAVE_ICONV - domain->conv = (iconv_t) -1; -# endif -#endif - domain->conv_tab = NULL; - - /* Get the header entry. */ - nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); - - if (nullentry != NULL) - { -#if defined _LIBC || HAVE_ICONV - const char *charsetstr; - - charsetstr = strstr (nullentry, "charset="); - if (charsetstr != NULL) - { - size_t len; - char *charset; - const char *outcharset; - - charsetstr += strlen ("charset="); - len = strcspn (charsetstr, " \t\n"); - - charset = (char *) alloca (len + 1); -# if defined _LIBC || HAVE_MEMPCPY - *((char *) mempcpy (charset, charsetstr, len)) = '\0'; -# else - memcpy (charset, charsetstr, len); - charset[len] = '\0'; -# endif - - /* The output charset should normally be determined by the - locale. But sometimes the locale is not used or not correctly - set up, so we provide a possibility for the user to override - this. Moreover, the value specified through - bind_textdomain_codeset overrides both. */ - if (domainbinding != NULL && domainbinding->codeset != NULL) - outcharset = domainbinding->codeset; - else - { - outcharset = getenv ("OUTPUT_CHARSET"); - if (outcharset == NULL || outcharset[0] == '\0') - { -# ifdef _LIBC - outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; -# else -# if HAVE_ICONV - extern const char *locale_charset (void); - outcharset = locale_charset (); -# endif -# endif - } - } - -# ifdef _LIBC - /* We always want to use transliteration. */ - outcharset = norm_add_slashes (outcharset, "TRANSLIT"); - charset = norm_add_slashes (charset, NULL); - if (__gconv_open (outcharset, charset, &domain->conv, - GCONV_AVOID_NOCONV) - != __GCONV_OK) - domain->conv = (__gconv_t) -1; -# else -# if HAVE_ICONV - /* When using GNU libiconv, we want to use transliteration. */ -# if _LIBICONV_VERSION >= 0x0105 - len = strlen (outcharset); - { - char *tmp = (char *) alloca (len + 10 + 1); - memcpy (tmp, outcharset, len); - memcpy (tmp + len, "//TRANSLIT", 10 + 1); - outcharset = tmp; - } -# endif - domain->conv = iconv_open (outcharset, charset); -# if _LIBICONV_VERSION >= 0x0105 - freea (outcharset); -# endif -# endif -# endif - - freea (charset); - } -#endif /* _LIBC || HAVE_ICONV */ - } - - return nullentry; -} - -/* Frees the codeset dependent parts of an opened message catalog. */ -void -internal_function -_nl_free_domain_conv (domain) - struct loaded_domain *domain; -{ - if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) - free (domain->conv_tab); - -#ifdef _LIBC - if (domain->conv != (__gconv_t) -1) - __gconv_close (domain->conv); -#else -# if HAVE_ICONV - if (domain->conv != (iconv_t) -1) - iconv_close (domain->conv); -# endif -#endif -} - -/* Load the message catalogs specified by FILENAME. If it is no valid - message catalog do nothing. */ -void -internal_function -_nl_load_domain (domain_file, domainbinding) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; -{ - int fd; - size_t size; -#ifdef _LIBC - struct stat64 st; -#else - struct stat st; -#endif - struct mo_file_header *data = (struct mo_file_header *) -1; - int use_mmap = 0; - struct loaded_domain *domain; - const char *nullentry; - - domain_file->decided = 1; - domain_file->data = NULL; - - /* Note that it would be useless to store domainbinding in domain_file - because domainbinding might be == NULL now but != NULL later (after - a call to bind_textdomain_codeset). */ - - /* If the record does not represent a valid locale the FILENAME - might be NULL. This can happen when according to the given - specification the locale file name is different for XPG and CEN - syntax. */ - if (domain_file->filename == NULL) - return; - - /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY | O_BINARY); - if (fd == -1) - return; - - /* We must know about the size of the file. */ - if ( -#ifdef _LIBC - __builtin_expect (fstat64 (fd, &st) != 0, 0) -#else - __builtin_expect (fstat (fd, &st) != 0, 0) -#endif - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) - || __builtin_expect (size < sizeof (struct mo_file_header), 0)) - { - /* Something went wrong. */ - close (fd); - return; - } - -#ifdef HAVE_MMAP - /* Now we are ready to load the file. If mmap() is available we try - this first. If not available or it failed we try to load it. */ - data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, - MAP_PRIVATE, fd, 0); - - if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) - { - /* mmap() call was successful. */ - close (fd); - use_mmap = 1; - } -#endif - - /* If the data is not yet available (i.e. mmap'ed) we try to load - it manually. */ - if (data == (struct mo_file_header *) -1) - { - size_t to_read; - char *read_ptr; - - data = (struct mo_file_header *) malloc (size); - if (data == NULL) - return; - - to_read = size; - read_ptr = (char *) data; - do - { - long int nb = (long int) read (fd, read_ptr, to_read); - if (nb <= 0) - { -#ifdef EINTR - if (nb == -1 && errno == EINTR) - continue; -#endif - close (fd); - return; - } - read_ptr += nb; - to_read -= nb; - } - while (to_read > 0); - - close (fd); - } - - /* Using the magic number we can test whether it really is a message - catalog file. */ - if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, - 0)) - { - /* The magic number is wrong: not a message catalog file. */ -#ifdef HAVE_MMAP - if (use_mmap) - munmap ((caddr_t) data, size); - else -#endif - free (data); - return; - } - - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain == NULL) - return; - domain_file->data = domain; - - domain->data = (char *) data; - domain->use_mmap = use_mmap; - domain->mmap_size = size; - domain->must_swap = data->magic != _MAGIC; - - /* Fill in the information about the available tables. */ - switch (W (domain->must_swap, data->revision)) - { - case 0: - domain->nstrings = W (domain->must_swap, data->nstrings); - domain->orig_tab = (struct string_desc *) - ((char *) data + W (domain->must_swap, data->orig_tab_offset)); - domain->trans_tab = (struct string_desc *) - ((char *) data + W (domain->must_swap, data->trans_tab_offset)); - domain->hash_size = W (domain->must_swap, data->hash_tab_size); - domain->hash_tab = (nls_uint32 *) - ((char *) data + W (domain->must_swap, data->hash_tab_offset)); - break; - default: - /* This is an invalid revision. */ -#ifdef HAVE_MMAP - if (use_mmap) - munmap ((caddr_t) data, size); - else -#endif - free (data); - free (domain); - domain_file->data = NULL; - return; - } - - /* Now initialize the character set converter from the character set - the file is encoded with (found in the header entry) to the domain's - specified character set or the locale's character set. */ - nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); - - /* Also look for a plural specification. */ - if (nullentry != NULL) - { - const char *plural; - const char *nplurals; - - plural = strstr (nullentry, "plural="); - nplurals = strstr (nullentry, "nplurals="); - if (plural == NULL || nplurals == NULL) - goto no_plural; - else - { - /* First get the number. */ - char *endp; - unsigned long int n; - struct parse_args args; - - nplurals += 9; - while (*nplurals != '\0' && isspace (*nplurals)) - ++nplurals; -#if defined HAVE_STRTOUL || defined _LIBC - n = strtoul (nplurals, &endp, 10); -#else - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) - n = n * 10 + (*endp - '0'); -#endif - domain->nplurals = n; - if (nplurals == endp) - goto no_plural; - - /* Due to the restrictions bison imposes onto the interface of the - scanner function we have to put the input string and the result - passed up from the parser into the same structure which address - is passed down to the parser. */ - plural += 7; - args.cp = plural; - if (PLURAL_PARSE (&args) != 0) - goto no_plural; - domain->plural = args.res; - } - } - else - { - /* By default we are using the Germanic form: singular form only - for `one', the plural form otherwise. Yes, this is also what - English is using since English is a Germanic language. */ - no_plural: - INIT_GERMANIC_PLURAL (); - domain->plural = &germanic_plural; - domain->nplurals = 2; - } -} - - -#ifdef _LIBC -void -internal_function -_nl_unload_domain (domain) - struct loaded_domain *domain; -{ - if (domain->plural != &germanic_plural) - __gettext_free_exp (domain->plural); - - _nl_free_domain_conv (domain); - -# ifdef _POSIX_MAPPED_FILES - if (domain->use_mmap) - munmap ((caddr_t) domain->data, domain->mmap_size); - else -# endif /* _POSIX_MAPPED_FILES */ - free ((void *) domain->data); - - free (domain); -} -#endif diff -Nru gimageview-0.2.27/intl/localcharset.c gimageview-0.3.0-0.20101117/intl/localcharset.c --- gimageview-0.2.27/intl/localcharset.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/localcharset.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,271 +0,0 @@ -/* Determine a canonical name for the current locale's character encoding. - - Copyright (C) 2000-2001 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 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. -*/ - -/* Written by Bruno Haible . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#if HAVE_STDDEF_H -# include -#endif - -#include -#if HAVE_STRING_H -# include -#else -# include -#endif -#if HAVE_STDLIB_H -# include -#endif - -#if defined _WIN32 || defined __WIN32__ -# undef WIN32 /* avoid warning on mingw32 */ -# define WIN32 -#endif - -#ifndef WIN32 -# if HAVE_LANGINFO_CODESET -# include -# else -# if HAVE_SETLOCALE -# include -# endif -# endif -#else /* WIN32 */ -# define WIN32_LEAN_AND_MEAN -# include -#endif - -#ifndef DIRECTORY_SEPARATOR -# define DIRECTORY_SEPARATOR '/' -#endif - -#ifndef ISSLASH -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) -#endif - -/* The following static variable is declared 'volatile' to avoid a - possible multithread problem in the function get_charset_aliases. If we - are running in a threaded environment, and if two threads initialize - 'charset_aliases' simultaneously, both will produce the same value, - and everything will be ok if the two assignments to 'charset_aliases' - are atomic. But I don't know what will happen if the two assignments mix. */ -#if __STDC__ != 1 -# define volatile /* empty */ -#endif -/* Pointer to the contents of the charset.alias file, if it has already been - read, else NULL. Its format is: - ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static const char * volatile charset_aliases; - -/* Return a pointer to the contents of the charset.alias file. */ -static const char * -get_charset_aliases () -{ - const char *cp; - - cp = charset_aliases; - if (cp == NULL) - { -#ifndef WIN32 - FILE *fp; - const char *dir = LIBDIR; - const char *base = "charset.alias"; - char *file_name; - - /* Concatenate dir and base into freshly allocated file_name. */ - { - size_t dir_len = strlen (dir); - size_t base_len = strlen (base); - int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); - file_name = (char *) malloc (dir_len + add_slash + base_len + 1); - if (file_name != NULL) - { - memcpy (file_name, dir, dir_len); - if (add_slash) - file_name[dir_len] = DIRECTORY_SEPARATOR; - memcpy (file_name + dir_len + add_slash, base, base_len + 1); - } - } - - if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) - /* Out of memory or file not found, treat it as empty. */ - cp = ""; - else - { - /* Parse the file's contents. */ - int c; - char buf1[50+1]; - char buf2[50+1]; - char *res_ptr = NULL; - size_t res_size = 0; - size_t l1, l2; - - for (;;) - { - c = getc (fp); - if (c == EOF) - break; - if (c == '\n' || c == ' ' || c == '\t') - continue; - if (c == '#') - { - /* Skip comment, to end of line. */ - do - c = getc (fp); - while (!(c == EOF || c == '\n')); - if (c == EOF) - break; - continue; - } - ungetc (c, fp); - if (fscanf(fp, "%50s %50s", buf1, buf2) < 2) - break; - l1 = strlen (buf1); - l2 = strlen (buf2); - if (res_size == 0) - { - res_size = l1 + 1 + l2 + 1; - res_ptr = malloc (res_size + 1); - } - else - { - res_size += l1 + 1 + l2 + 1; - res_ptr = realloc (res_ptr, res_size + 1); - } - if (res_ptr == NULL) - { - /* Out of memory. */ - res_size = 0; - break; - } - strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); - strcpy (res_ptr + res_size - (l2 + 1), buf2); - } - fclose (fp); - if (res_size == 0) - cp = ""; - else - { - *(res_ptr + res_size) = '\0'; - cp = res_ptr; - } - } - - if (file_name != NULL) - free (file_name); - -#else /* WIN32 */ - - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ - - cp = "CP936" "\0" "GBK" "\0" - "CP1361" "\0" "JOHAB" "\0"; -#endif - - charset_aliases = cp; - } - - return cp; -} - -/* Determine the current locale's character encoding, and canonicalize it - into one of the canonical names listed in config.charset. - The result must not be freed; it is statically allocated. - If the canonical name cannot be determined, the result is a non-canonical - name. */ - -#ifdef STATIC -STATIC -#endif -const char * -locale_charset () -{ - const char *codeset; - const char *aliases; - -#ifndef WIN32 - -# if HAVE_LANGINFO_CODESET - - /* Most systems support nl_langinfo (CODESET) nowadays. */ - codeset = nl_langinfo (CODESET); - -# else - - /* On old systems which lack it, use setlocale or getenv. */ - const char *locale = NULL; - - /* But most old systems don't have a complete set of locales. Some - (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't - use setlocale here; it would return "C" when it doesn't support the - locale name the user has set. */ -# if HAVE_SETLOCALE && 0 - locale = setlocale (LC_CTYPE, NULL); -# endif - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_ALL"); - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_CTYPE"); - if (locale == NULL || locale[0] == '\0') - locale = getenv ("LANG"); - } - } - - /* On some old systems, one used to set locale = "iso8859_1". On others, - you set it to "language_COUNTRY.charset". In any case, we resolve it - through the charset.alias file. */ - codeset = locale; - -# endif - -#else /* WIN32 */ - - static char buf[2 + 10 + 1]; - - /* Win32 has a function returning the locale's codepage as a number. */ - sprintf (buf, "CP%u", GetACP ()); - codeset = buf; - -#endif - - if (codeset == NULL) - /* The canonical name cannot be determined. */ - codeset = ""; - - /* Resolve alias. */ - for (aliases = get_charset_aliases (); - *aliases != '\0'; - aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) - if (strcmp (codeset, aliases) == 0 - || (aliases[0] == '*' && aliases[1] == '\0')) - { - codeset = aliases + strlen (aliases) + 1; - break; - } - - return codeset; -} diff -Nru gimageview-0.2.27/intl/locale.alias gimageview-0.3.0-0.20101117/intl/locale.alias --- gimageview-0.2.27/intl/locale.alias 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/locale.alias 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -# Locale name alias data base. -# Copyright (C) 1996,1997,1998,1999,2000,2001 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 02111-1307, USA. - -# The format of this file is the same as for the corresponding file of -# the X Window System, which normally can be found in -# /usr/lib/X11/locale/locale.alias -# A single line contains two fields: an alias and a substitution value. -# All entries are case independent. - -# Note: This file is far from being complete. If you have a value for -# your own site which you think might be useful for others too, share -# it with the rest of us. Send it using the `glibcbug' script to -# bugs@gnu.org. - -# Packages using this file: - -bokmal no_NO.ISO-8859-1 -bokm-Aål no_NO.ISO-8859-1$)B -catalan ca_ES.ISO-8859-1 -croatian hr_HR.ISO-8859-2 -czech cs_CZ.ISO-8859-2 -danish da_DK.ISO-8859-1 -dansk da_DK.ISO-8859-1 -deutsch de_DE.ISO-8859-1 -dutch nl_NL.ISO-8859-1 -eesti et_EE.ISO-8859-1 -estonian et_EE.ISO-8859-1 -finnish fi_FI.ISO-8859-1 -fran-Açais fr_FR.ISO-8859-1$)B -french fr_FR.ISO-8859-1 -galego gl_ES.ISO-8859-1 -galician gl_ES.ISO-8859-1 -german de_DE.ISO-8859-1 -greek el_GR.ISO-8859-7 -hebrew he_IL.ISO-8859-8 -hrvatski hr_HR.ISO-8859-2 -hungarian hu_HU.ISO-8859-2 -icelandic is_IS.ISO-8859-1 -italian it_IT.ISO-8859-1 -japanese ja_JP.eucJP -japanese.euc ja_JP.eucJP -ja_JP ja_JP.eucJP -ja_JP.ujis ja_JP.eucJP -japanese.sjis ja_JP.SJIS -korean ko_KR.eucKR -korean.euc ko_KR.eucKR -ko_KR ko_KR.eucKR -lithuanian lt_LT.ISO-8859-13 -nb_NO no_NO.ISO-8859-1 -nb_NO.ISO-8859-1 no_NO.ISO-8859-1 -norwegian no_NO.ISO-8859-1 -nynorsk nn_NO.ISO-8859-1 -polish pl_PL.ISO-8859-2 -portuguese pt_PT.ISO-8859-1 -romanian ro_RO.ISO-8859-2 -russian ru_RU.ISO-8859-5 -slovak sk_SK.ISO-8859-2 -slovene sl_SI.ISO-8859-2 -slovenian sl_SI.ISO-8859-2 -spanish es_ES.ISO-8859-1 -swedish sv_SE.ISO-8859-1 -thai th_TH.TIS-620 -turkish tr_TR.ISO-8859-9 diff -Nru gimageview-0.2.27/intl/localealias.c gimageview-0.3.0-0.20101117/intl/localealias.c --- gimageview-0.2.27/intl/localealias.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/localealias.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,404 +0,0 @@ -/* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000, 2001 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 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. -*/ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#include "gettextP.h" - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define strcasecmp __strcasecmp - -# ifndef mempcpy -# define mempcpy __mempcpy -# endif -# define HAVE_MEMPCPY 1 - -/* We need locking here since we can be called from different places. */ -# include - -__libc_lock_define_initialized (static, lock); -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif - -#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED -# undef fgets -# define fgets(buf, len, s) fgets_unlocked (buf, len, s) -#endif -#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED -# undef feof -# define feof(s) feof_unlocked (s) -#endif - - -struct alias_map -{ - const char *alias; - const char *value; -}; - - -static char *string_space; -static size_t string_space_act; -static size_t string_space_max; -static struct alias_map *map; -static size_t nmap; -static size_t maxmap; - - -/* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) - internal_function; -static int extend_alias_table PARAMS ((void)); -static int alias_compare PARAMS ((const struct alias_map *map1, - const struct alias_map *map2)); - - -const char * -_nl_expand_alias (name) - const char *name; -{ - static const char *locale_alias_path = LOCALE_ALIAS_PATH; - struct alias_map *retval; - const char *result = NULL; - size_t added; - -#ifdef _LIBC - __libc_lock_lock (lock); -#endif - - do - { - struct alias_map item; - - item.alias = name; - - if (nmap > 0) - retval = (struct alias_map *) bsearch (&item, map, nmap, - sizeof (struct alias_map), - (int (*) PARAMS ((const void *, - const void *)) - ) alias_compare); - else - retval = NULL; - - /* We really found an alias. Return the value. */ - if (retval != NULL) - { - result = retval->value; - break; - } - - /* Perhaps we can find another alias file. */ - added = 0; - while (added == 0 && locale_alias_path[0] != '\0') - { - const char *start; - - while (locale_alias_path[0] == PATH_SEPARATOR) - ++locale_alias_path; - start = locale_alias_path; - - while (locale_alias_path[0] != '\0' - && locale_alias_path[0] != PATH_SEPARATOR) - ++locale_alias_path; - - if (start < locale_alias_path) - added = read_alias_file (start, locale_alias_path - start); - } - } - while (added != 0); - -#ifdef _LIBC - __libc_lock_unlock (lock); -#endif - - return result; -} - - -static size_t -internal_function -read_alias_file (fname, fname_len) - const char *fname; - int fname_len; -{ - FILE *fp; - char *full_fname; - size_t added; - static const char aliasfile[] = "/locale.alias"; - - full_fname = (char *) alloca (fname_len + sizeof aliasfile); -#ifdef HAVE_MEMPCPY - mempcpy (mempcpy (full_fname, fname, fname_len), - aliasfile, sizeof aliasfile); -#else - memcpy (full_fname, fname, fname_len); - memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -#endif - - fp = fopen (full_fname, "r"); - freea (full_fname); - if (fp == NULL) - return 0; - - added = 0; - while (!feof (fp)) - { - /* It is a reasonable approach to use a fix buffer here because - a) we are only interested in the first two fields - b) these fields must be usable as file names and so must not - be that long - */ - char buf[BUFSIZ]; - char *alias; - char *value; - char *cp; - - if (fgets (buf, sizeof buf, fp) == NULL) - /* EOF reached. */ - break; - - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - if (strchr (buf, '\n') == NULL) - { - char altbuf[BUFSIZ]; - do - if (fgets (altbuf, sizeof altbuf, fp) == NULL) - /* Make sure the inner loop will be left. The outer loop - will exit at the `feof' test. */ - break; - while (strchr (altbuf, '\n') == NULL); - } - - cp = buf; - /* Ignore leading white space. */ - while (isspace (cp[0])) - ++cp; - - /* A leading '#' signals a comment line. */ - if (cp[0] != '\0' && cp[0] != '#') - { - alias = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) - ++cp; - /* Terminate alias name. */ - if (cp[0] != '\0') - *cp++ = '\0'; - - /* Now look for the beginning of the value. */ - while (isspace (cp[0])) - ++cp; - - if (cp[0] != '\0') - { - size_t alias_len; - size_t value_len; - - value = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) - ++cp; - /* Terminate value. */ - if (cp[0] == '\n') - { - /* This has to be done to make the following test - for the end of line possible. We are looking for - the terminating '\n' which do not overwrite here. */ - *cp++ = '\0'; - *cp = '\n'; - } - else if (cp[0] != '\0') - *cp++ = '\0'; - - if (nmap >= maxmap) - if (__builtin_expect (extend_alias_table (), 0)) - return added; - - alias_len = strlen (alias) + 1; - value_len = strlen (value) + 1; - - if (string_space_act + alias_len + value_len > string_space_max) - { - /* Increase size of memory pool. */ - size_t new_size = (string_space_max - + (alias_len + value_len > 1024 - ? alias_len + value_len : 1024)); - char *new_pool = (char *) realloc (string_space, new_size); - if (new_pool == NULL) - return added; - - if (__builtin_expect (string_space != new_pool, 0)) - { - size_t i; - - for (i = 0; i < nmap; i++) - { - map[i].alias += new_pool - string_space; - map[i].value += new_pool - string_space; - } - } - - string_space = new_pool; - string_space_max = new_size; - } - - map[nmap].alias = memcpy (&string_space[string_space_act], - alias, alias_len); - string_space_act += alias_len; - - map[nmap].value = memcpy (&string_space[string_space_act], - value, value_len); - string_space_act += value_len; - - ++nmap; - ++added; - } - } - } - - /* Should we test for ferror()? I think we have to silently ignore - errors. --drepper */ - fclose (fp); - - if (added > 0) - qsort (map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, const void *))) alias_compare); - - return added; -} - - -static int -extend_alias_table () -{ - size_t new_size; - struct alias_map *new_map; - - new_size = maxmap == 0 ? 100 : 2 * maxmap; - new_map = (struct alias_map *) realloc (map, (new_size - * sizeof (struct alias_map))); - if (new_map == NULL) - /* Simply don't extend: we don't have any more core. */ - return -1; - - map = new_map; - maxmap = new_size; - return 0; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - if (string_space != NULL) - free (string_space); - if (map != NULL) - free (map); -} -text_set_element (__libc_subfreeres, free_mem); -#endif - - -static int -alias_compare (map1, map2) - const struct alias_map *map1; - const struct alias_map *map2; -{ -#if defined _LIBC || defined HAVE_STRCASECMP - return strcasecmp (map1->alias, map2->alias); -#else - const unsigned char *p1 = (const unsigned char *) map1->alias; - const unsigned char *p2 = (const unsigned char *) map2->alias; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - /* I know this seems to be odd but the tolower() function in - some systems libc cannot handle nonalpha characters. */ - c1 = isupper (*p1) ? tolower (*p1) : *p1; - c2 = isupper (*p2) ? tolower (*p2) : *p2; - if (c1 == '\0') - break; - ++p1; - ++p2; - } - while (c1 == c2); - - return c1 - c2; -#endif -} diff -Nru gimageview-0.2.27/intl/Makefile.in gimageview-0.3.0-0.20101117/intl/Makefile.in --- gimageview-0.2.27/intl/Makefile.in 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,312 +0,0 @@ -# Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995-1998, 2000, 2001 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 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. - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -transform = @program_transform_name@ -libdir = @libdir@ -includedir = @includedir@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/intl -aliaspath = $(localedir) -subdir = intl - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` - -l = @INTL_LIBTOOL_SUFFIX_PREFIX@ - -AR = ar -CC = @CC@ -LIBTOOL = @LIBTOOL@ -RANLIB = @RANLIB@ -YACC = @INTLBISON@ -y -d -YFLAGS = --name-prefix=__gettext - -DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ --DLIBDIR=\"$(libdir)\" @DEFS@ -CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h -COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c -COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ -localcharset.c -OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ -plural.$lo localcharset.$lo -GETTOBJS = intl-compat.$lo -DISTFILES.common = Makefile.in \ -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) -DISTFILES.generated = plural.c -DISTFILES.normal = VERSION -DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c - -# Libtool's library version information for libintl. -# Before making a gettext release, the gettext maintainer must change this -# according to the libtool documentation, section "Library interface versions". -# Maintainers of other packages that include the intl directory must *not* -# change these values. -LTV_CURRENT=1 -LTV_REVISION=1 -LTV_AGE=0 - -.SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed -.c.o: - $(COMPILE) $< -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) $< - -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -.sin.sed: - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ - mv t-$@ $@ - -INCLUDES = -I.. -I. -I$(top_srcdir)/intl - -all: all-@USE_INCLUDED_LIBINTL@ -all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed -all-no: all-no-@BUILD_INCLUDED_LIBINTL@ -all-no-yes: libgnuintl.$la -all-no-no: - -libintl.a libgnuintl.a: $(OBJECTS) - rm -f $@ - $(AR) cru $@ $(OBJECTS) - $(RANLIB) $@ - -libintl.la libgnuintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link \ - $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ - $(OBJECTS) @LIBICONV@ \ - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ - -rpath $(libdir) \ - -no-undefined - -libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h - -charset.alias: config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ - mv t-$@ $@ - -check: all - -# This installation goal is only used in GNU gettext. Packages which -# only use the library should use install instead. - -# We must not install the libintl.h/libintl.a files if we are on a -# system which has the GNU gettext() function in its C library or in a -# separate library. -# If you want to use the one which comes with this version of the -# package, you have to use `configure --with-included-gettext'. -install: install-exec install-data -install-exec: all - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ - $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ - $(LIBTOOL) --mode=install \ - $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ - else \ - : ; \ - fi - if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir); \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - orig=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - if test @GLIBC21@ = no; then \ - orig=charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - fi; \ - fi; \ - $(mkinstalldirs) $(DESTDIR)$(localedir); \ - test -f $(DESTDIR)$(localedir)/locale.alias \ - && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - : ; \ - fi -install-data: all - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ - for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ - dists="$(DISTFILES.generated)"; \ - for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - $(INSTALL_DATA) $$dir/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - dists="$(DISTFILES.obsolete)"; \ - for file in $$dists; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - rm -f $(DESTDIR)$(includedir)/libintl.h; \ - $(LIBTOOL) --mode=uninstall \ - rm -f $(DESTDIR)$(libdir)/libintl.$la; \ - else \ - : ; \ - fi - if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - if test -f $(DESTDIR)$(localedir)/locale.alias; then \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - else \ - : ; \ - fi - if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi - -info dvi: - -$(OBJECTS): ../config.h libgnuintl.h -bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h - -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) - -id: ID - -ID: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) - - -mostlyclean: - rm -f *.a *.la *.o *.lo core core.* - rm -f libintl.h charset.alias ref-add.sed ref-del.sed - rm -f -r .libs _libs - -clean: mostlyclean - -distclean: clean - rm -f Makefile ID TAGS - if test "$(PACKAGE)" = gettext; then \ - rm -f ChangeLog.inst $(DISTFILES.normal); \ - else \ - : ; \ - fi - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - - -# GNU gettext needs not contain the file `VERSION' but contains some -# other files which should not be distributed in other packages. -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: Makefile - if test "$(PACKAGE)" = gettext; then \ - additional="$(DISTFILES.gettext)"; \ - else \ - additional="$(DISTFILES.normal)"; \ - fi; \ - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - ln $$dir/$$file $(distdir) 2> /dev/null \ - || cp -p $$dir/$$file $(distdir); \ - done - -Makefile: Makefile.in ../config.status - cd .. \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/intl/ngettext.c gimageview-0.3.0-0.20101117/intl/ngettext.c --- gimageview-0.2.27/intl/ngettext.c 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/ngettext.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/* Implementation of ngettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -#include - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define NGETTEXT __ngettext -# define DCNGETTEXT __dcngettext -#else -# define NGETTEXT ngettext__ -# define DCNGETTEXT dcngettext__ -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -char * -NGETTEXT (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__ngettext, ngettext); -#endif diff -Nru gimageview-0.2.27/intl/plural.c gimageview-0.3.0-0.20101117/intl/plural.c --- gimageview-0.2.27/intl/plural.c 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/plural.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1326 +0,0 @@ - -/* A Bison parser, made from plural.y - by GNU Bison version 1.28 */ - -#define YYBISON 1 /* Identify Bison output. */ - -#define yyparse __gettextparse -#define yylex __gettextlex -#define yyerror __gettexterror -#define yylval __gettextlval -#define yychar __gettextchar -#define yydebug __gettextdebug -#define yynerrs __gettextnerrs -#define EQUOP2 257 -#define CMPOP2 258 -#define ADDOP2 259 -#define MULOP2 260 -#define NUMBER 261 - -#line 1 "plural.y" - -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 2000. - - 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. -*/ - -/* The bison generated parser uses alloca. AIX 3 forces us to put this - declaration at the beginning of the file. The declaration in bison's - skeleton file comes too late. This must come before - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include "gettextP.h" - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ -#endif - -#define YYLEX_PARAM &((struct parse_args *) arg)->cp -#define YYPARSE_PARAM arg - -#line 53 "plural.y" -typedef union { - unsigned long int num; - enum operator op; - struct expression *exp; -} YYSTYPE; -#line 59 "plural.y" - -/* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); - -/* Allocation of expressions. */ - -static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; -{ - int i; - struct expression *newp; - - /* If any of the argument could not be malloc'ed, just return NULL. */ - for (i = nargs - 1; i >= 0; i--) - if (args[i] == NULL) - goto fail; - - /* Allocate a new expression. */ - newp = (struct expression *) malloc (sizeof (*newp)); - if (newp != NULL) - { - newp->nargs = nargs; - newp->operation = op; - for (i = nargs - 1; i >= 0; i--) - newp->val.args[i] = args[i]; - return newp; - } - - fail: - for (i = nargs - 1; i >= 0; i--) - FREE_EXPRESSION (args[i]); - - return NULL; -} - -static inline struct expression * -new_exp_0 (op) - enum operator op; -{ - return new_exp (0, op, NULL); -} - -static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; -{ - struct expression *args[1]; - - args[0] = right; - return new_exp (1, op, args); -} - -static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; -{ - struct expression *args[2]; - - args[0] = left; - args[1] = right; - return new_exp (2, op, args); -} - -static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; -{ - struct expression *args[3]; - - args[0] = bexp; - args[1] = tbranch; - args[2] = fbranch; - return new_exp (3, op, args); -} - -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const -#endif -#endif - - - -#define YYFINAL 27 -#define YYFLAG -32768 -#define YYNTBASE 16 - -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) - -static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 10, 2, 2, 2, 2, 5, 2, 14, - 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 12, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 13, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 6, 7, 8, 9, - 11 -}; - -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 2, 8, 12, 16, 20, 24, 28, 32, 35, - 37, 39 -}; - -static const short yyrhs[] = { 17, - 0, 17, 3, 17, 12, 17, 0, 17, 4, 17, - 0, 17, 5, 17, 0, 17, 6, 17, 0, 17, - 7, 17, 0, 17, 8, 17, 0, 17, 9, 17, - 0, 10, 17, 0, 13, 0, 11, 0, 14, 17, - 15, 0 -}; - -#endif - -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 178, 186, 190, 194, 198, 202, 206, 210, 214, 218, - 222, 227 -}; -#endif - - -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) - -static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'", -"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'", -"start","exp", NULL -}; -#endif - -static const short yyr1[] = { 0, - 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17 -}; - -static const short yyr2[] = { 0, - 1, 5, 3, 3, 3, 3, 3, 3, 2, 1, - 1, 3 -}; - -static const short yydefact[] = { 0, - 0, 11, 10, 0, 1, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 12, 0, 3, 4, 5, 6, - 7, 8, 0, 2, 0, 0, 0 -}; - -static const short yydefgoto[] = { 25, - 5 -}; - -static const short yypact[] = { -9, - -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9, - -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26, - -3,-32768, -9, 34, 21, 53,-32768 -}; - -static const short yypgoto[] = {-32768, - -1 -}; - - -#define YYLAST 53 - - -static const short yytable[] = { 6, - 1, 2, 7, 3, 4, 14, 16, 17, 18, 19, - 20, 21, 22, 8, 9, 10, 11, 12, 13, 14, - 26, 24, 12, 13, 14, 15, 8, 9, 10, 11, - 12, 13, 14, 13, 14, 23, 8, 9, 10, 11, - 12, 13, 14, 10, 11, 12, 13, 14, 11, 12, - 13, 14, 27 -}; - -static const short yycheck[] = { 1, - 10, 11, 4, 13, 14, 9, 8, 9, 10, 11, - 12, 13, 14, 3, 4, 5, 6, 7, 8, 9, - 0, 23, 7, 8, 9, 15, 3, 4, 5, 6, - 7, 8, 9, 8, 9, 12, 3, 4, 5, 6, - 7, 8, 9, 5, 6, 7, 8, 9, 6, 7, - 8, 9, 0 -}; -#define YYPURE 1 - -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/lib/bison.simple" -/* This file comes from bison-1.28. */ - -/* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 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 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ -#ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ -#include -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ - #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ - -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif - -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 -#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define YYFAIL goto yyerrlab -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ - goto yybackup; \ - } \ - else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ -while (0) - -#define YYTERROR 1 -#define YYERRCODE 256 - -#ifndef YYPURE -#define YYLEX yylex() -#endif - -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) -#endif -#else /* not YYLSP_NEEDED */ -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* not YYLSP_NEEDED */ -#endif - -/* If nonreentrant, generate the variables here */ - -#ifndef YYPURE - -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ - -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ -#endif - -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ - -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ -#endif - -/* YYINITDEPTH indicates the initial size of the parser's stacks */ - -#ifndef YYINITDEPTH -#define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ - -#if YYMAXDEPTH == 0 -#undef YYMAXDEPTH -#endif - -#ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 -#endif - -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; -{ - register char *f = from; - register char *t = to; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#else /* __cplusplus */ - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) -{ - register char *t = to; - register char *f = from; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#endif -#endif - -#line 217 "/usr/lib/bison.simple" - -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -#ifdef YYPARSE_PARAM -int yyparse (void *); -#else -int yyparse (void); -#endif -#endif - -int -yyparse(YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ - -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -#define YYPOPSTACK (yyvsp--, yyssp--) -#endif - - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; - -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; -#endif -#endif - - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ - - int yylen; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss - 1; - yyvsp = yyvs; -#ifdef YYLSP_NEEDED - yylsp = yyls; -#endif - -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: - - *++yyssp = yystate; - - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; - -#ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif - - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif -#else /* no yyoverflow */ - /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 2; - } - yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) - yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -#endif -#endif /* no yyoverflow */ - - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif - - if (yyssp >= yyss + yystacksize - 1) - YYABORT; - } - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif - - goto yybackup; - yybackup: - -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - - if (yychar == YYEMPTY) - { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif - yychar = YYLEX; - } - - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ - { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif - } - else - { - yychar1 = YYTRANSLATE(yychar); - -#if YYDEBUG != 0 - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); - } -#endif - } - - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) - goto yydefault; - - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; - - yystate = yyn; - goto yynewstate; - -/* Do the default action for the current state. */ -yydefault: - - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - -/* Do a reduction. yyn is the number of a rule to reduce with. */ -yyreduce: - yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ - -#if YYDEBUG != 0 - if (yydebug) - { - int i; - - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - - switch (yyn) { - -case 1: -#line 179 "plural.y" -{ - if (yyvsp[0].exp == NULL) - YYABORT; - ((struct parse_args *) arg)->res = yyvsp[0].exp; - ; - break;} -case 2: -#line 187 "plural.y" -{ - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 3: -#line 191 "plural.y" -{ - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 4: -#line 195 "plural.y" -{ - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 5: -#line 199 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 6: -#line 203 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 7: -#line 207 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 8: -#line 211 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 9: -#line 215 "plural.y" -{ - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); - ; - break;} -case 10: -#line 219 "plural.y" -{ - yyval.exp = new_exp_0 (var); - ; - break;} -case 11: -#line 223 "plural.y" -{ - if ((yyval.exp = new_exp_0 (num)) != NULL) - yyval.exp->val.num = yyvsp[0].num; - ; - break;} -case 12: -#line 228 "plural.y" -{ - yyval.exp = yyvsp[-1].exp; - ; - break;} -} - /* the action file gets copied in in place of this dollarsign */ -#line 543 "/usr/lib/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#ifdef YYLSP_NEEDED - yylsp -= yylen; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - - *++yyvsp = yyval; - -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } -#endif - - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTBASE]; - - goto yynewstate; - -yyerrlab: /* here on detecting error */ - - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ - { - ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) - { - strcpy(msg, "parse error"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; - } - } - yyerror(msg); - free(msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); - } - - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ - - if (yyerrstatus == 3) - { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif - - yychar = YYEMPTY; - } - - /* Else will try to reuse lookahead token - after shifting the error token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; - -yyerrdefault: /* current state does not do anything special for the error token. */ - -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; -#endif - -yyerrpop: /* pop the current state because it cannot handle the error token */ - - if (yyssp == yyss) YYABORT; - yyvsp--; - yystate = *--yyssp; -#ifdef YYLSP_NEEDED - yylsp--; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -yyerrhandle: - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; - - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrpop; - - if (yyn == YYFINAL) - YYACCEPT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - yystate = yyn; - goto yynewstate; - - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 1; -} -#line 233 "plural.y" - - -void -internal_function -FREE_EXPRESSION (exp) - struct expression *exp; -{ - if (exp == NULL) - return; - - /* Handle the recursive case. */ - switch (exp->nargs) - { - case 3: - FREE_EXPRESSION (exp->val.args[2]); - /* FALLTHROUGH */ - case 2: - FREE_EXPRESSION (exp->val.args[1]); - /* FALLTHROUGH */ - case 1: - FREE_EXPRESSION (exp->val.args[0]); - /* FALLTHROUGH */ - default: - break; - } - - free (exp); -} - - -static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; -{ - const char *exp = *pexp; - int result; - - while (1) - { - if (exp[0] == '\0') - { - *pexp = exp; - return YYEOF; - } - - if (exp[0] != ' ' && exp[0] != '\t') - break; - - ++exp; - } - - result = *exp++; - switch (result) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - unsigned long int n = result - '0'; - while (exp[0] >= '0' && exp[0] <= '9') - { - n *= 10; - n += exp[0] - '0'; - ++exp; - } - lval->num = n; - result = NUMBER; - } - break; - - case '=': - if (exp[0] == '=') - { - ++exp; - lval->op = equal; - result = EQUOP2; - } - else - result = YYERRCODE; - break; - - case '!': - if (exp[0] == '=') - { - ++exp; - lval->op = not_equal; - result = EQUOP2; - } - break; - - case '&': - case '|': - if (exp[0] == result) - ++exp; - else - result = YYERRCODE; - break; - - case '<': - if (exp[0] == '=') - { - ++exp; - lval->op = less_or_equal; - } - else - lval->op = less_than; - result = CMPOP2; - break; - - case '>': - if (exp[0] == '=') - { - ++exp; - lval->op = greater_or_equal; - } - else - lval->op = greater_than; - result = CMPOP2; - break; - - case '*': - lval->op = mult; - result = MULOP2; - break; - - case '/': - lval->op = divide; - result = MULOP2; - break; - - case '%': - lval->op = module; - result = MULOP2; - break; - - case '+': - lval->op = plus; - result = ADDOP2; - break; - - case '-': - lval->op = minus; - result = ADDOP2; - break; - - case 'n': - case '?': - case ':': - case '(': - case ')': - /* Nothing, just return the character. */ - break; - - case ';': - case '\n': - case '\0': - /* Be safe and let the user call this function again. */ - --exp; - result = YYEOF; - break; - - default: - result = YYERRCODE; -#if YYDEBUG != 0 - --exp; -#endif - break; - } - - *pexp = exp; - - return result; -} - - -static void -yyerror (str) - const char *str; -{ - /* Do nothing. We don't print error messages here. */ -} diff -Nru gimageview-0.2.27/intl/plural.y gimageview-0.3.0-0.20101117/intl/plural.y --- gimageview-0.2.27/intl/plural.y 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/plural.y 1970-01-01 00:00:00.000000000 +0000 @@ -1,413 +0,0 @@ -%{ -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 2000. - - 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. -*/ - -/* The bison generated parser uses alloca. AIX 3 forces us to put this - declaration at the beginning of the file. The declaration in bison's - skeleton file comes too late. This must come before - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include "gettextP.h" - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ -#endif - -#define YYLEX_PARAM &((struct parse_args *) arg)->cp -#define YYPARSE_PARAM arg -%} -%pure_parser -%expect 10 - -%union { - unsigned long int num; - enum operator op; - struct expression *exp; -} - -%{ -/* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); - -/* Allocation of expressions. */ - -static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; -{ - int i; - struct expression *newp; - - /* If any of the argument could not be malloc'ed, just return NULL. */ - for (i = nargs - 1; i >= 0; i--) - if (args[i] == NULL) - goto fail; - - /* Allocate a new expression. */ - newp = (struct expression *) malloc (sizeof (*newp)); - if (newp != NULL) - { - newp->nargs = nargs; - newp->operation = op; - for (i = nargs - 1; i >= 0; i--) - newp->val.args[i] = args[i]; - return newp; - } - - fail: - for (i = nargs - 1; i >= 0; i--) - FREE_EXPRESSION (args[i]); - - return NULL; -} - -static inline struct expression * -new_exp_0 (op) - enum operator op; -{ - return new_exp (0, op, NULL); -} - -static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; -{ - struct expression *args[1]; - - args[0] = right; - return new_exp (1, op, args); -} - -static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; -{ - struct expression *args[2]; - - args[0] = left; - args[1] = right; - return new_exp (2, op, args); -} - -static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; -{ - struct expression *args[3]; - - args[0] = bexp; - args[1] = tbranch; - args[2] = fbranch; - return new_exp (3, op, args); -} - -%} - -/* This declares that all operators have the same associativity and the - precedence order as in C. See [Harbison, Steele: C, A Reference Manual]. - There is no unary minus and no bitwise operators. - Operators with the same syntactic behaviour have been merged into a single - token, to save space in the array generated by bison. */ -%right '?' /* ? */ -%left '|' /* || */ -%left '&' /* && */ -%left EQUOP2 /* == != */ -%left CMPOP2 /* < > <= >= */ -%left ADDOP2 /* + - */ -%left MULOP2 /* * / % */ -%right '!' /* ! */ - -%token EQUOP2 CMPOP2 ADDOP2 MULOP2 -%token NUMBER -%type exp - -%% - -start: exp - { - if ($1 == NULL) - YYABORT; - ((struct parse_args *) arg)->res = $1; - } - ; - -exp: exp '?' exp ':' exp - { - $$ = new_exp_3 (qmop, $1, $3, $5); - } - | exp '|' exp - { - $$ = new_exp_2 (lor, $1, $3); - } - | exp '&' exp - { - $$ = new_exp_2 (land, $1, $3); - } - | exp EQUOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp CMPOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp ADDOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp MULOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | '!' exp - { - $$ = new_exp_1 (lnot, $2); - } - | 'n' - { - $$ = new_exp_0 (var); - } - | NUMBER - { - if (($$ = new_exp_0 (num)) != NULL) - $$->val.num = $1; - } - | '(' exp ')' - { - $$ = $2; - } - ; - -%% - -void -internal_function -FREE_EXPRESSION (exp) - struct expression *exp; -{ - if (exp == NULL) - return; - - /* Handle the recursive case. */ - switch (exp->nargs) - { - case 3: - FREE_EXPRESSION (exp->val.args[2]); - /* FALLTHROUGH */ - case 2: - FREE_EXPRESSION (exp->val.args[1]); - /* FALLTHROUGH */ - case 1: - FREE_EXPRESSION (exp->val.args[0]); - /* FALLTHROUGH */ - default: - break; - } - - free (exp); -} - - -static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; -{ - const char *exp = *pexp; - int result; - - while (1) - { - if (exp[0] == '\0') - { - *pexp = exp; - return YYEOF; - } - - if (exp[0] != ' ' && exp[0] != '\t') - break; - - ++exp; - } - - result = *exp++; - switch (result) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - unsigned long int n = result - '0'; - while (exp[0] >= '0' && exp[0] <= '9') - { - n *= 10; - n += exp[0] - '0'; - ++exp; - } - lval->num = n; - result = NUMBER; - } - break; - - case '=': - if (exp[0] == '=') - { - ++exp; - lval->op = equal; - result = EQUOP2; - } - else - result = YYERRCODE; - break; - - case '!': - if (exp[0] == '=') - { - ++exp; - lval->op = not_equal; - result = EQUOP2; - } - break; - - case '&': - case '|': - if (exp[0] == result) - ++exp; - else - result = YYERRCODE; - break; - - case '<': - if (exp[0] == '=') - { - ++exp; - lval->op = less_or_equal; - } - else - lval->op = less_than; - result = CMPOP2; - break; - - case '>': - if (exp[0] == '=') - { - ++exp; - lval->op = greater_or_equal; - } - else - lval->op = greater_than; - result = CMPOP2; - break; - - case '*': - lval->op = mult; - result = MULOP2; - break; - - case '/': - lval->op = divide; - result = MULOP2; - break; - - case '%': - lval->op = module; - result = MULOP2; - break; - - case '+': - lval->op = plus; - result = ADDOP2; - break; - - case '-': - lval->op = minus; - result = ADDOP2; - break; - - case 'n': - case '?': - case ':': - case '(': - case ')': - /* Nothing, just return the character. */ - break; - - case ';': - case '\n': - case '\0': - /* Be safe and let the user call this function again. */ - --exp; - result = YYEOF; - break; - - default: - result = YYERRCODE; -#if YYDEBUG != 0 - --exp; -#endif - break; - } - - *pexp = exp; - - return result; -} - - -static void -yyerror (str) - const char *str; -{ - /* Do nothing. We don't print error messages here. */ -} diff -Nru gimageview-0.2.27/intl/ref-add.sin gimageview-0.3.0-0.20101117/intl/ref-add.sin --- gimageview-0.2.27/intl/ref-add.sin 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/ref-add.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# Add this package to a list of references stored in a text file. -# -# Copyright (C) 2000 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 02111-1307, USA. -# -# Written by Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - ta - :a - s/ @PACKAGE@ / @PACKAGE@ / - tb - s/ $/ @PACKAGE@ / - :b - s/^/# Packages using this file:/ -} diff -Nru gimageview-0.2.27/intl/ref-del.sin gimageview-0.3.0-0.20101117/intl/ref-del.sin --- gimageview-0.2.27/intl/ref-del.sin 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/ref-del.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# Remove this package from a list of references stored in a text file. -# -# Copyright (C) 2000 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 02111-1307, USA. -# -# Written by Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - s/ @PACKAGE@ / / - s/^/# Packages using this file:/ -} diff -Nru gimageview-0.2.27/intl/textdomain.c gimageview-0.3.0-0.20101117/intl/textdomain.c --- gimageview-0.2.27/intl/textdomain.c 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/textdomain.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -/* Implementation of the textdomain(3) function. - Copyright (C) 1995-1998, 2000, 2001 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 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. -*/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_rwlock_define(CLASS, NAME) -# define __libc_rwlock_wrlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ -#endif - -/* @@ end of prolog @@ */ - -/* Name of the default text domain. */ -extern const char _nl_default_default_domain[]; - -/* Default text domain in which entries for gettext(3) are to be found. */ -extern const char *_nl_current_default_domain; - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define TEXTDOMAIN __textdomain -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# define TEXTDOMAIN textdomain__ -#endif - -/* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -char * -TEXTDOMAIN (domainname) - const char *domainname; -{ - char *new_domain; - char *old_domain; - - /* A NULL pointer requests the current setting. */ - if (domainname == NULL) - return (char *) _nl_current_default_domain; - - __libc_rwlock_wrlock (_nl_state_lock); - - old_domain = (char *) _nl_current_default_domain; - - /* If domain name is the null string set to default domain "messages". */ - if (domainname[0] == '\0' - || strcmp (domainname, _nl_default_default_domain) == 0) - { - _nl_current_default_domain = _nl_default_default_domain; - new_domain = (char *) _nl_current_default_domain; - } - else if (strcmp (domainname, old_domain) == 0) - /* This can happen and people will use it to signal that some - environment variable changed. */ - new_domain = old_domain; - else - { - /* If the following malloc fails `_nl_current_default_domain' - will be NULL. This value will be returned and so signals we - are out of core. */ -#if defined _LIBC || defined HAVE_STRDUP - new_domain = strdup (domainname); -#else - size_t len = strlen (domainname) + 1; - new_domain = (char *) malloc (len); - if (new_domain != NULL) - memcpy (new_domain, domainname, len); -#endif - - if (new_domain != NULL) - _nl_current_default_domain = new_domain; - } - - /* We use this possibility to signal a change of the loaded catalogs - since this is most likely the case and there is no other easy we - to do it. Do it only when the call was successful. */ - if (new_domain != NULL) - { - ++_nl_msg_cat_cntr; - - if (old_domain != new_domain && old_domain != _nl_default_default_domain) - free (old_domain); - } - - __libc_rwlock_unlock (_nl_state_lock); - - return new_domain; -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__textdomain, textdomain); -#endif diff -Nru gimageview-0.2.27/intl/VERSION gimageview-0.3.0-0.20101117/intl/VERSION --- gimageview-0.2.27/intl/VERSION 2004-05-23 14:08:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intl/VERSION 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -GNU gettext library from gettext-0.10.40 diff -Nru gimageview-0.2.27/intltool-extract.in gimageview-0.3.0-0.20101117/intltool-extract.in --- gimageview-0.2.27/intltool-extract.in 2004-05-23 14:08:01.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intltool-extract.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,389 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Extractor -# -# Copyright (C) 2000-2001 Free Software Foundation. -# -# Intltool 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. -# -# Intltool 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. -# -# 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. -# -# Authors: Kenneth Christiansen -# Darin Adler -# - -## Release information -my $PROGRAM = "intltool-extract"; -my $PACKAGE = "intltool"; -my $VERSION = "0.25"; - -## Loaded modules -use strict; -use File::Basename; -use Getopt::Long; - -## Scalars used by the option stuff -my $TYPE_ARG = "0"; -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; -my $QUIET_ARG = "0"; - -my $FILE; -my $OUTFILE; - -my $gettext_type = ""; -my $input; -my %messages = (); - -## Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -## Always print first -$| = 1; - -## Handle options -GetOptions ( - "type=s" => \$TYPE_ARG, - "local|l" => \$LOCAL_ARG, - "help|h" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - "quiet|q" => \$QUIET_ARG, - ) or &error; - -&split_on_argument; - - -## Check for options. -## This section will check for the different options. - -sub split_on_argument { - - if ($VERSION_ARG) { - &version; - - } elsif ($HELP_ARG) { - &help; - - } elsif ($LOCAL_ARG) { - &place_local; - &extract; - - } elsif ($UPDATE_ARG) { - &place_normal; - &extract; - - } elsif (@ARGV > 0) { - &place_normal; - &message; - &extract; - - } else { - &help; - - } -} - -sub place_normal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; -} - -sub place_local { - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - -sub determine_type { - if ($TYPE_ARG =~ /^gettext\/(.*)/) { - $gettext_type=$1 - } -} - -## Sub for printing release information -sub version{ - print "${PROGRAM} (${PACKAGE}) $VERSION\n"; - print "Copyright (C) 2000 Free Software Foundation, Inc.\n"; - print "Written by Kenneth Christiansen, 2000.\n\n"; - print "This is free software; see the source for copying conditions. There is NO\n"; - print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; - exit; -} - -## Sub for printing usage information -sub help{ - print "Usage: ${PROGRAM} [FILENAME] [OPTIONS] ...\n"; - print "Generates a header file from an xml source file.\n\nGrabs all strings "; - print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed "; - print "xml tags. Read the docs for more info.\n\n"; - print " -v, --version shows the version\n"; - print " -h, --help shows this help page\n"; - print " -q, --quiet quiet mode\n"; - print "\nReport bugs to .\n"; - exit; -} - -## Sub for printing error messages -sub error{ - print "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - -sub message { - print "Generating C format header file for translation.\n"; -} - -sub extract { - &determine_type; - - &convert ($FILE); - - open OUT, ">$OUTFILE"; - &msg_write; - close OUT; - - print "Wrote $OUTFILE\n" unless $QUIET_ARG; -} - -sub convert($) { - - ## Reading the file - { - local (*IN); - local $/; #slurp mode - open (IN, "<$FILE") || die "can't open $FILE: $!"; - $input = ; - } - - &type_ini if $gettext_type eq "ini"; - &type_keys if $gettext_type eq "keys"; - &type_xml if $gettext_type eq "xml"; - &type_glade if $gettext_type eq "glade"; - &type_scheme if $gettext_type eq "scheme"; - &type_schemas if $gettext_type eq "schemas"; - &type_rfc822deb if $gettext_type eq "rfc822deb"; -} - -sub entity_decode_minimal -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - - return $_; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - s/<//g; - - return $_; -} - -sub escape_char -{ - return '\"' if $_ eq '"'; - return '\n' if $_ eq "\n"; - return '\\' if $_ eq '\\'; - - return $_; -} - -sub escape -{ - my ($string) = @_; - return join "", map &escape_char, split //, $string; -} - -sub type_ini { - ### For generic translatable desktop files ### - while ($input =~ /^_.*=(.*)$/mg) { - $messages{$1} = []; - } -} - -sub type_keys { - ### For generic translatable mime/keys files ### - while ($input =~ /^\s*_\w+=(.*)$/mg) { - $messages{$1} = []; - } -} - -sub type_xml { - ### For generic translatable XML files ### - - while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # " - $messages{entity_decode_minimal($1)} = []; - } - - while ($input =~ /<_($w+)(?: xml:space="($w+)")?>(.+?)<\/_\1>/sg) { - $_ = $3; - if (!defined($2) || $2 ne "preserve") { - s/\s+/ /g; - s/^ //; - s/ $//; - } - $messages{entity_decode_minimal($_)} = []; - } -} - -sub type_schemas { - ### For schemas XML files ### - - # FIXME: We should handle escaped < (less than) - while ($input =~ / - \s* - (\s*(.*?)\s*<\/default>\s*)? - (\s*(.*?)\s*<\/short>\s*)? - (\s*(.*?)\s*<\/long>\s*)? - <\/locale> - /sgx) { - my @totranslate = ($2,$4,$6); - foreach (@totranslate) { - next if !$_; - s/\s+/ /g; - $messages{entity_decode_minimal($_)} = []; - } - } -} - -sub type_rfc822deb { - ### For rfc822-style Debian configuration files ### - - while ($input =~ /(?:^|\n)_[^:]+:\s*(.*?)(?=\n\S|$)/sg) { - my @str_list = rfc822deb_split($1); - for my $str (@str_list) { - # As rfc822deb is for configuration files, duplicates - # should never happen. Developers must use the - # [] construct to make msgid unique, see also intltool-merge - print STDERR "Warning: msgid multiply defined:\n $str\n" - if defined($messages{$str}); - $messages{$str} = []; - } - } -} - -sub rfc822deb_split { - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - my $text = shift; - $text =~ s/^ //mg; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - for my $line (split (/\n/, $text)) { - chomp $line; - $line =~ /\s+$/; - if ($line =~ /^\.$/) { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } elsif ($line =~ /^\s/) { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $str .= $line."\n"; - } else { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /[\n ]$/; - $str .= $line; - } - } - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - return @list; -} - -sub type_glade { - ### For translatable Glade XML files ### - - my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message"; - - while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) { - # Glade sometimes uses tags that normally mark translatable things for - # little bits of non-translatable content. We work around this by not - # translating strings that only includes something like label4 or window1. - $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/; - } - - while ($input =~ /(..[^<]*)<\/items>/sg) { - for my $item (split (/\n/, $1)) { - $messages{entity_decode($item)} = []; - } - } - - ## handle new glade files - while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) { - $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/; - } - while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { - $messages{entity_decode_minimal($2)} = []; - } -} - -sub type_scheme { - while ($input =~ /_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) { - $messages{$1} = []; - } -} - -sub msg_write { - for my $message (sort keys %messages) { - print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; - - my @lines = split (/\n/, $message, -1); - for (my $n = 0; $n < @lines; $n++) { - if ($n == 0) { - print OUT "char *s = N_(\""; - } else { - print OUT " \""; - } - - print OUT escape($lines[$n]); - - if ($n < @lines - 1) { - print OUT "\\n\"\n"; - } else { - print OUT "\");\n"; - } - } - } -} - diff -Nru gimageview-0.2.27/intltool-merge.in gimageview-0.3.0-0.20101117/intltool-merge.in --- gimageview-0.2.27/intltool-merge.in 2004-05-23 14:08:08.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intltool-merge.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,908 +0,0 @@ -#!@INTLTOOL_PERL@ -w - -# -# The Intltool Message Merger -# -# Copyright (C) 2000, 2002 Free Software Foundation. -# Copyright (C) 2000, 2001 Eazel, Inc -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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. -# -# 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. -# -# Authors: Maciej Stachowiak -# Kenneth Christiansen -# Darin Adler -# -# Proper XML UTF-8'ification written by Cyrille Chepelov -# - -## Release information -my $PROGRAM = "intltool-merge"; -my $PACKAGE = "intltool"; -my $VERSION = "0.25"; - -## Loaded modules -use strict; -use Getopt::Long; -use Text::Wrap; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $BA_STYLE_ARG = 0; -my $XML_STYLE_ARG = 0; -my $KEYS_STYLE_ARG = 0; -my $DESKTOP_STYLE_ARG = 0; -my $SCHEMAS_STYLE_ARG = 0; -my $RFC822DEB_STYLE_ARG = 0; -my $QUIET_ARG = 0; -my $PASS_THROUGH_ARG = 0; -my $UTF8_ARG = 0; -my $cache_file; - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "quiet|q" => \$QUIET_ARG, - "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility - "ba-style|b" => \$BA_STYLE_ARG, - "xml-style|x" => \$XML_STYLE_ARG, - "keys-style|k" => \$KEYS_STYLE_ARG, - "desktop-style|d" => \$DESKTOP_STYLE_ARG, - "schemas-style|s" => \$SCHEMAS_STYLE_ARG, - "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, - "pass-through|p" => \$PASS_THROUGH_ARG, - "utf8|u" => \$UTF8_ARG, - "cache|c=s" => \$cache_file - ) or &error; - -my $PO_DIR; -my $FILE; -my $OUTFILE; - -my %po_files_by_lang = (); -my %translations = (); - -# Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -# XML quoted string contents -my $q = "[^\\\"]*"; - -## Check for options. - -if ($VERSION_ARG) -{ - &print_version; -} -elsif ($HELP_ARG) -{ - &print_help; -} -elsif ($BA_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &ba_merge_translations; - &finalize; -} -elsif ($XML_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &xml_merge_translations; - &finalize; -} -elsif ($KEYS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &keys_merge_translations; - &finalize; -} -elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &desktop_merge_translations; - &finalize; -} -elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &schemas_merge_translations; - &finalize; -} -elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &rfc822deb_merge_translations; - &finalize; -} -else -{ - &print_help; -} - -exit; - -## Sub for printing release information -sub print_version -{ - print "${PROGRAM} (${PACKAGE}) ${VERSION}\n"; - print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n"; - print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; - print "Copyright (C) 2000-2001 Eazel, Inc.\n"; - print "This is free software; see the source for copying conditions. There is NO\n"; - print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; - exit; -} - -## Sub for printing usage information -sub print_help -{ - print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n"; - print "Generates an output file that includes translated versions of some attributes,\n"; - print "from an untranslated source and a po directory that includes translations.\n\n"; - print " -b, --ba-style includes translations in the bonobo-activation style\n"; - print " -d, --desktop-style includes translations in the desktop style\n"; - print " -k, --keys-style includes translations in the keys style\n"; - print " -s, --schemas-style includes translations in the schemas style\n"; - print " -r, --rfc822deb-style includes translations in the RFC822 style\n"; - print " -x, --xml-style includes translations in the standard xml style\n"; - print " -u, --utf8 convert all strings to UTF-8 before merging\n"; - print " -p, --pass-through use strings as found in .po files, without\n"; - print " conversion (STRONGLY unrecommended with -x)\n"; - print " -q, --quiet suppress most messages\n"; - print " --help display this help and exit\n"; - print " --version output version information and exit\n"; - print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n"; - print ".\n"; - exit; -} - - -## Sub for printing error messages -sub print_error -{ - print "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - - -sub print_message -{ - print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG; -} - - -sub preparation -{ - $PO_DIR = $ARGV[0]; - $FILE = $ARGV[1]; - $OUTFILE = $ARGV[2]; - - &gather_po_files; - &get_translation_database; -} - -# General-purpose code for looking up translations in .po files - -sub po_file2lang -{ - my ($tmp) = @_; - $tmp =~ s/^.*\/(.*)\.po$/$1/; - return $tmp; -} - -sub gather_po_files -{ - for my $po_file (glob "$PO_DIR/*.po") { - $po_files_by_lang{po_file2lang($po_file)} = $po_file; - } -} - -sub get_local_charset -{ - my ($encoding) = @_; - my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias"; - - # seek character encoding aliases in charset.alias (glib) - - if (open CHARSET_ALIAS, $alias_file) - { - while () - { - next if /^\#/; - return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) - } - - close CHARSET_ALIAS; - } - - # if not found, return input string - - return $encoding; -} - -sub get_po_encoding -{ - my ($in_po_file) = @_; - my $encoding = ""; - - open IN_PO_FILE, $in_po_file or die; - while () - { - ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" - if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) - { - $encoding = $1; - last; - } - } - close IN_PO_FILE; - - if (!$encoding) - { - print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n"; - $encoding = "ISO-8859-1"; - } - - $encoding = get_local_charset($encoding); - - return $encoding -} - -sub utf8_sanity_check -{ - if (!$UTF8_ARG) - { - if (!$PASS_THROUGH_ARG) - { - $PASS_THROUGH_ARG="1"; - } - } -} - -sub get_translation_database -{ - if ($cache_file) { - &get_cached_translation_database; - } else { - &create_translation_database; - } -} - -sub get_newest_po_age -{ - my $newest_age; - - foreach my $file (values %po_files_by_lang) - { - my $file_age = -M $file; - $newest_age = $file_age if !$newest_age || $file_age < $newest_age; - } - - return $newest_age; -} - -sub create_cache -{ - print "Generating and caching the translation database\n" unless $QUIET_ARG; - - &create_translation_database; - - open CACHE, ">$cache_file" || die; - print CACHE join "\x01", %translations; - close CACHE; -} - -sub load_cache -{ - print "Found cached translation database\n" unless $QUIET_ARG; - - my $contents; - open CACHE, "<$cache_file" || die; - { - local $/; - $contents = ; - } - close CACHE; - %translations = split "\x01", $contents; -} - -sub get_cached_translation_database -{ - my $cache_file_age = -M $cache_file; - if (defined $cache_file_age) - { - if ($cache_file_age <= &get_newest_po_age) - { - &load_cache; - return; - } - print "Found too-old cached translation database\n" unless $QUIET_ARG; - } - - &create_cache; -} - -sub create_translation_database -{ - for my $lang (keys %po_files_by_lang) - { - my $po_file = $po_files_by_lang{$lang}; - - if ($UTF8_ARG) - { - my $encoding = get_po_encoding ($po_file); - - if (lc $encoding eq "utf-8") - { - open PO_FILE, "<$po_file"; - } - else - { - my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; - open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; - } - } - else - { - open PO_FILE, "<$po_file"; - } - - my $nextfuzzy = 0; - my $inmsgid = 0; - my $inmsgstr = 0; - my $msgid = ""; - my $msgstr = ""; - - while () - { - $nextfuzzy = 1 if /^#, fuzzy/; - - if (/^msgid "((\\.|[^\\])*)"/ ) - { - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - $msgid = ""; - $msgstr = ""; - - if ($nextfuzzy) { - $inmsgid = 0; - } else { - $msgid = unescape_po_string($1); - $inmsgid = 1; - } - $inmsgstr = 0; - $nextfuzzy = 0; - } - - if (/^msgstr "((\\.|[^\\])*)"/) - { - $msgstr = unescape_po_string($1); - $inmsgstr = 1; - $inmsgid = 0; - } - - if (/^"((\\.|[^\\])*)"/) - { - $msgid .= unescape_po_string($1) if $inmsgid; - $msgstr .= unescape_po_string($1) if $inmsgstr; - } - } - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - } -} - -sub finalize -{ -} - -sub unescape_one_sequence -{ - my ($sequence) = @_; - - return "\\" if $sequence eq "\\\\"; - return "\"" if $sequence eq "\\\""; - return "\n" if $sequence eq "\\n"; - - # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal), - # \xXX (hex) and has a comment saying they want to handle \u and \U. - - return $sequence; -} - -sub unescape_po_string -{ - my ($string) = @_; - - $string =~ s/(\\.)/unescape_one_sequence($1)/eg; - - return $string; -} - -## NOTE: deal with < - < but not > - > because it seems its ok to have -## > in the entity. For further info please look at #84738. -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - s/</ 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60) - { - # the ($_ > 127) should probably be removed - return "&#" . $_ . ";"; - } - else - { - return chr $_; - } -} - -sub entity_encoded_translation -{ - my ($lang, $string) = @_; - - my $translation = $translations{$lang, $string}; - return $string if !$translation; - return entity_encode ($translation); -} - -## XML (bonobo-activation specific) merge code - -sub ba_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; - - while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) - { - print OUTPUT $1; - - my $node = $2 . "\n"; - - my @strings = (); - $_ = $node; - while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) { - push @strings, entity_decode($3); - } - print OUTPUT; - - my %langs; - for my $string (@strings) - { - for my $lang (keys %po_files_by_lang) - { - $langs{$lang} = 1 if $translations{$lang, $string}; - } - } - - for my $lang (sort keys %langs) - { - $_ = $node; - s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; - s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; - print OUTPUT; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - - -## XML (non-bonobo-activation) merge code - -sub xml_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die; - - # FIXME: support attribute translations - - # Empty nodes never need translation, so unmark all of them. - # For example, <_foo/> is just replaced by . - $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; - - # Support for <_foo>blah style translations. - while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) - { - print OUTPUT $1; - - my $spaces = $2; - my $tag = $3; - my $string = $4; - - print OUTPUT "$spaces<$tag>$string\n"; - - $string =~ s/\s+/ /g; - $string =~ s/^ //; - $string =~ s/ $//; - $string = entity_decode($string); - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - $translation = entity_encode($translation); - print OUTPUT "$spaces<$tag xml:lang=\"$lang\">$translation\n"; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - -sub keys_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/[$lang]$1=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub desktop_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/${1}[$lang]=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub schemas_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die; - - # FIXME: support attribute translations - - # Empty nodes never need translation, so unmark all of them. - # For example, <_foo/> is just replaced by . - $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; - - while ($source =~ s/ - (.*?) - (\s+)((\s*) - (\s*(.*?)\s*<\/default>)?(\s*) - (\s*(.*?)\s*<\/short>)?(\s*) - (\s*(.*?)\s*<\/long>)?(\s*) - <\/locale>) - //sx) - { - print OUTPUT $1; - - my $locale_start_spaces = $2 ? $2 : ''; - my $default_spaces = $4 ? $4 : ''; - my $short_spaces = $7 ? $7 : ''; - my $long_spaces = $10 ? $10 : ''; - my $locale_end_spaces = $13 ? $13 : ''; - my $c_default_block = $3 ? $3 : ''; - my $default_string = $6 ? $6 : ''; - my $short_string = $9 ? $9 : ''; - my $long_string = $12 ? $12 : ''; - - $c_default_block =~ s/default>\[.*?\]/default>/s; - - print OUTPUT "$locale_start_spaces$c_default_block"; - - $default_string =~ s/\s+/ /g; - $default_string = entity_decode($default_string); - $short_string =~ s/\s+/ /g; - $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; - $long_string = entity_decode($long_string); - - for my $lang (sort keys %po_files_by_lang) - { - my $default_translation = $translations{$lang, $default_string}; - my $short_translation = $translations{$lang, $short_string}; - my $long_translation = $translations{$lang, $long_string}; - - next if (!$default_translation && !$short_translation && - !$long_translation); - - print OUTPUT "\n$locale_start_spaces"; - - print OUTPUT "$default_spaces"; - - if ($default_translation) - { - $default_translation = entity_encode($default_translation); - print OUTPUT "$default_translation"; - } - - print OUTPUT "$short_spaces"; - - if ($short_translation) - { - $short_translation = entity_encode($short_translation); - print OUTPUT "$short_translation"; - } - - print OUTPUT "$long_spaces"; - - if ($long_translation) - { - $long_translation = entity_encode($long_translation); - print OUTPUT "$long_translation"; - } - - print OUTPUT "$locale_end_spaces"; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - -sub rfc822deb_merge_translations -{ - my $source; - - $Text::Wrap::huge = 'overflow'; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">${OUTFILE}" or die; - - while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg) - { - my $sep = $1; - my $non_translated_line = $3.$4; - my $string = $5; - my $is_translatable = defined($2); - # Remove [] dummy strings - $string =~ s/\[\s[^\[\]]*\]$//; - $non_translated_line .= $string; - - print OUTPUT $sep.$non_translated_line; - - if ($is_translatable) - { - my @str_list = rfc822deb_split($string); - - for my $lang (sort keys %po_files_by_lang) - { - my $is_translated = 1; - my $str_translated = ''; - my $first = 1; - - for my $str (@str_list) - { - my $translation = $translations{$lang, $str}; - - if (!$translation) - { - $is_translated = 0; - last; - } - - # $translation may also contain [] dummy - # strings, mostly to indicate an empty string - $translation =~ s/\[\s[^\[\]]*\]$//; - - if ($first) - { - $str_translated .= - Text::Tabs::expand($translation) . - "\n"; - } - else - { - $str_translated .= Text::Tabs::expand( - Text::Wrap::wrap(' ', ' ', $translation)) . - "\n .\n"; - } - $first = 0; - - # To fix some problems with Text::Wrap::wrap - $str_translated =~ s/(\n )+\n/\n .\n/g; - } - next unless $is_translated; - - $str_translated =~ s/\n \.\n$//; - $str_translated =~ s/\s+$//; - - $_ = $non_translated_line; - s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s; - print OUTPUT; - } - } - } - print OUTPUT "\n"; - - close OUTPUT; - close INPUT; -} - -sub rfc822deb_split -{ - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - my $text = shift; - $text =~ s/^ //mg; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - - for my $line (split (/\n/, $text)) - { - chomp $line; - $line =~ /\s+$/; - - if ($line =~ /^\.$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /[\n ]$/; - $str .= $line; - } - } - - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - - return @list; -} - diff -Nru gimageview-0.2.27/intltool-update.in gimageview-0.3.0-0.20101117/intltool-update.in --- gimageview-0.2.27/intltool-update.in 2004-05-23 14:08:06.000000000 +0000 +++ gimageview-0.3.0-0.20101117/intltool-update.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,642 +0,0 @@ -#!@INTLTOOL_PERL@ -w - -# -# The Intltool Message Updater -# -# Copyright (C) 2000-2002 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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. -# -# 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. -# -# Authors: Kenneth Christiansen -# Maciej Stachowiak -# Darin Adler - -## Release information -my $PROGRAM = "intltool-update"; -my $VERSION = "0.25"; -my $PACKAGE = "intltool"; - -## Loaded modules -use strict; -use Getopt::Long; -use Cwd; -use File::Copy; -use File::Find; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $DIST_ARG = 0; -my $POT_ARG = 0; -my $HEADERS_ARG = 0; -my $MAINTAIN_ARG = 0; -my $REPORT_ARG = 0; -my $VERBOSE = 0; -my $GETTEXT_PACKAGE = ""; - -my @languages; -my %po_files_by_lang = (); - -# Regular expressions to categorize file types. -# FIXME: Please check if the following is correct - -my $xml_extension = -"xml(\.in)*|". # .in is not required -"ui|". -"glade2?(\.in)*|". # .in is not required -"scm(\.in)*|". # .in is not required -"oaf(\.in)+|". -"etspec|". -"sheet(\.in)+|". -"schemas(\.in)+|". -"pong(\.in)+"; - -my $ini_extension = -"desktop(\.in)+|". -"caves(\.in)+|". -"directory(\.in)+|". -"soundlist(\.in)+|". -"keys(\.in)+|". -"theme(\.in)+|". -"server(\.in)+"; - -## Always print as the first thing -$| = 1; - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "dist|d" => \$DIST_ARG, - "pot|p" => \$POT_ARG, - "headers|s" => \$HEADERS_ARG, - "maintain|m" => \$MAINTAIN_ARG, - "report|r" => \$REPORT_ARG, - "verbose|x" => \$VERBOSE, - "gettext-package|g=s" => \$GETTEXT_PACKAGE, - ) or &print_error_invalid_option; - -&print_help if $HELP_ARG; -&print_version if $VERSION_ARG; - -my $arg_count = ($DIST_ARG > 0) - + ($POT_ARG > 0) - + ($HEADERS_ARG > 0) - + ($MAINTAIN_ARG > 0) - + ($REPORT_ARG > 0); -&print_help if $arg_count > 1; - -# --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || &find_package_name; - -if ($DIST_ARG) { - if ($ARGV[0] =~ /^[a-z]/){ - &update_po_file ($ARGV[0]); - &print_status ($ARGV[0]); - } else { - &print_help; - } -} elsif ($POT_ARG) { - &generate_headers; - &generate_po_template; -} elsif ($HEADERS_ARG) { - &generate_headers; -} elsif ($MAINTAIN_ARG) { - &find_leftout_files; -} elsif ($REPORT_ARG) { - &print_report; -} else { - if ($ARGV[0] =~ /^[a-z]/) { - &main ($ARGV[0]); - } else { - &print_help; - } -} - -exit; - -######### - -sub print_version -{ - ## Print version information - print "${PROGRAM} (${PACKAGE}) $VERSION\n"; - print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n"; - print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; - print "This is free software; see the source for copying conditions. There is NO\n"; - print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; - exit; -} - -sub print_help -{ - ## Print usage information - print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n"; - print "Updates PO template files and merge them with the translations.\n\n"; - print " -p, --pot generate the PO template only\n"; - print " -s, --headers generate the header files in POTFILES.in\n"; - print " -m, --maintain search for left out files from POTFILES.in\n"; - print " -r, --report display a status report for the module.\n"; - print " -x, --verbose display lots of feedback\n"; - print " --help display this help and exit\n"; - print " --version output version information and exit\n"; - print "\nExamples of use:\n"; - print "${PROGRAM} --pot just creates a new PO template from the source\n"; - print "${PROGRAM} da created new PO template and updated the da.po file\n\n"; - print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n"; - exit; -} - -sub main -{ - my ($lang) = @_; - - ## Report error if the language file supplied - ## to the command line is non-existent - &print_error_not_existing("$lang.po") if ! -s "$lang.po"; - - print "Working, please wait..." unless $VERBOSE; - &generate_headers; - &generate_po_template; - &update_po_file ($lang); - &print_status ($lang); -} - -sub determine_type ($) -{ - my $type = $_; - my $gettext_type; - - # FIXME: Use $xml_extentions, and maybe do all this even nicer - my $xml_regex = - "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|". - "pong(?:\.in)+|etspec|schemas(?:\.in)+)"; - my $ini_regex = - "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|". - "soundlist(?:\.in)+)"; - - if ($type =~ /\[type: gettext\/([^\]].*)]/) { - $gettext_type=$1; - } - elsif ($type =~ /schemas(\.in)+$/) { - $gettext_type="schemas"; - } - elsif ($type =~ /$xml_regex$/) { - $gettext_type="xml"; - } - elsif ($type =~ /glade2?(\.in)*$/) { - $gettext_type="glade"; - } - elsif ($type =~ /$ini_regex$/) { - $gettext_type="ini"; - } - elsif ($type =~ /scm(\.in)*$/) { - $gettext_type="scheme"; - } - elsif ($type =~ /keys(\.in)+$/) { - $gettext_type="keys"; - } - else { $gettext_type=""; } - - return "gettext\/$gettext_type"; -} - -sub find_leftout_files -{ - my (@buf_i18n_plain, - @buf_i18n_xml, - @buf_i18n_xml_unmarked, - @buf_i18n_ini, - @buf_potfiles, - @buf_potfiles_ignore, - @buf_allfiles, - @buf_allfiles_sorted, - @buf_potfiles_sorted - ); - - ## Search and find all translatable files - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/ - }, ".."; - find sub { - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/ - }, ".."; - find sub { - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/ - }, ".."; - find sub { - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/ - }, ".."; - - - open POTFILES, "POTFILES.in" or die "$PROGRAM: there's no POTFILES.in!\n"; - - @buf_potfiles = grep /^[^#]/, ; - foreach (@buf_potfiles) { - s/^\[.*]\s*//; - } - - print "Searching for missing translatable files...\n" if $VERBOSE; - - ## Check if we should ignore some found files, when - ## comparing with POTFILES.in - foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") { - if (-s $ignore) { - open FILE, $ignore; - while () { - if (/^[^#]/){ - push @buf_potfiles_ignore, $_; - } - } - print "Found $ignore: Ignoring files...\n" if $VERBOSE; - @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); - } - } - - foreach my $file (@buf_i18n_plain) - { - my $in_comment = 0; - my $in_macro = 0; - - open FILE, "<$file"; - while () - { - # Handle continued multi-line comment. - if ($in_comment) - { - next unless s-.*\*/--; - $in_comment = 0; - } - - # Handle continued macro. - if ($in_macro) - { - $in_macro = 0 unless /\\$/; - next; - } - - # Handle start of macro (or any preprocessor directive). - if (/^\s*\#/) - { - $in_macro = 1 if /^([^\\]|\\.)*\\$/; - next; - } - - # Handle comments and quoted text. - while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy - { - my $match = $1; - if ($match eq "/*") - { - if (!s-/\*.*?\*/--) - { - s-/\*.*--; - $in_comment = 1; - } - } - elsif ($match eq "//") - { - s-//.*--; - } - else # ' or " - { - if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) - { - warn "mismatched quotes at line $. in $file\n"; - s-$match.*--; - } - } - } - - - if (/_\(QUOTEDTEXT/) - { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml) { - open FILE, "<$file"; - while () { - if (/\s_(.*)=\"/ || /translatable=\"yes\"/){ - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - last; - } - } - } - - foreach my $file (@buf_i18n_ini){ - open FILE, "<$file"; - while () { - if (/_(.*)=/){ - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - last; - } - } - } - - foreach my $file (@buf_i18n_xml_unmarked){ - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - - - @buf_allfiles_sorted = sort (@buf_allfiles); - @buf_potfiles_sorted = sort (@buf_potfiles); - - my %in2; - foreach (@buf_potfiles_sorted) { - $in2{$_} = 1; - } - - my @result; - - foreach (@buf_allfiles_sorted){ - if (!exists($in2{$_})){ - push @result, $_ - } - } - - ## Save file with information about the files missing - ## if any, and give information about this procedure. - if (@result) { - print "\n" if $VERBOSE; - open OUT, ">missing"; - print OUT @result; - print "The following files contain translations and are currently not in use. Please\n"; - print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n"; - print @result, "\n"; - print "If some of these files are left out on purpose then please add them to\n"; - print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n"; - print "of left out files has been written in the current directory.\n"; - } - - ## If there is nothing to complain about, notify the user - else { - print "\nAll files containing translations are present in POTFILES.in.\n"; - } -} - -sub print_error_invalid_option -{ - ## Handle invalid arguments - print "Try `${PROGRAM} --help' for more information.\n"; - exit 1; -} - -sub generate_headers -{ - my $EXTRACT = `which intltool-extract 2>/dev/null`; - chomp $EXTRACT; - - $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"}; - - ## Generate the .h header files, so we can allow glade and - ## xml translation support - if (! -s $EXTRACT) - { - print "\n *** The intltool-extract script wasn't found!" - ."\n *** Without it, intltool-update can not generate files.\n"; - exit; - } - else - { - open FILE, ") { - chomp; - - ## Find xml files in POTFILES.in and generate the - ## files with help from the extract script - - my $gettext_type= &determine_type ($1); - - if (/\.($xml_extension|$ini_extension)$/ || /^\[/){ - $_ =~ s/^\[[^\[].*]\s*//; - my $filename = "../$_"; - - if ($VERBOSE){ - system($EXTRACT, "--update", "--type=$gettext_type", $filename); - } else { - system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename); - } - } - } - close FILE; - } -} - -sub generate_po_template -{ - ## Generate the potfiles from the POTFILES.in file - - print "Building the $MODULE.pot...\n" if $VERBOSE; - - move ("POTFILES.in", "POTFILES.in.old"); - - open INFILE, "POTFILES.in"; - while () { - chomp; - if (/\.($xml_extension|$ini_extension)$/ || /^\[/) { - s/^\[.*]\s*//; - print OUTFILE "$_.h\n"; - } else { - print OUTFILE "$_\n"; - } - } - close OUTFILE; - close INFILE; - - system ("xgettext", "--default-domain\=$MODULE", - "--directory\=\.\.", - "--add-comments", - "--keyword\=\_", - "--keyword\=N\_", - "--keyword\=U\_", - "--files-from\=\.\/POTFILES\.in"); - - move ("POTFILES.in.old", "POTFILES.in"); - - print "Removing generated header (.h) files..." if $VERBOSE; - - open FILE, ") - { - chomp; - unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/; - } - - close FILE; - print "done\n" if $VERBOSE; - - if (!-e "$MODULE.po") { - print "WARNING: It seems that none of the files in POTFILES.in ". - "contain marked strings\n"; - exit (1); - } - - system ("rm", "-f", "$MODULE.pot"); - move ("$MODULE.po", "$MODULE.pot") or die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n"; - - print "Wrote $MODULE.pot\n" if $VERBOSE; -} - -sub update_po_file -{ - my ($lang) = @_; - - print "Merging $lang.po with $MODULE.pot..." if $VERBOSE; - - copy ("$lang.po", "$lang.po.old") || die "copy failed: $!"; - - # Perform merge, remove backup file and the "messages" trash file - # generated by gettext - system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po"); - unlink "$lang.po.old"; - unlink "messages"; -} - -sub print_error_not_existing -{ - my ($file) = @_; - - ## Report error if supplied language file is non-existing - print "$PROGRAM: $file does not exist!\n"; - print "Try '$PROGRAM --help' for more information.\n"; - exit; -} - -sub gather_po_files -{ - my @po_files = glob ("./*.po"); - - @languages = map (&po_file2lang, @po_files); - - foreach my $lang (@languages) { - $po_files_by_lang{$lang} = shift (@po_files); - } -} - -sub po_file2lang ($) -{ - my $tmp = $_; - $tmp =~ s/^.*\/(.*)\.po$/$1/; - return $tmp; -} - -sub print_status -{ - my ($lang) = @_; - - system ("msgfmt", "--statistics", "$lang.po"); - print "\n"; -} - -sub print_report -{ - &generate_headers; - &generate_po_template; - &gather_po_files; - - foreach my $lang (@languages) { - print "$lang: "; - &update_po_file ($lang); - } - - print "\n\n * Current translation support in $MODULE \n\n"; - - foreach my $lang (@languages){ - print "$lang: "; - system ("msgfmt", "--statistics", "$lang.po"); - } -} - -sub find_package_name -{ - my $base_dirname = getcwd(); - $base_dirname =~ s@.*/@@; - - my ($conf_in, $src_dir); - - if ($base_dirname =~ /^po(-.+)?$/) { - if (-f "../configure.in") { - $conf_in = "../configure.in"; - } elsif (-f "../configure.ac") { - $conf_in = "../configure.ac"; - } else { - my $makefile_source; - local (*IN); - open IN, ") { - if (/^top_srcdir[ \t]*=/) { - $src_dir = $_; - # print "${src_dir}\n"; - - $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - # print "${src_dir}\n"; - chomp $src_dir; - $conf_in = "$src_dir" . "/configure.in" . "\n"; - last; - } - } - $conf_in || die "Cannot find top_srcdir in Makefile." - } - - my %varhash = (); - my $conf_source; { - local (*IN); - open (IN, "<$conf_in") || die "can't open $conf_in: $!"; - while () { - if (/^(\w+)=(\S+)/) { $varhash{$1} = $2 }; - } - seek (IN, 0, 0); - local $/; # slurp mode - $conf_source = ; - } - - my $name = ""; - $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m; - if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) { - $name = $1; - $varhash{"AC_PACKAGE_NAME"} = $1; - } - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m; - - $name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME"; - - my $oldname = ""; - while (($name =~ /[\$](\S+)/) && ("$oldname" ne "$name")) { - $oldname = $name; - if (exists $varhash{$1}) { - $name =~ s/[\$](\S+)/$varhash{$1}/; - } - } - return $name if $name; - } - - print "$PROGRAM: Unable to determine package name.\n" . - "Make sure to run this script inside the po directory.\n"; - exit; -} diff -Nru gimageview-0.2.27/lib/dllloader/advapi32.c gimageview-0.3.0-0.20101117/lib/dllloader/advapi32.c --- gimageview-0.2.27/lib/dllloader/advapi32.c 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/advapi32.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 01:39:30 2002. - * $Id: advapi32.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: advapi32.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/advapi32.h gimageview-0.3.0-0.20101117/lib/dllloader/advapi32.h --- gimageview-0.2.27/lib/dllloader/advapi32.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/advapi32.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:37:50 2001. - * $Id: advapi32.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: advapi32.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/borlndmm.c gimageview-0.3.0-0.20101117/lib/dllloader/borlndmm.c --- gimageview-0.2.27/lib/dllloader/borlndmm.c 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/borlndmm.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 01:39:44 2002. - * $Id: borlndmm.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: borlndmm.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/borlndmm.h gimageview-0.3.0-0.20101117/lib/dllloader/borlndmm.h --- gimageview-0.2.27/lib/dllloader/borlndmm.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/borlndmm.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:38:09 2001. - * $Id: borlndmm.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: borlndmm.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/common.h gimageview-0.3.0-0.20101117/lib/dllloader/common.h --- gimageview-0.2.27/lib/dllloader/common.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/common.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 02:05:53 2002. - * $Id: common.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: common.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/compat.h gimageview-0.3.0-0.20101117/lib/dllloader/compat.h --- gimageview-0.2.27/lib/dllloader/compat.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/compat.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 01:36:43 2002. - * $Id: compat.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: compat.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/converter.c gimageview-0.3.0-0.20101117/lib/dllloader/converter.c --- gimageview-0.2.27/lib/dllloader/converter.c 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/converter.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Wed Dec 26 08:17:46 2001. - * $Id: converter.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: converter.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/converter.h gimageview-0.3.0-0.20101117/lib/dllloader/converter.h --- gimageview-0.2.27/lib/dllloader/converter.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/converter.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sun Oct 7 00:14:55 2001. - * $Id: converter.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: converter.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/dlist.c gimageview-0.3.0-0.20101117/lib/dllloader/dlist.c --- gimageview-0.2.27/lib/dllloader/dlist.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/dlist.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Wed Dec 26 08:24:42 2001. - * $Id: dlist.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: dlist.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/dlist.h gimageview-0.3.0-0.20101117/lib/dllloader/dlist.h --- gimageview-0.2.27/lib/dllloader/dlist.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/dlist.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sun Feb 4 22:01:46 2001. - * $Id: dlist.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: dlist.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/export.h gimageview-0.3.0-0.20101117/lib/dllloader/export.h --- gimageview-0.2.27/lib/dllloader/export.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/export.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:38:17 2001. - * $Id: export.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: export.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/hash.c gimageview-0.3.0-0.20101117/lib/dllloader/hash.c --- gimageview-0.2.27/lib/dllloader/hash.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/hash.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Fri Sep 21 19:32:03 2001. - * $Id: hash.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: hash.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/hash.h gimageview-0.3.0-0.20101117/lib/dllloader/hash.h --- gimageview-0.2.27/lib/dllloader/hash.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/hash.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Sep 17 17:21:25 2001. - * $Id: hash.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: hash.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/kernel32.c gimageview-0.3.0-0.20101117/lib/dllloader/kernel32.c --- gimageview-0.2.27/lib/dllloader/kernel32.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/kernel32.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 03:19:51 2002. - * $Id: kernel32.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: kernel32.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/kernel32.h gimageview-0.3.0-0.20101117/lib/dllloader/kernel32.h --- gimageview-0.2.27/lib/dllloader/kernel32.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/kernel32.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:38:52 2001. - * $Id: kernel32.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: kernel32.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/libstring.c gimageview-0.3.0-0.20101117/lib/dllloader/libstring.c --- gimageview-0.2.27/lib/dllloader/libstring.c 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/libstring.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 03:01:56 2002. - * $Id: libstring.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: libstring.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/libstring.h gimageview-0.3.0-0.20101117/lib/dllloader/libstring.h --- gimageview-0.2.27/lib/dllloader/libstring.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/libstring.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 03:00:39 2002. - * $Id: libstring.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: libstring.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/Makefile.am gimageview-0.3.0-0.20101117/lib/dllloader/Makefile.am --- gimageview-0.2.27/lib/dllloader/Makefile.am 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # Makefile.am for enfle -# $Id: Makefile.am,v 1.1 2003/08/01 13:41:06 makeinu Exp $ +# $Id: Makefile.am 968 2003-08-01 13:41:06Z makeinu $ if PLATFORM_WIN32 else diff -Nru gimageview-0.2.27/lib/dllloader/Makefile.in gimageview-0.3.0-0.20101117/lib/dllloader/Makefile.in --- gimageview-0.2.27/lib/dllloader/Makefile.in 2004-12-28 04:01:21.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,614 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Makefile.am for enfle -# $Id: Makefile.am,v 1.1 2003/08/01 13:41:06 makeinu Exp $ - -SOURCES = $(libdllloader_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = lib/dllloader -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libdllloader_la_LIBADD = -am_libdllloader_la_OBJECTS = mm.lo pe_image.lo module.lo kernel32.lo \ - user32.lo advapi32.lo msvcrt.lo borlndmm.lo hash.lo \ - converter.lo dlist.lo libstring.lo misc.lo -libdllloader_la_OBJECTS = $(am_libdllloader_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/advapi32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/borlndmm.Plo ./$(DEPDIR)/converter.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/dlist.Plo ./$(DEPDIR)/hash.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/kernel32.Plo ./$(DEPDIR)/libstring.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/mm.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/module.Plo ./$(DEPDIR)/msvcrt.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/pe_image.Plo ./$(DEPDIR)/user32.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libdllloader_la_SOURCES) -DIST_SOURCES = $(libdllloader_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@ENABLE_SPI_TRUE@@PLATFORM_WIN32_FALSE@noinst_LTLIBRARIES = libdllloader.la -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -libdllloader_la_SOURCES = \ - compat.h common.h \ - windef.h w32api.h export.h \ - mm.c mm.h \ - pe_image.c pe_image.h pe.h \ - module.c module.h \ - kernel32.c kernel32.h \ - user32.c user32.h \ - advapi32.c advapi32.h \ - msvcrt.c msvcrt.h \ - borlndmm.c borlndmm.h \ - hash.c hash.h \ - converter.c converter.h \ - dlist.c dlist.h \ - libstring.c libstring.h \ - misc.c misc.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dllloader/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/dllloader/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libdllloader.la: $(libdllloader_la_OBJECTS) $(libdllloader_la_DEPENDENCIES) - $(LINK) $(libdllloader_la_LDFLAGS) $(libdllloader_la_OBJECTS) $(libdllloader_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/advapi32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/borlndmm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kernel32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstring.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvcrt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe_image.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user32.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/lib/dllloader/misc.c gimageview-0.3.0-0.20101117/lib/dllloader/misc.c --- gimageview-0.2.27/lib/dllloader/misc.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/misc.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Fri Feb 8 02:09:04 2002. - * $Id: misc.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: misc.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/misc.h gimageview-0.3.0-0.20101117/lib/dllloader/misc.h --- gimageview-0.2.27/lib/dllloader/misc.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/misc.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Fri Feb 8 02:11:50 2002. - * $Id: misc.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: misc.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/mm.c gimageview-0.3.0-0.20101117/lib/dllloader/mm.c --- gimageview-0.2.27/lib/dllloader/mm.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/mm.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 01:37:22 2002. - * $Id: mm.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: mm.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/mm.h gimageview-0.3.0-0.20101117/lib/dllloader/mm.h --- gimageview-0.2.27/lib/dllloader/mm.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/mm.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Wed Oct 10 20:52:52 2001. - * $Id: mm.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: mm.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/module.c gimageview-0.3.0-0.20101117/lib/dllloader/module.c --- gimageview-0.2.27/lib/dllloader/module.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/module.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 01:39:10 2002. - * $Id: module.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: module.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/module.h gimageview-0.3.0-0.20101117/lib/dllloader/module.h --- gimageview-0.2.27/lib/dllloader/module.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/module.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:39:21 2001. - * $Id: module.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: module.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/msvcrt.c gimageview-0.3.0-0.20101117/lib/dllloader/msvcrt.c --- gimageview-0.2.27/lib/dllloader/msvcrt.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/msvcrt.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Mon Feb 18 03:20:24 2002. - * $Id: msvcrt.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: msvcrt.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/msvcrt.h gimageview-0.3.0-0.20101117/lib/dllloader/msvcrt.h --- gimageview-0.2.27/lib/dllloader/msvcrt.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/msvcrt.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:39:37 2001. - * $Id: msvcrt.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: msvcrt.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/pe.h gimageview-0.3.0-0.20101117/lib/dllloader/pe.h --- gimageview-0.2.27/lib/dllloader/pe.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/pe.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Fri Oct 5 14:16:29 2001. - * $Id: pe.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: pe.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/pe_image.c gimageview-0.3.0-0.20101117/lib/dllloader/pe_image.c --- gimageview-0.2.27/lib/dllloader/pe_image.c 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/pe_image.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Tue Feb 26 05:21:44 2002. - * $Id: pe_image.c,v 1.2 2004/03/07 12:24:17 makeinu Exp $ + * $Id: pe_image.c 992 2004-03-07 12:24:17Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/pe_image.h gimageview-0.3.0-0.20101117/lib/dllloader/pe_image.h --- gimageview-0.2.27/lib/dllloader/pe_image.h 2004-05-23 14:07:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/pe_image.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Fri Oct 5 15:28:53 2001. - * $Id: pe_image.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: pe_image.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/spi.c gimageview-0.3.0-0.20101117/lib/dllloader/spi.c --- gimageview-0.2.27/lib/dllloader/spi.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/spi.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,503 @@ +/* + * spi.c -- spi to enfle bridge + * (C)Copyright 2000, 2001 by Hiroshi Takekawa + * This file is part of Enfle. + * + * Last Modified: Mon Feb 18 03:05:24 2002. + * $Id: spi.c 968 2003-08-01 13:41:06Z makeinu $ + * + * Enfle is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Enfle 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 + */ + +#define REQUIRE_STRING_H +#include "compat.h" +#define REQUIRE_FATAL +#include "common.h" + +#ifdef HAVE_CONFIG_H +# ifndef CONFIG_H_INCLUDED +# include "enfle-config.h" +# define CONFIG_H_INCLUDED +# endif +#endif + +#ifdef USE_SPI + +#include "dllloader/pe_image.h" +#include "spi-private.h" +#include "spi.h" +#include "loader-plugin.h" +#include "loader-extra.h" +#include "archiver-plugin.h" +#include "archiver-extra.h" +#include "utils/misc.h" + +static LoaderStatus loader_identify(Image *, Stream *, VideoWindow *, Config *, void *); +static LoaderStatus loader_load(Image *, Stream *, VideoWindow *, Config *, void *); +static ArchiverStatus archiver_identify(Archive *, Stream *, void *); +static ArchiverStatus archiver_open(Archive *, Stream *, void *); + +typedef struct _susie_loader { + PE_image *pe; + IsSupportedFunc is_supported; + GetPictureInfoFunc get_pic_info; + GetPictureFunc get_pic; +} SusieLoader; + +typedef struct _susie_archiver { + PE_image *pe; + IsSupportedFunc is_supported; + GetArchiveInfoFunc get_archive_info; + GetFileInfoFunc get_file_info; + GetFileFunc get_file; +} SusieArchiver; + +typedef struct _susie_archiver_info { + GetFileFunc get_file; + unsigned long position; + unsigned long filesize; +} Susie_archiver_info; + +static LoaderPlugin loader_template = { + type: ENFLE_PLUGIN_LOADER, + name: NULL, + description: NULL, + author: NULL, + image_private: NULL, + + identify: loader_identify, + load: loader_load +}; + +static ArchiverPlugin archiver_template = { + type: ENFLE_PLUGIN_ARCHIVER, + name: NULL, + description: NULL, + author: NULL, + archiver_private: NULL, + + identify: archiver_identify, + open: archiver_open +}; + +static LoaderStatus +loader_identify(Image *p, Stream *st, VideoWindow *vw, Config *c, void *priv) +{ + SusieLoader *sl = priv; +#if 1 + PictureInfo info; +#endif + int err; + unsigned char buf[2048]; + + memset(buf, 0, 2048); + stream_read(st, buf, 2048); + debug_message_fnc("%s: using %s\n", st->path, sl->pe->filepath); +#if 0 + if ((err = sl->is_supported(st->path, (DWORD)buf)) != SPI_SUCCESS) + return LOAD_ERROR; +#endif + +#if 1 + if (st->path) + err = sl->get_pic_info(st->path, 0, 0, &info); + else + err = sl->get_pic_info((LPSTR)st->buffer, st->buffer_size, 1, &info); + if (err == SPI_SUCCESS) { + if (info.width <= 0 || info.height <= 0) { + debug_message("Invalid dimension (%ld, %ld)\n", info.width, info.height); + return LOAD_ERROR; + } else if (info.colorDepth > 32 || info.colorDepth <= 0) { + debug_message("Invalid depth %d\n", info.colorDepth); + return LOAD_ERROR; + } + debug_message_fnc("(%ld, %ld) depth %d\n", info.width, info.height, info.colorDepth); + return LOAD_OK; + } + debug_message_fnc("Susie plugin error: %s: %s\n", st->path, spi_errormsg[err]); + + return LOAD_ERROR; +#else + return LOAD_OK; +#endif +} + +static int PASCAL +susie_loader_progress_callback(int nNum, int nDenom, long lData) +{ + return 0; +} + +static LoaderStatus +loader_load(Image *p, Stream *st, VideoWindow *vw, Config *c, void *priv) +{ + SusieLoader *sl = priv; + unsigned char *image, *d; + BITMAPINFOHEADER *bih; + int i, err, bpl; + unsigned int j; + + debug_message_fn("()\n"); + if ((err = sl->get_pic(st->path, 0, 0, (HANDLE *)&bih, (HANDLE *)&image, + susie_loader_progress_callback, 0)) == SPI_SUCCESS) { + p->depth = p->bits_per_pixel = bih->biBitCount; + p->width = bih->biWidth; + p->height = bih->biHeight; + debug_message_fnc("(%d, %d) depth %d\n", p->width, p->height, p->depth); + switch (p->depth) { + case 4: + p->type = _INDEX; + p->bytes_per_line = p->width; + bpl = (((p->width + 1) >> 1) + 3) & ~3; + for (i = 0; i < 16; i++) { + p->colormap[i][0] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 2); + p->colormap[i][1] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 1); + p->colormap[i][2] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 0); + } + break; + case 8: + p->type = _INDEX; + p->bytes_per_line = p->width; + bpl = (p->bytes_per_line + 3) & ~3; + for (i = 0; i < 256; i++) { + p->colormap[i][0] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 2); + p->colormap[i][1] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 1); + p->colormap[i][2] = *(unsigned char *)((void *)bih + sizeof(*bih) + i * 4 + 0); + } + break; + case 24: + p->type = _BGR24; + p->bytes_per_line = p->width * 3; + bpl = (p->bytes_per_line + 3) & ~3; + break; + default: + free(image); + free(bih); + show_message("Depth %d is not supported yet.\n", p->depth); + return LOAD_ERROR; + } + + if ((d = memory_alloc(p->image, p->bytes_per_line * p->height)) == NULL) { + free(image); + free(bih); + show_message("No enough memory for image\n"); + return LOAD_ERROR; + } + + switch (p->depth) { + case 8: + case 24: + for (i = p->height - 1; i >= 0; i--) + memcpy(d + p->bytes_per_line * (p->height - 1 - i), image + bpl * i, p->bytes_per_line); + break; + case 4: + for (i = p->height - 1; i >= 0; i--) { + for (j = 0; j < (p->width >> 1); j++) { + *(d + p->bytes_per_line * (p->height - 1 - i) + (j << 1) ) = *(image + bpl * i + j) >> 4; + *(d + p->bytes_per_line * (p->height - 1 - i) + (j << 1) + 1) = *(image + bpl * i + j) & 0xf; + } + if ((j << 1) < p->width) + *(d + p->bytes_per_line * (p->height - 1 - i) + (j << 1) ) = *(image + bpl * i + j) >> 4; + } + break; + default: + free(image); + free(bih); + show_message("Depth %d is not supported yet. (should not be reached)\n", p->depth); + return LOAD_ERROR; + } + + free(image); + free(bih); + return LOAD_OK; + } + + debug_message_fn("(): %s\n", spi_errormsg[err]); + + return LOAD_ERROR; +} + +static ArchiverStatus +archiver_identify(Archive *a, Stream *st, void *priv) +{ + SusieArchiver *sa = priv; + unsigned char buffer[2048]; + + debug_message_fnc("%s: using %s\n", st->path, sa->pe->filepath); + + memset(buffer, 0, 2048); + stream_read(st, buffer, 2048); + + if (sa->is_supported(st->path, (DWORD)buffer)) + return OPEN_OK; + + return OPEN_ERROR; +} + +static int PASCAL +susie_archive_progress_callback(int nNum, int nDenom, long lData) +{ + debug_message_fnc("%d/%d\n", nNum, nDenom); + return 0; +} + +static int +susie_archive_open(Archive *a, Stream *st, char *path) +{ + Susie_archiver_info *sai; + unsigned char *dest; + + debug_message_fnc("%s: %s: %s\n", a->format, a->st->path, path); + + if ((sai = (Susie_archiver_info *)archive_get(a, path)) == NULL) + return 0; + + debug_message_fnc("get_file: %s(%ld)\n", path, sai->position); + + if ((sai->get_file(a->st->path, sai->position, (LPSTR)&dest, 0x100 /* disk to memory */, + susie_archive_progress_callback, 0)) != SPI_SUCCESS) { + show_message_fnc("GetFile() failed.\n"); + return 0; + } + + debug_message_fnc("GetFile() succeeded.\n"); + + return stream_make_memorystream(st, dest, sai->filesize); +} + +static void +susie_archive_destroy(Archive *a) +{ + stream_destroy(a->st); + hash_destroy(a->filehash, 1); + free(a); +} + +static ArchiverStatus +archiver_open(Archive *a, Stream *st, void *priv) +{ + int i, err; + SusieArchiver *sa = priv; + Susie_archiver_info *sai; + fileInfo *info; + + if ((err = sa->get_archive_info(st->path, 0, 0, (HLOCAL *)&info)) != SPI_SUCCESS) { + show_message_fnc("Susie plugin error: %s: %s\n", st->path, spi_errormsg[err]); + debug_message_fnc("Susie plugin error: %s: %s(%d)\n", st->path, spi_errormsg[err], err); + return OPEN_ERROR; + } + + for (i = 0; info[i].method[0]; i++) { + if ((sai = malloc(sizeof(Susie_archiver_info))) == NULL) { + show_message_fnc("No enough memory.\n"); + free(info); + return OPEN_ERROR; + } + sai->get_file = sa->get_file; + sai->position = info[i].position; + sai->filesize = info[i].filesize; + debug_message_fnc("%ld: %s (%ld bytes)\n", sai->position, info[i].filename, sai->filesize); + archive_add(a, info[i].filename, (void *)sai); + } + + debug_message_fnc("%d files found\n", i); + + free(info); + + a->st = stream_transfer(st); + a->open = susie_archive_open; + a->destroy = susie_archive_destroy; + + return OPEN_OK; +} + +static void +spi_plugin_exit(void *p) +{ + EnflePlugin *ep = (EnflePlugin *)p; + + if (ep->name) + free((void *)ep->name); + if (ep->description) + free((void *)ep->description); + + switch (ep->type) { + case ENFLE_PLUGIN_LOADER: + { + LoaderPlugin *l = (LoaderPlugin *)p; + SusieLoader *sl = l->image_private; + + peimage_destroy(sl->pe); + free(sl); + } + break; + case ENFLE_PLUGIN_ARCHIVER: + { + ArchiverPlugin *arp = (ArchiverPlugin *)p; + SusieArchiver *sa = arp->archiver_private; + + peimage_destroy(sa->pe); + free(sa); + } + break; + default: + show_message_fnc("inappropriate type %d\n", ep->type); + break; + } + + free(ep); +} + +char * +spi_load(EnflePlugins *eps, char *path, PluginType *type_return) +{ + PE_image *pe; + SusieLoader *sl = NULL; + SusieArchiver *sa = NULL; + GetPluginInfoFunc get_plugin_info; + EnflePlugin *ep = NULL; + LoaderPlugin *lp = NULL; + ArchiverPlugin *ap = NULL; + Plugin *p = NULL; + PluginList *pl; + char buf[256]; + int err; + + debug_message_fnc("%s...\n", path); + pe = peimage_create(); + if (!peimage_load(pe, path)) { + show_message("peimage_load() failed: %s\n", path); + return NULL; + } + debug_message("OK\n"); + + if ((get_plugin_info = (GetPluginInfoFunc)peimage_resolve(pe, "GetPluginInfo")) == NULL) { + show_message("Cannot resolve GetPluginInfo.\n"); + goto error; + } + + debug_message("GetPluginInfo 0 "); + if ((err = get_plugin_info(0, buf, 256)) == 0) { + show_message("GetPluginInfo returns 0\n"); + goto error; + } + debug_message("OK\n"); + + switch (buf[2]) { + case 'I': + *type_return = ENFLE_PLUGIN_LOADER; + if ((sl = calloc(1, sizeof(SusieLoader))) == NULL) { + show_message("No enough memory for SusieLoader\n"); + goto error; + } + sl->pe = pe; + if ((sl->is_supported = (IsSupportedFunc)peimage_resolve(pe, "IsSupported")) == NULL) { + show_message("Cannot resolve IsSupported.\n"); + goto error; + } + if ((sl->get_pic_info = (GetPictureInfoFunc)peimage_resolve(pe, "GetPictureInfo")) == NULL) { + show_message("Cannot resolve GetPictureInfo.\n"); + goto error; + } + if ((sl->get_pic = (GetPictureFunc)peimage_resolve(pe, "GetPicture")) == NULL) { + show_message("Cannot resolve GetPicture.\n"); + goto error; + } + if ((lp = calloc(1, sizeof(LoaderPlugin))) == NULL) { + show_message("No enough memory for LoaderPlugin\n"); + goto error; + } + memcpy(lp, &loader_template, sizeof(LoaderPlugin)); + lp->image_private = sl; + ep = (EnflePlugin *)lp; + break; + case 'X': + *type_return = ENFLE_PLUGIN_SAVER; + show_message("Export filter is not supported yet.\n"); + return NULL; + case 'A': + *type_return = ENFLE_PLUGIN_ARCHIVER; + if ((sa = calloc(1, sizeof(SusieArchiver))) == NULL) { + show_message("No enough memory for SusieArchiver\n"); + return NULL; + } + sa->pe = pe; + if ((sa->is_supported = (IsSupportedFunc)peimage_resolve(pe, "IsSupported")) == NULL) { + show_message("Cannot resolve IsSupported.\n"); + goto error; + } + if ((sa->get_archive_info = (GetArchiveInfoFunc)peimage_resolve(pe, "GetArchiveInfo")) == NULL) { + show_message("Cannot resolve GetArchiveInfo.\n"); + return NULL; + } + if ((sa->get_file_info = (GetFileInfoFunc)peimage_resolve(pe, "GetFileInfo")) == NULL) { + show_message("Cannot resolve GetFileInfo.\n"); + return NULL; + } + if ((sa->get_file = (GetFileFunc)peimage_resolve(pe, "GetFile")) == NULL) { + show_message("Cannot resolve GetFile.\n"); + return NULL; + } + if ((ap = calloc(1, sizeof(ArchiverPlugin))) == NULL) { + show_message("No enough memory for ArchiverPlugin\n"); + goto error; + } + memcpy(ap, &archiver_template, sizeof(ArchiverPlugin)); + ap->archiver_private = sa; + ep = (EnflePlugin *)ap; + break; + default: + show_message("Unknown susie plugin type %c.\n", buf[2]); + break; + } + + debug_message("GetPluginInfo 1 "); + if ((err = get_plugin_info(1, buf, 256)) == 0) + fatal(1, "GetPluginInfo returns 0\n"); + debug_message("OK\n"); + + ep->name = strdup(misc_basename(path)); + ep->description = (const unsigned char *)strdup(buf); + ep->author = (char *)"SPI author"; + + p = plugin_create(); + p->filepath = strdup(path); + p->substance = ep; + p->substance_unload = spi_plugin_exit; + + pl = eps->pls[ep->type]; + if (!pluginlist_add(pl, p ,ep->name)) { + show_message("pluginlist_add failed: %s\n", ep->name); + goto error; + } + + return (char *)ep->name; + + error: + peimage_destroy(pe); + if (p) + plugin_destroy(p); + if (sl) + free(sl); + if (sa) + free(sa); + if (lp) + free(lp); + if (ap) + free(ap); + + return NULL; +} + +#endif diff -Nru gimageview-0.2.27/lib/dllloader/spi.h gimageview-0.3.0-0.20101117/lib/dllloader/spi.h --- gimageview-0.2.27/lib/dllloader/spi.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/spi.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,7 @@ +/* + * spi.h + */ + +#include "enfle-plugins.h" + +char *spi_load(EnflePlugins *, char *, PluginType *); diff -Nru gimageview-0.2.27/lib/dllloader/user32.c gimageview-0.3.0-0.20101117/lib/dllloader/user32.c --- gimageview-0.2.27/lib/dllloader/user32.c 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/user32.c 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Wed Dec 26 08:35:16 2001. - * $Id: user32.c,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: user32.c 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/user32.h gimageview-0.3.0-0.20101117/lib/dllloader/user32.h --- gimageview-0.2.27/lib/dllloader/user32.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/user32.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:40:14 2001. - * $Id: user32.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: user32.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/w32api.h gimageview-0.3.0-0.20101117/lib/dllloader/w32api.h --- gimageview-0.2.27/lib/dllloader/w32api.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/w32api.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sat Jan 6 01:40:23 2001. - * $Id: w32api.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: w32api.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/dllloader/windef.h gimageview-0.3.0-0.20101117/lib/dllloader/windef.h --- gimageview-0.2.27/lib/dllloader/windef.h 2004-05-23 14:07:38.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/dllloader/windef.h 2010-11-17 06:10:11.000000000 +0000 @@ -4,7 +4,7 @@ * This file is part of Enfle. * * Last Modified: Sun Sep 30 05:10:02 2001. - * $Id: windef.h,v 1.1 2003/08/01 13:41:06 makeinu Exp $ + * $Id: windef.h 968 2003-08-01 13:41:06Z makeinu $ * * Enfle is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff -Nru gimageview-0.2.27/lib/libexif/exif-byte-order.c gimageview-0.3.0-0.20101117/lib/libexif/exif-byte-order.c --- gimageview-0.2.27/lib/libexif/exif-byte-order.c 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-byte-order.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* exif-byte-order.c - * - * Copyright © 2002 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-byte-order.h" -#include "i18n.h" - -#include - -const char * -exif_byte_order_get_name (ExifByteOrder order) -{ - switch (order) { - case EXIF_BYTE_ORDER_MOTOROLA: - return (_("Motorola")); - case EXIF_BYTE_ORDER_INTEL: - return (_("Intel")); - default: - return NULL; - } -} diff -Nru gimageview-0.2.27/lib/libexif/exif-byte-order.h gimageview-0.3.0-0.20101117/lib/libexif/exif-byte-order.h --- gimageview-0.2.27/lib/libexif/exif-byte-order.h 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-byte-order.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* exif-byte-order.h - * - * Copyright © 2002 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_BYTE_ORDER_H__ -#define __EXIF_BYTE_ORDER_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef enum { - EXIF_BYTE_ORDER_MOTOROLA, - EXIF_BYTE_ORDER_INTEL -} ExifByteOrder; - -const char *exif_byte_order_get_name (ExifByteOrder order); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_BYTE_ORDER_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-content.c gimageview-0.3.0-0.20101117/lib/libexif/exif-content.c --- gimageview-0.2.27/lib/libexif/exif-content.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-content.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -/* exif-content.c - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-content.h" - -#include -#include -#include - -//#define DEBUG - -static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; - -struct _ExifContentPrivate -{ - unsigned int ref_count; -}; - -ExifContent * -exif_content_new (void) -{ - ExifContent *content; - - content = malloc (sizeof (ExifContent)); - if (!content) - return (NULL); - memset (content, 0, sizeof (ExifContent)); - content->priv = malloc (sizeof (ExifContentPrivate)); - if (!content->priv) { - free (content); - return (NULL); - } - memset (content->priv, 0, sizeof (ExifContentPrivate)); - - content->priv->ref_count = 1; - - return (content); -} - -void -exif_content_ref (ExifContent *content) -{ - content->priv->ref_count++; -} - -void -exif_content_unref (ExifContent *content) -{ - content->priv->ref_count--; - if (!content->priv->ref_count) - exif_content_free (content); -} - -void -exif_content_free (ExifContent *content) -{ - unsigned int i; - - for (i = 0; i < content->count; i++) - exif_entry_unref (content->entries[i]); - free (content->entries); - free (content->priv); - free (content); -} - -void -exif_content_dump (ExifContent *content, unsigned int indent) -{ - char buf[1024]; - unsigned int i; - - for (i = 0; i < 2 * indent; i++) - buf[i] = ' '; - buf[i] = '\0'; - - if (!content) - return; - - printf ("%sDumping exif content (%i entries)...\n", buf, - content->count); - for (i = 0; i < content->count; i++) - exif_entry_dump (content->entries[i], indent + 1); -} - -void -exif_content_add_entry (ExifContent *content, ExifEntry *entry) -{ - if (entry->parent) - return; - - entry->parent = content; - content->entries = realloc (content->entries, - sizeof (ExifEntry) * (content->count + 1)); - content->entries[content->count] = entry; - exif_entry_ref (entry); - content->count++; -} - -void -exif_content_remove_entry (ExifContent *content, ExifEntry *entry) -{ - unsigned int i; - - if (entry->parent != content) - return; - - for (i = 0; i < content->count; i++) - if (content->entries[i] == entry) - break; - if (i == content->count) - return; - - memmove (&content->entries[i], &content->entries[i + 1], - sizeof (ExifEntry) * (content->count - i - 1)); - content->count--; - - entry->parent = NULL; - exif_entry_unref (entry); -} - -ExifEntry * -exif_content_get_entry (ExifContent *content, ExifTag tag) -{ - unsigned int i; - - if (!content) - return (NULL); - - for (i = 0; i < content->count; i++) - if (content->entries[i]->tag == tag) - return (content->entries[i]); - return (NULL); -} - -void -exif_content_foreach_entry (ExifContent *content, - ExifContentForeachEntryFunc func, void *data) -{ - unsigned int i; - - if (!content || !func) - return; - - for (i = 0; i < content->count; i++) - func (content->entries[i], data); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-content.h gimageview-0.3.0-0.20101117/lib/libexif/exif-content.h --- gimageview-0.2.27/lib/libexif/exif-content.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-content.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* exif-content.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_CONTENT_H__ -#define __EXIF_CONTENT_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef struct _ExifContent ExifContent; -typedef struct _ExifContentPrivate ExifContentPrivate; - -#include -#include -#include - -struct _ExifContent -{ - ExifEntry **entries; - unsigned int count; - - /* Data containing this content */ - ExifData *parent; - - ExifContentPrivate *priv; -}; - -/* Lifecycle */ -ExifContent *exif_content_new (void); -void exif_content_ref (ExifContent *content); -void exif_content_unref (ExifContent *content); -void exif_content_free (ExifContent *content); - -void exif_content_add_entry (ExifContent *content, ExifEntry *e); -void exif_content_remove_entry (ExifContent *content, ExifEntry *e); -ExifEntry *exif_content_get_entry (ExifContent *content, ExifTag tag); - -typedef void (* ExifContentForeachEntryFunc) (ExifEntry *, void *user_data); -void exif_content_foreach_entry (ExifContent *content, - ExifContentForeachEntryFunc func, - void *user_data); - -/* For your convenience */ -#define exif_content_get_value(c,t) \ - (exif_content_get_entry (c,t) ? \ - exif_entry_get_value (exif_content_get_entry (c,t)) : NULL) -#define exif_content_get_value_brief(c,t) \ - (exif_content_get_entry (c,t) ? \ - exif_entry_get_value_brief (exif_content_get_entry (c,t)) : NULL) - -void exif_content_dump (ExifContent *content, unsigned int indent); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_CONTENT_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-data.c gimageview-0.3.0-0.20101117/lib/libexif/exif-data.c --- gimageview-0.2.27/lib/libexif/exif-data.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-data.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,865 +0,0 @@ -/* exif-data.c - * - * Copyright -A© 2001 Lutz Müller $)B - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-data.h" -#include "exif-ifd.h" -#include "exif-utils.h" -#include "exif-loader.h" -#include "jpeg-marker.h" - -#include -#include -#include - -#undef MAX -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) - -/* #define DEBUG */ - -static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; - -struct _ExifDataPrivate -{ - ExifByteOrder order; - - unsigned int ref_count; -}; - -ExifData * -exif_data_new (void) -{ - ExifData *data; - unsigned int i; - - data = malloc (sizeof (ExifData)); - if (!data) - return (NULL); - memset (data, 0, sizeof (ExifData)); - data->priv = malloc (sizeof (ExifDataPrivate)); - if (!data->priv) { - free (data); - return (NULL); - } - memset (data->priv, 0, sizeof (ExifDataPrivate)); - data->priv->ref_count = 1; - - for (i = 0; i < EXIF_IFD_COUNT; i++) { - data->ifd[i] = exif_content_new (); - if (!data->ifd[i]) { - exif_data_free (data); - return (NULL); - } - data->ifd[i]->parent = data; - } - - return (data); -} - -ExifData * -exif_data_new_from_data (const unsigned char *data, unsigned int size) -{ - ExifData *edata; - - edata = exif_data_new (); - exif_data_load_data (edata, data, size); - return (edata); -} - -static void -exif_data_load_data_entry (ExifData *data, ExifEntry *entry, - const unsigned char *d, - unsigned int size, unsigned int offset) -{ - unsigned int s, doff; - - entry->tag = exif_get_short (d + offset + 0, data->priv->order); - entry->format = exif_get_short (d + offset + 2, data->priv->order); - entry->components = exif_get_long (d + offset + 4, data->priv->order); - - /* - * Size? If bigger than 4 bytes, the actual data is not - * in the entry but somewhere else (offset). - */ - s = exif_format_get_size (entry->format) * entry->components; - if (!s) - return; - if (s > 4) - doff = exif_get_long (d + offset + 8, data->priv->order); - else - doff = offset + 8; - - /* Sanity check */ - if (size < doff + s) - return; - - entry->data = malloc (sizeof (char) * s); - if (!entry->data) - return; - entry->size = s; - memcpy (entry->data, d + doff, s); -} - -static void -exif_data_save_data_entry (ExifData *data, ExifEntry *entry, - unsigned char **d, unsigned int *ds, - unsigned int offset) -{ - unsigned int doff, s; - - /* - * Each entry is 12 bytes long. The memory for the entry has - * already been allocated. - */ - exif_set_short (*d + 6 + offset + 0, - data->priv->order, entry->tag); - exif_set_short (*d + 6 + offset + 2, - data->priv->order, entry->format); - exif_set_long (*d + 6 + offset + 4, - data->priv->order, entry->components); - - /* - * Size? If bigger than 4 bytes, the actual data is not in - * the entry but somewhere else. - */ - s = exif_format_get_size (entry->format) * entry->components; - if (!s) - return; - if (s > 4) { - *ds += entry->size; - *d = realloc (*d, sizeof (char) * *ds); - doff = *ds - 6 - entry->size; - exif_set_long (*d + 6 + offset + 8, - data->priv->order, doff); - } else - doff = offset + 8; - memcpy (*d + 6 + doff, entry->data, entry->size); -} - -static void -exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong offset, ExifLong size) -{ - if (ds < offset + size) { -#ifdef DEBUG - printf ("Bogus thumbnail offset and size: %i < %i + %i.\n", - (int) ds, (int) offset, (int) size); -#endif - return; - } - if (data->data) - free (data->data); - data->size = size; - data->data = malloc (sizeof (char) * data->size); - memcpy (data->data, d + offset, data->size); -} - -static void -exif_data_load_data_content (ExifData *data, ExifContent *ifd, - const unsigned char *d, - unsigned int ds, unsigned int offset) -{ - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; - ExifEntry *entry; - unsigned int i; - ExifTag tag; - - /* Read the number of entries */ - n = exif_get_short (d + offset, data->priv->order); -#ifdef DEBUG - printf ("Loading %i entries...\n", n); -#endif - offset += 2; - for (i = 0; i < n; i++) { - - tag = exif_get_short (d + offset + 12 * i, data->priv->order); -#ifdef DEBUG - printf ("Loading entry '%s' (%i of %i)...\n", - exif_tag_get_name (tag), i + 1, n); -#endif - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - case EXIF_TAG_GPS_INFO_IFD_POINTER: - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH: - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - o = exif_get_long (d + offset + 12 * i + 8, - data->priv->order); - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - exif_data_load_data_content (data, - data->ifd[EXIF_IFD_EXIF], d, ds, o); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - exif_data_load_data_content (data, - data->ifd[EXIF_IFD_GPS], d, ds, o); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - exif_data_load_data_content (data, - data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: -#ifdef DEBUG - printf ("Thumbnail at %i.\n", (int) o); -#endif - thumbnail_offset = o; - if (thumbnail_offset && thumbnail_length) - exif_data_load_data_thumbnail (data, d, - ds, thumbnail_offset, - thumbnail_length); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH: -#ifdef DEBUG - printf ("Thumbnail size: %i.\n", (int) o); -#endif - thumbnail_length = o; - if (thumbnail_offset && thumbnail_length) - exif_data_load_data_thumbnail (data, d, - ds, thumbnail_offset, - thumbnail_length); - break; - default: - return; - } - break; - default: - entry = exif_entry_new (); - exif_content_add_entry (ifd, entry); - exif_data_load_data_entry (data, entry, d, ds, - offset + 12 * i); - exif_entry_unref (entry); - break; - } - } -} - -static void -exif_data_save_data_content (ExifData *data, ExifContent *ifd, - unsigned char **d, unsigned int *ds, - unsigned int offset) -{ - unsigned int j, n_ptr = 0, n_thumb = 0; - ExifIfd i; - - if (!data || !ifd || !d || !ds) - return; - - for (i = 0; i < EXIF_IFD_COUNT; i++) - if (ifd == data->ifd[i]) - break; - if (i == EXIF_IFD_COUNT) - return; - - /* - * Check if we need some extra entries for pointers or the thumbnail. - */ - switch (i) { - case EXIF_IFD_0: - - /* - * The pointer to IFD_EXIF is in IFD_0. The pointer to - * IFD_INTEROPERABILITY is in IFD_EXIF. - */ - if (data->ifd[EXIF_IFD_EXIF]->count || - data->ifd[EXIF_IFD_INTEROPERABILITY]->count) - n_ptr++; - - /* The pointer to IFD_GPS is in IFD_0. */ - if (data->ifd[EXIF_IFD_GPS]->count) - n_ptr++; - - break; - case EXIF_IFD_1: - if (data->size) - n_thumb = 2; - break; - case EXIF_IFD_EXIF: - if (data->ifd[EXIF_IFD_INTEROPERABILITY]->count) - n_ptr++; - default: - break; - } - - /* - * Allocate enough memory for all entries - * and the number of entries. - */ - *ds += (2 + (ifd->count + n_ptr + n_thumb) * 12 + 4); - *d = realloc (*d, sizeof (char) * *ds); - - /* Save the number of entries */ - exif_set_short (*d + 6 + offset, data->priv->order, - ifd->count + n_ptr + n_thumb); - offset += 2; - -#ifdef DEBUG - printf ("Saving %i entries (IFD '%s', offset: %i)...\n", - ifd->count, exif_ifd_get_name (i), offset); -#endif - - /* Save each entry */ - for (j = 0; j < ifd->count; j++) - exif_data_save_data_entry (data, ifd->entries[j], - d, ds, offset + 12 * j); - offset += 12 * ifd->count; - - /* Now save special entries. */ - switch (i) { - case EXIF_IFD_0: - - /* - * The pointer to IFD_EXIF is in IFD_0. - * However, the pointer to IFD_INTEROPERABILITY is in IFD_EXIF, - * therefore, if IFD_INTEROPERABILITY is not empty, we need - * IFD_EXIF even if latter is empty. - */ - if (data->ifd[EXIF_IFD_EXIF]->count || - data->ifd[EXIF_IFD_INTEROPERABILITY]->count) { - exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_EXIF_IFD_POINTER); - exif_set_short (*d + 6 + offset + 2, data->priv->order, - EXIF_FORMAT_LONG); - exif_set_long (*d + 6 + offset + 4, data->priv->order, - 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, - *ds - 6); - exif_data_save_data_content (data, - data->ifd[EXIF_IFD_EXIF], d, ds, *ds - 6); - offset += 12; - } - - /* The pointer to IFD_GPS is in IFD_0, too. */ - if (data->ifd[EXIF_IFD_GPS]->count) { - exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_GPS_INFO_IFD_POINTER); - exif_set_short (*d + 6 + offset + 2, data->priv->order, - EXIF_FORMAT_LONG); - exif_set_long (*d + 6 + offset + 4, data->priv->order, - 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, - *ds - 6); - exif_data_save_data_content (data, - data->ifd[EXIF_IFD_GPS], d, ds, *ds - 6); - offset += 12; - } - - break; - case EXIF_IFD_EXIF: - - /* - * The pointer to IFD_INTEROPERABILITY is in IFD_EXIF. - * See note above. - */ - if (data->ifd[EXIF_IFD_INTEROPERABILITY]->count) { - exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_INTEROPERABILITY_IFD_POINTER); - exif_set_short (*d + 6 + offset + 2, data->priv->order, - EXIF_FORMAT_LONG); - exif_set_long (*d + 6 + offset + 4, data->priv->order, - 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, - *ds - 6); - exif_data_save_data_content (data, - data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, - *ds - 6); - offset += 12; - } - - break; - case EXIF_IFD_1: - - /* - * Information about the thumbnail (if any) is saved in - * IFD_1. - */ - if (data->size) { - - /* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */ - exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_JPEG_INTERCHANGE_FORMAT); - exif_set_short (*d + 6 + offset + 2, data->priv->order, - EXIF_FORMAT_LONG); - exif_set_long (*d + 6 + offset + 4, data->priv->order, - 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, - *ds - 6); - *ds += data->size; - *d = realloc (*d, sizeof (char) * *ds); - memcpy (*d + *ds - data->size, data->data, data->size); - offset += 12; -#ifdef DEBUG - printf ("Wrote %i bytes of thumbnail data at offset " - "%i.\n", data->size, *ds - data->size); - printf ("We currently have %i bytes EXIF data.\n", *ds); -#endif - - /* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */ - exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); - exif_set_short (*d + 6 + offset + 2, data->priv->order, - EXIF_FORMAT_LONG); - exif_set_long (*d + 6 + offset + 4, data->priv->order, - 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, - data->size); - offset += 12; - } - - break; - default: - break; - } - - /* Correctly terminate the directory */ - if (i == EXIF_IFD_0 && (data->ifd[EXIF_IFD_1]->count || - data->size)) { - - /* - * We are saving IFD 0. Tell where IFD 1 starts and save - * IFD 1. - */ - exif_set_long (*d + 6 + offset, data->priv->order, *ds - 6); - exif_data_save_data_content (data, data->ifd[EXIF_IFD_1], d, ds, - *ds - 6); - } else - exif_set_long (*d + 6 + offset, data->priv->order, 0); -} - -void -exif_data_load_data (ExifData *data, const unsigned char *d, unsigned int size) -{ - unsigned int l, len = size; - ExifLong offset; - ExifShort n; - - if (!data) - return; - if (!d || !size) - return; - -#ifdef DEBUG - printf ("Parsing %i byte(s) EXIF data...\n", size); -#endif - - /* - * It can be that the data starts with the EXIF header. If it does - * not, search the EXIF marker. - */ - if (size < 6) { -#ifdef DEBUG - printf ("Size too small.\n"); -#endif - return; - } - if (!memcmp (d, ExifHeader, 6)) { -#ifdef DEBUG - printf ("Found EXIF header.\n"); -#endif - } else { -#ifdef DEBUG - printf ("Data begins with 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x " - "0x%x...\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6]); -#endif - while (1) { - while ((d[0] == 0xff) && size) { - d++; - size--; - } - - /* JPEG_MARKER_SOI */ - if (d[0] == JPEG_MARKER_SOI) { - d++; - size--; - continue; - } - - /* JPEG_MARKER_APP0 */ - if (d[0] == JPEG_MARKER_APP0) { - d++; - size--; - l = (d[0] << 8) | d[1]; - if (l > size) - return; - d += l; - size -= l; - continue; - } - - /* JPEG_MARKER_APP1 */ - if (d[0] == JPEG_MARKER_APP1) - break; - - /* Unknown marker or data. Give up. */ -#ifdef DEBUG - printf ("EXIF marker not found.\n"); -#endif - return; - } - d++; - size--; - if (size < 2) { -#ifdef DEBUG - printf ("Size too small.\n"); -#endif - return; - } - len = (d[0] << 8) | d[1]; -#ifdef DEBUG - printf ("We have to deal with %i byte(s) of EXIF data.\n", len); -#endif - d += 2; - size -= 2; - } - - /* - * Verify the exif header - * (offset 2, length 6). - */ - if (size < 6) { -#ifdef DEBUG - printf ("Size too small.\n"); -#endif - return; - } - if (memcmp (d, ExifHeader, 6)) { -#ifdef DEBUG - printf ("EXIF header not found.\n"); -#endif - return; - } - -#ifdef DEBUG - printf ("Found EXIF header.\n"); -#endif - - /* Byte order (offset 6, length 2) */ - if (size < 12) - return; - if (!memcmp (d + 6, "II", 2)) - data->priv->order = EXIF_BYTE_ORDER_INTEL; - else if (!memcmp (d + 6, "MM", 2)) - data->priv->order = EXIF_BYTE_ORDER_MOTOROLA; - else - return; - - /* Fixed value */ - if (exif_get_short (d + 8, data->priv->order) != 0x002a) - return; - - /* IFD 0 offset */ - offset = exif_get_long (d + 10, data->priv->order); -#ifdef DEBUG - printf ("IFD 0 at %i.\n", (int) offset); -#endif - - /* Parse the actual exif data (offset 14) */ - exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6, - size - 6, offset); - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); - offset = exif_get_long (d + 6 + offset + 2 + 12 * n, data->priv->order); - if (offset) { -#ifdef DEBUG - printf ("IFD 1 at %i.\n", (int) offset); -#endif - - /* Sanity check. */ - if (offset > size - 6) { -#ifdef DEBUG - printf ("Bogus offset!\n"); -#endif - return; - } - - exif_data_load_data_content (data, data->ifd[EXIF_IFD_1], d + 6, - size - 6, offset); - } -} - -void -exif_data_save_data (ExifData *data, unsigned char **d, unsigned int *ds) -{ - if (!data) - return; - if (!d || !ds) - return; - - /* Header */ - *ds = 6; - *d = malloc (sizeof (char) * *ds); - memcpy (*d, ExifHeader, 6); - - /* Order (offset 6) */ - *ds += 2; - *d = realloc (*d, sizeof (char) * *ds); - if (data->priv->order == EXIF_BYTE_ORDER_INTEL) { - memcpy (*d + 6, "II", 2); - } else { - memcpy (*d + 6, "MM", 2); - } - - /* Fixed value (2 bytes, offset 8) */ - *ds += 2; - *d = realloc (*d, sizeof (char) * *ds); - exif_set_short (*d + 8, data->priv->order, 0x002a); - - /* - * IFD 0 offset (4 bytes, offset 10). - * We will start 8 bytes after the - * EXIF header (2 bytes for order, another 2 for the test, and - * 4 bytes for the IFD 0 offset make 8 bytes together). - */ - *ds += 4; - *d = realloc (*d, sizeof (char) * *ds); - exif_set_long (*d + 10, data->priv->order, 8); - - /* Now save IFD 0. IFD 1 will be saved automatically. */ -#ifdef DEBUG - printf ("Saving IFDs...\n"); -#endif - exif_data_save_data_content (data, data->ifd[EXIF_IFD_0], d, ds, - *ds - 6); - -#ifdef DEBUG - printf ("Saved %i byte(s) EXIF data.\n", *ds); -#endif -} - -ExifData * -exif_data_new_from_file (const char *path) -{ - FILE *f; - int size; - ExifData *edata; - ExifLoader *loader; - unsigned char data[1024]; - - f = fopen (path, "rb"); - if (!f) - return (NULL); - - loader = exif_loader_new (); - while (1) { - size = fread (data, 1, 1024, f); - if (size <= 0) break; - if (!exif_loader_write (loader, data, size)) break; - } - fclose (f); - - edata = exif_loader_get_data (loader); - exif_loader_unref (loader); - - return (edata); -} - -void -exif_data_ref (ExifData *data) -{ - if (!data) - return; - - data->priv->ref_count++; -} - -void -exif_data_unref (ExifData *data) -{ - if (!data) - return; - - data->priv->ref_count--; - if (!data->priv->ref_count) - exif_data_free (data); -} - -void -exif_data_free (ExifData *data) -{ - unsigned int i; - - if (!data) - return; - - for (i = 0; i < EXIF_IFD_COUNT; i++) { - if (data->ifd[i]) { - exif_content_unref (data->ifd[i]); - data->ifd[i] = NULL; - } - } - if (data->data) { - free (data->data); - data->data = NULL; - } - if (data->priv) { - free (data->priv); - data->priv = NULL; - } - free (data); -} - -void -exif_data_dump (ExifData *data) -{ - unsigned int i; - - if (!data) - return; - - for (i = 0; i < EXIF_IFD_COUNT; i++) { - if (data->ifd[i] && data->ifd[i]->count) { - printf ("Dumping IFD '%s'...\n", - exif_ifd_get_name (i)); - exif_content_dump (data->ifd[i], 0); - } - } - - if (data->data) { - printf ("%i byte(s) thumbnail data available.", data->size); - if (data->size >= 4) { - printf ("0x%02x 0x%02x ... 0x%02x 0x%02x\n", - data->data[0], data->data[1], - data->data[data->size - 2], - data->data[data->size - 1]); - } - } -} - -ExifByteOrder -exif_data_get_byte_order (ExifData *data) -{ - if (!data) - return (0); - - return (data->priv->order); -} - -void -exif_data_foreach_content (ExifData *data, ExifDataForeachContentFunc func, - void *user_data) -{ - unsigned int i; - - if (!data || !func) - return; - - for (i = 0; i < EXIF_IFD_COUNT; i++) - func (data->ifd[i], user_data); -} - -typedef struct _ByteOrderChangeData ByteOrderChangeData; -struct _ByteOrderChangeData { - ExifByteOrder old, new; -}; - -static void -entry_set_byte_order (ExifEntry *e, void *data) -{ - ByteOrderChangeData *d = data; - unsigned int i; - ExifShort s; - ExifLong l; - ExifSLong sl; - ExifRational r; - ExifSRational sr; - - if (!e) - return; - - switch (e->format) { - case EXIF_FORMAT_SHORT: - for (i = 0; i < e->components; i++) { - s = exif_get_short (e->data + - (i * exif_format_get_size (e->format)), - d->old); - exif_set_short (e->data + - (i * exif_format_get_size (e->format)), - d->new, s); - } - break; - case EXIF_FORMAT_LONG: - for (i = 0; i < e->components; i++) { - l = exif_get_long (e->data + - (i * exif_format_get_size (e->format)), - d->old); - exif_set_long (e->data + - (i * exif_format_get_size (e->format)), - d->new, l); - } - break; - case EXIF_FORMAT_RATIONAL: - for (i = 0; i < e->components; i++) { - r = exif_get_rational (e->data + - (i * exif_format_get_size (e->format)), - d->old); - exif_set_rational (e->data + - (i * exif_format_get_size (e->format)), - d->new, r); - } - break; - case EXIF_FORMAT_SLONG: - for (i = 0; i < e->components; i++) { - sl = exif_get_slong (e->data + - (i * exif_format_get_size (e->format)), - d->old); - exif_set_slong (e->data + - (i * exif_format_get_size (e->format)), - d->new, sl); - } - break; - case EXIF_FORMAT_SRATIONAL: - for (i = 0; i < e->components; i++) { - sr = exif_get_srational (e->data + - (i * exif_format_get_size (e->format)), - d->old); - exif_set_srational (e->data + - (i * exif_format_get_size (e->format)), - d->new, sr); - } - break; - case EXIF_FORMAT_UNDEFINED: - case EXIF_FORMAT_BYTE: - case EXIF_FORMAT_ASCII: - default: - /* Nothing here. */ - break; - } -} - -static void -content_set_byte_order (ExifContent *content, void *data) -{ - exif_content_foreach_entry (content, entry_set_byte_order, data); -} - -void -exif_data_set_byte_order (ExifData *data, ExifByteOrder order) -{ - ByteOrderChangeData d; - - if (!data || (order == data->priv->order)) - return; - - d.old = data->priv->order; - d.new = order; - exif_data_foreach_content (data, content_set_byte_order, &d); - data->priv->order = order; -} diff -Nru gimageview-0.2.27/lib/libexif/exif-data.h gimageview-0.3.0-0.20101117/lib/libexif/exif-data.h --- gimageview-0.2.27/lib/libexif/exif-data.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-data.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* exif-data.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_DATA_H__ -#define __EXIF_DATA_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include -#include -#include - -typedef struct _ExifData ExifData; -typedef struct _ExifDataPrivate ExifDataPrivate; - -#include - -struct _ExifData -{ - ExifContent *ifd[EXIF_IFD_COUNT]; - - unsigned char *data; - unsigned int size; - - ExifDataPrivate *priv; -}; - -ExifData *exif_data_new (void); -ExifData *exif_data_new_from_file (const char *path); -ExifData *exif_data_new_from_data (const unsigned char *data, - unsigned int size); - -void exif_data_load_data (ExifData *data, const unsigned char *d, - unsigned int size); -void exif_data_save_data (ExifData *data, unsigned char **d, - unsigned int *size); - -void exif_data_ref (ExifData *data); -void exif_data_unref (ExifData *data); -void exif_data_free (ExifData *data); - -ExifByteOrder exif_data_get_byte_order (ExifData *data); -void exif_data_set_byte_order (ExifData *data, ExifByteOrder order); - -typedef void (* ExifDataForeachContentFunc) (ExifContent *, void *user_data); -void exif_data_foreach_content (ExifData *data, - ExifDataForeachContentFunc func, - void *user_data); - -void exif_data_dump (ExifData *data); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_DATA_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-entry.c gimageview-0.3.0-0.20101117/lib/libexif/exif-entry.c --- gimageview-0.2.27/lib/libexif/exif-entry.c 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-entry.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1458 +0,0 @@ -/* exif-entry.c - * - * Copyright -A© 2001 Lutz Müller $)B - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-entry.h" -#include "exif-ifd.h" -#include "exif-utils.h" -#include "i18n.h" - -#include -#include -#include -#include -#include - -/* #define DEBUG */ - -#undef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - -static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; - -struct _ExifEntryPrivate -{ - unsigned int ref_count; -}; - -ExifEntry * -exif_entry_new (void) -{ - ExifEntry *e; - - e = malloc (sizeof (ExifEntry)); - if (!e) - return (NULL); - memset (e, 0, sizeof (ExifEntry)); - e->priv = malloc (sizeof (ExifEntryPrivate)); - if (!e->priv) { - free (e); - return (NULL); - } - memset (e->priv, 0, sizeof (ExifEntryPrivate)); - e->priv->ref_count = 1; - - return (e); -} - -void -exif_entry_ref (ExifEntry *e) -{ - if (!e) - return; - - e->priv->ref_count++; -} - -void -exif_entry_unref (ExifEntry *e) -{ - if (!e) - return; - - e->priv->ref_count--; - if (!e->priv->ref_count) - exif_entry_free (e); -} - -void -exif_entry_free (ExifEntry *e) -{ - if (!e) - return; - - if (e->data) - free (e->data); - free (e->priv); - free (e); -} - -void -exif_entry_dump (ExifEntry *e, unsigned int indent) -{ - char buf[1024]; - unsigned int i; - - for (i = 0; i < 2 * indent; i++) - buf[i] = ' '; - buf[i] = '\0'; - - if (!e) - return; - - printf ("%sTag: 0x%x ('%s')\n", buf, e->tag, - exif_tag_get_name (e->tag)); - printf ("%s Format: %i ('%s')\n", buf, e->format, - exif_format_get_name (e->format)); - printf ("%s Components: %i\n", buf, (int) e->components); - printf ("%s Size: %i\n", buf, e->size); - printf ("%s Value: %s\n", buf, exif_entry_get_value (e)); -} - -#define CF(format,target,v) \ -{ \ - if (format != target) { \ - snprintf (v, sizeof (v), \ - _("Invalid format '%s', " \ - "expected '%s'."), \ - exif_format_get_name (format), \ - exif_format_get_name (target)); \ - break; \ - } \ -} - -#define CC(number,target,v) \ -{ \ - if (number != target) { \ - snprintf (v, sizeof (v), \ - _("Invalid number of components (%i, " \ - "expected %i)."), (int) number, (int) target); \ - break; \ - } \ -} - -const char * -exif_entry_get_value (ExifEntry *e) -{ - unsigned int i; - ExifByte v_byte; - ExifShort v_short, v_short2, v_short3, v_short4; - ExifLong v_long; - ExifSLong v_slong; - ExifRational v_rat; - ExifSRational v_srat; - static char v[1024], b[1024]; - const char *c; - ExifByteOrder o; - double d; - ExifEntry *entry; - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); - - /* We need the byte order */ - if (!e || !e->parent || !e->parent->parent) - return (NULL); - o = exif_data_get_byte_order (e->parent->parent); - - memset (v, 0, sizeof (v)); - memset (b, 0, sizeof (b)); - - /* Sanity check */ - if (e->size != e->components * exif_format_get_size (e->format)) { - snprintf (v, sizeof (v), _("Invalid size of entry (%i, " - "expected %li x %i)."), e->size, e->components, - exif_format_get_size (e->format)); - return v; - } - - switch (e->tag) { - case EXIF_TAG_USER_COMMENT: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - if (e->size < 8) break; - strncpy (v, e->data + 8, sizeof (v) - 1); - break; - case EXIF_TAG_EXIF_VERSION: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - CC (e->components, 4, v); - if (!memcmp (e->data, "0200", 4)) - strncpy (v, "Exif Version 2.0", sizeof (v) - 1); - else if (!memcmp (e->data, "0210", 4)) - strncpy (v, "Exif Version 2.1", sizeof (v) - 1); - else if (!memcmp (e->data, "0220", 4)) - strncpy (v, "Exif Version 2.2", sizeof (v) - 1); - else strncpy (v, _("Unknown Exif Version"), sizeof (v) - 1); - break; - case EXIF_TAG_FLASH_PIX_VERSION: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - CC (e->components, 4, v); - if (!memcmp (e->data, "0100", 4)) - strncpy (v, "FlashPix Version 1.0", sizeof (v)); - else - strncpy (v, _("Unknown FlashPix Version"), sizeof (v)); - break; - case EXIF_TAG_COPYRIGHT: - CF (e->format, EXIF_FORMAT_ASCII, v); - - /* - * First part: Photographer. - * Some cameras store a string like " " here. Ignore it. - */ - if (e->size && e->data && - (strspn (e->data, " ") != strlen ((char *) e->data))) - strncpy (v, e->data, MIN (sizeof (v) - 1, e->size)); - else - strncpy (v, _("[None]"), sizeof (v) - 1); - strncat (v, " ", sizeof (v) - 1); - strncat (v, _("(Photographer)"), sizeof (v) - 1); - - /* Second part: Editor. */ - strncat (v, " - ", sizeof (v) - 1); - if (e->size && e->data && - (strlen ((char *) e->data) + 1 < e->size) && - (strspn (e->data, " ") != strlen ((char *) e->data))) - strncat (v, e->data + strlen (e->data) + 1, - sizeof (v) - 1); - else - strncat (v, _("[None]"), sizeof (v) - 1); - strncat (v, " ", sizeof (v) - 1); - strncat (v, _("(Editor)"), sizeof (v) - 1); - - break; - case EXIF_TAG_FNUMBER: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) return (NULL); - snprintf (v, sizeof (v), "f/%.01f", (float) v_rat.numerator / - (float) v_rat.denominator); - break; - case EXIF_TAG_APERTURE_VALUE: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) return (NULL); - snprintf (v, sizeof (v), "f/%.01f", - pow (2 , ((float) v_rat.numerator / - (float) v_rat.denominator) / 2.)); - break; - case EXIF_TAG_FOCAL_LENGTH: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) return (NULL); - - /* - * For calculation of the 35mm equivalent, - * Minolta cameras need a multiplier that depends on the - * camera model. - */ - d = 0.; - entry = exif_content_get_entry ( - e->parent->parent->ifd[EXIF_IFD_0], EXIF_TAG_MAKE); - if (entry && entry->data && - !strncmp (entry->data, "Minolta", 7)) { - entry = exif_content_get_entry ( - e->parent->parent->ifd[EXIF_IFD_0], - EXIF_TAG_MODEL); - if (entry && entry->data) { - if (!strncmp (entry->data, "DiMAGE 7", 8)) - d = 3.9; - else if (!strncmp (entry->data, "DiMAGE 5", 8)) - d = 4.9; - } - } - if (d) - snprintf (b, sizeof (b), _(" (35 equivalent: %d mm)"), - (int) (d * (double) v_rat.numerator / - (double) v_rat.denominator)); - - snprintf (v, sizeof (v), "%.1f mm%s", - (float) v_rat.numerator / (float) v_rat.denominator, - b); - break; - case EXIF_TAG_SUBJECT_DISTANCE: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) return (NULL); - snprintf (v, sizeof (v), "%.1f m", (float) v_rat.numerator / - (float) v_rat.denominator); - break; - case EXIF_TAG_EXPOSURE_TIME: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) return (NULL); - d = (double) v_rat.numerator / (double) v_rat.denominator; - if (d < 1) - snprintf (v, sizeof (v), _("1/%d sec."), - (int) (1. / d)); - else - snprintf (v, sizeof (v), _("%d sec."), (int) d); - break; - case EXIF_TAG_SHUTTER_SPEED_VALUE: - CF (e->format, EXIF_FORMAT_SRATIONAL, v); - CC (e->components, 1, v); - v_srat = exif_get_srational (e->data, o); - if (!v_srat.denominator) return (NULL); - snprintf (b, sizeof (b), "%.0f/%.0f sec.", - (float) v_srat.numerator, (float) v_srat.denominator); - snprintf (v, sizeof (v), "%s (APEX: %i)", b, - (int) pow (sqrt(2), (float) v_srat.numerator / - (float) v_srat.denominator)); - break; - case EXIF_TAG_BRIGHTNESS_VALUE: - CF (e->format, EXIF_FORMAT_SRATIONAL, v); - CC (e->components, 1, v); - v_srat = exif_get_srational (e->data, o); - snprintf (v, sizeof (v), "%i/%i", (int) v_srat.numerator, - (int) v_srat.denominator); - /* FIXME: How do I calculate the APEX value? */ - break; - case EXIF_TAG_METERING_MODE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (v, _("Unknown"), sizeof (v)); break; - case 1: strncpy (v, _("Average"), sizeof (v)); break; - case 2: strncpy (v, _("Center-Weighted Average"), sizeof (v)); - break; - case 3: strncpy (v, _("Spot"), sizeof (v)); break; - case 4: strncpy (v, _("Multi Spot"), sizeof (v)); break; - case 5: strncpy (v, _("Pattern"), sizeof (v)); break; - case 6: strncpy (v, _("Partial"), sizeof (v)); break; - case 255: strncpy (v, _("Other"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_COMPRESSION: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (v, _("Uncompressed"), sizeof (v)); break; - case 6: strncpy (v, _("JPEG compression"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_FILE_SOURCE: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - CC (e->components, 1, v); - switch (e->data[0]) { - case 0x03: strncpy (v, _("DSC"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "0x%02x", e->data[0]); break; - } - break; - case EXIF_TAG_PLANAR_CONFIGURATION: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (v, _("chunky format"), sizeof (v)); break; - case 2: strncpy (v, _("planar format"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_COMPONENTS_CONFIGURATION: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - CC (e->components, 4, v); - for (i = 0; i < 4; i++) { - switch (e->data[i]) { - case 0: c = _("-"); break; - case 1: c = _("Y"); break; - case 2: c = _("Cb"); break; - case 3: c = _("Cr"); break; - case 4: c = _("R"); break; - case 5: c = _("G"); break; - case 6: c = _("B"); break; - default: c = _("reserved"); break; - } - strncat (v, c, sizeof (v)); - if (i < 3) strncat (v, " ", sizeof (v)); - } - break; - case EXIF_TAG_SENSING_METHOD: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (v, _("Not defined"), sizeof (v)); break; - case 2: - strncpy (v, _("One-chip color area sensor"), - sizeof (v)); - break; - case 3: - strncpy (v, _("Two-chip color area sensor"), - sizeof (v)); - break; - case 4: - strncpy (v, _("Three-chip color area sensor"), - sizeof (v)); - break; - case 5: - strncpy (v, _("Color sequential area sensor"), - sizeof (v)); - break; - case 7: strncpy (v, _("Trilinear sensor"), sizeof (v)); break; - case 8: - strncpy (v, _("Color sequential linear sensor"), - sizeof (v)); - break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_LIGHT_SOURCE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (v, _("Unknown"), sizeof (v)); break; - case 1: strncpy (v, _("Daylight"), sizeof (v)); break; - case 2: strncpy (v, _("Fluorescent"), sizeof (v)); break; - case 3: - strncpy (v, _("Tungsten (incandescent light)"), - sizeof (v)); - break; - case 4: strncpy (v, _("Flash"), sizeof (v)); break; - case 9: strncpy (v, _("Fine weather"), sizeof (v)); break; - case 10: strncpy (v, _("Cloudy weather"), sizeof (v)); break; - case 11: strncpy (v, _("Shade"), sizeof (v)); break; - case 12: - strncpy (v, _("Daylight fluorescent"), sizeof (v)); - break; - case 13: - strncpy (v, _("Day white fluorescent"), sizeof (v)); - break; - case 14: - strncpy (v, _("Cool white fluorescent"), sizeof (v)); - break; - case 15: - strncpy (v, _("White fluorescent"), sizeof (v)); - break; - case 17: - strncpy (v, _("Standard light A"), sizeof (v)); break; - case 18: strncpy (v, _("Standard light B"), sizeof (v)); break; - case 19: strncpy (v, _("Standard light C"), sizeof (v)); break; - case 20: strncpy (v, _("D55"), sizeof (v)); break; - case 21: strncpy (v, _("D65"), sizeof (v)); break; - case 22: strncpy (v, _("D75"), sizeof (v)); break; - case 24: - strncpy (v, _("ISO studio tungsten"), sizeof (v)); - break; - case 255: strncpy (v, _("Other"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT: - case EXIF_TAG_RESOLUTION_UNIT: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 2: strncpy (v, _("Inch"), sizeof (v)); break; - case 3: strncpy (v, _("Centimeter"), sizeof (v)); break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_EXPOSURE_PROGRAM: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (v, _("Not defined"), sizeof (v)); break; - case 1: strncpy (v, _("Manual"), sizeof (v)); break; - case 2: strncpy (v, _("Normal program"), sizeof (v)); break; - case 3: strncpy (v, _("Aperture priority"), sizeof (v)); break; - case 4: strncpy (v, _("Shutter priority"), sizeof (v)); break; - case 5: - strncpy (v, _("Creative program (biased toward " - "depth of field)"), sizeof (v)); - break; - case 6: - strncpy (v, _("Action program (biased toward " - "fast shutter speed)"), sizeof (v)); - break; - case 7: - strncpy (v, _("Portrait mode (for closeup photos " - "with the background out of focus"), - sizeof (v)); - break; - case 8: - strncpy (v, _("Landscape mode (for landscape " - "photos with the background in focus"), - sizeof (v)); - break; - default: snprintf (v, sizeof (v), "%i", v_short); break; - } - break; - case EXIF_TAG_EXPOSURE_BIAS_VALUE: - CF (e->format, EXIF_FORMAT_SRATIONAL, v); - CC (e->components, 1, v); - v_srat = exif_get_srational (e->data, o); - if (!v_srat.denominator) - return (NULL); - snprintf (v, sizeof (v), "%s%.01f", - v_srat.denominator * v_srat.numerator > 0 ? "+" : "", - (double) v_srat.numerator / - (double) v_srat.denominator); - break; - case EXIF_TAG_ORIENTATION: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (v, _("top - left"), sizeof (v)); - break; - case 2: - strncpy (v, _("top - right"), sizeof (v)); - break; - case 3: - strncpy (v, _("bottom - right"), sizeof (v)); - break; - case 4: - strncpy (v, _("bottom - left"), sizeof (v)); - break; - case 5: - strncpy (v, _("left - top"), sizeof (v)); - break; - case 6: - strncpy (v, _("right - top"), sizeof (v)); - break; - case 7: - strncpy (v, _("right - bottom"), sizeof (v)); - break; - case 8: - strncpy (v, _("left - bottom"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_YCBCR_POSITIONING: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (v, _("centered"), sizeof (v)); - break; - case 2: - strncpy (v, _("co-sited"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_YCBCR_SUB_SAMPLING: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 2, v); - v_short = exif_get_short (e->data, o); - v_short2 = exif_get_short ( - e->data + exif_format_get_size (e->format), - o); - if ((v_short == 2) && (v_short2 == 1)) - strncpy (v, _("YCbCr4:2:2"), sizeof (v)); - else if ((v_short == 2) && (v_short2 == 2)) - strncpy (v, _("YCbCr4:2:0"), sizeof (v)); - else - snprintf (v, sizeof (v), "%i, %i", v_short, v_short2); - break; - case EXIF_TAG_PHOTOMETRIC_INTERPRETATION: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 2: - strncpy (v, _("RGB"), sizeof (v)); - break; - case 6: - strncpy (v, _("YCbCr"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_COLOR_SPACE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (v, _("sRGB"), sizeof (v)); - break; - case 0xffff: - strncpy (v, _("Uncalibrated"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_FLASH: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0x000: - strncpy (v, _("Flash did not fire."), sizeof (v)); - break; - case 0x0001: - strncpy (v, _("Flash fired."), sizeof (v)); - break; - case 0x0005: - strncpy (v, _("Strobe return light not detected."), - sizeof (v)); - break; - case 0x0007: - strncpy (v, _("Strobe return light detected."), - sizeof (v)); - break; - case 0x000d: - strncpy (v, _("Flash fired, compulsory flash mode, " - "return light not detected."), sizeof (v)); - break; - case 0x000f: - strncpy (v, _("Flash fired, compulsory flash mode, " - "return light detected."), sizeof (v)); - break; - case 0x0010: - strncpy (v, _("Flash did not fire, compulsory flash " - "mode."), sizeof (v)); - break; - case 0x0018: - strncpy (v, _("Flash did not fire, auto mode."), - sizeof (v)); - break; - case 0x0019: - strncpy (v, _("Flash fired, auto mode."), sizeof (v)); - break; - case 0x001d: - strncpy (v, _("Flash fired, auto mode, return light " - "not detected."), sizeof (v)); - break; - case 0x001f: - strncpy (v, _("Flash fired, auto mode, return light " - "detected."), sizeof (v)); - break; - case 0x0020: - strncpy (v, _("No flash function."), sizeof (v)); - break; - case 0x0041: - strncpy (v, _("Flash fired, red-eye reduction mode."), - sizeof (v)); - break; - case 0x0045: - strncpy (v, _("Flash fired, red-eye reduction mode, " - "return light not detected."), sizeof (v)); - break; - case 0x0047: - strncpy (v, _("Flash fired, red-eye reduction mode, " - "return light detected."), sizeof (v)); - break; - case 0x0049: - strncpy (v, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode."), sizeof (v)); - break; - case 0x004d: - strncpy (v, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode, return light not " - "detected."), sizeof (v)); - break; - case 0x004f: - strncpy (v, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode, return light " - "detected."), sizeof (v)); - break; - case 0x0059: - strncpy (v, _("Flash fired, auto mode, red-eye " - "reduction mode."), sizeof (v)); - break; - case 0x005d: - strncpy (v, _("Flash fired, auto mode, return light " - "not detected, red-eye reduction mode."), - sizeof (v)); - break; - case 0x005f: - strncpy (v, _("Flash fired, auto mode, return light " - "detected, red-eye reduction mode."), - sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_MAKER_NOTE: - CF (e->format, EXIF_FORMAT_UNDEFINED, v); - snprintf (v, sizeof (v), _("%i bytes unknown data"), - (int) e->components); - break; - case EXIF_TAG_CUSTOM_RENDERED: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Normal process"), sizeof (v)); - break; - case 1: - strncpy (v, _("Custom process"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_EXPOSURE_MODE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Auto exposure"), sizeof (v)); - break; - case 1: - strncpy (v, _("Manual exposure"), sizeof (v)); - break; - case 2: - strncpy (v, _("Auto bracket"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_WHITE_BALANCE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Auto white balance"), sizeof (v)); - break; - case 1: - strncpy (v, _("Manual white balance"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_SCENE_CAPTURE_TYPE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Standard"), sizeof (v)); - break; - case 1: - strncpy (v, _("Landscape"), sizeof (v)); - break; - case 2: - strncpy (v, _("Portrait"), sizeof (v)); - break; - case 3: - strncpy (v, _("Night scene"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_GAIN_CONTROL: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Normal"), sizeof (v)); - break; - case 1: - strncpy (v, _("Low gain up"), sizeof (v)); - break; - case 2: - strncpy (v, _("High gain up"), sizeof (v)); - break; - case 3: - strncpy (v, _("Low gain down"), sizeof (v)); - break; - case 4: - strncpy (v, _("High gain down"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_SATURATION: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Normal"), sizeof (v)); - break; - case 1: - strncpy (v, _("Low saturation"), sizeof (v)); - break; - case 2: - strncpy (v, _("High saturation"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_CONTRAST: - case EXIF_TAG_SHARPNESS: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Normal"), sizeof (v)); - break; - case 1: - strncpy (v, _("Soft"), sizeof (v)); - break; - case 2: - strncpy (v, _("Hard"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_SUBJECT_DISTANCE_RANGE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("Unknown"), sizeof (v)); - break; - case 1: - strncpy (v, _("Macro"), sizeof (v)); - break; - case 2: - strncpy (v, _("Close view"), sizeof (v)); - break; - case 3: - strncpy (v, _("Distant view"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_SUBJECT_AREA: - CF (e->format, EXIF_FORMAT_SHORT, v); - switch (e->components) { - case 2: - v_short = exif_get_short (e->data, o); - v_short2 = exif_get_short (e->data + 2, o); - snprintf (v, sizeof (v), "(x,y) = (%i,%i)", - v_short, v_short2); - break; - case 3: - v_short = exif_get_short (e->data, o); - v_short2 = exif_get_short (e->data + 2, o); - v_short3 = exif_get_short (e->data + 4, o); - snprintf (v, sizeof (v), _("Within distance %i of " - "(x,y) = (%i,%i)"), v_short3, v_short, - v_short2); - break; - case 4: - v_short = exif_get_short (e->data, o); - v_short2 = exif_get_short (e->data + 2, o); - v_short3 = exif_get_short (e->data + 4, o); - v_short4 = exif_get_short (e->data + 6, o); - snprintf (v, sizeof (v), _("Within rectangle " - "(width %i, height %i) around " - "(x,y) = (%i,%i)"), v_short3, v_short4, - v_short, v_short2); - break; - default: - snprintf (v, sizeof (v), _("Unexpected number " - "of components (%li, expected 2, 3, or 4)."), - e->components); - } - default: - if (!e->components) break; - switch (e->format) { - case EXIF_FORMAT_UNDEFINED: - break; - case EXIF_FORMAT_BYTE: - v_byte = e->data[0]; - snprintf (v, sizeof (v), "0x%02x", v_byte); - for (i = 1; i < e->components; i++) { - v_byte = e->data[i]; - snprintf (b, sizeof (b), "0x%02x", v_byte); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - case EXIF_FORMAT_SHORT: - v_short = exif_get_short (e->data, o); - snprintf (v, sizeof (v), "%i", v_short); - for (i = 1; i < e->components; i++) { - v_short = exif_get_short (e->data + - exif_format_get_size (e->format) * - i, o); - snprintf (b, sizeof (b), "%i", v_short); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - case EXIF_FORMAT_LONG: - v_long = exif_get_long (e->data, o); - snprintf (v, sizeof (v), "%i", (int) v_long); - for (i = 1; i < e->components; i++) { - v_long = exif_get_long (e->data + - exif_format_get_size (e->format) * - i, o); - snprintf (b, sizeof (b), "%li", v_long); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - case EXIF_FORMAT_SLONG: - v_slong = exif_get_slong (e->data, o); - snprintf (v, sizeof (v), "%li", v_slong); - for (i = 1; i < e->components; i++) { - v_long = exif_get_slong (e->data + - exif_format_get_size (e->format) * - i, o); - snprintf (b, sizeof (b), "%li", v_long); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - case EXIF_FORMAT_ASCII: - strncpy (v, e->data, MIN (sizeof (v), e->size)); - break; - case EXIF_FORMAT_RATIONAL: - v_rat = exif_get_rational (e->data, o); - snprintf (v, sizeof (v), "%i/%i", - (int) v_rat.numerator, - (int) v_rat.denominator); - for (i = 1; i < e->components; i++) { - v_rat = exif_get_rational ( - e->data + 8 * i, o); - snprintf (b, sizeof (b), "%i/%i", - (int) v_rat.numerator, - (int) v_rat.denominator); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - case EXIF_FORMAT_SRATIONAL: - v_srat = exif_get_srational (e->data, o); - snprintf (v, sizeof (v), "%i/%i", - (int) v_srat.numerator, - (int) v_srat.denominator); - for (i = 1; i < e->components; i++) { - v_srat = exif_get_srational ( - e->data + 8 * i, o); - snprintf (b, sizeof (b), "%i/%i", - (int) v_srat.numerator, - (int) v_srat.denominator); - strncat (v, ", ", sizeof (v)); - strncat (v, b, sizeof (v)); - } - break; - } - } - - return (v); -} - -const char * -exif_entry_get_value_brief (ExifEntry *e) -{ - ExifByteOrder o; - ExifEntry *entry; - static char v[1024]; - ExifRational v_rat; - ExifSRational v_srat; - ExifShort v_short; - double d; - - /* We need the byte order */ - if (!e || !e->parent || !e->parent->parent) - return (NULL); - o = exif_data_get_byte_order (e->parent->parent); - - memset (v, 0, sizeof (v)); - - switch (e->tag) { - case EXIF_TAG_FOCAL_LENGTH: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) - return (NULL); - - /* - * For calculation of the 35mm equivalent, - * Minolta cameras need a multiplier that depends on the - * camera model. - */ - d = (double) v_rat.numerator / (double) v_rat.denominator; - entry = exif_content_get_entry ( - e->parent->parent->ifd[EXIF_IFD_0], EXIF_TAG_MAKE); - if (entry && entry->data && - !strncmp (entry->data, "Minolta", 7)) { - entry = exif_content_get_entry ( - e->parent->parent->ifd[EXIF_IFD_0], - EXIF_TAG_MODEL); - if (entry && entry->data) { - if (!strncmp (entry->data, "DiMAGE 7", 8)) - d *= 3.9; - else if (!strncmp (entry->data, "DiMAGE 5", 8)) - d *= 4.9; - } - } - snprintf (v, sizeof (v), "%dmm", - (int) (d * (double) v_rat.numerator / - (double) v_rat.denominator)); - break; - case EXIF_TAG_EXPOSURE_TIME: - CF (e->format, EXIF_FORMAT_RATIONAL, v); - CC (e->components, 1, v); - v_rat = exif_get_rational (e->data, o); - if (!v_rat.denominator) - return (NULL); - d = (double) v_rat.numerator / (double) v_rat.denominator; - if (d < 1.) - snprintf (v, sizeof (v), "1/%d", (int) (1. / d)); - else - snprintf (v, sizeof (v), "%d", (int) d); - break; - case EXIF_TAG_SHUTTER_SPEED_VALUE: - CF (e->format, EXIF_FORMAT_SRATIONAL, v); - CC (e->components, 1, v); - v_srat = exif_get_srational (e->data, o); - if (!v_srat.denominator) - return (NULL); - d = 1. / pow (2., (double) v_srat.numerator / - (double) v_srat.denominator); - if (d < 1.) - snprintf (v, sizeof (v), "1/%d", (int) (1. / d)); - else - snprintf (v, sizeof (v), "%d", (int) d); - break; - case EXIF_TAG_METERING_MODE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("unknown"), sizeof (v)); - break; - case 1: - strncpy (v, _("average"), sizeof (v)); - break; - case 2: - strncpy (v, _("center-weight"), sizeof (v)); - break; - case 3: - strncpy (v, _("spot"), sizeof (v)); - break; - case 4: - strncpy (v, _("multi-spot"), sizeof (v)); - break; - case 5: - strncpy (v, _("matrix"), sizeof (v)); - break; - case 6: - strncpy (v, _("partial"), sizeof (v)); - break; - case 255: - strncpy (v, _("other"), sizeof (v)); - break; - default: - snprintf (v, sizeof (v), "%i", v_short); - break; - } - break; - case EXIF_TAG_LIGHT_SOURCE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (v, _("sunny"), sizeof (v)); - break; - case 1: - strncpy (v, _("fluorescent"), sizeof (v)); - break; - case 2: - strncpy (v, _("tungsten"), sizeof (v)); - break; - case 3: - strncpy (v, _("cloudy"), sizeof (v)); - break; - default: - return (exif_entry_get_value (e)); - } - break; - case EXIF_TAG_RESOLUTION_UNIT: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 2: - strncpy (v, _("in"), sizeof (v)); - break; - case 3: - strncpy (v, _("cm"), sizeof (v)); - break; - default: - return (NULL); - } - break; - case EXIF_TAG_EXPOSURE_PROGRAM: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (v, _("manual"), sizeof (v)); - break; - case 2: - strncpy (v, _("normal"), sizeof (v)); - break; - case 3: - strncpy (v, _("aperture"), sizeof (v)); - break; - case 4: - strncpy (v, _("shutter"), sizeof (v)); - break; - case 5: - strncpy (v, _("creative"), sizeof (v)); - break; - case 6: - strncpy (v, _("action"), sizeof (v)); - break; - case 7: - strncpy (v, _("portrait"), sizeof (v)); - break; - case 8: - strncpy (v, _("landscape"), sizeof (v)); - break; - default: - return (exif_entry_get_value (e)); - } - break; - case EXIF_TAG_FLASH: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0x0001: - strncpy (v, _("yes"), sizeof (v)); - break; - case 0x0005: - strncpy (v, _("w/o strobe"), sizeof (v)); - break; - case 0x0007: - strncpy (v, _("w. strobe"), sizeof (v)); - break; - default: - return (exif_entry_get_value (e)); - } - break; - default: - return (exif_entry_get_value (e)); - } - - return (v); -} - -void -exif_entry_initialize (ExifEntry *e, ExifTag tag) -{ - time_t t; - struct tm *tm; - ExifRational r; - ExifByteOrder o; - - /* We need the byte order */ - if (!e || !e->parent || e->data || !e->parent->parent) - return; - o = exif_data_get_byte_order (e->parent->parent); - - e->tag = tag; - switch (tag) { - - /* LONG, 1 component, no default */ - case EXIF_TAG_EXIF_IFD_POINTER: - case EXIF_TAG_GPS_INFO_IFD_POINTER: - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH: - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - e->components = 1; - e->format = EXIF_FORMAT_LONG; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memset (e->data, 0, e->size); - break; - - /* SHORT, 1 component, no default */ - case EXIF_TAG_SUBJECT_LOCATION: - case EXIF_TAG_SENSING_METHOD: - case EXIF_TAG_PHOTOMETRIC_INTERPRETATION: - case EXIF_TAG_COMPRESSION: - case EXIF_TAG_EXPOSURE_MODE: - case EXIF_TAG_WHITE_BALANCE: - case EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM: - case EXIF_TAG_GAIN_CONTROL: - case EXIF_TAG_SUBJECT_DISTANCE_RANGE: - - /* SHORT, 1 component, default 0 */ - case EXIF_TAG_IMAGE_WIDTH: - case EXIF_TAG_IMAGE_LENGTH: - case EXIF_TAG_EXPOSURE_PROGRAM: - case EXIF_TAG_LIGHT_SOURCE: - case EXIF_TAG_METERING_MODE: - case EXIF_TAG_CUSTOM_RENDERED: - case EXIF_TAG_SCENE_CAPTURE_TYPE: - case EXIF_TAG_CONTRAST: - case EXIF_TAG_SATURATION: - case EXIF_TAG_SHARPNESS: - e->components = 1; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 0); - break; - - /* SHORT, 1 component, default 1 */ - case EXIF_TAG_ORIENTATION: - case EXIF_TAG_PLANAR_CONFIGURATION: - case EXIF_TAG_YCBCR_POSITIONING: - e->components = 1; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 1); - break; - - /* SHORT, 1 component, default 2 */ - case EXIF_TAG_RESOLUTION_UNIT: - case EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT: - e->components = 1; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 2); - break; - - /* SHORT, 1 component, default 3 */ - case EXIF_TAG_SAMPLES_PER_PIXEL: - e->components = 1; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 3); - break; - - case EXIF_TAG_BITS_PER_SAMPLE: - e->components = 3; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 8); - exif_set_short ( - e->data + exif_format_get_size (e->format), - o, 8); - exif_set_short ( - e->data + 2 * exif_format_get_size (e->format), - o, 8); - break; - case EXIF_TAG_YCBCR_SUB_SAMPLING: - e->components = 2; - e->format = EXIF_FORMAT_SHORT; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - exif_set_short (e->data, o, 2); - exif_set_short ( - e->data + exif_format_get_size (e->format), - o, 1); - break; - - /* SRATIONAL, 1 component, no default */ - case EXIF_TAG_EXPOSURE_BIAS_VALUE: - case EXIF_TAG_BRIGHTNESS_VALUE: - case EXIF_TAG_SHUTTER_SPEED_VALUE: - e->components = 1; - e->format = EXIF_FORMAT_SRATIONAL; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memset (e->data, 0, e->size); - break; - - /* RATIONAL, 1 component, no default */ - case EXIF_TAG_EXPOSURE_TIME: - case EXIF_TAG_FOCAL_PLANE_X_RESOLUTION: - case EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION: - case EXIF_TAG_EXPOSURE_INDEX: - case EXIF_TAG_FLASH_ENERGY: - case EXIF_TAG_FNUMBER: - case EXIF_TAG_FOCAL_LENGTH: - case EXIF_TAG_SUBJECT_DISTANCE: - case EXIF_TAG_MAX_APERTURE_VALUE: - case EXIF_TAG_APERTURE_VALUE: - case EXIF_TAG_COMPRESSED_BITS_PER_PIXEL: - case EXIF_TAG_PRIMARY_CHROMATICITIES: - case EXIF_TAG_DIGITAL_ZOOM_RATIO: - e->components = 1; - e->format = EXIF_FORMAT_RATIONAL; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memset (e->data, 0, e->size); - break; - - /* RATIONAL, 1 component, default 72/1 */ - case EXIF_TAG_X_RESOLUTION: - case EXIF_TAG_Y_RESOLUTION: - e->components = 1; - e->format = EXIF_FORMAT_RATIONAL; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - r.numerator = 72; - r.denominator = 1; - exif_set_rational (e->data, o, r); - break; - - /* RATIONAL, 2 components, no default */ - case EXIF_TAG_WHITE_POINT: - e->components = 2; - e->format = EXIF_FORMAT_RATIONAL; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memset (e->data, 0, e->size); - break; - - /* RATIONAL, 6 components */ - case EXIF_TAG_REFERENCE_BLACK_WHITE: - e->components = 6; - e->format = EXIF_FORMAT_RATIONAL; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - r.denominator = 1; - r.numerator = 0; - exif_set_rational (e->data, o, r); - r.numerator = 255; - exif_set_rational ( - e->data + exif_format_get_size (e->format), o, r); - r.numerator = 0; - exif_set_rational ( - e->data + 2 * exif_format_get_size (e->format), o, r); - r.numerator = 255; - exif_set_rational ( - e->data + 3 * exif_format_get_size (e->format), o, r); - r.numerator = 0; - exif_set_rational ( - e->data + 4 * exif_format_get_size (e->format), o, r); - r.numerator = 255; - exif_set_rational ( - e->data + 5 * exif_format_get_size (e->format), o, r); - break; - case EXIF_TAG_DATE_TIME: - case EXIF_TAG_DATE_TIME_ORIGINAL: - case EXIF_TAG_DATE_TIME_DIGITIZED: - t = time (NULL); - tm = localtime (&t); - e->components = 20; - e->format = EXIF_FORMAT_ASCII; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - snprintf ((char *) e->data, e->size, - "%04i:%02i:%02i %02i:%02i:%02i", - tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - break; - case EXIF_TAG_IMAGE_DESCRIPTION: - case EXIF_TAG_MAKE: - case EXIF_TAG_MODEL: - case EXIF_TAG_SOFTWARE: - case EXIF_TAG_ARTIST: - e->components = strlen ("[None]") + 1; - e->format = EXIF_FORMAT_ASCII; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - strncpy (e->data, "[None]", e->size); - break; - case EXIF_TAG_COPYRIGHT: - e->components = (strlen ("[None]") + 1) * 2; - e->format = EXIF_FORMAT_ASCII; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - strcpy (e->data + 0, "[None]"); - strcpy (e->data + strlen ("[None]") + 1, "[None]"); - break; - - /* UNDEFINED, no components, no default */ - case EXIF_TAG_USER_COMMENT: - e->components = 0; - e->format = EXIF_FORMAT_UNDEFINED; - e->size = 0; - e->data = 0; - break; - - /* UNDEFINED, 1 component, default 1 */ - case EXIF_TAG_SCENE_TYPE: - e->components = 1; - e->format = EXIF_FORMAT_UNDEFINED; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - e->data[0] = 0x01; - break; - - /* UNDEFINED, 1 component, default 3 */ - case EXIF_TAG_FILE_SOURCE: - e->components = 1; - e->format = EXIF_FORMAT_UNDEFINED; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - e->data[0] = 0x03; - break; - - /* UNDEFINED, 4 components, default 0 1 0 0 */ - case EXIF_TAG_FLASH_PIX_VERSION: - e->components = 4; - e->format = EXIF_FORMAT_UNDEFINED; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memcpy (e->data, "0100", 4); - break; - - /* UNDEFINED, 4 components, default 0 2 1 0 */ - case EXIF_TAG_EXIF_VERSION: - e->components = 4; - e->format = EXIF_FORMAT_UNDEFINED; - e->size = exif_format_get_size (e->format) * e->components; - e->data = malloc (e->size); - memcpy (e->data, "0210", 4); - break; - - default: - break; - } -} diff -Nru gimageview-0.2.27/lib/libexif/exif-entry.h gimageview-0.3.0-0.20101117/lib/libexif/exif-entry.h --- gimageview-0.2.27/lib/libexif/exif-entry.h 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-entry.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/* exif-entry.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_ENTRY_H__ -#define __EXIF_ENTRY_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef struct _ExifEntry ExifEntry; -typedef struct _ExifEntryPrivate ExifEntryPrivate; - -#include -#include - -struct _ExifEntry { - ExifTag tag; - ExifFormat format; - unsigned long components; - - unsigned char *data; - unsigned int size; - - /* Content containing this entry */ - ExifContent *parent; - - ExifEntryPrivate *priv; -}; - -/* Lifecycle */ -ExifEntry *exif_entry_new (void); -void exif_entry_ref (ExifEntry *entry); -void exif_entry_unref (ExifEntry *entry); -void exif_entry_free (ExifEntry *entry); - -void exif_entry_initialize (ExifEntry *entry, ExifTag tag); - -/* For your convenience */ -const char *exif_entry_get_value (ExifEntry *entry); -const char *exif_entry_get_value_brief (ExifEntry *entry); - -void exif_entry_dump (ExifEntry *entry, unsigned int indent); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_ENTRY_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-format.c gimageview-0.3.0-0.20101117/lib/libexif/exif-format.c --- gimageview-0.2.27/lib/libexif/exif-format.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-format.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/* exif-format.c - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-format.h" -#include "i18n.h" - -#include - -static struct { - ExifFormat format; - const char *name; - unsigned char size; -} ExifFormatTable[] = { - {EXIF_FORMAT_BYTE, "Byte", 1}, - {EXIF_FORMAT_ASCII, "Ascii", 1}, - {EXIF_FORMAT_SHORT, "Short", 2}, - {EXIF_FORMAT_LONG, "Long", 4}, - {EXIF_FORMAT_RATIONAL, "Rational", 8}, - {EXIF_FORMAT_SLONG, "SLong", 4}, - {EXIF_FORMAT_SRATIONAL, "SRational", 8}, - {EXIF_FORMAT_UNDEFINED, N_("Undefined"), 1}, - {0, NULL, 0} -}; - -const char * -exif_format_get_name (ExifFormat format) -{ - unsigned int i; - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); - - for (i = 0; ExifFormatTable[i].name; i++) - if (ExifFormatTable[i].format == format) - return (_(ExifFormatTable[i].name)); - return (NULL); -} - -unsigned char -exif_format_get_size (ExifFormat format) -{ - unsigned int i; - - for (i = 0; ExifFormatTable[i].size; i++) - if (ExifFormatTable[i].format == format) - return (ExifFormatTable[i].size); - return (0); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-format.h gimageview-0.3.0-0.20101117/lib/libexif/exif-format.h --- gimageview-0.2.27/lib/libexif/exif-format.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-format.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/* exif-format.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_FORMAT_H__ -#define __EXIF_FORMAT_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef enum { - EXIF_FORMAT_BYTE = 1, - EXIF_FORMAT_ASCII = 2, - EXIF_FORMAT_SHORT = 3, - EXIF_FORMAT_LONG = 4, - EXIF_FORMAT_RATIONAL = 5, - EXIF_FORMAT_UNDEFINED = 7, - EXIF_FORMAT_SLONG = 9, - EXIF_FORMAT_SRATIONAL = 10 -} ExifFormat; - -const char *exif_format_get_name (ExifFormat format); -unsigned char exif_format_get_size (ExifFormat format); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_FORMAT_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-ifd.c gimageview-0.3.0-0.20101117/lib/libexif/exif-ifd.c --- gimageview-0.2.27/lib/libexif/exif-ifd.c 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-ifd.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -/* exif-ifd.c - * - * Copyright © 2002 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-ifd.h" - -#include - -static struct { - ExifIfd ifd; - const char *name; -} ExifIfdTable[] = { - {EXIF_IFD_0, "0"}, - {EXIF_IFD_1, "1"}, - {EXIF_IFD_EXIF, "EXIF"}, - {EXIF_IFD_GPS, "GPS"}, - {EXIF_IFD_INTEROPERABILITY, "Interoperability"}, - {0, NULL} -}; - -const char * -exif_ifd_get_name (ExifIfd ifd) -{ - unsigned int i; - - for (i = 0; ExifIfdTable[i].name; i++) - if (ExifIfdTable[i].ifd == ifd) - break; - - return (ExifIfdTable[i].name); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-ifd.h gimageview-0.3.0-0.20101117/lib/libexif/exif-ifd.h --- gimageview-0.2.27/lib/libexif/exif-ifd.h 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-ifd.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* exif-ifd.h - * - * Copyright © 2002 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_IFD_H__ -#define __EXIF_IFD_H__ - -typedef enum { - EXIF_IFD_0 = 0, - EXIF_IFD_1, - EXIF_IFD_EXIF, - EXIF_IFD_GPS, - EXIF_IFD_INTEROPERABILITY, - EXIF_IFD_COUNT -} ExifIfd; - -const char *exif_ifd_get_name (ExifIfd ifd); - -#endif /* __EXIF_IFD_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-loader.c gimageview-0.3.0-0.20101117/lib/libexif/exif-loader.c --- gimageview-0.2.27/lib/libexif/exif-loader.c 2004-09-18 12:25:39.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-loader.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -#include -#include "exif-loader.h" - -#include -#include - -#include - -typedef enum { - EL_READ = 0, - EL_READ_SIZE_HIGH_BYTE, - EL_READ_SIZE_LOW_BYTE, - EL_SKIP_BYTES, - EL_EXIF_FOUND, - EL_FAILED -} ExifLoaderState; - -struct _ExifLoader { - ExifLoaderState state; - - int size; - int last_marker; - unsigned char *buf; - int bytes_read; - - unsigned int ref_count; -}; - -#undef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - -/* This function imitates code from libexif, written by Lutz - * M-Aüller. See libexif/exif-data.c:exif_data_new_from_file. Here, it$)B - * can cope with a sequence of data chunks. - */ -unsigned char -exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len) -{ - unsigned int i; - int len_remain; - - if (!eld) return 0; - if (eld->state == EL_FAILED) return 0; - if (eld->size && eld->bytes_read == eld->size) return 0; - - for (i = 0; (i < len) && (eld->state != EL_EXIF_FOUND) && - (eld->state != EL_FAILED); i++) { - - switch (eld->state) { - case EL_SKIP_BYTES: - eld->size--; - if (eld->size == 0) { - eld->state = EL_READ; - } - break; - - case EL_READ_SIZE_HIGH_BYTE: - eld->size = buf [i] << 8; - eld->state = EL_READ_SIZE_LOW_BYTE; - break; - - case EL_READ_SIZE_LOW_BYTE: - eld->size |= buf [i]; - - switch (eld->last_marker) { - case JPEG_MARKER_APP0: - eld->state = EL_SKIP_BYTES; - break; - - case JPEG_MARKER_APP1: - eld->state = EL_EXIF_FOUND; - break; - - case 0: - /* - * Assume that we are reading EXIF data. - * This should probably be verified by reading - * some bytes ahead. - */ - eld->state = EL_EXIF_FOUND; - break; - default: - return 0; - } - - eld->last_marker = 0; - break; - - default: - if (buf[i] != 0xff) { - if (buf [i] == JPEG_MARKER_APP0 || - buf [i] == JPEG_MARKER_APP1) { - eld->state = EL_READ_SIZE_HIGH_BYTE; - eld->last_marker = buf [i]; - - } else if (buf [i] == JPEG_MARKER_SOI) { - /* Nothing */ - } else { - /* Assume that we are reading EXIF - * data. This should probably be - * verified by reading some bytes - * ahead. - */ - eld->last_marker = JPEG_MARKER_APP1; - eld->state = EL_READ_SIZE_HIGH_BYTE; - i--; - } - } - } - } - - len_remain = len - i; - if (!len_remain) return 1; - - if (eld->state == EL_EXIF_FOUND && len_remain > 0) { - if (eld->buf == NULL) { - eld->buf = malloc (sizeof (unsigned char) * eld->size); - eld->bytes_read = 0; - } - - if (eld->bytes_read < eld->size) { - int cp_len; - - /* the number of bytes we need to copy */ - cp_len = MIN (eld->size - eld->bytes_read, len_remain); - - if ((cp_len + eld->bytes_read) > eld->size) return 1; - - /* Copy memory */ - memcpy (eld->buf + eld->bytes_read, &buf[i], cp_len); - eld->bytes_read += cp_len; - } - } - - return 1; -} - -ExifLoader * -exif_loader_new (void) -{ - ExifLoader *loader = malloc (sizeof (ExifLoader)); - - memset (loader, 0, sizeof (ExifLoader)); - loader->ref_count = 1; - - return loader; -} - -void -exif_loader_ref (ExifLoader *loader) -{ - if (loader) loader->ref_count++; -} - -void -exif_loader_unref (ExifLoader *loader) -{ - if (!loader) return; - if (!--loader->ref_count) { - exif_loader_reset (loader); - free (loader); - } -} - -void -exif_loader_reset (ExifLoader *loader) -{ - if (!loader) return; - free (loader->buf); loader->buf = NULL; - loader->size = 0; - loader->bytes_read = 0; - loader->last_marker = 0; - loader->state = 0; -} - -ExifData * -exif_loader_get_data (ExifLoader *loader) -{ - return exif_data_new_from_data (loader->buf, loader->bytes_read); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-loader.h gimageview-0.3.0-0.20101117/lib/libexif/exif-loader.h --- gimageview-0.2.27/lib/libexif/exif-loader.h 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-loader.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/* exif-loader.h - * - * Copyright © 2003 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_LOADER_H__ -#define __EXIF_LOADER_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef struct _ExifLoader ExifLoader; - -ExifLoader *exif_loader_new (void); -void exif_loader_ref (ExifLoader *); -void exif_loader_unref (ExifLoader *); - -/* - * Returns 1 while EXIF data is read (or while there is still - * hope that there will be EXIF data later on), 0 otherwise. - */ -unsigned char exif_loader_write (ExifLoader *, unsigned char *, unsigned int); - -void exif_loader_reset (ExifLoader *); -ExifData *exif_loader_get_data (ExifLoader *); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_LOADER_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-result.h gimageview-0.3.0-0.20101117/lib/libexif/exif-result.h --- gimageview-0.2.27/lib/libexif/exif-result.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-result.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/* exif-result.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_RESULT_H__ -#define __EXIF_RESULT_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef enum { - EXIF_OK, - EXIF_ERROR -} ExifResult; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_RESULT_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-tag.c gimageview-0.3.0-0.20101117/lib/libexif/exif-tag.c --- gimageview-0.2.27/lib/libexif/exif-tag.c 2004-05-23 14:07:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-tag.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,614 +0,0 @@ -/* exif-tag.c - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-tag.h" -#include "i18n.h" - -#include - -static struct { - ExifTag tag; - const char *name; - const char *title; - const char *description; -} ExifTagTable[] = { - {EXIF_TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex", - "InteroperabilityIndex", - N_("Indicates the identification of the Interoperability rule. " - "Use \"R98\" for stating ExifR98 Rules. Four bytes used " - "including the termination code (NULL). see the separate " - "volume of Recommended Exif Interoperability Rules (ExifR98) " - "for other tags used for ExifR98.")}, - {EXIF_TAG_INTEROPERABILITY_VERSION, "InteroperabilityVersion", - "InteroperabilityVersion", ""}, - {EXIF_TAG_IMAGE_WIDTH, "ImageWidth", N_("Image Width"), - N_("The number of colums of image data, equal to the number of " - "pixels per row. In JPEG compressed data a JPEG marker is " - "used instead of this tag.")}, - {EXIF_TAG_IMAGE_LENGTH, "ImageLength", N_("Image Length"), - N_("The number of rows of image data. In JPEG compressed data a " - "JPEG marker is used instead of this tag.")}, - {EXIF_TAG_BITS_PER_SAMPLE, "BitsPerSample", N_("Bits per Sample"), - N_("The number of bits per image component. In this standard each " - "component of the image is 8 bits, so the value for this " - "tag is 9. See also . In JPEG compressed data " - "a JPEG marker is used instead of this tag.")}, - {EXIF_TAG_COMPRESSION, "Compression", N_("Compression"), - N_("The compression scheme used for the image data. When a " - "primary image is JPEG compressed, this designation is " - "not necessary and is omitted. When thumbnails use JPEG " - "compression, this tag value is set to 6.")}, - {EXIF_TAG_PHOTOMETRIC_INTERPRETATION, "PhotometricInterpretation", - N_("Photometric Interpretation"), - N_("The pixel composition. In JPEG compressed data a JPEG " - "marker is used instead of this tag.")}, - {EXIF_TAG_FILL_ORDER, "FillOrder", N_("Fill Order"), ""}, - {EXIF_TAG_DOCUMENT_NAME, "DocumentName", N_("Document Name"), ""}, - {EXIF_TAG_IMAGE_DESCRIPTION, "ImageDescription", - N_("Image Description"), - N_("A character string giving the title of the image. It may be " - "a comment such as \"1988 company picnic\" or " - "the like. Two-bytes character codes cannot be used. " - "When a 2-bytes code is necessary, the Exif Private tag " - " is to be used.")}, - {EXIF_TAG_MAKE, "Make", N_("Manufacturer"), - N_("The manufacturer of the recording " - "equipment. This is the manufacturer of the DSC, scanner, " - "video digitizer or other equipment that generated the " - "image. When the field is left blank, it is treated as " - "unknown.")}, - {EXIF_TAG_MODEL, "Model", N_("Model"), - N_("The model name or model number of the equipment. This is the " - "model name or number of the DSC, scanner, video digitizer " - "or other equipment that generated the image. When the field " - "is left blank, it is treated as unknown.")}, - {EXIF_TAG_STRIP_OFFSETS, "StripOffsets", N_("Strip Offsets"), - N_("For each strip, the byte offset of that strip. It is " - "recommended that this be selected so the number of strip " - "bytes does not exceed 64 Kbytes. With JPEG compressed " - "data this designation is not needed and is omitted. See also " - " and .")}, - {EXIF_TAG_ORIENTATION, "Orientation", N_("Orientation"), - N_("The image orientation viewed in terms of rows and colums.")}, - {EXIF_TAG_SAMPLES_PER_PIXEL, "SamplesPerPixel", - N_("Samples per Pixel"), - N_("The number of components per pixel. Since this standard applies " - "to RGB and YCbCr images, the value set for this tag is 3. " - "In JPEG compressed data a JPEG marker is used instead of this " - "tag.")}, - {EXIF_TAG_ROWS_PER_STRIP, "RowsPerStrip", N_("Rows per Strip"), - N_("The number of rows per strip. This is the number of rows " - "in the image of one strip when an image is divided into " - "strips. With JPEG compressed data this designation is not " - "needed and is omitted. See also and " - ".")}, - {EXIF_TAG_STRIP_BYTE_COUNTS, "StripByteCounts", N_("Strip Byte Count"), - N_("The total number of bytes in each strip. With JPEG compressed " - "data this designation is not needed and is omitted.")}, - {EXIF_TAG_X_RESOLUTION, "XResolution", N_("x-Resolution"), - N_("The number of pixels per in the " - "direction. When the image resolution is unknown, 72 [dpi] " - "is designated.")}, - {EXIF_TAG_Y_RESOLUTION, "YResolution", N_("y-Resolution"), - N_("The number of pixels per in the " - "direction. The same value as is designated.")}, - {EXIF_TAG_PLANAR_CONFIGURATION, "PlanarConfiguration", - N_("Planar Configuration"), - N_("Indicates whether pixel components are recorded in a chunky " - "or planar format. In JPEG compressed files a JPEG marker " - "is used instead of this tag. If this field does not exist, " - "the TIFF default of 1 (chunky) is assumed.")}, - {EXIF_TAG_RESOLUTION_UNIT, "ResolutionUnit", N_("Resolution Unit"), - N_("The unit for measuring and . The same " - "unit is used for both and . If " - "the image resolution is unknown, 2 (inches) is designated.")}, - {EXIF_TAG_TRANSFER_FUNCTION, "TransferFunction", - N_("Transfer Function"), - N_("A transfer function for the image, described in tabular style. " - "Normally this tag is not necessary, since color space is " - "specified in the color space information tag ().")}, - {EXIF_TAG_SOFTWARE, "Software", N_("Software"), - N_("This tag records the name and version of the software or " - "firmware of the camera or image input device used to " - "generate the image. The detailed format is not specified, but " - "it is recommended that the example shown below be " - "followed. When the field is left blank, it is treated as " - "unknown.")}, - {EXIF_TAG_DATE_TIME, "DateTime", N_("Date and Time"), - N_("The date and time of image creation. In this standard " - "(EXIF-2.1) it is the date and time the file was changed.")}, - {EXIF_TAG_ARTIST, "Artist", N_("Artist"), - N_("This tag records the name of the camera owner, photographer or " - "image creator. The detailed format is not specified, but it is " - "recommended that the information be written as in the example " - "below for ease of Interoperability. When the field is " - "left blank, it is treated as unknown.")}, - {EXIF_TAG_WHITE_POINT, "WhitePoint", N_("White Point"), - N_("The chromaticity of the white point of the image. Normally " - "this tag is not necessary, since color space is specified " - "in the colorspace information tag ().")}, - {EXIF_TAG_PRIMARY_CHROMATICITIES, "PrimaryChromaticities", - N_("Primary Chromaticities"), - N_("The chromaticity of the three primary colors of the image. " - "Normally this tag is not necessary, since colorspace is " - "specified in the colorspace information tag ().")}, - {EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""}, - {EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""}, - {EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat", - N_("JPEG Interchange Format"), - N_("The offset to the start byte (SOI) of JPEG compressed " - "thumbnail data. This is not used for primary image " - "JPEG data.")}, - {EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, - "JPEGInterchangeFormatLength", N_("JPEG Interchange Format Length"), - N_("The number of bytes of JPEG compressed thumbnail data. This " - "is not used for primary image JPEG data. JPEG thumbnails " - "are not divided but are recorded as a continuous JPEG " - "bitstream from SOI to EOI. Appn and COM markers should " - "not be recorded. Compressed thumbnails must be recorded in no " - "more than 64 Kbytes, including all other data to be " - "recorded in APP1.")}, - {EXIF_TAG_YCBCR_COEFFICIENTS, "YCbCrCoefficients", - N_("YCbCr Coefficients"), - N_("The matrix coefficients for transformation from RGB to YCbCr " - "image data. No default is given in TIFF; but here the " - "value given in Appendix E, \"Color Space Guidelines\", is used " - "as the default. The color space is declared in a " - "color space information tag, with the default being the value " - "that gives the optimal image characteristics " - "Interoperability this condition.")}, - {EXIF_TAG_YCBCR_SUB_SAMPLING, "YCbCrSubSampling", - N_("YCbCr Sub-Sampling"), - N_("The sampling ratio of chrominance components in relation to the " - "luminance component. In JPEG compressed data a JPEG marker " - "is used instead of this tag.")}, - {EXIF_TAG_YCBCR_POSITIONING, "YCbCrPositioning", - N_("YCbCr Positioning"), - N_("The position of chrominance components in relation to the " - "luminance component. This field is designated only for " - "JPEG compressed data or uncompressed YCbCr data. The TIFF " - "default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is " - "recommended in this standard that 2 (co-sited) be used to " - "record data, in order to improve the image quality when viewed " - "on TV systems. When this field does not exist, the reader shall " - "assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the " - "TIFF default (centered) is recommended. If the reader " - "does not have the capability of supporting both kinds of " - ", it shall follow the TIFF default regardless " - "of the value in this field. It is preferable that readers " - "be able to support both centered and co-sited positioning.")}, - {EXIF_TAG_REFERENCE_BLACK_WHITE, "ReferenceBlackWhite", - N_("Reference Black/White"), - N_("The reference black point value and reference white point " - "value. No defaults are given in TIFF, but the values " - "below are given as defaults here. The color space is declared " - "in a color space information tag, with the default " - "being the value that gives the optimal image characteristics " - "Interoperability these conditions.")}, - {EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat", - "RelatedImageFileFormat", ""}, - {EXIF_TAG_RELATED_IMAGE_WIDTH, "RelatedImageWidth", - "RelatedImageWidth", ""}, - {EXIF_TAG_RELATED_IMAGE_LENGTH, "RelatedImageLength", - "RelatedImageLength", ""}, - {EXIF_TAG_CFA_REPEAT_PATTERN_DIM, "CFARepeatPatternDim", - "CFARepeatPatternDim", ""}, - {EXIF_TAG_CFA_PATTERN, "CFAPattern", - N_("CFA Pattern"), - N_("Indicates the color filter array (CFA) geometric pattern of the " - "image sensor when a one-chip color area sensor is used. " - "It does not apply to all sensing methods.")}, - {EXIF_TAG_BATTERY_LEVEL, "BatteryLevel", N_("Battery Level"), ""}, - {EXIF_TAG_COPYRIGHT, "Copyright", N_("Copyright"), - N_("Copyright information. In this standard the tag is used to " - "indicate both the photographer and editor copyrights. It is " - "the copyright notice of the person or organization claiming " - "rights to the image. The Interoperability copyright " - "statement including date and rights should be written in this " - "field; e.g., \"Copyright, John Smith, 19xx. All rights " - "reserved.\". In this standard the field records both the " - "photographer and editor copyrights, with each recorded in a " - "separate part of the statement. When there is a clear " - "distinction between the photographer and editor copyrights, " - "these are to be written in the order of photographer followed " - "by editor copyright, separated by NULL (in this case, " - "since the statement also ends with a NULL, there are two NULL " - "codes) (see example 1). When only the photographer is given, " - "it is terminated by one NULL code (see example 2). When only " - "the editor copyright is given, " - "the photographer copyright part consists of one space followed " - "by a terminating NULL code, then the editor copyright is given " - "(see example 3). When the field is left blank, it is treated " - "as unknown.")}, - {EXIF_TAG_EXPOSURE_TIME, "ExposureTime", N_("Exposure Time"), - N_("Exposure time, given in seconds (sec).")}, - {EXIF_TAG_FNUMBER, "FNumber", "FNumber", - N_("The F number.")}, - {EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""}, - {EXIF_TAG_EXIF_IFD_POINTER, "ExifIFDPointer", "ExifIFDPointer", - N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the " - "same structure as that of the IFD specified in TIFF. " - "ordinarily, however, it does not contain image data as in " - "the case of TIFF.")}, - {EXIF_TAG_INTER_COLOR_PROFILE, "InterColorProfile", - "InterColorProfile", ""}, - {EXIF_TAG_EXPOSURE_PROGRAM, "ExposureProgram", "ExposureProgram", - N_("The class of the program used by the camera to set exposure " - "when the picture is taken.")}, - {EXIF_TAG_SPECTRAL_SENSITIVITY, "SpectralSensitivity", - N_("Spectral Sensitivity"), - N_("Indicates the spectral sensitivity of each channel of the " - "camera used. The tag value is an ASCII string compatible " - "with the standard developed by the ASTM Technical committee.")}, - {EXIF_TAG_GPS_INFO_IFD_POINTER, "GPSInfoIFDPointer", - "GPSInfoIFDPointer", - N_("A pointer to the GPS Info IFD. The " - "Interoperability structure of the GPS Info IFD, like that of " - "Exif IFD, has no image data.")}, -#if 0 - {EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", "", - N_("Indicates the version of . The version is given " - "as 2.0.0.0. This tag is mandatory when tag is " - "present. (Note: The tag. When the version is " - "2.0.0.0, the tag value is 02000000.H).")}, - {EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", "" - N_("Indicates whether the latitude is north or south latitude. The " - "ASCII value 'N' indicates north latitude, and 'S' is south " - "latitude.")}, - {EXIF_TAG_GPS_LATITUDE, "GPSLatitude", "" - N_("Indicates the latitude. The latitude is expressed as three " - "RATIONAL values giving the degrees, minutes, and seconds, " - "respectively. When degrees, minutes and seconds are expressed, " - "the format is dd/1,mm/1,ss/1. When degrees and minutes are used " - "and, for example, fractions of minutes are given up to two " - "two decimal places, the format is dd/1,mmmm/100,0/1.")}, - {EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", "" - N_("Indicates whether the longitude is east or west longitude. " - "ASCII 'E' indicates east longitude, and 'W' is west " - "longitude.")}, - {EXIF_TAG_GPS_LONGITUDE, "GPSLongitude", "" - N_("Indicates the longitude. The longitude is expressed as three " - "RATIONAL values giving the degrees, minutes, and seconds, " - "respectively. When degrees, minutes and seconds are expressed, " - "the format is ddd/1,mm/1,ss/1. When degrees and minutes are " - "used and, for example, fractions of minutes are given up to " - "two decimal places, the format is ddd/1,mmmm/100,0/1.")}, -#endif - {EXIF_TAG_ISO_SPEED_RATINGS, "ISOSpeedRatings", - N_("ISO Speed Ratings"), - N_("Indicates the ISO Speed and ISO Latitude of the camera or " - "input device as specified in ISO 12232.")}, - {EXIF_TAG_OECF, "OECF", "OECF", - N_("Indicates the Opto-Electoric Conversion Function (OECF) " - "specified in ISO 14524. is the relationship between " - "the camera optical input and the image values.")}, - {EXIF_TAG_EXIF_VERSION, "ExifVersion", N_("Exif Version"), - N_("The version of this standard supported. Nonexistence of this " - "field is taken to mean nonconformance to the standard.")}, - {EXIF_TAG_DATE_TIME_ORIGINAL, "DateTimeOriginal", - N_("Date and Time (original)"), - N_("The date and time when the original image data was generated. " - "For a digital still camera " - "the date and time the picture was taken are recorded.")}, - {EXIF_TAG_DATE_TIME_DIGITIZED, "DateTimeDigitized", - N_("Date and Time (digitized)"), - N_("The date and time when the image was stored as digital data. ")}, - {EXIF_TAG_COMPONENTS_CONFIGURATION, "ComponentsConfiguration", - "ComponentsConfiguration", - N_("Information specific to compressed data. The channels of " - "each component are arranged in order from the 1st " - "component to the 4th. For uncompressed data the data " - "arrangement is given in the tag. " - "However, since can only " - "express the order of Y, Cb and Cr, this tag is provided " - "for cases when compressed data uses components other than " - "Y, Cb, and Cr and to enable support of other sequences.")}, - {EXIF_TAG_COMPRESSED_BITS_PER_PIXEL, "CompressedBitsPerPixel", - N_("Compressed Bits per Pixel"), - N_("Information specific to compressed data. The compression mode " - "used for a compressed image is indicated in unit bits " - "per pixel.")}, - {EXIF_TAG_SHUTTER_SPEED_VALUE, "ShutterSpeedValue", N_("Shutter speed"), - N_("Shutter speed. The unit is the APEX (Additive System of " - "Photographic Exposure) setting (see Appendix C).")}, - {EXIF_TAG_APERTURE_VALUE, "ApertureValue", N_("Aperture"), - N_("The lens aperture. The unit is the APEX value.")}, - {EXIF_TAG_BRIGHTNESS_VALUE, "BrightnessValue", N_("Brightness"), - N_("The value of brightness. The unit is the APEX value. " - "Ordinarily it is given in the range of -99.99 to 99.99.")}, - {EXIF_TAG_EXPOSURE_BIAS_VALUE, "ExposureBiasValue", - N_("Exposure Bias"), - N_("The exposure bias. The units is the APEX value. Ordinarily " - "it is given in the range of -99.99 to 99.99.")}, - {EXIF_TAG_MAX_APERTURE_VALUE, "MaxApertureValue", "MaxApertureValue", - N_("The smallest F number of the lens. The unit is the APEX value. " - "Ordinarily it is given in the range of 00.00 to 99.99, " - "but it is not limited to this range.")}, - {EXIF_TAG_SUBJECT_DISTANCE, "SubjectDistance", - N_("Subject Distance"), - N_("The distance to the subject, given in meters.")}, - {EXIF_TAG_METERING_MODE, "MeteringMode", N_("Metering Mode"), - N_("The metering mode.")}, - {EXIF_TAG_LIGHT_SOURCE, "LightSource", N_("Light Source"), - N_("The kind of light source.")}, - {EXIF_TAG_FLASH, "Flash", N_("Flash"), - N_("This tag is recorded when an image is taken using a strobe " - "light (flash).")}, - {EXIF_TAG_FOCAL_LENGTH, "FocalLength", N_("Focal Length"), - N_("The actual focal length of the lens, in mm. Conversion is not " - "made to the focal length of a 35 mm film camera.")}, - {EXIF_TAG_MAKER_NOTE, "MakerNote", N_("Maker Note"), - N_("A tag for manufacturers of Exif writers to record any desired " - "information. The contents are up to the manufacturer.")}, - {EXIF_TAG_USER_COMMENT, "UserComment", N_("User Comment"), - N_("A tag for Exif users to write keywords or comments on the image " - "besides those in , and without the " - "character code limitations of the tag. The " - "character code used in the tag is identified " - "based on an ID code in a fixed 8-byte area at the start of " - "the tag data area. The unused portion of the area is padded " - "with NULL (\"00.h\"). ID codes are assigned by means of " - "registration. The designation method and references for each " - "character code are given in Table 6. The value of CountN " - "is determinated based on the 8 bytes in the character code " - "area and the number of bytes in the user comment part. Since " - "the TYPE is not ASCII, NULL termination is not necessary " - "(see Fig. 9). " - "The ID code for the area may be a Defined code " - "such as JIS or ASCII, or may be Undefined. The Undefined name " - "is UndefinedText, and the ID code is filled with 8 bytes of all " - "\"NULL\" (\"00.H\"). An Exif reader that reads the " - " tag must have a function for determining the " - "ID code. This function is not required in Exif readers that " - "do not use the tag (see Table 7). " - "When a area is set aside, it is recommended that " - "the ID code be ASCII and that the following user comment " - "part be filled with blank characters [20.H].")}, - {EXIF_TAG_SUBSEC_TIME, "SubsecTime", "SubsecTime", - N_("A tag used to record fractions of seconds for the " - " tag.")}, - {EXIF_TAG_SUB_SEC_TIME_ORIGINAL, "SubSecTimeOriginal", - "SubSecTimeOriginal", - N_("A tag used to record fractions of seconds for the " - " tag.")}, - {EXIF_TAG_SUB_SEC_TIME_DIGITIZED, "SubSecTimeDigitized", - "SubSecTimeDigitized", - N_("A tag used to record fractions of seconds for the " - " tag.")}, - {EXIF_TAG_FLASH_PIX_VERSION, "FlashPixVersion", "FlashPixVersion", - N_("The FlashPix format version supported by a FPXR file.")}, - {EXIF_TAG_COLOR_SPACE, "ColorSpace", N_("Color Space"), - N_("The color space information tag is always " - "recorded as the color space specifier. Normally sRGB (=1) " - "is used to define the color space based on the PC monitor " - "conditions and environment. If a color space other than " - "sRGB is used, Uncalibrated (=FFFF.H) is set. Image data " - "recorded as Uncalibrated can be treated as sRGB when it is " - "converted to FlashPix. On sRGB see Appendix E.")}, - {EXIF_TAG_PIXEL_X_DIMENSION, "PixelXDimension", "PixelXDimension", - N_("Information specific to compressed data. When a " - "compressed file is recorded, the valid width of the " - "meaningful image must be recorded in this tag, whether or " - "not there is padding data or a restart marker. This tag " - "should not exist in an uncompressed file. For details see " - "section 2.8.1 and Appendix F.")}, - {EXIF_TAG_PIXEL_Y_DIMENSION, "PixelYDimension", "PixelYDimension", - N_("Information specific to compressed data. When a compressed " - "file is recorded, the valid height of the meaningful image " - "must be recorded in this tag, whether or not there is padding " - "data or a restart marker. This tag should not exist in an " - "uncompressed file. For details see section 2.8.1 and Appendix " - "F. Since data padding is unnecessary in the vertical direction, " - "the number of lines recorded in this valid image height tag " - "will in fact be the same as that recorded in the SOF.")}, - {EXIF_TAG_RELATED_SOUND_FILE, "RelatedSoundFile", - "RelatedSoundFile", - N_("This tag is used to record the name of an audio file related " - "to the image data. The only relational information " - "recorded here is the Exif audio file name and extension (an " - "ASCII string consisting of 8 characters + '.' + 3 " - "characters). The path is not recorded. Stipulations on audio " - "are given in section 3.6.3. File naming conventions are " - "given in section 3.7.1. " - "When using this tag, audio files must be recorded in " - "conformance to the Exif audio format. Writers are also allowed " - "to store the data such as Audio within APP2 as FlashPix " - "extension stream data. " - "Audio files must be recorded in conformance to the Exif audio " - "format. The mapping of Exif image files and audio files is done " - "in any of the three ways shown in Table 8. If multiple files " - "are mapped to one file as in [2] or [3] of this table, the above " - "format is used to record just one audio file name. If " - "there are multiple audio files, the first recorded file is " - "given. In the case of [3] in Table 8, for example, for the " - "Exif image file \"DSC00001.JPG\" only \"SND00001.WAV\" is " - "given as the related Exif audio file. When there are three " - "Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and " - "\"SND00003.WAV\", the Exif image file name for each of them, " - "\"DSC00001.JPG\", is indicated. By combining multiple " - "relational information, a variety of playback possibilities " - "can be supported. The method of using relational information " - "is left to the implementation on the playback side. Since this " - "information is an ASCII character string, it is terminated by " - "NULL. When this tag is used to map audio files, the relation " - "of the audio file to image data must also be indicated on the " - "audio file end.")}, - {EXIF_TAG_INTEROPERABILITY_IFD_POINTER, "InteroperabilityIFDPointer", - "InteroperabilityIFDPointer", - N_("Interoperability IFD is composed of tags which stores the " - "information to ensure the Interoperability and pointed " - "by the following tag located in Exif IFD. " - "The Interoperability structure of Interoperability IFD is " - "the same as TIFF defined IFD structure " - "but does not contain the " - "image data characteristically compared with normal TIFF " - "IFD.")}, - {EXIF_TAG_FLASH_ENERGY, "FlashEnergy", N_("Flash Energy"), - N_("Indicates the strobe energy at the time the image is " - "captured, as measured in Beam Candle Power Seconds (BCPS).")}, - {EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE, "SpatialFrequencyResponse", - N_("Spatial Frequency Response"), - N_("This tag records the camera or input device spatial frequency " - "table and SFR values in the direction of image width, " - "image height, and diagonal direction, as specified in ISO " - "12233.")}, - {EXIF_TAG_FOCAL_PLANE_X_RESOLUTION, "FocalPlaneXResolution", - N_("Focal Plane x-Resolution"), - N_("Indicates the number of pixels in the image width (X) direction " - "per on the camera focal plane.")}, - {EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION, "FocalPlaneYResolution", - N_("Focal Plane y-Resolution"), - N_("Indicates the number of pixels in the image height (V) direction " - "per on the camera focal plane.")}, - {EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT, "FocalPlaneResolutionUnit", - N_("Focal Plane Resolution Unit"), - N_("Indicates the unit for measuring and " - ". This value is the same as the " - ".")}, - {EXIF_TAG_SUBJECT_LOCATION, "SubjectLocation", - N_("Subject Location"), - N_("Indicates the location of the main subject in the scene. The " - "value of this tag represents the pixel at the center of the " - "main subject relative to the left edge, prior to rotation " - "processing as per the tag. The first value " - "indicates the X column number and second indicates " - "the Y row number.")}, - {EXIF_TAG_EXPOSURE_INDEX, "ExposureIndex", N_("Exposure index"), - N_("Indicates the exposure index selected on the camera or " - "input device at the time the image is captured.")}, - {EXIF_TAG_SENSING_METHOD, "SensingMethod", N_("Sensing Method"), - N_("Indicates the image sensor type on the camera or input " - "device.")}, - {EXIF_TAG_FILE_SOURCE, "FileSource", N_("File Source"), - N_("Indicates the image source. If a DSC recorded the image, " - "this tag value of this tag always be set to 3, indicating " - "that the image was recorded on a DSC.")}, - {EXIF_TAG_SCENE_TYPE, "SceneType", N_("Scene Type"), - N_("Indicates the type of scene. If a DSC recorded the image, " - "this tag value must always be set to 1, indicating that the " - "image was directly photographed.")}, - {EXIF_TAG_NEW_CFA_PATTERN, "CFAPattern", - N_("CFA Pattern"), - N_("Indicates the color filter array (CFA) geometric pattern of the " - "image sensor when a one-chip color area sensor is used. " - "It does not apply to all sensing methods.")}, - {EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"), - N_("This tag indicates the location and area of the main subject " - "in the overall scene.")}, - {EXIF_TAG_CUSTOM_RENDERED, "CustomRendered", N_("Custom Rendered"), - N_("This tag indicates the use of special processing on image " - "data, such as rendering geared to output. When special " - "processing is performed, the reader is expected to disable " - "or minimize any further processing.")}, - {EXIF_TAG_EXPOSURE_MODE, "ExposureMode", N_("Exposure Mode"), - N_("This tag indicates the exposure mode set when the image was " - "shot. In auto-bracketing mode, the camera shoots a series of " - "frames of the same scene at different exposure settings.")}, - {EXIF_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), - N_("This tag indicates the white balance mode set when the image " - "was shot.")}, - {EXIF_TAG_DIGITAL_ZOOM_RATIO, "DigitalZoomRatio", - N_("Digital Zoom Ratio"), - N_("This tag indicates the digital zoom ratio when the image was " - "shot. If the numerator of the recorded value is 0, this " - "indicates that digital zoom was not used.")}, - {EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM, "FocalLengthIn35mmFilm", - N_("Focal Length In 35mm Film"), - N_("This tag indicates the equivalent focal length assuming a " - "35mm film camera, in mm. A value of 0 means the focal " - "length is unknown. Note that this tag differs from the " - "FocalLength tag.")}, - {EXIF_TAG_SCENE_CAPTURE_TYPE, "SceneCaptureType", - N_("Scene Capture Type"), - N_("This tag indicates the type of scene that was shot. It can " - "also be used to record the mode in which the image was " - "shot. Note that this differs from the scene type " - "(SceneType) tag.")}, - {EXIF_TAG_GAIN_CONTROL, "GainControl", N_("Gain Control"), - N_("This tag indicates the degree of overall image gain " - "adjustment.")}, - {EXIF_TAG_CONTRAST, "Contrast", N_("Contrast"), - N_("This tag indicates the direction of contrast processing " - "applied by the camera when the image was shot.")}, - {EXIF_TAG_SATURATION, "Saturation", N_("Saturation"), - N_("This tag indicates the direction of saturation processing " - "applied by the camera when the image was shot.")}, - {EXIF_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), - N_("This tag indicates the direction of sharpness processing " - "applied by the camera when the image was shot.")}, - {EXIF_TAG_DEVICE_SETTING_DESCRIPTION, "DeviceSettingDescription", - N_("Device Setting Description"), - N_("This tag indicates information on the picture-taking " - "conditions of a particular camera model. The tag is used " - "only to indicate the picture-taking conditions in the " - "reader.")}, - {EXIF_TAG_SUBJECT_DISTANCE_RANGE, "SubjectDistanceRange", - N_("Subject Distance Range"), - N_("This tag indicates the distance to the subject.")}, - {EXIF_TAG_IMAGE_UNIQUE_ID, "ImageUniqueID", N_("Image Unique ID"), - N_("This tag indicates an identifier assigned uniquely to " - "each image. It is recorded as an ASCII string equivalent " - "to hexadecimal notation and 128-bit fixed length.")}, - {0, NULL, NULL, NULL} -}; - -const char * -exif_tag_get_name (ExifTag tag) -{ - unsigned int i; - - for (i = 0; ExifTagTable[i].name; i++) - if (ExifTagTable[i].tag == tag) - break; - - return (ExifTagTable[i].name); -} - -const char * -exif_tag_get_title (ExifTag tag) -{ - unsigned int i; - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); - - for (i = 0; ExifTagTable[i].title; i++) - if (ExifTagTable[i].tag == tag) - break; - - return (_(ExifTagTable[i].title)); -} - -const char * -exif_tag_get_description (ExifTag tag) -{ - unsigned int i; - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); - - for (i = 0; ExifTagTable[i].description; i++) - if (ExifTagTable[i].tag == tag) - break; - - return (_(ExifTagTable[i].description)); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-tag.h gimageview-0.3.0-0.20101117/lib/libexif/exif-tag.h --- gimageview-0.2.27/lib/libexif/exif-tag.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-tag.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -/* exif-tag.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_TAG_H__ -#define __EXIF_TAG_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef enum { - EXIF_TAG_INTEROPERABILITY_INDEX = 0x0001, - EXIF_TAG_INTEROPERABILITY_VERSION = 0x0002, - EXIF_TAG_IMAGE_WIDTH = 0x0100, - EXIF_TAG_IMAGE_LENGTH = 0x0101, - EXIF_TAG_BITS_PER_SAMPLE = 0x0102, - EXIF_TAG_COMPRESSION = 0x0103, - EXIF_TAG_PHOTOMETRIC_INTERPRETATION = 0x0106, - EXIF_TAG_FILL_ORDER = 0x010a, - EXIF_TAG_DOCUMENT_NAME = 0x010d, - EXIF_TAG_IMAGE_DESCRIPTION = 0x010e, - EXIF_TAG_MAKE = 0x010f, - EXIF_TAG_MODEL = 0x0110, - EXIF_TAG_STRIP_OFFSETS = 0x0111, - EXIF_TAG_ORIENTATION = 0x0112, - EXIF_TAG_SAMPLES_PER_PIXEL = 0x0115, - EXIF_TAG_ROWS_PER_STRIP = 0x0116, - EXIF_TAG_STRIP_BYTE_COUNTS = 0x0117, - EXIF_TAG_X_RESOLUTION = 0x011a, - EXIF_TAG_Y_RESOLUTION = 0x011b, - EXIF_TAG_PLANAR_CONFIGURATION = 0x011c, - EXIF_TAG_RESOLUTION_UNIT = 0x0128, - EXIF_TAG_TRANSFER_FUNCTION = 0x012d, - EXIF_TAG_SOFTWARE = 0x0131, - EXIF_TAG_DATE_TIME = 0x0132, - EXIF_TAG_ARTIST = 0x013b, - EXIF_TAG_WHITE_POINT = 0x013e, - EXIF_TAG_PRIMARY_CHROMATICITIES = 0x013f, - EXIF_TAG_TRANSFER_RANGE = 0x0156, - EXIF_TAG_JPEG_PROC = 0x0200, - EXIF_TAG_JPEG_INTERCHANGE_FORMAT = 0x0201, - EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = 0x0202, - EXIF_TAG_YCBCR_COEFFICIENTS = 0x0211, - EXIF_TAG_YCBCR_SUB_SAMPLING = 0x0212, - EXIF_TAG_YCBCR_POSITIONING = 0x0213, - EXIF_TAG_REFERENCE_BLACK_WHITE = 0x0214, - EXIF_TAG_RELATED_IMAGE_FILE_FORMAT = 0x1000, - EXIF_TAG_RELATED_IMAGE_WIDTH = 0x1001, - EXIF_TAG_RELATED_IMAGE_LENGTH = 0x1002, - EXIF_TAG_CFA_REPEAT_PATTERN_DIM = 0x828d, - EXIF_TAG_CFA_PATTERN = 0x828e, - EXIF_TAG_BATTERY_LEVEL = 0x828f, - EXIF_TAG_COPYRIGHT = 0x8298, - EXIF_TAG_EXPOSURE_TIME = 0x829a, - EXIF_TAG_FNUMBER = 0x829d, - EXIF_TAG_IPTC_NAA = 0x83bb, - EXIF_TAG_EXIF_IFD_POINTER = 0x8769, - EXIF_TAG_INTER_COLOR_PROFILE = 0x8773, - EXIF_TAG_EXPOSURE_PROGRAM = 0x8822, - EXIF_TAG_SPECTRAL_SENSITIVITY = 0x8824, - EXIF_TAG_GPS_INFO_IFD_POINTER = 0x8825, - EXIF_TAG_ISO_SPEED_RATINGS = 0x8827, - EXIF_TAG_OECF = 0x8828, - EXIF_TAG_EXIF_VERSION = 0x9000, - EXIF_TAG_DATE_TIME_ORIGINAL = 0x9003, - EXIF_TAG_DATE_TIME_DIGITIZED = 0x9004, - EXIF_TAG_COMPONENTS_CONFIGURATION = 0x9101, - EXIF_TAG_COMPRESSED_BITS_PER_PIXEL = 0x9102, - EXIF_TAG_SHUTTER_SPEED_VALUE = 0x9201, - EXIF_TAG_APERTURE_VALUE = 0x9202, - EXIF_TAG_BRIGHTNESS_VALUE = 0x9203, - EXIF_TAG_EXPOSURE_BIAS_VALUE = 0x9204, - EXIF_TAG_MAX_APERTURE_VALUE = 0x9205, - EXIF_TAG_SUBJECT_DISTANCE = 0x9206, - EXIF_TAG_METERING_MODE = 0x9207, - EXIF_TAG_LIGHT_SOURCE = 0x9208, - EXIF_TAG_FLASH = 0x9209, - EXIF_TAG_FOCAL_LENGTH = 0x920a, - EXIF_TAG_SUBJECT_AREA = 0x9214, - EXIF_TAG_MAKER_NOTE = 0x927c, - EXIF_TAG_USER_COMMENT = 0x9286, - EXIF_TAG_SUBSEC_TIME = 0x9290, - EXIF_TAG_SUB_SEC_TIME_ORIGINAL = 0x9291, - EXIF_TAG_SUB_SEC_TIME_DIGITIZED = 0x9292, - EXIF_TAG_FLASH_PIX_VERSION = 0xa000, - EXIF_TAG_COLOR_SPACE = 0xa001, - EXIF_TAG_PIXEL_X_DIMENSION = 0xa002, - EXIF_TAG_PIXEL_Y_DIMENSION = 0xa003, - EXIF_TAG_RELATED_SOUND_FILE = 0xa004, - EXIF_TAG_INTEROPERABILITY_IFD_POINTER = 0xa005, - EXIF_TAG_FLASH_ENERGY = 0xa20b, - EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE = 0xa20c, - EXIF_TAG_FOCAL_PLANE_X_RESOLUTION = 0xa20e, - EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION = 0xa20f, - EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT = 0xa210, - EXIF_TAG_SUBJECT_LOCATION = 0xa214, - EXIF_TAG_EXPOSURE_INDEX = 0xa215, - EXIF_TAG_SENSING_METHOD = 0xa217, - EXIF_TAG_FILE_SOURCE = 0xa300, - EXIF_TAG_SCENE_TYPE = 0xa301, - EXIF_TAG_NEW_CFA_PATTERN = 0xa302, - EXIF_TAG_CUSTOM_RENDERED = 0xa401, - EXIF_TAG_EXPOSURE_MODE = 0xa402, - EXIF_TAG_WHITE_BALANCE = 0xa403, - EXIF_TAG_DIGITAL_ZOOM_RATIO = 0xa404, - EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM = 0xa405, - EXIF_TAG_SCENE_CAPTURE_TYPE = 0xa406, - EXIF_TAG_GAIN_CONTROL = 0xa407, - EXIF_TAG_CONTRAST = 0xa408, - EXIF_TAG_SATURATION = 0xa409, - EXIF_TAG_SHARPNESS = 0xa40a, - EXIF_TAG_DEVICE_SETTING_DESCRIPTION = 0xa40b, - EXIF_TAG_SUBJECT_DISTANCE_RANGE = 0xa40c, - EXIF_TAG_IMAGE_UNIQUE_ID = 0xa420 -} ExifTag; - -const char *exif_tag_get_name (ExifTag tag); -const char *exif_tag_get_title (ExifTag tag); -const char *exif_tag_get_description (ExifTag tag); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_TAG_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/exif-utils.c gimageview-0.3.0-0.20101117/lib/libexif/exif-utils.c --- gimageview-0.2.27/lib/libexif/exif-utils.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-utils.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -/* exif-utils.c - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "exif-utils.h" - -typedef signed short ExifSShort; - -static ExifSShort -exif_get_sshort (const unsigned char *buf, ExifByteOrder order) -{ - switch (order) { - case EXIF_BYTE_ORDER_MOTOROLA: - return ((buf[0] << 8) | buf[1]); - case EXIF_BYTE_ORDER_INTEL: - return ((buf[1] << 8) | buf[0]); - } - - /* Won't be reached */ - return (0); -} - -ExifShort -exif_get_short (const unsigned char *buf, ExifByteOrder order) -{ - return (exif_get_sshort (buf, order) & 0xffff); -} - -void -exif_set_short (unsigned char *b, ExifByteOrder order, ExifShort value) -{ - switch (order) { - case EXIF_BYTE_ORDER_MOTOROLA: - b[0] = (unsigned char) (value >> 8); - b[1] = (unsigned char) value; - break; - case EXIF_BYTE_ORDER_INTEL: - b[0] = (unsigned char) value; - b[1] = (unsigned char) (value >> 8); - break; - } -} - -ExifSLong -exif_get_slong (const unsigned char *b, ExifByteOrder order) -{ - switch (order) { - case EXIF_BYTE_ORDER_MOTOROLA: - return ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]); - case EXIF_BYTE_ORDER_INTEL: - return ((b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0]); - } - - /* Won't be reached */ - return (0); -} - -void -exif_set_slong (unsigned char *b, ExifByteOrder order, ExifSLong value) -{ - switch (order) { - case EXIF_BYTE_ORDER_MOTOROLA: - b[0] = (unsigned char) (value >> 24); - b[1] = (unsigned char) (value >> 16); - b[2] = (unsigned char) (value >> 8); - b[3] = (unsigned char) value; - break; - case EXIF_BYTE_ORDER_INTEL: - b[3] = (unsigned char) (value >> 24); - b[2] = (unsigned char) (value >> 16); - b[1] = (unsigned char) (value >> 8); - b[0] = (unsigned char) value; - break; - } -} - -ExifLong -exif_get_long (const unsigned char *buf, ExifByteOrder order) -{ - return (exif_get_slong (buf, order) & 0xffffffff); -} - -void -exif_set_long (unsigned char *b, ExifByteOrder order, ExifLong value) -{ - exif_set_slong (b, order, value); -} - -ExifSRational -exif_get_srational (const unsigned char *buf, ExifByteOrder order) -{ - ExifSRational r; - - r.numerator = exif_get_slong (buf, order); - r.denominator = exif_get_slong (buf + 4, order); - - return (r); -} - -ExifRational -exif_get_rational (const unsigned char *buf, ExifByteOrder order) -{ - ExifRational r; - - r.numerator = exif_get_long (buf, order); - r.denominator = exif_get_long (buf + 4, order); - - return (r); -} - -void -exif_set_rational (unsigned char *buf, ExifByteOrder order, - ExifRational value) -{ - exif_set_long (buf, order, value.numerator); - exif_set_long (buf + 4, order, value.denominator); -} - -void -exif_set_srational (unsigned char *buf, ExifByteOrder order, - ExifSRational value) -{ - exif_set_slong (buf, order, value.numerator); - exif_set_slong (buf + 4, order, value.denominator); -} diff -Nru gimageview-0.2.27/lib/libexif/exif-utils.h gimageview-0.3.0-0.20101117/lib/libexif/exif-utils.h --- gimageview-0.2.27/lib/libexif/exif-utils.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/exif-utils.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/* exif-utils.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EXIF_UTILS_H__ -#define __EXIF_UTILS_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -typedef char ExifByte; /* 1 byte */ -typedef char * ExifAscii; -typedef unsigned short ExifShort; /* 2 bytes */ -typedef unsigned long ExifLong; /* 4 bytes */ -typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational; -typedef char ExifUndefined; /* 1 byte */ -typedef signed long ExifSLong; /* 4 bytes */ -typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; - - -ExifShort exif_get_short (const unsigned char *b, ExifByteOrder order); -ExifLong exif_get_long (const unsigned char *b, ExifByteOrder order); -ExifSLong exif_get_slong (const unsigned char *b, ExifByteOrder order); -ExifRational exif_get_rational (const unsigned char *b, ExifByteOrder order); -ExifSRational exif_get_srational (const unsigned char *b, ExifByteOrder order); - -void exif_set_short (unsigned char *b, ExifByteOrder order, - ExifShort value); -void exif_set_long (unsigned char *b, ExifByteOrder order, - ExifLong value); -void exif_set_slong (unsigned char *b, ExifByteOrder order, - ExifSLong value); -void exif_set_rational (unsigned char *b, ExifByteOrder order, - ExifRational value); -void exif_set_srational (unsigned char *b, ExifByteOrder order, - ExifSRational value); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EXIF_UTILS_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/i18n.h gimageview-0.3.0-0.20101117/lib/libexif/i18n.h --- gimageview-0.2.27/lib/libexif/i18n.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/i18n.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* i18n.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __I18N_H__ -#define __I18N_H__ - -#ifdef ENABLE_NLS -# include -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bind_textdomain_codeset(Domain,Codeset) (Codeset) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - -#endif /* __I18N_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/jpeg-data.c gimageview-0.3.0-0.20101117/lib/libexif/jpeg-data.c --- gimageview-0.2.27/lib/libexif/jpeg-data.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/jpeg-data.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,425 +0,0 @@ -/* jpeg-data.c - * - * Copyright -A© 2001 Lutz Müller $)B - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "jpeg-data.h" - -#include -#include -#include -#include - -/* #define DEBUG */ - -struct _JPEGDataPrivate -{ - unsigned int ref_count; -}; - -JPEGData * -jpeg_data_new (void) -{ - JPEGData *data; - - data = malloc (sizeof (JPEGData)); - if (!data) - return (NULL); - memset (data, 0, sizeof (JPEGData)); - data->priv = malloc (sizeof (JPEGDataPrivate)); - if (!data->priv) { - free (data); - return (NULL); - } - memset (data->priv, 0, sizeof (JPEGDataPrivate)); - data->priv->ref_count = 1; - - return (data); -} - -static void -jpeg_data_append_section (JPEGData *data) -{ - JPEGSection *s; - - if (!data->count) - s = malloc (sizeof (JPEGSection)); - else - s = realloc (data->sections, - sizeof (JPEGSection) * (data->count + 1)); - if (!s) - return; - - data->sections = s; - data->count++; -} - -void -jpeg_data_save_file (JPEGData *data, const char *path) -{ - FILE *f; - unsigned char *d = NULL; - unsigned int size = 0; - - jpeg_data_save_data (data, &d, &size); - if (!d) - return; - - unlink (path); - f = fopen (path, "wb"); - if (!f) { - free (d); - return; - } - fwrite (d, sizeof (char), size, f); - fclose (f); - free (d); -} - -void -jpeg_data_save_data (JPEGData *data, unsigned char **d, unsigned int *ds) -{ - unsigned int i, eds = 0; - JPEGSection s; - unsigned char *ed = NULL; - - if (!data) - return; - if (!d) - return; - if (!ds) - return; - - for (*ds = i = 0; i < data->count; i++) { - s = data->sections[i]; -#ifdef DEBUG - printf ("Writing marker 0x%x at position %i...\n", - s.marker, *ds); -#endif - - /* Write the marker */ - *d = realloc (*d, sizeof (char) * (*ds + 2)); - (*d)[*ds + 0] = 0xff; - (*d)[*ds + 1] = s.marker; - *ds += 2; - - switch (s.marker) { - case JPEG_MARKER_SOI: - case JPEG_MARKER_EOI: - break; - case JPEG_MARKER_APP1: - exif_data_save_data (s.content.app1, &ed, &eds); - *d = realloc (*d, sizeof (char) * (*ds + 2)); - (*d)[*ds + 0] = (eds + 2) >> 8; - (*d)[*ds + 1] = (eds + 2) >> 0; - *ds += 2; - *d = realloc (*d, sizeof (char) * (*ds + eds)); - memcpy (*d + *ds, ed, eds); - *ds += eds; - break; - default: - *d = realloc (*d, sizeof (char) * - (*ds + s.content.generic.size + 2)); - (*d)[*ds + 0] = (s.content.generic.size + 2) >> 8; - (*d)[*ds + 1] = (s.content.generic.size + 2) >> 0; - *ds += 2; - memcpy (*d + *ds, s.content.generic.data, - s.content.generic.size); - *ds += s.content.generic.size; - - /* In case of SOS, we need to write the data. */ - if (s.marker == JPEG_MARKER_SOS) { - *d = realloc (*d, *ds + data->size); - memcpy (*d + *ds, data->data, data->size); - *ds += data->size; - } - break; - } - } -} - -JPEGData * -jpeg_data_new_from_data (const unsigned char *d, - unsigned int size) -{ - JPEGData *data; - - data = jpeg_data_new (); - jpeg_data_load_data (data, d, size); - return (data); -} - -void -jpeg_data_load_data (JPEGData *data, const unsigned char *d, - unsigned int size) -{ - unsigned int i, o, len; - JPEGSection *s; - JPEGMarker marker; - - if (!data) - return; - if (!d) - return; - -#ifdef DEBUG - printf ("Parsing %i bytes...\n", size); -#endif - - for (o = 0; o < size;) { - - /* - * JPEG sections start with 0xff. The first byte that is - * not 0xff is a marker (hopefully). - */ - for (i = 0; i < 7; i++) - if (d[o + i] != 0xff) - break; - if (!JPEG_IS_MARKER (d[o + i])) - return; - marker = d[o + i]; - -#ifdef DEBUG - printf ("Found marker 0x%x ('%s') at %i.\n", marker, - jpeg_marker_get_name (marker), o + i); -#endif - - /* Append this section */ - jpeg_data_append_section (data); - s = &data->sections[data->count - 1]; - s->marker = marker; - o += i + 1; - - switch (s->marker) { - case JPEG_MARKER_SOI: - case JPEG_MARKER_EOI: - break; - default: - - /* Read the length of the section */ - len = ((d[o] << 8) | d[o + 1]) - 2; - o += 2; - - switch (s->marker) { - case JPEG_MARKER_APP1: - s->content.app1 = exif_data_new_from_data ( - d + o - 4, len + 4); - break; - default: - s->content.generic.size = len; - s->content.generic.data = - malloc (sizeof (char) * len); - memcpy (s->content.generic.data, &d[o], len); - - /* In case of SOS, image data will follow. */ - if (s->marker == JPEG_MARKER_SOS) { - data->size = size - 2 - o - len; - data->data = malloc ( - sizeof (char) * data->size); - memcpy (data->data, d + o + len, - data->size); - o += data->size; - } - break; - } - o += len; - break; - } - } -} - -JPEGData * -jpeg_data_new_from_file (const char *path) -{ - JPEGData *data; - - data = jpeg_data_new (); - jpeg_data_load_file (data, path); - return (data); -} - -void -jpeg_data_load_file (JPEGData *data, const char *path) -{ - FILE *f; - unsigned char *d; - unsigned int size; - - if (!data) - return; - if (!path) - return; - - f = fopen (path, "rb"); - if (!f) - return; - - /* For now, we read the data into memory. Patches welcome... */ - fseek (f, 0, SEEK_END); - size = ftell (f); - fseek (f, 0, SEEK_SET); - d = malloc (sizeof (char) * size); - if (!d) { - fclose (f); - return; - } - if (fread (d, 1, size, f) != size) { - free (d); - fclose (f); - return; - } - fclose (f); - - jpeg_data_load_data (data, d, size); - free (d); -} - -void -jpeg_data_ref (JPEGData *data) -{ - if (!data) - return; - - data->priv->ref_count++; -} - -void -jpeg_data_unref (JPEGData *data) -{ - if (!data) - return; - - data->priv->ref_count--; - if (!data->priv->ref_count) - jpeg_data_free (data); -} - -void -jpeg_data_free (JPEGData *data) -{ - unsigned int i; - JPEGSection s; - - if (!data) - return; - - if (data->count) { - for (i = 0; i < data->count; i++) { - s = data->sections[i]; - switch (s.marker) { - case JPEG_MARKER_SOI: - case JPEG_MARKER_EOI: - break; - case JPEG_MARKER_APP1: - exif_data_unref (s.content.app1); - break; - default: - free (s.content.generic.data); - break; - } - } - free (data->sections); - } - - if (data->data) - free (data->data); - free (data->priv); - free (data); -} - -void -jpeg_data_dump (JPEGData *data) -{ - unsigned int i; - JPEGContent content; - JPEGMarker marker; - - if (!data) - return; - - printf ("Dumping JPEG data (%i bytes of data)...\n", data->size); - for (i = 0; i < data->count; i++) { - marker = data->sections[i].marker; - content = data->sections[i].content; - printf ("Section %i (marker 0x%x - %s):\n", i, marker, - jpeg_marker_get_name (marker)); - printf (" Description: %s\n", - jpeg_marker_get_description (marker)); - switch (marker) { - case JPEG_MARKER_SOI: - case JPEG_MARKER_EOI: - break; - case JPEG_MARKER_APP1: - exif_data_dump (content.app1); - break; - default: - printf (" Size: %i\n", content.generic.size); - printf (" Unknown content.\n"); - break; - } - } -} - -static JPEGSection * -jpeg_data_get_section (JPEGData *data, JPEGMarker marker) -{ - unsigned int i; - - if (!data) - return (NULL); - - for (i = 0; i < data->count; i++) - if (data->sections[i].marker == marker) - return (&data->sections[i]); - return (NULL); -} - -ExifData * -jpeg_data_get_exif_data (JPEGData *data) -{ - JPEGSection *section; - - if (!data) - return NULL; - - section = jpeg_data_get_section (data, JPEG_MARKER_APP1); - if (section) { - exif_data_ref (section->content.app1); - return (section->content.app1); - } - - return (NULL); -} - -void -jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data) -{ - JPEGSection *section; - - section = jpeg_data_get_section (data, JPEG_MARKER_APP1); - if (!section) { - jpeg_data_append_section (data); - memmove (&data->sections[2], &data->sections[1], - sizeof (JPEGSection) * (data->count - 2)); - section = &data->sections[1]; - } - section->marker = JPEG_MARKER_APP1; - section->content.app1 = exif_data; - exif_data_ref (exif_data); -} diff -Nru gimageview-0.2.27/lib/libexif/jpeg-data.h gimageview-0.3.0-0.20101117/lib/libexif/jpeg-data.h --- gimageview-0.2.27/lib/libexif/jpeg-data.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/jpeg-data.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/* jpeg-data.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __JPEG_DATA_H__ -#define __JPEG_DATA_H__ - -#include -#include - -typedef ExifData * JPEGContentAPP1; - -typedef struct _JPEGContentGeneric JPEGContentGeneric; -struct _JPEGContentGeneric -{ - unsigned char *data; - unsigned int size; -}; - -typedef union _JPEGContent JPEGContent; -union _JPEGContent -{ - JPEGContentGeneric generic; - JPEGContentAPP1 app1; -}; - -typedef struct _JPEGSection JPEGSection; -struct _JPEGSection -{ - JPEGMarker marker; - JPEGContent content; -}; - -typedef struct _JPEGData JPEGData; -typedef struct _JPEGDataPrivate JPEGDataPrivate; - -struct _JPEGData -{ - JPEGSection *sections; - unsigned int count; - - unsigned char *data; - unsigned int size; - - JPEGDataPrivate *priv; -}; - -JPEGData *jpeg_data_new (void); -JPEGData *jpeg_data_new_from_file (const char *path); -JPEGData *jpeg_data_new_from_data (const unsigned char *data, - unsigned int size); - -void jpeg_data_ref (JPEGData *data); -void jpeg_data_unref (JPEGData *data); -void jpeg_data_free (JPEGData *data); - -void jpeg_data_load_data (JPEGData *data, const unsigned char *d, - unsigned int size); -void jpeg_data_save_data (JPEGData *data, unsigned char **d, - unsigned int *size); - -void jpeg_data_load_file (JPEGData *data, const char *path); -void jpeg_data_save_file (JPEGData *data, const char *path); - -void jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data); -ExifData *jpeg_data_get_exif_data (JPEGData *data); - -void jpeg_data_dump (JPEGData *data); - -#endif /* __JPEG_DATA_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/jpeg-marker.c gimageview-0.3.0-0.20101117/lib/libexif/jpeg-marker.c --- gimageview-0.2.27/lib/libexif/jpeg-marker.c 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/jpeg-marker.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -/* jpeg-marker.c - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#include "config.h" -#include "jpeg-marker.h" - -#include - -static struct { - JPEGMarker marker; - const char *name; - const char *description; -} JPEGMarkerTable[] = { - {JPEG_MARKER_SOF0, "SOF0", "Encoding (baseline)"}, - {JPEG_MARKER_SOF1, "SOF1", "Encoding (extended sequential)"}, - {JPEG_MARKER_SOF2, "SOF2", "Encoding (progressive)"}, - {JPEG_MARKER_SOF3, "SOF3", "Encoding (lossless)"}, - {JPEG_MARKER_SOF5, "SOF5", "Encoding (differential sequential)"}, - {JPEG_MARKER_SOF6, "SOF6", "Encoding (differential progressive)"}, - {JPEG_MARKER_SOF7, "SOF7", "Encoding (differential lossless)"}, - {JPEG_MARKER_SOF9, "SOF9", - "Encoding (extended sequential, arithmetic)"}, - {JPEG_MARKER_SOF10, "SOF10", "Encoding (progressive, arithmetic)"}, - {JPEG_MARKER_SOF11, "SOF11", "Encoding (lossless, arithmetic)"}, - {JPEG_MARKER_SOF13, "SOF13", - "Encoding (differential sequential, arithmetic)"}, - {JPEG_MARKER_SOF14, "SOF14", - "Encoding (differential progressive, arithmetic)"}, - {JPEG_MARKER_SOF15, "SOF15", - "Encoding (differential lossless, arithmetic)"}, - {JPEG_MARKER_SOI, "SOI", "Start of image"}, - {JPEG_MARKER_EOI, "EOI", "End of image"}, - {JPEG_MARKER_SOS, "SOS", "Start of scan"}, - {JPEG_MARKER_COM, "COM", "Comment"}, - {JPEG_MARKER_DHT, "DHT", "Define Huffman table"}, - {JPEG_MARKER_JPG, "JPG", "Extension"}, - {JPEG_MARKER_DAC, "DAC", "Define arithmetic coding conditioning"}, - {JPEG_MARKER_RST1, "RST1", "Restart 1"}, - {JPEG_MARKER_RST2, "RST2", "Restart 2"}, - {JPEG_MARKER_RST3, "RST3", "Restart 3"}, - {JPEG_MARKER_RST4, "RST4", "Restart 4"}, - {JPEG_MARKER_RST5, "RST5", "Restart 5"}, - {JPEG_MARKER_RST6, "RST6", "Restart 6"}, - {JPEG_MARKER_RST7, "RST7", "Restart 7"}, - {JPEG_MARKER_DQT, "DQT", "Define quantization table"}, - {JPEG_MARKER_DNL, "DNL", "Define number of lines"}, - {JPEG_MARKER_DRI, "DRI", "Define restart interval"}, - {JPEG_MARKER_DHP, "DHP", "Define hierarchical progression"}, - {JPEG_MARKER_EXP, "EXP", "Expand reference component"}, - {JPEG_MARKER_APP0, "APP0", "Application segment 0"}, - {JPEG_MARKER_APP1, "APP1", "Application segment 1"}, - {JPEG_MARKER_APP2, "APP2", "Application segment 2"}, - {JPEG_MARKER_APP3, "APP3", "Application segment 3"}, - {JPEG_MARKER_APP4, "APP4", "Application segment 4"}, - {JPEG_MARKER_APP5, "APP5", "Application segment 5"}, - {JPEG_MARKER_APP6, "APP6", "Application segment 6"}, - {JPEG_MARKER_APP7, "APP7", "Application segment 7"}, - {JPEG_MARKER_APP8, "APP8", "Application segment 8"}, - {JPEG_MARKER_APP9, "APP9", "Application segment 9"}, - {JPEG_MARKER_APP10, "APP10", "Application segment 10"}, - {JPEG_MARKER_APP11, "APP11", "Application segment 11"}, - {JPEG_MARKER_APP12, "APP12", "Application segment 12"}, - {JPEG_MARKER_APP13, "APP13", "Application segment 13"}, - {JPEG_MARKER_APP14, "APP14", "Application segment 14"}, - {JPEG_MARKER_APP15, "APP15", "Application segment 15"}, - {JPEG_MARKER_JPG0, "JPG0", "Extension 0"}, - {JPEG_MARKER_JPG1, "JPG1", "Extension 1"}, - {JPEG_MARKER_JPG2, "JPG2", "Extension 2"}, - {JPEG_MARKER_JPG3, "JPG3", "Extension 3"}, - {JPEG_MARKER_JPG4, "JPG4", "Extension 4"}, - {JPEG_MARKER_JPG5, "JPG5", "Extension 5"}, - {JPEG_MARKER_JPG6, "JPG6", "Extension 6"}, - {JPEG_MARKER_JPG7, "JPG7", "Extension 7"}, - {JPEG_MARKER_JPG8, "JPG8", "Extension 8"}, - {JPEG_MARKER_JPG9, "JPG9", "Extension 9"}, - {JPEG_MARKER_JPG10, "JPG10", "Extension 10"}, - {JPEG_MARKER_JPG11, "JPG11", "Extension 11"}, - {JPEG_MARKER_JPG12, "JPG12", "Extension 12"}, - {JPEG_MARKER_JPG13, "JPG13", "Extension 13"}, - {0, NULL, NULL} -}; - -const char * -jpeg_marker_get_name (JPEGMarker marker) -{ - unsigned int i; - - for (i = 0; JPEGMarkerTable[i].name; i++) - if (JPEGMarkerTable[i].marker == marker) - break; - - return (JPEGMarkerTable[i].name); -} - -const char * -jpeg_marker_get_description (JPEGMarker marker) -{ - unsigned int i; - - for (i = 0; JPEGMarkerTable[i].description; i++) - if (JPEGMarkerTable[i].marker == marker) - break; - - return (JPEGMarkerTable[i].description); -} - diff -Nru gimageview-0.2.27/lib/libexif/jpeg-marker.h gimageview-0.3.0-0.20101117/lib/libexif/jpeg-marker.h --- gimageview-0.2.27/lib/libexif/jpeg-marker.h 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/jpeg-marker.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/* jpeg-marker.h - * - * Copyright © 2001 Lutz Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#ifndef __JPEG_MARKER_H__ -#define __JPEG_MARKER_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef enum _JPEGMarker JPEGMarker; -enum _JPEGMarker { - JPEG_MARKER_SOF0 = 0xc0, - JPEG_MARKER_SOF1 = 0xc1, - JPEG_MARKER_SOF2 = 0xc2, - JPEG_MARKER_SOF3 = 0xc3, - JPEG_MARKER_DHT = 0xc4, - JPEG_MARKER_SOF5 = 0xc5, - JPEG_MARKER_SOF6 = 0xc6, - JPEG_MARKER_SOF7 = 0xc7, - JPEG_MARKER_JPG = 0xc8, - JPEG_MARKER_SOF9 = 0xc9, - JPEG_MARKER_SOF10 = 0xca, - JPEG_MARKER_SOF11 = 0xcb, - JPEG_MARKER_DAC = 0xcc, - JPEG_MARKER_SOF13 = 0xcd, - JPEG_MARKER_SOF14 = 0xce, - JPEG_MARKER_SOF15 = 0xcf, - JPEG_MARKER_RST0 = 0xd0, - JPEG_MARKER_RST1 = 0xd1, - JPEG_MARKER_RST2 = 0xd2, - JPEG_MARKER_RST3 = 0xd3, - JPEG_MARKER_RST4 = 0xd4, - JPEG_MARKER_RST5 = 0xd5, - JPEG_MARKER_RST6 = 0xd6, - JPEG_MARKER_RST7 = 0xd7, - JPEG_MARKER_SOI = 0xd8, - JPEG_MARKER_EOI = 0xd9, - JPEG_MARKER_SOS = 0xda, - JPEG_MARKER_DQT = 0xdb, - JPEG_MARKER_DNL = 0xdc, - JPEG_MARKER_DRI = 0xdd, - JPEG_MARKER_DHP = 0xde, - JPEG_MARKER_EXP = 0xdf, - JPEG_MARKER_APP0 = 0xe0, - JPEG_MARKER_APP1 = 0xe1, - JPEG_MARKER_APP2 = 0xe2, - JPEG_MARKER_APP3 = 0xe3, - JPEG_MARKER_APP4 = 0xe4, - JPEG_MARKER_APP5 = 0xe5, - JPEG_MARKER_APP6 = 0xe6, - JPEG_MARKER_APP7 = 0xe7, - JPEG_MARKER_APP8 = 0xe8, - JPEG_MARKER_APP9 = 0xe9, - JPEG_MARKER_APP10 = 0xea, - JPEG_MARKER_APP11 = 0xeb, - JPEG_MARKER_APP12 = 0xec, - JPEG_MARKER_APP13 = 0xed, - JPEG_MARKER_APP14 = 0xee, - JPEG_MARKER_APP15 = 0xef, - JPEG_MARKER_JPG0 = 0xf0, - JPEG_MARKER_JPG1 = 0xf1, - JPEG_MARKER_JPG2 = 0xf2, - JPEG_MARKER_JPG3 = 0xf3, - JPEG_MARKER_JPG4 = 0xf4, - JPEG_MARKER_JPG5 = 0xf5, - JPEG_MARKER_JPG6 = 0xf6, - JPEG_MARKER_JPG7 = 0xf7, - JPEG_MARKER_JPG8 = 0xf8, - JPEG_MARKER_JPG9 = 0xf9, - JPEG_MARKER_JPG10 = 0xfa, - JPEG_MARKER_JPG11 = 0xfb, - JPEG_MARKER_JPG12 = 0xfc, - JPEG_MARKER_JPG13 = 0xfd, - JPEG_MARKER_COM = 0xfe -}; - -#define JPEG_IS_MARKER(m) (((m) >= JPEG_MARKER_SOF0) && \ - ((m) <= JPEG_MARKER_COM)) - -const char *jpeg_marker_get_name (JPEGMarker marker); -const char *jpeg_marker_get_description (JPEGMarker marker); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __JPEG_MARKER_H__ */ diff -Nru gimageview-0.2.27/lib/libexif/Makefile.am gimageview-0.3.0-0.20101117/lib/libexif/Makefile.am --- gimageview-0.2.27/lib/libexif/Makefile.am 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -if ENABLE_EXIF -noinst_LTLIBRARIES = libexif.la -endif - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib - -CPPFLAGS= \ - -DGETTEXT_PACKAGE=PACKAGE \ - -DLIBEXIF_LOCALEDIR=\""$(localedir)"\" - -libexif_la_SOURCES = \ - exif-byte-order.c exif-byte-order.h \ - exif-content.c exif-content.h \ - exif-data.c exif-data.h \ - exif-entry.c exif-entry.h \ - exif-format.c exif-format.h \ - exif-ifd.c exif-ifd.h \ - exif-loader.c exif-loader.h \ - exif-result.h \ - exif-tag.c exif-tag.h \ - exif-utils.c exif-utils.h \ - i18n.h \ - jpeg-data.c jpeg-data.h \ - jpeg-marker.c jpeg-marker.h diff -Nru gimageview-0.2.27/lib/libexif/Makefile.in gimageview-0.3.0-0.20101117/lib/libexif/Makefile.in --- gimageview-0.2.27/lib/libexif/Makefile.in 2004-12-28 04:01:22.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/libexif/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,618 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -SOURCES = $(libexif_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = lib/libexif -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libexif_la_LIBADD = -am_libexif_la_OBJECTS = exif-byte-order.lo exif-content.lo \ - exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \ - exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo \ - jpeg-marker.lo -libexif_la_OBJECTS = $(am_libexif_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/exif-byte-order.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-content.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-data.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-entry.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-format.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-ifd.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-tag.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/exif-utils.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libexif_la_SOURCES) -DIST_SOURCES = $(libexif_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = \ - -DGETTEXT_PACKAGE=PACKAGE \ - -DLIBEXIF_LOCALEDIR=\""$(localedir)"\" - -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@ENABLE_EXIF_TRUE@noinst_LTLIBRARIES = libexif.la -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib - -libexif_la_SOURCES = \ - exif-byte-order.c exif-byte-order.h \ - exif-content.c exif-content.h \ - exif-data.c exif-data.h \ - exif-entry.c exif-entry.h \ - exif-format.c exif-format.h \ - exif-ifd.c exif-ifd.h \ - exif-loader.c exif-loader.h \ - exif-result.h \ - exif-tag.c exif-tag.h \ - exif-utils.c exif-utils.h \ - i18n.h \ - jpeg-data.c jpeg-data.h \ - jpeg-marker.c jpeg-marker.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libexif/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/libexif/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libexif.la: $(libexif_la_OBJECTS) $(libexif_la_DEPENDENCIES) - $(LINK) $(libexif_la_LDFLAGS) $(libexif_la_OBJECTS) $(libexif_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-byte-order.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-content.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-entry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-format.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-ifd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-tag.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg-marker.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/lib/Makefile.am gimageview-0.3.0-0.20101117/lib/Makefile.am --- gimageview-0.2.27/lib/Makefile.am 2004-05-23 14:07:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,5 +1,4 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- SUBDIRS = \ - dllloader \ - libexif + dllloader diff -Nru gimageview-0.2.27/lib/Makefile.in gimageview-0.3.0-0.20101117/lib/Makefile.in --- gimageview-0.2.27/lib/Makefile.in 2004-12-28 04:01:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/lib/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,605 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = \ - dllloader \ - libexif - -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# 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. -$(RECURSIVE_TARGETS): - @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; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - 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 -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/ltmain.sh gimageview-0.3.0-0.20101117/ltmain.sh --- gimageview-0.2.27/ltmain.sh 2004-12-28 04:00:52.000000000 +0000 +++ gimageview-0.3.0-0.20101117/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,6479 +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 -# 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. - -# 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 "$0" --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 1 -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -if test -z "$max_cmd_len"; then - i=0 - testring="ABCD" - new_result= - - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - max_cmd_len="$new_result" && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring="$testring$testring" - done - testring= - # 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. - max_cmd_len=`expr $max_cmd_len \/ 2` -fi - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# 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. -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 | \ - grep -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 -} - -# End of Shell function definitions -##################################### - -# 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 1 - ;; - 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$" < "$0" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" - 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 0 - ;; - - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 - # 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" < "$0" - done - exit 0 - ;; - - --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 0 - ;; - - --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 1 - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 -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 1 - 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 1 - 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 1 - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit 1 - ;; - *) - # 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 1 - ;; - esac - - # 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. - if test -n "$available_tags" && test -z "$tagname"; then - case $base_compile 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` "*) ;; - # 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$" < "$0" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case "$base_compile " in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # 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 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi - - 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 1 - 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 1" 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 1" 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 "$0" "$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 1 - 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 1 - 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 1 - 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 < /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case $base_compile in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # The compiler in $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 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&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 1 - 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 1 - 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 1 - 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 1 - 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 1 - ;; - 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 - ;; - *) - 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 1 - 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 1 - 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 1 - ;; - 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 - ;; - - -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread ) - compiler_flags="$compiler_flags $arg" - 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 1 - 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 1 - 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 1 - 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 1 - ;; - *.$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 duplcations 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 1 - ;; - 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% $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 $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" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - ;; - *) - $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 1 - 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 1 - 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 1 - 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 1 - 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 1 - 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 1 - 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 1 - 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 | grep "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 1 - 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 1 - 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="$deplibs $depdepl" ;; - 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\" - 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 1 - 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\" - 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 1 - 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 1 - 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" - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - [0-9]*) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case $revision in - [0-9]*) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case $age in - [0-9]*) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - 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 1 - 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 1 - ;; - 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 echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - 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 - # It is ok to link against an archive when - # building a shared library. - if $AR -t $potlib > /dev/null 2>&1; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - 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\" - 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" - eval cmd=\"$cmd\" - $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 0 - 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 1 - 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 0 - 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 0 - 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 0 - ;; - - 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 1 - ;; - 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 0 - 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 $0 --fallback-echo"; then - case $0 in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; - *) qecho="$SHELL `pwd`/$0 --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 1" 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 1" 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 1 - 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 1 - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" - chmod +x $output - fi - exit 0 - ;; - 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 $0 $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 1 - fi - # We do not want portage's install root ($D) present. Check only for - # this if the .la is being installed. - if test "$installed" = yes && test "$D"; then - eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`" - else - mynewdependency_lib="$libdir/$name" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi - ;; - *) - if test "$installed" = yes; then - # Rather use S=WORKDIR if our version of portage supports it. - # This is because some ebuild (gcc) do not use $S as buildroot. - if test "$PWORKDIR"; then - S="$PWORKDIR" - fi - # We do not want portage's build root ($S) present. - if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then - mynewdependency_lib="" - # We do not want portage's install root ($D) present. - elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then - eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" - else - mynewdependency_lib="$deplib" - fi - else - mynewdependency_lib="$deplib" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi - ;; - 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 1 - 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 1 - 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 - # Do not add duplicates - if test "$installed" = yes && test "$D"; then - install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" - fi - $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 0 - ;; - - # 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 1 - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - 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 1 - 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 1 - 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 1 - ;; - 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 1 - 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 1 - 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 1 - 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 1 - ;; - 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 0 - ;; - - *) - # 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 1 - 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-$$" - if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : - else - $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 $0 $preserve_args --finish$current_libdirs' - else - exit 0 - 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 0 - - $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 0 - ;; - - # 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 1 - 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 1 - 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 1 - 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 1 - 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 0 - 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 1 - 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 1 - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit 1 -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 0 - ;; - -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 1 - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit 0 - -# 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 -Nru gimageview-0.2.27/m4/codeset.m4 gimageview-0.3.0-0.20101117/m4/codeset.m4 --- gimageview-0.2.27/m4/codeset.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#serial AM1 - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) diff -Nru gimageview-0.2.27/m4/gdk-pixbuf.m4 gimageview-0.3.0-0.20101117/m4/gdk-pixbuf.m4 --- gimageview-0.2.27/m4/gdk-pixbuf.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/gdk-pixbuf.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -# Configure paths for gdk-pixbuf -# Elliot Lee 2000-01-10 -# stolen from Raph Levien 98-11-18 -# stolen from Manish Singh 98-9-30 -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS -dnl -AC_DEFUN(AM_PATH_GDK_PIXBUF, -[dnl -dnl Get the cflags and libraries from the gdk-pixbuf-config script -dnl -AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], - gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") -AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], - gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") -AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], - , enable_gdk_pixbuftest=yes) - - if test x$gdk_pixbuf_exec_prefix != x ; then - gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" - if test x${GDK_PIXBUF_CONFIG+set} = xset ; then - GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config - fi - fi - if test x$gdk_pixbuf_prefix != x ; then - gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" - if test x${GDK_PIXBUF_CONFIG+set} = xset ; then - GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config - fi - fi - - AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) - min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) - AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) - no_gdk_pixbuf="" - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - no_gdk_pixbuf=yes - else - GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` - GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` - - gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gdk_pixbuftest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - LIBS="$LIBS $GDK_PIXBUF_LIBS" -dnl -dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity -dnl checks the results of gdk-pixbuf-config to some extent -dnl - rm -f conf.gdk_pixbuftest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gdk_pixbuftest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_gdk_pixbuf_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); - exit(1); - } - - if (($gdk_pixbuf_major_version > major) || - (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || - (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); - printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); - printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gdk_pixbuf" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GDK_PIXBUF_CONFIG" = "no" ; then - echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" - echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" - echo "*** full path to gdk-pixbuf-config." - else - if test -f conf.gdk_pixbuftest ; then - : - else - echo "*** Could not run GDK_PIXBUF test program, checking why..." - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - LIBS="$LIBS $GDK_PIXBUF_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" - echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" - echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" - echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GDK_PIXBUF_CFLAGS="" - GDK_PIXBUF_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - rm -f conf.gdk_pixbuftest -]) diff -Nru gimageview-0.2.27/m4/gettext.m4 gimageview-0.3.0-0.20101117/m4/gettext.m4 --- gimageview-0.2.27/m4/gettext.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/gettext.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,371 +0,0 @@ -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. - -# serial 10 - -dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). -dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). Otherwise, a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. -dnl LIBDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - CATOBJEXT=NONE - - dnl Add a version number to the cache macros. - define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) - define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - dnl If iconv() is in a separate libiconv library, then anyone - dnl linking with libintl{.a,.so} also needs to link with - dnl libiconv. - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - LIBS="$gt_save_LIBS" - - dnl Search for GNU msgfmt in the PATH. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext in the PATH. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - - CATOBJEXT=.gmo - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - AC_SUBST(MSGFMT) - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - AC_DEFINE(USE_INCLUDED_LIBINTL, 1, [Define if you use included gettext.]) - CATOBJEXT=.gmo - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - AC_OUTPUT_COMMANDS( - [for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done]) - - - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(GMOFILES) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - ]) - -dnl Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN([AM_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) - - AM_ICONV - AM_LANGINFO_CODESET - AM_LC_MESSAGES - AM_WITH_NLS([$1],[$2],[$3]) - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) diff -Nru gimageview-0.2.27/m4/glibc21.m4 gimageview-0.3.0-0.20101117/m4/glibc21.m4 --- gimageview-0.2.27/m4/glibc21.m4 2004-05-23 14:07:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/glibc21.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#serial 2 - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_DEFINE(HAVE_GLIBC21, 1, [Define if you have the GNU C Library 2.1 or newer.]) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) diff -Nru gimageview-0.2.27/m4/gnome.m4 gimageview-0.3.0-0.20101117/m4/gnome.m4 --- gimageview-0.2.27/m4/gnome.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/gnome.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -AC_DEFUN(AM_PATH_GNOME, -[dnl -dnl Get the cflags and libraries from the gnome-config script -dnl -AC_ARG_WITH(gnome-prefix,[ --with-gnome-prefix=PFX Prefix where GNOME is installed (optional)], - gnome_config_prefix="$withval", gnome_config_prefix="") -AC_ARG_WITH(gnome-exec-prefix,[ --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)], - gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="") - - if test x$gnome_config_exec_prefix != x ; then - gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config - fi - fi - if test x$gnome_config_prefix != x ; then - gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config - fi - fi - - AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) - min_gnome_version=ifelse([$1], , 1.1.0, $1) - - AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version) - no_gnome="" - if test "$GNOME_CONFIG" = "no" ; then - no_gnome=yes - else - GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`" - GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`" - GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`" - GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`" - - gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - needed_major_version=`echo $min_gnome_version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - needed_minor_version=`echo $min_gnome_version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - needed_micro_version=`echo $min_gnome_version | \ - sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - - if test "$gnome_config_major_version" -lt "$needed_major_version"; then - ifelse([$3], , :, [$3]) - no_gnome=yes - elif test "$gnome_config_major_version" = "$needed_major_version"; then - if test -n "$needed_minor_version" -a "$gnome_config_minor_version" -lt "$needed_minor_version"; then - ifelse([$3], , :, [$3]) - no_gnome=yes - elif test -n "$needed_minor_version" -a "$gnome_config_minor_version" = "$needed_minor_version"; then - if test -n "$needed_micro_version" -a "$gnome_config_micro_version" -lt "$needed_micro_version"; then - ifelse([$3], , :, [$3]) - no_gnome=yes - fi - fi - fi - fi - AC_SUBST(GNOME_CFLAGS) - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_CFLAGS) - AC_SUBST(GNOMEUI_LIBS) - - if test "x$no_gnome" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GNOME_CONFIG" = "no" ; then - echo "*** The gnome-config script could not be found." - else - : - fi - GNOME_CFLAGS="" - GNOME_LIBS="" - ifelse([$3], , :, [$3]) - fi - - tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir` - if test -n "$4"; then - AC_MSG_CHECKING([for additional GNOME modules]) - fi - for module in $4 ""; do - gnome_m4_notfound=no - if test "$module" = zvt; then - ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`" - AC_SUBST(ZVT_LIBS) - elif test "$module" = gtk; then - GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`" - GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`" - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - elif test "$module" = "glib"; then - GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`" - GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`" - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - elif test "$module" = "oaf"; then - OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`" - OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`" - AC_SUBST(OAF_CFLAGS) - AC_SUBST(OAF_LIBS) - elif test "$module" = "gnorba"; then - GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`" - GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`" - AC_SUBST(GNORBA_CFLAGS) - AC_SUBST(GNORBA_LIBS) - elif test -n "$module"; then - if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then - tmp_bsnom=`echo $module | tr a-z A-Z` - eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\" - eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\" - else - AC_MSG_RESULT([*** $module library is not installed]) - ifelse([$3], , :, [$3]) - gnome_m4_notfound=yes - fi - fi - if test "$gnome_m4_notfound" = no; then - echo $ac_n " $module" 1>&6 - fi - done - if test -n "$4"; then - AC_MSG_RESULT([]) - fi -]) diff -Nru gimageview-0.2.27/m4/gtk.m4 gimageview-0.3.0-0.20101117/m4/gtk.m4 --- gimageview-0.2.27/m4/gtk.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/gtk.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,194 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) - - for module in . $4 - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff -Nru gimageview-0.2.27/m4/iconv.m4 gimageview-0.3.0-0.20101117/m4/iconv.m4 --- gimageview-0.2.27/m4/iconv.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/iconv.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-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. - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) diff -Nru gimageview-0.2.27/m4/imlib.m4 gimageview-0.3.0-0.20101117/m4/imlib.m4 --- gimageview-0.2.27/m4/imlib.m4 2004-05-23 14:07:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/imlib.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,301 +0,0 @@ -# Configure paths for IMLIB -# Frank Belew 98-8-31 -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS -dnl -AC_DEFUN(AM_PATH_IMLIB, -[dnl -dnl Get the cflags and libraries from the imlib-config script -dnl -AC_ARG_WITH(imlib-prefix,[ --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional)], - imlib_prefix="$withval", imlib_prefix="") -AC_ARG_WITH(imlib-exec-prefix,[ --with-imlib-exec-prefix=PFX Exec prefix where IMLIB is installed (optional)], - imlib_exec_prefix="$withval", imlib_exec_prefix="") -AC_ARG_ENABLE(imlibtest, [ --disable-imlibtest Do not try to compile and run a test IMLIB program], - , enable_imlibtest=yes) - - if test x$imlib_exec_prefix != x ; then - imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_exec_prefix/bin/imlib-config - fi - fi - if test x$imlib_prefix != x ; then - imlib_args="$imlib_args --prefix=$imlib_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_prefix/bin/imlib-config - fi - fi - - AC_PATH_PROG(IMLIB_CONFIG, imlib-config, no) - min_imlib_version=ifelse([$1], ,1.8.2,$1) - AC_MSG_CHECKING(for IMLIB - version >= $min_imlib_version) - no_imlib="" - if test "$IMLIB_CONFIG" = "no" ; then - no_imlib=yes - else - IMLIB_CFLAGS=`$IMLIB_CONFIG $imlibconf_args --cflags` - IMLIB_LIBS=`$IMLIB_CONFIG $imlibconf_args --libs` - - imlib_major_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - imlib_minor_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - imlib_micro_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_imlibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $IMLIB_CFLAGS" - LIBS="$LIBS $IMLIB_LIBS" -dnl -dnl Now check if the installed IMLIB is sufficiently new. (Also sanity -dnl checks the results of imlib-config to some extent -dnl - rm -f conf.imlibtest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.imlibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_imlib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_imlib_version"); - exit(1); - } - - if (($imlib_major_version > major) || - (($imlib_major_version == major) && ($imlib_minor_version > minor)) || - (($imlib_major_version == major) && ($imlib_minor_version == minor) && - ($imlib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version); - printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor); - printf("*** best to upgrade to the required version.\n"); - printf("*** If imlib-config was wrong, set the environment variable IMLIB_CONFIG\n"); - printf("*** to point to the correct copy of imlib-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_imlib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_imlib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$IMLIB_CONFIG" = "no" ; then - echo "*** The imlib-config script installed by IMLIB could not be found" - echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the IMLIB_CONFIG environment variable to the" - echo "*** full path to imlib-config." - else - if test -f conf.imlibtest ; then - : - else - echo "*** Could not run IMLIB test program, checking why..." - CFLAGS="$CFLAGS $IMLIB_CFLAGS" - LIBS="$LIBS $IMLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding IMLIB or finding the wrong" - echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" - echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" - echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - IMLIB_CFLAGS="" - IMLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(IMLIB_CFLAGS) - AC_SUBST(IMLIB_LIBS) - rm -f conf.imlibtest -]) - -# Check for gdk-imlib -AC_DEFUN(AM_PATH_GDK_IMLIB, -[dnl -dnl Get the cflags and libraries from the imlib-config script -dnl -AC_ARG_WITH(imlib-prefix,[ --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional)], - imlib_prefix="$withval", imlib_prefix="") -AC_ARG_WITH(imlib-exec-prefix,[ --with-imlib-exec-prefix=PFX Exec prefix where IMLIB is installed (optional)], - imlib_exec_prefix="$withval", imlib_exec_prefix="") -AC_ARG_ENABLE(imlibtest, [ --disable-imlibtest Do not try to compile and run a test IMLIB program], - , enable_imlibtest=yes) - - if test x$imlib_exec_prefix != x ; then - imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_exec_prefix/bin/imlib-config - fi - fi - if test x$imlib_prefix != x ; then - imlib_args="$imlib_args --prefix=$imlib_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_prefix/bin/imlib-config - fi - fi - - AC_PATH_PROG(IMLIB_CONFIG, imlib-config, no) - min_imlib_version=ifelse([$1], ,1.8.2,$1) - AC_MSG_CHECKING(for IMLIB - version >= $min_imlib_version) - no_imlib="" - if test "$IMLIB_CONFIG" = "no" ; then - no_imlib=yes - else - GDK_IMLIB_CFLAGS=`$IMLIB_CONFIG $imlibconf_args --cflags-gdk` - GDK_IMLIB_LIBS=`$IMLIB_CONFIG $imlibconf_args --libs-gdk` - - imlib_major_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - imlib_minor_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - if test "x$enable_imlibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" -dnl -dnl Now check if the installed IMLIB is sufficiently new. (Also sanity -dnl checks the results of imlib-config to some extent -dnl - rm -f conf.imlibtest - AC_TRY_RUN([ -#include -#include -#include - -int main () -{ - int major, minor; - char *tmp_version; - - system ("touch conf.gdkimlibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_imlib_version"); - if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) { - printf("%s, bad version string\n", "$min_imlib_version"); - exit(1); - } - - if (($imlib_major_version > major) || - (($imlib_major_version == major) && ($imlib_minor_version >= minor))) - { - return 0; - } - else - { - printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version); - printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor); - printf("*** best to upgrade to the required version.\n"); - printf("*** If imlib-config was wrong, set the environment variable IMLIB_CONFIG\n"); - printf("*** to point to the correct copy of imlib-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_imlib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_imlib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$IMLIB_CONFIG" = "no" ; then - echo "*** The imlib-config script installed by IMLIB could not be found" - echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the IMLIB_CONFIG environment variable to the" - echo "*** full path to imlib-config." - else - if test -f conf.gdkimlibtest ; then - : - else - echo "*** Could not run IMLIB test program, checking why..." - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding IMLIB or finding the wrong" - echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" - echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" - echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - IMLIB_CFLAGS="" - IMLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GDK_IMLIB_CFLAGS) - AC_SUBST(GDK_IMLIB_LIBS) - rm -f conf.gdkimlibtest -]) diff -Nru gimageview-0.2.27/m4/intltool.m4 gimageview-0.3.0-0.20101117/m4/intltool.m4 --- gimageview-0.2.27/m4/intltool.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/intltool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak -## Kenneth Christiansen -## -## 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. - -dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) -# serial 1 AC_PROG_INTLTOOL -AC_DEFUN(AC_PROG_INTLTOOL, -[ - -if test -n "$1"; then - AC_MSG_CHECKING(for intltool >= $1) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${srcdir}/intltool-update.in` - changequote({{,}}) - INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}/intltool-update.in` - changequote([,]) - - if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - else - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.]) - exit 1 - fi -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' - -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) - -# Use the tools built into the package, not the ones that are installed. - -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' -INTLTOOL_MERGE='$(top_builddir)/intltool-merge' -INTLTOOL_UPDATE='$(top_builddir)/intltool-update' - -AC_SUBST(INTLTOOL_EXTRACT) -AC_SUBST(INTLTOOL_MERGE) -AC_SUBST(INTLTOOL_UPDATE) - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) -fi - -# Remove file type tags (using []) from po/POTFILES. - -ifdef([AC_DIVERSION_ICMDS],[ - AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) - changequote(,) - mv -f po/POTFILES po/POTFILES.tmp - sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES - rm -f po/POTFILES.tmp - changequote([,]) - AC_DIVERT_POP() -],[ - ifdef([AC_CONFIG_COMMANDS_PRE],[ - AC_CONFIG_COMMANDS_PRE([ - changequote(,) - mv -f po/POTFILES po/POTFILES.tmp - sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES - rm -f po/POTFILES.tmp - changequote([,]) - ]) - ]) -]) - -# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. - -AC_OUTPUT_COMMANDS([ - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out -if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then - rm -f intltool-extract.out -else - mv -f intltool-extract.out intltool-extract -fi -chmod ugo+x intltool-extract -chmod u+w intltool-extract - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.in > intltool-merge.out -if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then - rm -f intltool-merge.out -else - mv -f intltool-merge.out intltool-merge -fi -chmod ugo+x intltool-merge -chmod u+w intltool-merge - -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.in > intltool-update.out -if cmp -s intltool-update intltool-update.out 2>/dev/null; then - rm -f intltool-update.out -else - mv -f intltool-update.out intltool-update -fi -chmod ugo+x intltool-update -chmod u+w intltool-update - -], INTLTOOL_PERL=${INTLTOOL_PERL}) - -]) diff -Nru gimageview-0.2.27/m4/isc-posix.m4 gimageview-0.3.0-0.20101117/m4/isc-posix.m4 --- gimageview-0.2.27/m4/isc-posix.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/isc-posix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#serial 1 -# 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 -Nru gimageview-0.2.27/m4/lcmessage.m4 gimageview-0.3.0-0.20101117/m4/lcmessage.m4 --- gimageview-0.2.27/m4/lcmessage.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/lcmessage.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. - -# serial 2 - -AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) diff -Nru gimageview-0.2.27/m4/libcharset.m4 gimageview-0.3.0-0.20101117/m4/libcharset.m4 --- gimageview-0.2.27/m4/libcharset.m4 2004-05-23 14:07:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/libcharset.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -# Macro to add for using libcharset. -# Takuro Ashie , 2002. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. - -AC_DEFUN([AM_LIBCHARSET], -[ - AC_ARG_WITH([libcharset-prefix], -[ --with-libcharset-prefix=DIR search for libcharset in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) - - AC_CACHE_CHECK(for libcharset, am_cv_libcharset, [ - am_cv_libcharset=no - am_save_LIBS="$LIBS" - LIBS="$LIBS -lcharset" - AC_TRY_LINK([#include ], - [const char *charset = locale_charset ();], - am_cv_libcharset=yes) - LIBS="$am_save_LIBS" - ]) - - LIBCHARSET= - if test "$am_cv_libcharset" = yes; then - AC_DEFINE(HAVE_LIBCHARSET, 1, [Define if you have the locale_charset() function.]) - LIBCHARSET="-lcharset" - fi - AC_SUBST(LIBCHARSET) -]) diff -Nru gimageview-0.2.27/m4/libtool.m4 gimageview-0.3.0-0.20101117/m4/libtool.m4 --- gimageview-0.2.27/m4/libtool.m4 2004-06-11 09:40:02.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/libtool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,3528 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 -## 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. - -## 2003-05-21 Takuro Ashie -## -## * Added "/lib/w32api" in sys_lib_search_path_spec -## - -# serial 46 AC_PROG_LIBTOOL - -builtin([undefine],[symbols]) - -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])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_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.13)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 -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -_LT_AC_PROG_ECHO_BACKSLASH -# 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_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE(libtool-lock, - [ --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 -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - 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 - 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_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - 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 - ;; - -ifdef([AC_PROVIDE_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) - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, - [AC_TRY_LINK([], - [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0);], - [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; - ]) -esac - -_LT_AC_LTCONFIG_HACK - -]) - -# _LT_AC_CHECK_DLFCN -# -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, -[AC_CHECK_HEADERS(dlfcn.h) -])# _LT_AC_CHECK_DLFCN - -# 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]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl - -# 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_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_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 - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix*) - [symcode='[BCDEGRST]'] - ;; -solaris* | sysv5*) - [symcode='[BDT]'] - ;; -sysv4) - [symcode='[DFNSTU]'] - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $host_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. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - [symcode='[ABCDGISTW]'] -fi - -# 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 egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' 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_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#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[] =] -{ -EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AC_FD_CC - fi - else - echo "cannot find nm_test_var in $nlist" >&AC_FD_CC - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi - else - echo "$progname: failed program was:" >&AC_FD_CC - 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 -]) -global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -if test -z "$lt_cv_sys_global_symbol_pipe"; then - global_symbol_to_cdecl= - global_symbol_to_c_name_address= -else - global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" - global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -fi -if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; -then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - -# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -# --------------------------------- -AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], -[# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac -fi -])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR - -# _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], -[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR - -# 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. - - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH /usr/ucb; do - 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="$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) -AC_DIVERT_POP -])# _LT_AC_PROG_ECHO_BACKSLASH - -# _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, -[if test "$cross_compiling" = yes; then : - [$4] -else - AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - 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, -[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 - ;; - - cygwin* | mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - *) - 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" - AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - 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_DEFUN([_LT_AC_LTCONFIG_HACK], -[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl -# 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' - -# 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" -need_locks="$enable_libtool_lock" - -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 "$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 "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -if test x"$host" != x"$build"; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case $host_os in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -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 - -# 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 - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="[$]2" - -## FIXME: this should be a separate macro -## -AC_MSG_CHECKING([for objdir]) -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -AC_MSG_RESULT($objdir) -## -## END FIXME - - -## FIXME: this should be a separate macro -## -AC_ARG_WITH(pic, -[ --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 - -# We assume here that the value for lt_cv_prog_cc_pic will not be cached -# in isolation, and that seeing it set (from the cache) indicates that -# the associated values are set (in the cache) correctly too. -AC_MSG_CHECKING([for $compiler option to produce PIC]) -AC_CACHE_VAL(lt_cv_prog_cc_pic, -[ lt_cv_prog_cc_pic= - lt_cv_prog_cc_shlib= - lt_cv_prog_cc_wl= - lt_cv_prog_cc_static= - lt_cv_prog_cc_no_builtin= - lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-static' - - case $host_os in - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # not sure about C++ programs. - lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" - ;; - 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_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_cv_prog_cc_pic='-fno-common' - ;; - cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_cv_prog_cc_pic=-Kconform_pic - fi - ;; - *) - lt_cv_prog_cc_pic='-fPIC' - ;; - esac - else - # PORTME Check for PIC flags for the system compiler. - case $host_os in - aix3* | aix4* | aix5*) - lt_cv_prog_cc_wl='-Wl,' - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | 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_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - - newsos6) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - - solaris*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - ;; - - sunos4*) - lt_cv_prog_cc_pic='-PIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi - ;; - - uts4*) - lt_cv_prog_cc_pic='-pic' - lt_cv_prog_cc_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_cv_prog_cc_pic='-Kconform_pic' - lt_cv_prog_cc_static='-Bstatic' - fi - ;; - - *) - lt_cv_prog_cc_can_build_shared=no - ;; - esac - fi -]) -if test -z "$lt_cv_prog_cc_pic"; then - AC_MSG_RESULT([none]) -else - AC_MSG_RESULT([$lt_cv_prog_cc_pic]) - - # Check to make sure the pic_flag actually works. - AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works]) - AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - AC_TRY_COMPILE([], [], [dnl - case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; - *) - lt_cv_prog_cc_pic_works=yes - ;; - esac - ], [dnl - lt_cv_prog_cc_pic_works=no - ]) - CFLAGS="$save_CFLAGS" - ]) - - if test "X$lt_cv_prog_cc_pic_works" = Xno; then - lt_cv_prog_cc_pic= - lt_cv_prog_cc_can_build_shared=no - else - lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" - fi - - AC_MSG_RESULT([$lt_cv_prog_cc_pic_works]) -fi -## -## END FIXME - -# Check for any special shared library compilation flags. -if test -n "$lt_cv_prog_cc_shlib"; then - AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : - else - AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) - lt_cv_prog_cc_can_build_shared=no - fi -fi - -## FIXME: this should be a separate macro -## -AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works]) -AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl - lt_cv_prog_cc_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes]) - LDFLAGS="$save_LDFLAGS" -]) - -# Belt *and* braces to stop my trousers falling down: -test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -AC_MSG_RESULT([$lt_cv_prog_cc_static_works]) - -pic_flag="$lt_cv_prog_cc_pic" -special_shlib_compile_flags="$lt_cv_prog_cc_shlib" -wl="$lt_cv_prog_cc_wl" -link_static_flag="$lt_cv_prog_cc_static" -no_builtin_flag="$lt_cv_prog_cc_no_builtin" -can_build_shared="$lt_cv_prog_cc_can_build_shared" -## -## END FIXME - - -## FIXME: this should be a separate macro -## -# Check to see if options -o and -c are simultaneously supported by compiler -AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext]) -AC_CACHE_VAL([lt_cv_compiler_c_o], [ -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -echo "int some_variable = 0;" > conftest.$ac_ext -mkdir out -# According to Tom Tromey, Ian Lance Taylor reported there are C compilers -# that will create temporary files in the current directory regardless of -# the output directory. Thus, making CWD read-only will cause this test -# to fail, enabling locking or at least warning the user not to do parallel -# builds. -chmod -w . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" -compiler_c_o=no -if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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_compiler_c_o=no - else - lt_cv_compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&AC_FD_CC - lt_cv_compiler_c_o=no -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null -]) -compiler_c_o=$lt_cv_compiler_c_o -AC_MSG_RESULT([$compiler_c_o]) - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - AC_MSG_CHECKING([if $compiler supports -c -o file.lo]) - AC_CACHE_VAL([lt_cv_compiler_o_lo], [ - lt_cv_compiler_o_lo=no - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - save_objext="$ac_objext" - ac_objext=lo - AC_TRY_COMPILE([], [int some_variable = 0;], [dnl - # 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_compiler_o_lo=no - else - lt_cv_compiler_o_lo=yes - fi - ]) - ac_objext="$save_objext" - CFLAGS="$save_CFLAGS" - ]) - compiler_o_lo=$lt_cv_compiler_o_lo - AC_MSG_RESULT([$compiler_o_lo]) -else - compiler_o_lo=no -fi -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Check to see if we can do hard links to lock some files if needed -hard_links="nottested" -if test "$compiler_c_o" = 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 -## -## END FIXME - -## FIXME: this should be a separate macro -## -if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions]) - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - AC_TRY_COMPILE([], [int some_variable = 0;], [dnl - # 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 - compiler_rtti_exceptions=no - else - compiler_rtti_exceptions=yes - fi - ]) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$compiler_rtti_exceptions]) - - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi -fi -## -## END FIXME - -## FIXME: this should be a separate macro -## -# See if the linker supports building shared libraries. -AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries]) - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -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_into_libs=no -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -link_all_deplibs=unknown -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 egrep regular expression 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, the GNU linker is very broken - # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. - 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 - ;; - - 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 use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': 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*) - # 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=yes - - extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ - sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ - test -f $output_objdir/impgen.exe || (cd $output_objdir && \ - if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ - else $CC -o impgen impgen.c ; fi)~ - $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' - - # cygwin and mingw dlls have different entry points and sets of symbols - # to exclude. - # FIXME: what about values for MSVC? - dll_entry=__cygwin_dll_entry@12 - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ - case $host_os in - mingw*) - # mingw values - dll_entry=_DllMainCRTStartup@12 - dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; - esac - - # mingw and cygwin differ, and it's simplest to just exclude the union - # of the two symbol sets. - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one (in ltdll.c) - if test "x$lt_cv_need_dllmain" = "xyes"; then - ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ - test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' - else - ltdll_obj= - ltdll_cmds= - fi - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - # Be careful not to strip the DATA tag left be newer dlltools. - export_symbols_cmds="$ltdll_cmds"' - $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' - - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; - fi~ - '"$ltdll_cmds"' - $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ - $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ - $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' - ;; - - netbsd*) - 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 -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared -nodefaultlibs $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 | egrep '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 | egrep ': 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 - ;; - - *) - if $LD --help 2>&1 | egrep ': 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' - case $host_os in - cygwin* | mingw* | pw32*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - 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 - 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. - - hardcode_direct=yes - archive_cmds='' - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - 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 - shared_flag='${wl}-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 can do strange things, 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' - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - 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 ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but 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 ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $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 - ;; - - 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 - # 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"`' - ;; - - darwin* | rhapsody*) - case "$host_os" in - rhapsody* | darwin1.[[012]]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' - # We need to add '_' to the symbols in $export_symbols first - #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes - hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' - ;; - - 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*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - 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' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - 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 $linker_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 $linker_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 "-exported_symbol " >> $lib.exp; echo "\$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 - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - - solaris*) - no_undefined_flag=' -z defs' - # $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='-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) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - 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 - fi - 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' - ;; - - 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 - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - 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 - ;; - - sysv5uw7* | 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 - ;; - - *) - ld_shlibs=no - ;; - esac -fi -AC_MSG_RESULT([$ld_shlibs]) -test "$ld_shlibs" = no && can_build_shared=no -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Check hardcoding attributes. -AC_MSG_CHECKING([how to hardcode library paths into programs]) -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; 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 "$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 -AC_MSG_RESULT([$hardcode_action]) -## -## END FIXME - -## FIXME: this should be a separate macro -## -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 - AC_MSG_RESULT([no]) -fi -## -## END FIXME - -reload_cmds='$LD$reload_flag -o $output$reload_objs' -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -## FIXME: this should be a separate macro -## -# PORTME Fill in your ld.so characteristics -AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -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" -sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' - ;; - -aix4* | aix5*) - version_type=linux - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' - 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}.so$versuffix ${libname}${release}.so$major $libname.so' - 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}.so$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}.so' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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" - export_dynamic_flag_spec=-rdynamic - # 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 - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin*) - library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' - postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog .libs/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - ;; - yes,mingw*) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - ;; - *) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $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 - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' - soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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}.so$versuffix ${libname}${release}.so $libname.so' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - *) - 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}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$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. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") 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}" - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # We 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' - ;; - -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}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$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}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - 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 - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - 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}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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}.so$versuffix ${libname}.so$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}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=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 - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no -## -## END FIXME - -## FIXME: this should be a separate macro -## -# Report the final consequences. -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) -## -## END FIXME - -## FIXME: this should be a separate macro -## -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*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) -## -## END FIXME - -## FIXME: this should be a separate macro -## -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]) -## -## END FIXME - -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 - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -AC_LIBTOOL_DLOPEN_SELF - -## FIXME: this should be a separate macro -## -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. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - AC_CACHE_VAL([lt_cv_archive_cmds_need_lc], - [$rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile); then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_cv_prog_cc_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi]) - AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc]) - ;; - esac -fi -need_lc=${lt_cv_archive_cmds_need_lc-yes} -## -## END FIXME - -## FIXME: this should be a separate macro -## -# The second 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 - : -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. - test -f Makefile && make "$ltmain" -fi - -if test -f "$ltmain"; then - trap "$rm \"${ofile}T\"; exit 1" 1 2 15 - $rm -f "${ofile}T" - - echo creating $ofile - - # 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 CC LD LN_S NM SHELL \ - reload_flag reload_cmds wl \ - pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ - thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ - RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ - postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ - old_striplib striplib file_magic_cmd export_symbols_cmds \ - deplibs_check_method allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ - global_symbol_to_c_name_address \ - hardcode_libdir_flag_spec hardcode_libdir_separator \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - - case $var in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ - extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - finish_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 - - cat <<__EOF__ > "${ofile}T" -#! $SHELL - -# `$echo "$ofile" | 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-2000 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. - -# 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 - -# ### 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=$need_lc - -# 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 - -# The default C compiler. -CC=$lt_CC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# 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=$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_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_pic_flag -pic_mode=$pic_mode - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_compiler_c_o - -# Can we write directly to a .lo ? -compiler_o_lo=$lt_compiler_o_lo - -# 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_link_static_flag - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_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 to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# 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_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_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 - -# 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.so 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 - -# 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 >> "${ofile}T" - -# 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 - - case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments -# /* 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 */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# 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 /* for printf() */ -# #include /* for open(), lseek(), read() */ -# #include /* for O_RDONLY, O_BINARY */ -# #include /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); -# -# printf ("EXPORTS\n"); -# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - - mv -f "${ofile}T" "$ofile" || \ - (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") - chmod +x "$ofile" -fi -## -## END FIXME - -])# _LT_AC_LTCONFIG_HACK - -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# 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_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where 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, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -# 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_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where 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, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -# 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_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where 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, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[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. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) - -# 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_LIBTOOL_PICMODE - implement the --with-pic flag -# Usage: AC_LIBTOOL_PICMODE[(MODE)] -# Where 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_PATH_TOOL_PREFIX - find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -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 - 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="$ac_save_ifs" - MAGIC_CMD="$ac_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_MAGIC - find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl -AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$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) - else - MAGIC_CMD=: - fi -fi -]) - - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --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([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 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(lt_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 - 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. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_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_PROG_LD_GNU -]) - -# AC_PROG_LD_GNU - -AC_DEFUN([AC_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$lt_cv_prog_gnu_ld -]) - -# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, -[lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" -]) - -# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], -lt_cv_deplibs_check_method, -[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 egrep 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* | mingw* | pw32*) - 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='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd*) - 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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] - else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] - 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 - ;; - -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*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -[sysv5uw[78]* | sysv4*uw2*)] - 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 - ;; - esac - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -]) - - -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - 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 - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - 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 - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -AC_MSG_RESULT([$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*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL 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 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL 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, main, - [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 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) - -# 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]) diff -Nru gimageview-0.2.27/m4/libwmf.m4 gimageview-0.3.0-0.20101117/m4/libwmf.m4 --- gimageview-0.2.27/m4/libwmf.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/libwmf.m4 2010-11-17 06:10:11.000000000 +0000 @@ -10,7 +10,7 @@ dnl AM_PATH_LIBWMF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for libwmf, and define LIBWMF_CFLAGS and LIBWMF_LIBS dnl -AC_DEFUN(AM_PATH_LIBWMF, +AC_DEFUN([AM_PATH_LIBWMF], [dnl dnl Get the cflags and libraries from the libwmf-config script dnl diff -Nru gimageview-0.2.27/m4/Makefile.am gimageview-0.3.0-0.20101117/m4/Makefile.am --- gimageview-0.2.27/m4/Makefile.am 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,20 +1,5 @@ CLEANFILES = *~ .deps/* .*.swp .*.swo EXTRA_DIST = \ - codeset.m4 \ - gdk-pixbuf.m4 \ - gettext.m4 \ - glibc21.m4 \ - gnome.m4 \ - gtk.m4 \ - iconv.m4 \ - imlib.m4 \ - intltool.m4 \ - isc-posix.m4 \ - lcmessage.m4 \ - libcharset.m4 \ - libtool.m4 \ libwmf.m4 \ - pkg.m4 \ - progtest.m4 \ xine.m4 diff -Nru gimageview-0.2.27/m4/Makefile.in gimageview-0.3.0-0.20101117/m4/Makefile.in --- gimageview-0.2.27/m4/Makefile.in 2004-12-28 04:01:22.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,481 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -CLEANFILES = *~ .deps/* .*.swp .*.swo -EXTRA_DIST = \ - codeset.m4 \ - gdk-pixbuf.m4 \ - gettext.m4 \ - glibc21.m4 \ - gnome.m4 \ - gtk.m4 \ - iconv.m4 \ - imlib.m4 \ - intltool.m4 \ - isc-posix.m4 \ - lcmessage.m4 \ - libcharset.m4 \ - libtool.m4 \ - libwmf.m4 \ - pkg.m4 \ - progtest.m4 \ - xine.m4 - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign m4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/m4/pkg.m4 gimageview-0.3.0-0.20101117/m4/pkg.m4 --- gimageview-0.2.27/m4/pkg.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/pkg.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - diff -Nru gimageview-0.2.27/m4/progtest.m4 gimageview-0.3.0-0.20101117/m4/progtest.m4 --- gimageview-0.2.27/m4/progtest.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/progtest.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. - -# serial 2 - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) diff -Nru gimageview-0.2.27/m4/xine.m4 gimageview-0.3.0-0.20101117/m4/xine.m4 --- gimageview-0.2.27/m4/xine.m4 2004-05-23 14:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/m4/xine.m4 2010-11-17 06:10:11.000000000 +0000 @@ -31,13 +31,14 @@ dnl Get the cflags and libraries from the xine-config script dnl AC_ARG_WITH(xine-prefix, - [ --with-xine-prefix=PFX Prefix where XINE is installed (optional)], + AC_HELP_STRING([--with-xine-prefix=DIR], [prefix where XINE is installed (optional)]), xine_config_prefix="$withval", xine_config_prefix="") AC_ARG_WITH(xine-exec-prefix, - [ --with-xine-exec-prefix=PFX Exec prefix where XINE is installed (optional)], + AC_HELP_STRING([--with-xine-exec-prefix=DIR], [exec prefix where XINE is installed (optional)]), xine_config_exec_prefix="$withval", xine_config_exec_prefix="") AC_ARG_ENABLE(xinetest, - [ --disable-xinetest Do not try to compile and run a test XINE program],, enable_xinetest=yes) + AC_HELP_STRING([--disable-xinetest], [do not try to compile and run a test XINE program]), + enable_xinetest=$enableval, enable_xinetest=yes) if test x$xine_config_exec_prefix != x ; then xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix" @@ -56,7 +57,7 @@ if test "x$enable_xinetest" != "xyes" ; then AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version]) else - AC_PATH_PROG(XINE_CONFIG, xine-config, no) + AC_PATH_TOOL(XINE_CONFIG, xine-config, no) AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version]) no_xine="" if test "$XINE_CONFIG" = "no" ; then @@ -209,4 +210,6 @@ dnl Make sure HAVE_STRSEP, HAVE_SETENV and HAVE_STRPBRK are defined as dnl necessary. AC_CHECK_FUNCS([strsep strpbrk setenv]) +dnl alloca (in public macro) and MinGW + AC_CHECK_HEADERS([malloc.h]) ]) diff -Nru gimageview-0.2.27/Makefile.am gimageview-0.3.0-0.20101117/Makefile.am --- gimageview-0.2.27/Makefile.am 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,8 +1,8 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -SUBDIRS = doc etc m4 po intl lib src plugins +SUBDIRS = doc etc m4 po lib src plugins -CLEANFILES = *~ .deps/* .*.swp .*.swo +CLEANFILES = *~ .*.swp .*.swo endocdir = $(DESTDIR)$(gimv_docdir)/text/C endoc_DATA = \ @@ -12,8 +12,7 @@ README \ INSTALL \ NEWS \ - TODO \ - HACKING + TODO EXTRA_DIST = \ intltool-merge.in \ diff -Nru gimageview-0.2.27/Makefile.in gimageview-0.3.0-0.20101117/Makefile.in --- gimageview-0.2.27/Makefile.in 2004-12-28 04:01:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,798 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/gimageview.spec.in $(top_srcdir)/configure \ - $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO acconfig.h config.guess config.sub \ - depcomp install-sh ltmain.sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = intl/Makefile gimageview.spec -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -am__installdirs = "$(DESTDIR)$(endocdir)" -endocDATA_INSTALL = $(INSTALL_DATA) -DATA = $(endoc_DATA) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = doc etc m4 po intl lib src plugins -CLEANFILES = *~ .deps/* .*.swp .*.swo -endocdir = $(DESTDIR)$(gimv_docdir)/text/C -endoc_DATA = \ - AUTHORS \ - COPYING \ - ChangeLog \ - README \ - INSTALL \ - NEWS \ - TODO \ - HACKING - -EXTRA_DIST = \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in \ - autogen.sh \ - gimageview.spec \ - gimageview.spec.in \ - $(endoc_DATA) - -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -gimageview.spec: $(top_builddir)/config.status $(srcdir)/gimageview.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-endocDATA: $(endoc_DATA) - @$(NORMAL_INSTALL) - test -z "$(endocdir)" || $(mkdir_p) "$(DESTDIR)$(endocdir)" - @list='$(endoc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(endocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(endocdir)/$$f'"; \ - $(endocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(endocdir)/$$f"; \ - done - -uninstall-endocDATA: - @$(NORMAL_UNINSTALL) - @list='$(endoc_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(endocdir)/$$f'"; \ - rm -f "$(DESTDIR)$(endocdir)/$$f"; \ - 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. -$(RECURSIVE_TARGETS): - @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; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - 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 -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/intl $(distdir)/m4 $(distdir)/po - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_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 - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - --with-included-gettext \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) config.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(endocdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-endocDATA - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-endocDATA uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-endocDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-endocDATA uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/missing gimageview-0.3.0-0.20101117/missing --- gimageview-0.2.27/missing 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/missing 1970-01-01 00:00:00.000000000 +0000 @@ -1,336 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 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, 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. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - - aclocal*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 diff -Nru gimageview-0.2.27/mkinstalldirs gimageview-0.3.0-0.20101117/mkinstalldirs --- gimageview-0.2.27/mkinstalldirs 2004-05-23 14:08:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in -0) exit 0 ;; -esac - -case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 3 -# End: -# mkinstalldirs ends here diff -Nru gimageview-0.2.27/plugins/archiver/lha-ext.c gimageview-0.3.0-0.20101117/plugins/archiver/lha-ext.c --- gimageview-0.2.27/plugins/archiver/lha-ext.c 2004-05-23 14:08:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/lha-ext.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: lha-ext.c,v 1.14 2003/06/18 09:26:53 makeinu Exp $ + * $Id: lha-ext.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -28,14 +28,17 @@ #include "gimageview.h" -#include "fileutil.h" #include "fr-archive.h" #include "fr-command.h" #include "gimv_image_info.h" #include "gimv_plugin.h" +#include "utils_file.h" #include "lha-ext.h" +G_DEFINE_TYPE (FRCommandLha, fr_command_lha, FR_TYPE_COMMAND) + + /* plugin implement definition */ static ExtArchiverPlugin plugin_impl[] = { @@ -59,16 +62,7 @@ }; -static void fr_command_lha_class_init (FRCommandLhaClass *class); - -static void fr_command_lha_init (FRCommand *afile); - -static void fr_command_lha_destroy (GtkObject *object); - - -/* Parent Class */ - -static FRCommandClass *parent_class = NULL; +static void fr_command_lha_dispose (GObject *object); /* -- list -- */ @@ -312,13 +306,12 @@ fr_command_lha_class_init (FRCommandLhaClass *class) { FRCommandClass *afc; - GtkObjectClass *object_class; + GObjectClass *gobject_class; - parent_class = gtk_type_class (FR_COMMAND_TYPE); - object_class = (GtkObjectClass*) class; + gobject_class = (GObjectClass*) class; afc = (FRCommandClass*) class; - object_class->destroy = fr_command_lha_destroy; + gobject_class->dispose = fr_command_lha_dispose; afc->list = fr_command_lha_list; afc->add = fr_command_lha_add; @@ -328,8 +321,9 @@ static void -fr_command_lha_init (FRCommand *comm) +fr_command_lha_init (FRCommandLha *lha_comm) { + FRCommand *comm = FR_COMMAND(lha_comm); comm->propAddCanUpdate = TRUE; comm->propExtractCanAvoidOverwrite = FALSE; comm->propExtractCanSkipOlder = FALSE; @@ -340,38 +334,14 @@ static void -fr_command_lha_destroy (GtkObject *object) +fr_command_lha_dispose (GObject *object) { g_return_if_fail (object != NULL); - g_return_if_fail (IS_FR_COMMAND_LHA (object)); + g_return_if_fail (FR_IS_COMMAND_LHA (object)); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GtkType -fr_command_lha_get_type () -{ - static guint fr_command_lha_type = 0; - - if (!fr_command_lha_type) { - GtkTypeInfo fr_command_lha_info = { - "FRCommandLha", - sizeof (FRCommandLha), - sizeof (FRCommandLhaClass), - (GtkClassInitFunc) fr_command_lha_class_init, - (GtkObjectInitFunc) fr_command_lha_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - fr_command_lha_type = gtk_type_unique (fr_command_get_type(), - &fr_command_lha_info); - } - - return fr_command_lha_type; + if (G_OBJECT_CLASS (fr_command_lha_parent_class)->dispose) + G_OBJECT_CLASS (fr_command_lha_parent_class)->dispose (object); } @@ -382,7 +352,7 @@ { FRCommand *comm; - comm = FR_COMMAND (gtk_type_new (fr_command_lha_get_type ())); + comm = FR_COMMAND (g_object_new (FR_TYPE_COMMAND_LHA, NULL)); fr_command_construct (comm, process, filename); fr_process_set_proc_line_func (FR_COMMAND (comm)->process, process_line, diff -Nru gimageview-0.2.27/plugins/archiver/lha-ext.h gimageview-0.3.0-0.20101117/plugins/archiver/lha-ext.h --- gimageview-0.2.27/plugins/archiver/lha-ext.h 2004-05-23 14:08:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/lha-ext.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,45 +19,41 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: lha-ext.h,v 1.7 2003/06/13 09:42:56 makeinu Exp $ + * $Id: lha-ext.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_COMMAND_LHA_H #define FR_COMMAND_LHA_H -#include +#include #include "fr-command.h" #include "fr-process.h" - -#define FR_COMMAND_LHA_TYPE fr_command_lha_get_type () -#define FR_COMMAND_LHA(o) GTK_CHECK_CAST (o, FR_COMMAND_LHA_TYPE, FRCommandLha) -#define FR_COMMAND_LHA_CLASS(k) GTK_CHECK_CLASS_CAST (k, FR_COMMAND_LHA_TYPE, FRCommandLhaClass) -#define IS_FR_COMMAND_LHA(o) GTK_CHECK_TYPE (o, FR_COMMAND_LHA_TYPE) - +#define FR_TYPE_COMMAND_LHA (fr_command_lha_get_type ()) +#define FR_COMMAND_LHA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND_LHA, FRCommandLha)) +#define FR_COMMAND_LHA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND_LHA, FRCommandLhaClass)) +#define FR_IS_COMMAND_LHA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND_LHA)) +#define FR_IS_COMMAND_LHA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND_LHA)) +#define FR_COMMAND_LHA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND_LHA, FRCommandLhaClass)) typedef struct _FRCommandLha FRCommandLha; typedef struct _FRCommandLhaClass FRCommandLhaClass; - struct _FRCommandLha { FRCommand __parent; }; - struct _FRCommandLhaClass { FRCommandClass __parent_class; }; - -GtkType fr_command_lha_get_type (void); +GType fr_command_lha_get_type (void); FRCommand* fr_command_lha_new (FRProcess *process, const char *filename, FRArchive *archive); - #endif /* FR_COMMAND_LHA_H */ diff -Nru gimageview-0.2.27/plugins/archiver/Makefile.in gimageview-0.3.0-0.20101117/plugins/archiver/Makefile.in --- gimageview-0.2.27/plugins/archiver/Makefile.in 2004-12-28 04:01:25.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,648 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_lha_extarc_la_SOURCES) $(libgimv_rar_extarc_la_SOURCES) $(libgimv_tar_extarc_la_SOURCES) $(libgimv_zip_extarc_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/archiver -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(archiver_plugindir)" -archiver_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(archiver_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_lha_extarc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_lha_extarc_la_OBJECTS = lha-ext.lo -libgimv_lha_extarc_la_OBJECTS = $(am_libgimv_lha_extarc_la_OBJECTS) -libgimv_rar_extarc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_rar_extarc_la_OBJECTS = rar-ext.lo -libgimv_rar_extarc_la_OBJECTS = $(am_libgimv_rar_extarc_la_OBJECTS) -libgimv_tar_extarc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_tar_extarc_la_OBJECTS = tar-ext.lo -libgimv_tar_extarc_la_OBJECTS = $(am_libgimv_tar_extarc_la_OBJECTS) -libgimv_zip_extarc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_zip_extarc_la_OBJECTS = zip-ext.lo -libgimv_zip_extarc_la_OBJECTS = $(am_libgimv_zip_extarc_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/lha-ext.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/rar-ext.Plo ./$(DEPDIR)/tar-ext.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/zip-ext.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_lha_extarc_la_SOURCES) \ - $(libgimv_rar_extarc_la_SOURCES) \ - $(libgimv_tar_extarc_la_SOURCES) \ - $(libgimv_zip_extarc_la_SOURCES) -DIST_SOURCES = $(libgimv_lha_extarc_la_SOURCES) \ - $(libgimv_rar_extarc_la_SOURCES) \ - $(libgimv_tar_extarc_la_SOURCES) \ - $(libgimv_zip_extarc_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -archiver_plugin_LTLIBRARIES = \ - libgimv_lha_extarc.la \ - libgimv_rar_extarc.la \ - libgimv_tar_extarc.la \ - libgimv_zip_extarc.la - -archiver_plugindir = $(DESTDIR)$(plugindir)/$(ARCHIVER_PLUGIN_DIR) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) -libgimv_lha_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_lha_extarc_la_SOURCES = lha-ext.c lha-ext.h -libgimv_lha_extarc_la_LIBADD = $(GTK_LIBS) -libgimv_rar_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_rar_extarc_la_SOURCES = rar-ext.c rar-ext.h -libgimv_rar_extarc_la_LIBADD = $(GTK_LIBS) -libgimv_tar_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_tar_extarc_la_SOURCES = tar-ext.c tar-ext.h -libgimv_tar_extarc_la_LIBADD = $(GTK_LIBS) -libgimv_zip_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_zip_extarc_la_SOURCES = zip-ext.c zip-ext.h -libgimv_zip_extarc_la_LIBADD = $(GTK_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/archiver/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/archiver/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-archiver_pluginLTLIBRARIES: $(archiver_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(archiver_plugindir)" || $(mkdir_p) "$(DESTDIR)$(archiver_plugindir)" - @list='$(archiver_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(archiver_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(archiver_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(archiver_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(archiver_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-archiver_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(archiver_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(archiver_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(archiver_plugindir)/$$p"; \ - done - -clean-archiver_pluginLTLIBRARIES: - -test -z "$(archiver_plugin_LTLIBRARIES)" || rm -f $(archiver_plugin_LTLIBRARIES) - @list='$(archiver_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_lha_extarc.la: $(libgimv_lha_extarc_la_OBJECTS) $(libgimv_lha_extarc_la_DEPENDENCIES) - $(LINK) -rpath $(archiver_plugindir) $(libgimv_lha_extarc_la_LDFLAGS) $(libgimv_lha_extarc_la_OBJECTS) $(libgimv_lha_extarc_la_LIBADD) $(LIBS) -libgimv_rar_extarc.la: $(libgimv_rar_extarc_la_OBJECTS) $(libgimv_rar_extarc_la_DEPENDENCIES) - $(LINK) -rpath $(archiver_plugindir) $(libgimv_rar_extarc_la_LDFLAGS) $(libgimv_rar_extarc_la_OBJECTS) $(libgimv_rar_extarc_la_LIBADD) $(LIBS) -libgimv_tar_extarc.la: $(libgimv_tar_extarc_la_OBJECTS) $(libgimv_tar_extarc_la_DEPENDENCIES) - $(LINK) -rpath $(archiver_plugindir) $(libgimv_tar_extarc_la_LDFLAGS) $(libgimv_tar_extarc_la_OBJECTS) $(libgimv_tar_extarc_la_LIBADD) $(LIBS) -libgimv_zip_extarc.la: $(libgimv_zip_extarc_la_OBJECTS) $(libgimv_zip_extarc_la_DEPENDENCIES) - $(LINK) -rpath $(archiver_plugindir) $(libgimv_zip_extarc_la_LDFLAGS) $(libgimv_zip_extarc_la_OBJECTS) $(libgimv_zip_extarc_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lha-ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rar-ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar-ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zip-ext.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(archiver_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-archiver_pluginLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-archiver_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-archiver_pluginLTLIBRARIES uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-archiver_pluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-archiver_pluginLTLIBRARIES install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-archiver_pluginLTLIBRARIES uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/archiver/rar-ext.c gimageview-0.3.0-0.20101117/plugins/archiver/rar-ext.c --- gimageview-0.2.27/plugins/archiver/rar-ext.c 2004-09-28 13:38:24.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/rar-ext.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: rar-ext.c,v 1.14 2004/09/28 13:38:24 makeinu Exp $ + * $Id: rar-ext.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -28,14 +28,17 @@ #include "gimageview.h" -#include "fileutil.h" #include "fr-archive.h" #include "fr-command.h" #include "gimv_image_info.h" #include "gimv_plugin.h" +#include "utils_file.h" #include "rar-ext.h" +G_DEFINE_TYPE (FRCommandRar, fr_command_rar, FR_TYPE_COMMAND) + + /* plugin implement definition */ static ExtArchiverPlugin plugin_impl[] = { @@ -59,16 +62,7 @@ }; -static void fr_command_rar_class_init (FRCommandRarClass *class); - -static void fr_command_rar_init (FRCommand *afile); - -static void fr_command_rar_destroy (GtkObject *object); - - -/* Parent Class */ - -static FRCommandClass *parent_class = NULL; +static void fr_command_rar_dispose (GObject *object); /* -- list -- */ @@ -234,7 +228,7 @@ static void fr_command_rar_list (FRCommand *comm) { - FR_COMMAND_RAR (comm)->list_started = FALSE; + FR_COMMAND_RAR(comm)->list_started = FALSE; fr_process_clear (comm->process); fr_process_begin_command (comm->process, "rar"); @@ -343,13 +337,12 @@ fr_command_rar_class_init (FRCommandRarClass *class) { FRCommandClass *afc; - GtkObjectClass *object_class; + GObjectClass *gobject_class; - parent_class = gtk_type_class (FR_COMMAND_TYPE); - object_class = (GtkObjectClass*) class; + gobject_class = (GObjectClass*) class; afc = (FRCommandClass*) class; - object_class->destroy = fr_command_rar_destroy; + gobject_class->dispose = fr_command_rar_dispose; afc->list = fr_command_rar_list; afc->add = fr_command_rar_add; @@ -359,8 +352,10 @@ static void -fr_command_rar_init (FRCommand *comm) +fr_command_rar_init (FRCommandRar *rar_comm) { + FRCommand *comm = FR_COMMAND(rar_comm); + comm->propAddCanUpdate = TRUE; comm->propExtractCanAvoidOverwrite = TRUE; comm->propExtractCanSkipOlder = TRUE; @@ -371,38 +366,14 @@ static void -fr_command_rar_destroy (GtkObject *object) +fr_command_rar_dispose (GObject *object) { g_return_if_fail (object != NULL); - g_return_if_fail (IS_FR_COMMAND_RAR (object)); + g_return_if_fail (FR_IS_COMMAND_RAR (object)); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GtkType -fr_command_rar_get_type () -{ - static guint fr_command_rar_type = 0; - - if (!fr_command_rar_type) { - GtkTypeInfo fr_command_rar_info = { - "FRCommandRar", - sizeof (FRCommandRar), - sizeof (FRCommandRarClass), - (GtkClassInitFunc) fr_command_rar_class_init, - (GtkObjectInitFunc) fr_command_rar_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - fr_command_rar_type = gtk_type_unique (fr_command_get_type(), - &fr_command_rar_info); - } - - return fr_command_rar_type; + if (G_OBJECT_CLASS (fr_command_rar_parent_class)->dispose) + G_OBJECT_CLASS (fr_command_rar_parent_class)->dispose (object); } @@ -413,7 +384,7 @@ { FRCommand *comm; - comm = FR_COMMAND (gtk_type_new (fr_command_rar_get_type ())); + comm = FR_COMMAND (g_object_new (FR_TYPE_COMMAND_RAR, NULL)); fr_command_construct (comm, process, filename); fr_process_set_proc_line_func (FR_COMMAND (comm)->process, process_line, diff -Nru gimageview-0.2.27/plugins/archiver/rar-ext.h gimageview-0.3.0-0.20101117/plugins/archiver/rar-ext.h --- gimageview-0.2.27/plugins/archiver/rar-ext.h 2004-05-23 14:08:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/rar-ext.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,29 +19,27 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: rar-ext.h,v 1.6 2003/06/18 09:26:53 makeinu Exp $ + * $Id: rar-ext.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_COMMAND_RAR_H #define FR_COMMAND_RAR_H - -#include +#include #include "fr-command.h" #include "fr-process.h" #include "gimv_image_info.h" - -#define FR_COMMAND_RAR_TYPE fr_command_rar_get_type () -#define FR_COMMAND_RAR(o) GTK_CHECK_CAST (o, FR_COMMAND_RAR_TYPE, FRCommandRar) -#define FR_COMMAND_RAR_CLASS(k) GTK_CHECK_CLASS_CAST (k, FR_COMMAND_RAR_TYPE, FRCommandRarClass) -#define IS_FR_COMMAND_RAR(o) GTK_CHECK_TYPE (o, FR_COMMAND_RAR_TYPE) - +#define FR_TYPE_COMMAND_RAR (fr_command_rar_get_type ()) +#define FR_COMMAND_RAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND_RAR, FRCommandRar)) +#define FR_COMMAND_RAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND_RAR, FRCommandRarClass)) +#define FR_IS_COMMAND_RAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND_RAR)) +#define FR_IS_COMMAND_RAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND_RAR)) +#define FR_COMMAND_RAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND_RAR, FRCommandRarClass)) typedef struct _FRCommandRar FRCommandRar; typedef struct _FRCommandRarClass FRCommandRarClass; - struct _FRCommandRar { FRCommand __parent; @@ -51,18 +49,15 @@ GimvImageInfo *fdata; }; - struct _FRCommandRarClass { FRCommandClass __parent_class; }; - -GtkType fr_command_rar_get_type (void); +GType fr_command_rar_get_type (void); FRCommand* fr_command_rar_new (FRProcess *process, const char *filename, FRArchive *archive); - #endif /* FR_COMMAND_RAR_H */ diff -Nru gimageview-0.2.27/plugins/archiver/tar-ext.c gimageview-0.3.0-0.20101117/plugins/archiver/tar-ext.c --- gimageview-0.2.27/plugins/archiver/tar-ext.c 2004-12-20 14:06:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/tar-ext.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: tar-ext.c,v 1.16 2004/12/20 14:06:51 makeinu Exp $ + * $Id: tar-ext.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -31,19 +31,18 @@ #include "gimageview.h" -#include "fileutil.h" #include "fr-archive.h" #include "fr-command.h" #include "gimv_image_info.h" #include "gimv_plugin.h" +#include "utils_file.h" #include "tar-ext.h" -static void fr_command_tar_class_init (FRCommandTarClass *class); +G_DEFINE_TYPE (FRCommandTar, fr_command_tar, FR_TYPE_COMMAND) -static void fr_command_tar_init (FRCommand *afile); -static void fr_command_tar_destroy (GtkObject *object); +static void fr_command_tar_dispose (GObject *object); static FRCommand *fr_command_tar_none_new (FRProcess *process, @@ -94,11 +93,6 @@ }; -/* Parent Class */ - -static FRCommandClass *parent_class = NULL; - - /* -- list -- */ static time_t @@ -716,13 +710,12 @@ fr_command_tar_class_init (FRCommandTarClass *class) { FRCommandClass *afc; - GtkObjectClass *object_class; + GObjectClass *gobject_class; - parent_class = gtk_type_class (FR_COMMAND_TYPE); - object_class = (GtkObjectClass*) class; + gobject_class = (GObjectClass*) class; afc = (FRCommandClass*) class; - object_class->destroy = fr_command_tar_destroy; + gobject_class->dispose = fr_command_tar_dispose; afc->list = fr_command_tar_list; afc->add = fr_command_tar_add; @@ -732,8 +725,10 @@ static void -fr_command_tar_init (FRCommand *comm) +fr_command_tar_init (FRCommandTar *tar_comm) { + FRCommand *comm = FR_COMMAND(tar_comm); + comm->propAddCanUpdate = TRUE; comm->propExtractCanAvoidOverwrite = FALSE; comm->propExtractCanSkipOlder = FALSE; @@ -744,38 +739,14 @@ static void -fr_command_tar_destroy (GtkObject *object) +fr_command_tar_dispose (GObject *object) { g_return_if_fail (object != NULL); - g_return_if_fail (IS_FR_COMMAND_TAR (object)); + g_return_if_fail (FR_IS_COMMAND_TAR (object)); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GtkType -fr_command_tar_get_type () -{ - static guint fr_command_tar_type = 0; - - if (!fr_command_tar_type) { - GtkTypeInfo fr_command_tar_info = { - "FRCommandTar", - sizeof (FRCommandTar), - sizeof (FRCommandTarClass), - (GtkClassInitFunc) fr_command_tar_class_init, - (GtkObjectInitFunc) fr_command_tar_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - fr_command_tar_type = gtk_type_unique (fr_command_get_type(), - &fr_command_tar_info); - } - - return fr_command_tar_type; + if (G_OBJECT_CLASS (fr_command_tar_parent_class)->dispose) + G_OBJECT_CLASS (fr_command_tar_parent_class)->dispose (object); } @@ -787,7 +758,7 @@ { FRCommand *comm; - comm = FR_COMMAND (gtk_type_new (fr_command_tar_get_type ())); + comm = FR_COMMAND (g_object_new (FR_TYPE_COMMAND_TAR, NULL)); fr_command_construct (comm, process, filename); fr_process_set_proc_line_func (FR_COMMAND (comm)->process, process_line, diff -Nru gimageview-0.2.27/plugins/archiver/tar-ext.h gimageview-0.3.0-0.20101117/plugins/archiver/tar-ext.h --- gimageview-0.2.27/plugins/archiver/tar-ext.h 2004-05-23 14:08:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/tar-ext.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,28 +19,26 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: tar-ext.h,v 1.8 2003/06/13 09:42:56 makeinu Exp $ + * $Id: tar-ext.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_COMMAND_TAR_H #define FR_COMMAND_TAR_H - -#include +#include #include "fr-command.h" #include "fr-process.h" - -#define FR_COMMAND_TAR_TYPE fr_command_tar_get_type () -#define FR_COMMAND_TAR(o) GTK_CHECK_CAST (o, FR_COMMAND_TAR_TYPE, FRCommandTar) -#define FR_COMMAND_TAR_CLASS(k) GTK_CHECK_CLASS_CAST (k, FR_COMMAND_TAR_TYPE, FRCommandTarClass) -#define IS_FR_COMMAND_TAR(o) GTK_CHECK_TYPE (o, FR_COMMAND_TAR_TYPE) - +#define FR_TYPE_COMMAND_TAR (fr_command_tar_get_type ()) +#define FR_COMMAND_TAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND_TAR, FRCommandTar)) +#define FR_COMMAND_TAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND_TAR, FRCommandTarClass)) +#define FR_IS_COMMAND_TAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND_TAR)) +#define FR_IS_COMMAND_TAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND_TAR)) +#define FR_COMMAND_TAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND_TAR, FRCommandTarClass)) typedef struct _FRCommandTar FRCommandTar; typedef struct _FRCommandTarClass FRCommandTarClass; - typedef enum { FR_COMPRESS_PROGRAM_NONE, FR_COMPRESS_PROGRAM_GZIP, @@ -50,26 +48,22 @@ FR_COMPRESS_PROGRAM_LZO, } FRCompressProgram; - struct _FRCommandTar { FRCommand __parent; FRCompressProgram compress_prog; }; - struct _FRCommandTarClass { FRCommandClass __parent_class; }; - -GtkType fr_command_tar_get_type (void); +GType fr_command_tar_get_type (void); FRCommand* fr_command_tar_new (FRProcess *process, const char *filename, FRArchive *archive, FRCompressProgram prog); - #endif /* FR_COMMAND_TAR_H */ diff -Nru gimageview-0.2.27/plugins/archiver/zip-ext.c gimageview-0.3.0-0.20101117/plugins/archiver/zip-ext.c --- gimageview-0.2.27/plugins/archiver/zip-ext.c 2004-12-20 14:06:52.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/zip-ext.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: zip-ext.c,v 1.17 2004/12/20 14:06:52 makeinu Exp $ + * $Id: zip-ext.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -28,14 +28,17 @@ #include "gimageview.h" -#include "fileutil.h" #include "fr-archive.h" #include "fr-command.h" #include "gimv_image_info.h" #include "gimv_plugin.h" +#include "utils_file.h" #include "zip-ext.h" +G_DEFINE_TYPE (FRCommandZip, fr_command_zip, FR_TYPE_COMMAND) + + /* plugin implement definition */ static ExtArchiverPlugin plugin_impl[] = { @@ -62,16 +65,7 @@ }; -static void fr_command_zip_class_init (FRCommandZipClass *class); - -static void fr_command_zip_init (FRCommand *afile); - -static void fr_command_zip_destroy (GtkObject *object); - - -/* Parent Class */ - -static FRCommandClass *parent_class = NULL; +static void fr_command_zip_dispose (GObject *object); /* -- list -- */ @@ -373,13 +367,12 @@ fr_command_zip_class_init (FRCommandZipClass *class) { FRCommandClass *afc; - GtkObjectClass *object_class; + GObjectClass *gobject_class; - parent_class = gtk_type_class (FR_COMMAND_TYPE); - object_class = (GtkObjectClass*) class; + gobject_class = (GObjectClass*) class; afc = (FRCommandClass*) class; - object_class->destroy = fr_command_zip_destroy; + gobject_class->dispose = fr_command_zip_dispose; afc->list = fr_command_zip_list; afc->add = fr_command_zip_add; @@ -389,8 +382,10 @@ static void -fr_command_zip_init (FRCommand *comm) +fr_command_zip_init (FRCommandZip *zip_comm) { + FRCommand *comm = FR_COMMAND(zip_comm); + comm->propAddCanUpdate = TRUE; comm->propExtractCanAvoidOverwrite = TRUE; comm->propExtractCanSkipOlder = TRUE; @@ -401,38 +396,14 @@ static void -fr_command_zip_destroy (GtkObject *object) +fr_command_zip_dispose (GObject *object) { g_return_if_fail (object != NULL); - g_return_if_fail (IS_FR_COMMAND_ZIP (object)); + g_return_if_fail (FR_IS_COMMAND_ZIP (object)); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GtkType -fr_command_zip_get_type () -{ - static guint fr_command_zip_type = 0; - - if (!fr_command_zip_type) { - GtkTypeInfo fr_command_zip_info = { - "FRCommandZip", - sizeof (FRCommandZip), - sizeof (FRCommandZipClass), - (GtkClassInitFunc) fr_command_zip_class_init, - (GtkObjectInitFunc) fr_command_zip_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - fr_command_zip_type = gtk_type_unique (fr_command_get_type(), - &fr_command_zip_info); - } - - return fr_command_zip_type; + if (G_OBJECT_CLASS (fr_command_zip_parent_class)->dispose) + G_OBJECT_CLASS (fr_command_zip_parent_class)->dispose (object); } @@ -443,7 +414,7 @@ { FRCommand *comm; - comm = FR_COMMAND (gtk_type_new (fr_command_zip_get_type ())); + comm = FR_COMMAND (g_object_new (FR_TYPE_COMMAND_ZIP, NULL)); fr_command_construct (comm, process, filename); fr_process_set_proc_line_func (FR_COMMAND (comm)->process, process_line, diff -Nru gimageview-0.2.27/plugins/archiver/zip-ext.h gimageview-0.3.0-0.20101117/plugins/archiver/zip-ext.h --- gimageview-0.2.27/plugins/archiver/zip-ext.h 2004-05-23 14:08:18.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/archiver/zip-ext.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,45 +19,40 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: zip-ext.h,v 1.7 2003/06/13 09:42:57 makeinu Exp $ + * $Id: zip-ext.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_COMMAND_ZIP_H #define FR_COMMAND_ZIP_H - -#include +#include #include "fr-command.h" #include "fr-process.h" - -#define FR_COMMAND_ZIP_TYPE fr_command_zip_get_type () -#define FR_COMMAND_ZIP(o) GTK_CHECK_CAST (o, FR_COMMAND_ZIP_TYPE, FRCommandZip) -#define FR_COMMAND_ZIP_CLASS(k) GTK_CHECK_CLASS_CAST (k, FR_COMMAND_ZIP_TYPE, FRCommandZipClass) -#define IS_FR_COMMAND_ZIP(o) GTK_CHECK_TYPE (o, FR_COMMAND_ZIP_TYPE) - +#define FR_TYPE_COMMAND_ZIP (fr_command_zip_get_type ()) +#define FR_COMMAND_ZIP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND_ZIP, FRCommandZip)) +#define FR_COMMAND_ZIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND_ZIP, FRCommandZipClass)) +#define FR_IS_COMMAND_ZIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND_ZIP)) +#define FR_IS_COMMAND_ZIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND_ZIP)) +#define FR_COMMAND_ZIP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND_ZIP, FRCommandZipClass)) typedef struct _FRCommandZip FRCommandZip; typedef struct _FRCommandZipClass FRCommandZipClass; - struct _FRCommandZip { FRCommand __parent; }; - struct _FRCommandZipClass { FRCommandClass __parent_class; }; - -GtkType fr_command_zip_get_type (void); +GType fr_command_zip_get_type (void); FRCommand* fr_command_zip_new (FRProcess *process, const char *filename, FRArchive *archive); - #endif /* FR_COMMAND_ZIP_H */ diff -Nru gimageview-0.2.27/plugins/image_loader/bmp.c gimageview-0.3.0-0.20101117/plugins/image_loader/bmp.c --- gimageview-0.2.27/plugins/image_loader/bmp.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/bmp.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: bmp.c,v 1.9 2004/09/21 08:44:27 makeinu Exp $ + * $Id: bmp.c 1036 2004-09-21 08:44:33Z makeinu $ */ /* diff -Nru gimageview-0.2.27/plugins/image_loader/bmp.h gimageview-0.3.0-0.20101117/plugins/image_loader/bmp.h --- gimageview-0.2.27/plugins/image_loader/bmp.h 2004-05-23 14:08:15.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/bmp.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: bmp.h,v 1.7 2003/06/14 03:39:50 makeinu Exp $ + * $Id: bmp.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __BMP_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/imlib_loader.c gimageview-0.3.0-0.20101117/plugins/image_loader/imlib_loader.c --- gimageview-0.2.27/plugins/image_loader/imlib_loader.c 2004-05-23 14:08:17.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/imlib_loader.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,203 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001-2002 Takuro Ashie - * - * 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: imlib_loader.c,v 1.7 2003/08/01 09:09:32 makeinu Exp $ - */ - -#include "imlib_loader.h" - -#ifdef HAVE_GDK_IMLIB - -#include -#include "gimv_plugin.h" - -static GimvImageLoaderPlugin gimv_imlib1_loader[] = -{ - { - if_version: GIMV_IMAGE_LOADER_IF_VERSION, - id: "Imlib1", - priority_hint: GIMV_IMAGE_LOADER_PRIORITY_CANNOT_CANCEL, - check_type: NULL, - get_info: NULL, - loader: gimv_imlib_load_file, - } -}; - -/* native support only. do not add ImageMagick fall back */ -static const gchar *bmp_extensions[] = { - "bmp", -}; -static const gchar *gif_extensions[] = { - "gif", -}; -static const gchar *jpeg_extensions[] = { - "jpeg", - "jpe", - "jpg", -}; -static const gchar *png_extensions[] = { - "png", -}; -static const gchar *ppm_extensions[] = { - "ppm", -}; -static const gchar *pgm_extensions[] = { - "pgm", -}; -static const gchar *pbm_extensions[] = { - "pbm", -}; -static const gchar *pnm_extensions[] = { - "pnm", - "pbm", - "pgm", - "ppm", -}; -static const gchar *tiff_extensions[] = { - "tiff", - "tif", -}; -static const gchar *xpm_extensions[] = { - "xpm", -}; - -static GimvMimeTypeEntry imlib1_mime_types[] = { - { - mime_type: "image/bmp", - description: N_("The BMP image format"), - extensions: bmp_extensions, - extensions_len: sizeof (bmp_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-bmp", - description: N_("The BMP image format"), - extensions: bmp_extensions, - extensions_len: sizeof (bmp_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-MS-bmp", - description: N_("The BMP image format"), - extensions: bmp_extensions, - extensions_len: sizeof (bmp_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/gif", - description: N_("The GIF image format"), - extensions: gif_extensions, - extensions_len: sizeof (gif_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/jpeg", - description: N_("The JPEG image format"), - extensions: jpeg_extensions, - extensions_len: sizeof (jpeg_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/png", - description: N_("The PNG image format"), - extensions: png_extensions, - extensions_len: sizeof (png_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-portable-anymap", - description: N_("Portable Any Map Image"), - extensions: pnm_extensions, - extensions_len: sizeof (pnm_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-portable-bitmap", - description: N_("The PBM image format"), - extensions: pbm_extensions, - extensions_len: sizeof (pbm_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-portable-graymap", - description: N_("The PGM image format"), - extensions: pgm_extensions, - extensions_len: sizeof (pgm_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-portable-pixmap", - description: N_("The PPM image format"), - extensions: ppm_extensions, - extensions_len: sizeof (ppm_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/tiff", - description: N_("The TIFF image format"), - extensions: tiff_extensions, - extensions_len: sizeof (tiff_extensions) / sizeof (gchar *), - icon: NULL, - }, - { - mime_type: "image/x-xpixmap", - description: N_("The XPM image format"), - extensions: xpm_extensions, - extensions_len: sizeof (xpm_extensions) / sizeof (gchar *), - icon: NULL, - }, -}; - -GIMV_PLUGIN_GET_IMPL(gimv_imlib1_loader, GIMV_PLUGIN_IMAGE_LOADER) -GIMV_PLUGIN_GET_MIME_TYPE(imlib1_mime_types) - -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Imlib1 Image Loader"), - version: "0.1.1", - author: N_("Takuro Ashie"), - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: gimv_plugin_get_mime_type, - get_prefs_ui: NULL, -}; - -GimvImage * -gimv_imlib_load_file (GimvImageLoader *loader, gpointer data) -{ - const gchar *filename; - GimvImage *image = NULL; - - g_return_val_if_fail (loader, NULL); - - filename = gimv_image_loader_get_path (loader); - if (!filename || !*filename) return NULL; - - image = gimv_image_new (); - image->image = gdk_imlib_load_image ((char *)filename); - if (image && !image->image) { - gimv_image_unref (image); - image = NULL; - } - - return image; -} -#endif /* HAVE_GDK_IMLIB */ diff -Nru gimageview-0.2.27/plugins/image_loader/imlib_loader.h gimageview-0.3.0-0.20101117/plugins/image_loader/imlib_loader.h --- gimageview-0.2.27/plugins/image_loader/imlib_loader.h 2004-05-23 14:08:17.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/imlib_loader.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001-2002 Takuro Ashie - * - * 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: imlib_loader.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ - */ - -#ifndef __IMLIB_LOADER_H__ -#define __IMLIB_LOADER_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HAVE_GDK_IMLIB - -#include -#include -#include "gimv_image_loader.h" -#include "gimv_image.h" - -GimvImage *gimv_imlib_load_file (GimvImageLoader *loader, - gpointer data); - -#endif /* HAVE_GDK_IMLIB */ - -#endif /* __IMLIB_LOADER_H__ */ diff -Nru gimageview-0.2.27/plugins/image_loader/mag.c gimageview-0.3.0-0.20101117/plugins/image_loader/mag.c --- gimageview-0.2.27/plugins/image_loader/mag.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/mag.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mag.c,v 1.9 2004/09/21 08:44:27 makeinu Exp $ + * $Id: mag.c 1036 2004-09-21 08:44:33Z makeinu $ */ /* diff -Nru gimageview-0.2.27/plugins/image_loader/mag.h gimageview-0.3.0-0.20101117/plugins/image_loader/mag.h --- gimageview-0.2.27/plugins/image_loader/mag.h 2004-05-23 14:08:15.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/mag.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mag.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: mag.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __MAG_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/Makefile.am gimageview-0.3.0-0.20101117/plugins/image_loader/Makefile.am --- gimageview-0.2.27/plugins/image_loader/Makefile.am 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,12 +1,12 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv endif -CLEANFILES = *~ .deps/* .*.swp .*.swo - image_loader_plugin_LTLIBRARIES = \ libgimv_bmp_loader.la \ libgimv_mag_loader.la \ @@ -17,13 +17,7 @@ libgimv_xcf_loader.la \ libgimv_xvpics_loader.la -if ENABLE_GDK_IMLIB -gimv_imlib1_loader_plugin_LTLIBRARIES = libgimv_imlib1_loader.la -endif - -if ENABLE_GDK_PIXBUF gimv_pixbuf_loader_plugin_LTLIBRARIES = libgimv_pixbuf_loader.la -endif if ENABLE_JPEG gimv_jpeg_loader_plugin_LTLIBRARIES = libgimv_jpeg_loader.la @@ -46,7 +40,6 @@ endif image_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_imlib1_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) gimv_jpeg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) gimv_mng_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) gimv_pixbuf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) @@ -56,12 +49,10 @@ INCLUDES = \ $(GTK_CFLAGS) \ - $(GIMV_IMAGELIB_CFLAGS) \ $(ZLIB_CFLAGS) \ $(PNG_CFLAGS) \ $(JPEG_CFLAGS) \ $(MNG_CFLAGS) \ - $(XML_CFLAGS) \ $(LIBRSVG_CFLAGS) \ $(LIBWMF_CFLAGS) \ $(DLLLOADER_CFLAGS) \ @@ -75,10 +66,6 @@ libgimv_bmp_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_bmp_loader_la_SOURCES = bmp.c bmp.h -libgimv_imlib1_loader_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) -libgimv_imlib1_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_imlib1_loader_la_SOURCES = imlib_loader.c imlib_loader.h - libgimv_jpeg_loader_la_LIBADD = $(GTK_LIBS) $(JPEG_LIBS) libgimv_jpeg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_jpeg_loader_la_SOURCES = jpeg_loader.c @@ -112,7 +99,7 @@ spi.c spi.h spi-private.h \ spi_image_loader.c spi_image_loader.h -libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) $(LIBRSVG_LIBS) +libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) libgimv_rsvg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_rsvg_loader_la_SOURCES = svg.c svg.h diff -Nru gimageview-0.2.27/plugins/image_loader/Makefile.in gimageview-0.3.0-0.20101117/plugins/image_loader/Makefile.in --- gimageview-0.2.27/plugins/image_loader/Makefile.in 2004-12-28 04:01:26.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,1080 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_bmp_loader_la_SOURCES) $(libgimv_imlib1_loader_la_SOURCES) $(libgimv_jpeg_loader_la_SOURCES) $(libgimv_mag_loader_la_SOURCES) $(libgimv_mng_loader_la_SOURCES) $(libgimv_pcx_loader_la_SOURCES) $(libgimv_pixbuf_loader_la_SOURCES) $(libgimv_png_loader_la_SOURCES) $(libgimv_rsvg_loader_la_SOURCES) $(libgimv_spi_loader_la_SOURCES) $(libgimv_tga_loader_la_SOURCES) $(libgimv_wmf_loader_la_SOURCES) $(libgimv_xbm_loader_la_SOURCES) $(libgimv_xcf_loader_la_SOURCES) $(libgimv_xvpics_loader_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/image_loader -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(gimv_imlib1_loader_plugindir)" "$(DESTDIR)$(gimv_jpeg_loader_plugindir)" "$(DESTDIR)$(gimv_mng_loader_plugindir)" "$(DESTDIR)$(gimv_pixbuf_loader_plugindir)" "$(DESTDIR)$(gimv_rsvg_loader_plugindir)" "$(DESTDIR)$(gimv_spi_loader_plugindir)" "$(DESTDIR)$(gimv_wmf_loader_plugindir)" "$(DESTDIR)$(image_loader_plugindir)" -gimv_imlib1_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_jpeg_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_mng_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_pixbuf_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_rsvg_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_spi_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_wmf_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -image_loader_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(gimv_imlib1_loader_plugin_LTLIBRARIES) \ - $(gimv_jpeg_loader_plugin_LTLIBRARIES) \ - $(gimv_mng_loader_plugin_LTLIBRARIES) \ - $(gimv_pixbuf_loader_plugin_LTLIBRARIES) \ - $(gimv_rsvg_loader_plugin_LTLIBRARIES) \ - $(gimv_spi_loader_plugin_LTLIBRARIES) \ - $(gimv_wmf_loader_plugin_LTLIBRARIES) \ - $(image_loader_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_bmp_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_bmp_loader_la_OBJECTS = bmp.lo -libgimv_bmp_loader_la_OBJECTS = $(am_libgimv_bmp_loader_la_OBJECTS) -libgimv_imlib1_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_imlib1_loader_la_OBJECTS = imlib_loader.lo -libgimv_imlib1_loader_la_OBJECTS = \ - $(am_libgimv_imlib1_loader_la_OBJECTS) -libgimv_jpeg_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_jpeg_loader_la_OBJECTS = jpeg_loader.lo -libgimv_jpeg_loader_la_OBJECTS = $(am_libgimv_jpeg_loader_la_OBJECTS) -libgimv_mag_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_mag_loader_la_OBJECTS = mag.lo -libgimv_mag_loader_la_OBJECTS = $(am_libgimv_mag_loader_la_OBJECTS) -libgimv_mng_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_mng_loader_la_OBJECTS = mng.lo -libgimv_mng_loader_la_OBJECTS = $(am_libgimv_mng_loader_la_OBJECTS) -libgimv_pcx_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_pcx_loader_la_OBJECTS = pcx.lo -libgimv_pcx_loader_la_OBJECTS = $(am_libgimv_pcx_loader_la_OBJECTS) -libgimv_pixbuf_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_pixbuf_loader_la_OBJECTS = pixbuf_anim.lo pixbuf_loader.lo -libgimv_pixbuf_loader_la_OBJECTS = \ - $(am_libgimv_pixbuf_loader_la_OBJECTS) -libgimv_png_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_libgimv_png_loader_la_OBJECTS = png_loader.lo -libgimv_png_loader_la_OBJECTS = $(am_libgimv_png_loader_la_OBJECTS) -libgimv_rsvg_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_libgimv_rsvg_loader_la_OBJECTS = svg.lo -libgimv_rsvg_loader_la_OBJECTS = $(am_libgimv_rsvg_loader_la_OBJECTS) -libgimv_spi_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_spi_loader_la_OBJECTS = prefs_spi.lo spi.lo \ - spi_image_loader.lo -libgimv_spi_loader_la_OBJECTS = $(am_libgimv_spi_loader_la_OBJECTS) -libgimv_tga_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_tga_loader_la_OBJECTS = tga.lo -libgimv_tga_loader_la_OBJECTS = $(am_libgimv_tga_loader_la_OBJECTS) -libgimv_wmf_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_wmf_loader_la_OBJECTS = wmf.lo -libgimv_wmf_loader_la_OBJECTS = $(am_libgimv_wmf_loader_la_OBJECTS) -libgimv_xbm_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_xbm_loader_la_OBJECTS = xbm.lo -libgimv_xbm_loader_la_OBJECTS = $(am_libgimv_xbm_loader_la_OBJECTS) -libgimv_xcf_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_xcf_loader_la_OBJECTS = xcf.lo -libgimv_xcf_loader_la_OBJECTS = $(am_libgimv_xcf_loader_la_OBJECTS) -libgimv_xvpics_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_xvpics_loader_la_OBJECTS = xvpics.lo -libgimv_xvpics_loader_la_OBJECTS = \ - $(am_libgimv_xvpics_loader_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bmp.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/imlib_loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/jpeg_loader.Plo ./$(DEPDIR)/mag.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/mng.Plo ./$(DEPDIR)/pcx.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf_anim.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf_loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/png_loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_spi.Plo ./$(DEPDIR)/spi.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/spi_image_loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/svg.Plo ./$(DEPDIR)/tga.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/wmf.Plo ./$(DEPDIR)/xbm.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/xcf.Plo ./$(DEPDIR)/xvpics.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_bmp_loader_la_SOURCES) \ - $(libgimv_imlib1_loader_la_SOURCES) \ - $(libgimv_jpeg_loader_la_SOURCES) \ - $(libgimv_mag_loader_la_SOURCES) \ - $(libgimv_mng_loader_la_SOURCES) \ - $(libgimv_pcx_loader_la_SOURCES) \ - $(libgimv_pixbuf_loader_la_SOURCES) \ - $(libgimv_png_loader_la_SOURCES) \ - $(libgimv_rsvg_loader_la_SOURCES) \ - $(libgimv_spi_loader_la_SOURCES) \ - $(libgimv_tga_loader_la_SOURCES) \ - $(libgimv_wmf_loader_la_SOURCES) \ - $(libgimv_xbm_loader_la_SOURCES) \ - $(libgimv_xcf_loader_la_SOURCES) \ - $(libgimv_xvpics_loader_la_SOURCES) -DIST_SOURCES = $(libgimv_bmp_loader_la_SOURCES) \ - $(libgimv_imlib1_loader_la_SOURCES) \ - $(libgimv_jpeg_loader_la_SOURCES) \ - $(libgimv_mag_loader_la_SOURCES) \ - $(libgimv_mng_loader_la_SOURCES) \ - $(libgimv_pcx_loader_la_SOURCES) \ - $(libgimv_pixbuf_loader_la_SOURCES) \ - $(libgimv_png_loader_la_SOURCES) \ - $(libgimv_rsvg_loader_la_SOURCES) \ - $(libgimv_spi_loader_la_SOURCES) \ - $(libgimv_tga_loader_la_SOURCES) \ - $(libgimv_wmf_loader_la_SOURCES) \ - $(libgimv_xbm_loader_la_SOURCES) \ - $(libgimv_xcf_loader_la_SOURCES) \ - $(libgimv_xvpics_loader_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = \ - -DPLUGINDIR=\""$(plugindir)"\" - -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -CLEANFILES = *~ .deps/* .*.swp .*.swo -image_loader_plugin_LTLIBRARIES = \ - libgimv_bmp_loader.la \ - libgimv_mag_loader.la \ - libgimv_pcx_loader.la \ - libgimv_png_loader.la \ - libgimv_tga_loader.la \ - libgimv_xbm_loader.la \ - libgimv_xcf_loader.la \ - libgimv_xvpics_loader.la - -@ENABLE_GDK_IMLIB_TRUE@gimv_imlib1_loader_plugin_LTLIBRARIES = libgimv_imlib1_loader.la -@ENABLE_GDK_PIXBUF_TRUE@gimv_pixbuf_loader_plugin_LTLIBRARIES = libgimv_pixbuf_loader.la -@ENABLE_JPEG_TRUE@gimv_jpeg_loader_plugin_LTLIBRARIES = libgimv_jpeg_loader.la -@ENABLE_MNG_TRUE@gimv_mng_loader_plugin_LTLIBRARIES = libgimv_mng_loader.la -@ENABLE_SPI_TRUE@gimv_spi_loader_plugin_LTLIBRARIES = libgimv_spi_loader.la -@ENABLE_LIBRSVG_TRUE@gimv_rsvg_loader_plugin_LTLIBRARIES = libgimv_rsvg_loader.la -@ENABLE_WMF_TRUE@gimv_wmf_loader_plugin_LTLIBRARIES = libgimv_wmf_loader.la -image_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_imlib1_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_jpeg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_mng_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_pixbuf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_spi_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_rsvg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_wmf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -INCLUDES = \ - $(GTK_CFLAGS) \ - $(GIMV_IMAGELIB_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(PNG_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(MNG_CFLAGS) \ - $(XML_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(LIBWMF_CFLAGS) \ - $(DLLLOADER_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -libgimv_bmp_loader_la_LIBADD = $(GTK_LIBS) -libgimv_bmp_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_bmp_loader_la_SOURCES = bmp.c bmp.h -libgimv_imlib1_loader_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) -libgimv_imlib1_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_imlib1_loader_la_SOURCES = imlib_loader.c imlib_loader.h -libgimv_jpeg_loader_la_LIBADD = $(GTK_LIBS) $(JPEG_LIBS) -libgimv_jpeg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_jpeg_loader_la_SOURCES = jpeg_loader.c -libgimv_mag_loader_la_LIBADD = $(GTK_LIBS) -libgimv_mag_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_mag_loader_la_SOURCES = mag.c mag.h -libgimv_mng_loader_la_LIBADD = $(GTK_LIBS) $(MNG_LIBS) -libgimv_mng_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_mng_loader_la_SOURCES = mng.c mng.h -libgimv_pcx_loader_la_LIBADD = $(GTK_LIBS) -libgimv_pcx_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_pcx_loader_la_SOURCES = pcx.c pcx.h -libgimv_pixbuf_loader_la_LIBADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) -libgimv_pixbuf_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_pixbuf_loader_la_SOURCES = \ - pixbuf_anim.c pixbuf_anim.h \ - pixbuf_loader.c pixbuf_loader.h - -libgimv_png_loader_la_LIBADD = $(GTK_LIBS) $(PNG_LIBS) $(ZLIB_LIBS) -libgimv_png_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_png_loader_la_SOURCES = png_loader.c png_loader.h -libgimv_spi_loader_la_LIBADD = $(GTK_LIBS) $(DLLLOADER_LIBS) -libgimv_spi_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_spi_loader_la_SOURCES = \ - prefs_spi.c prefs_spi.h \ - spi.c spi.h spi-private.h \ - spi_image_loader.c spi_image_loader.h - -libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) $(LIBRSVG_LIBS) -libgimv_rsvg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_rsvg_loader_la_SOURCES = svg.c svg.h -libgimv_tga_loader_la_LIBADD = $(GTK_LIBS) -libgimv_tga_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_tga_loader_la_SOURCES = tga.c tga.h -libgimv_wmf_loader_la_LIBADD = $(GTK_LIBS) $(LIBWMF_LIBS) -libgimv_wmf_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_wmf_loader_la_SOURCES = wmf.c wmf.h -libgimv_xbm_loader_la_LIBADD = $(GTK_LIBS) -libgimv_xbm_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xbm_loader_la_SOURCES = xbm.c xbm.h -libgimv_xcf_loader_la_LIBADD = $(GTK_LIBS) -libgimv_xcf_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xcf_loader_la_SOURCES = xcf.c xcf.h -libgimv_xvpics_loader_la_LIBADD = $(GTK_LIBS) -libgimv_xvpics_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xvpics_loader_la_SOURCES = xvpics.c xvpics.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/image_loader/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/image_loader/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-gimv_imlib1_loader_pluginLTLIBRARIES: $(gimv_imlib1_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_imlib1_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_imlib1_loader_plugindir)" - @list='$(gimv_imlib1_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_imlib1_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_imlib1_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_imlib1_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_imlib1_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_imlib1_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_imlib1_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_imlib1_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_imlib1_loader_plugindir)/$$p"; \ - done - -clean-gimv_imlib1_loader_pluginLTLIBRARIES: - -test -z "$(gimv_imlib1_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_imlib1_loader_plugin_LTLIBRARIES) - @list='$(gimv_imlib1_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_jpeg_loader_pluginLTLIBRARIES: $(gimv_jpeg_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_jpeg_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_jpeg_loader_plugindir)" - @list='$(gimv_jpeg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_jpeg_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_jpeg_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_jpeg_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_jpeg_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_jpeg_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_jpeg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_jpeg_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_jpeg_loader_plugindir)/$$p"; \ - done - -clean-gimv_jpeg_loader_pluginLTLIBRARIES: - -test -z "$(gimv_jpeg_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_jpeg_loader_plugin_LTLIBRARIES) - @list='$(gimv_jpeg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_mng_loader_pluginLTLIBRARIES: $(gimv_mng_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_mng_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_mng_loader_plugindir)" - @list='$(gimv_mng_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_mng_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_mng_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_mng_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_mng_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_mng_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_mng_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_mng_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_mng_loader_plugindir)/$$p"; \ - done - -clean-gimv_mng_loader_pluginLTLIBRARIES: - -test -z "$(gimv_mng_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_mng_loader_plugin_LTLIBRARIES) - @list='$(gimv_mng_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_pixbuf_loader_pluginLTLIBRARIES: $(gimv_pixbuf_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_pixbuf_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_pixbuf_loader_plugindir)" - @list='$(gimv_pixbuf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_pixbuf_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_pixbuf_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_pixbuf_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_pixbuf_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_pixbuf_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_pixbuf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_pixbuf_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_pixbuf_loader_plugindir)/$$p"; \ - done - -clean-gimv_pixbuf_loader_pluginLTLIBRARIES: - -test -z "$(gimv_pixbuf_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_pixbuf_loader_plugin_LTLIBRARIES) - @list='$(gimv_pixbuf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_rsvg_loader_pluginLTLIBRARIES: $(gimv_rsvg_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_rsvg_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_rsvg_loader_plugindir)" - @list='$(gimv_rsvg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_rsvg_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_rsvg_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_rsvg_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_rsvg_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_rsvg_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_rsvg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_rsvg_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_rsvg_loader_plugindir)/$$p"; \ - done - -clean-gimv_rsvg_loader_pluginLTLIBRARIES: - -test -z "$(gimv_rsvg_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_rsvg_loader_plugin_LTLIBRARIES) - @list='$(gimv_rsvg_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_spi_loader_pluginLTLIBRARIES: $(gimv_spi_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_spi_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_spi_loader_plugindir)" - @list='$(gimv_spi_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_spi_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_spi_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_spi_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_spi_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_spi_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_spi_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_spi_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_spi_loader_plugindir)/$$p"; \ - done - -clean-gimv_spi_loader_pluginLTLIBRARIES: - -test -z "$(gimv_spi_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_spi_loader_plugin_LTLIBRARIES) - @list='$(gimv_spi_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_wmf_loader_pluginLTLIBRARIES: $(gimv_wmf_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_wmf_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_wmf_loader_plugindir)" - @list='$(gimv_wmf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_wmf_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_wmf_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_wmf_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_wmf_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_wmf_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_wmf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_wmf_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_wmf_loader_plugindir)/$$p"; \ - done - -clean-gimv_wmf_loader_pluginLTLIBRARIES: - -test -z "$(gimv_wmf_loader_plugin_LTLIBRARIES)" || rm -f $(gimv_wmf_loader_plugin_LTLIBRARIES) - @list='$(gimv_wmf_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-image_loader_pluginLTLIBRARIES: $(image_loader_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(image_loader_plugindir)" || $(mkdir_p) "$(DESTDIR)$(image_loader_plugindir)" - @list='$(image_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(image_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(image_loader_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(image_loader_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(image_loader_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-image_loader_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(image_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(image_loader_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(image_loader_plugindir)/$$p"; \ - done - -clean-image_loader_pluginLTLIBRARIES: - -test -z "$(image_loader_plugin_LTLIBRARIES)" || rm -f $(image_loader_plugin_LTLIBRARIES) - @list='$(image_loader_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_bmp_loader.la: $(libgimv_bmp_loader_la_OBJECTS) $(libgimv_bmp_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_bmp_loader_la_LDFLAGS) $(libgimv_bmp_loader_la_OBJECTS) $(libgimv_bmp_loader_la_LIBADD) $(LIBS) -libgimv_imlib1_loader.la: $(libgimv_imlib1_loader_la_OBJECTS) $(libgimv_imlib1_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_imlib1_loader_plugindir) $(libgimv_imlib1_loader_la_LDFLAGS) $(libgimv_imlib1_loader_la_OBJECTS) $(libgimv_imlib1_loader_la_LIBADD) $(LIBS) -libgimv_jpeg_loader.la: $(libgimv_jpeg_loader_la_OBJECTS) $(libgimv_jpeg_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_jpeg_loader_plugindir) $(libgimv_jpeg_loader_la_LDFLAGS) $(libgimv_jpeg_loader_la_OBJECTS) $(libgimv_jpeg_loader_la_LIBADD) $(LIBS) -libgimv_mag_loader.la: $(libgimv_mag_loader_la_OBJECTS) $(libgimv_mag_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_mag_loader_la_LDFLAGS) $(libgimv_mag_loader_la_OBJECTS) $(libgimv_mag_loader_la_LIBADD) $(LIBS) -libgimv_mng_loader.la: $(libgimv_mng_loader_la_OBJECTS) $(libgimv_mng_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_mng_loader_plugindir) $(libgimv_mng_loader_la_LDFLAGS) $(libgimv_mng_loader_la_OBJECTS) $(libgimv_mng_loader_la_LIBADD) $(LIBS) -libgimv_pcx_loader.la: $(libgimv_pcx_loader_la_OBJECTS) $(libgimv_pcx_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_pcx_loader_la_LDFLAGS) $(libgimv_pcx_loader_la_OBJECTS) $(libgimv_pcx_loader_la_LIBADD) $(LIBS) -libgimv_pixbuf_loader.la: $(libgimv_pixbuf_loader_la_OBJECTS) $(libgimv_pixbuf_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_pixbuf_loader_plugindir) $(libgimv_pixbuf_loader_la_LDFLAGS) $(libgimv_pixbuf_loader_la_OBJECTS) $(libgimv_pixbuf_loader_la_LIBADD) $(LIBS) -libgimv_png_loader.la: $(libgimv_png_loader_la_OBJECTS) $(libgimv_png_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_png_loader_la_LDFLAGS) $(libgimv_png_loader_la_OBJECTS) $(libgimv_png_loader_la_LIBADD) $(LIBS) -libgimv_rsvg_loader.la: $(libgimv_rsvg_loader_la_OBJECTS) $(libgimv_rsvg_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_rsvg_loader_plugindir) $(libgimv_rsvg_loader_la_LDFLAGS) $(libgimv_rsvg_loader_la_OBJECTS) $(libgimv_rsvg_loader_la_LIBADD) $(LIBS) -libgimv_spi_loader.la: $(libgimv_spi_loader_la_OBJECTS) $(libgimv_spi_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_spi_loader_plugindir) $(libgimv_spi_loader_la_LDFLAGS) $(libgimv_spi_loader_la_OBJECTS) $(libgimv_spi_loader_la_LIBADD) $(LIBS) -libgimv_tga_loader.la: $(libgimv_tga_loader_la_OBJECTS) $(libgimv_tga_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_tga_loader_la_LDFLAGS) $(libgimv_tga_loader_la_OBJECTS) $(libgimv_tga_loader_la_LIBADD) $(LIBS) -libgimv_wmf_loader.la: $(libgimv_wmf_loader_la_OBJECTS) $(libgimv_wmf_loader_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_wmf_loader_plugindir) $(libgimv_wmf_loader_la_LDFLAGS) $(libgimv_wmf_loader_la_OBJECTS) $(libgimv_wmf_loader_la_LIBADD) $(LIBS) -libgimv_xbm_loader.la: $(libgimv_xbm_loader_la_OBJECTS) $(libgimv_xbm_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_xbm_loader_la_LDFLAGS) $(libgimv_xbm_loader_la_OBJECTS) $(libgimv_xbm_loader_la_LIBADD) $(LIBS) -libgimv_xcf_loader.la: $(libgimv_xcf_loader_la_OBJECTS) $(libgimv_xcf_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_xcf_loader_la_LDFLAGS) $(libgimv_xcf_loader_la_OBJECTS) $(libgimv_xcf_loader_la_LIBADD) $(LIBS) -libgimv_xvpics_loader.la: $(libgimv_xvpics_loader_la_OBJECTS) $(libgimv_xvpics_loader_la_DEPENDENCIES) - $(LINK) -rpath $(image_loader_plugindir) $(libgimv_xvpics_loader_la_LDFLAGS) $(libgimv_xvpics_loader_la_OBJECTS) $(libgimv_xvpics_loader_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mag.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mng.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf_anim.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_spi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spi_image_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tga.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvpics.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(gimv_imlib1_loader_plugindir)" "$(DESTDIR)$(gimv_jpeg_loader_plugindir)" "$(DESTDIR)$(gimv_mng_loader_plugindir)" "$(DESTDIR)$(gimv_pixbuf_loader_plugindir)" "$(DESTDIR)$(gimv_rsvg_loader_plugindir)" "$(DESTDIR)$(gimv_spi_loader_plugindir)" "$(DESTDIR)$(gimv_wmf_loader_plugindir)" "$(DESTDIR)$(image_loader_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-gimv_imlib1_loader_pluginLTLIBRARIES \ - clean-gimv_jpeg_loader_pluginLTLIBRARIES \ - clean-gimv_mng_loader_pluginLTLIBRARIES \ - clean-gimv_pixbuf_loader_pluginLTLIBRARIES \ - clean-gimv_rsvg_loader_pluginLTLIBRARIES \ - clean-gimv_spi_loader_pluginLTLIBRARIES \ - clean-gimv_wmf_loader_pluginLTLIBRARIES \ - clean-image_loader_pluginLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-gimv_imlib1_loader_pluginLTLIBRARIES \ - install-gimv_jpeg_loader_pluginLTLIBRARIES \ - install-gimv_mng_loader_pluginLTLIBRARIES \ - install-gimv_pixbuf_loader_pluginLTLIBRARIES \ - install-gimv_rsvg_loader_pluginLTLIBRARIES \ - install-gimv_spi_loader_pluginLTLIBRARIES \ - install-gimv_wmf_loader_pluginLTLIBRARIES \ - install-image_loader_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-gimv_imlib1_loader_pluginLTLIBRARIES \ - uninstall-gimv_jpeg_loader_pluginLTLIBRARIES \ - uninstall-gimv_mng_loader_pluginLTLIBRARIES \ - uninstall-gimv_pixbuf_loader_pluginLTLIBRARIES \ - uninstall-gimv_rsvg_loader_pluginLTLIBRARIES \ - uninstall-gimv_spi_loader_pluginLTLIBRARIES \ - uninstall-gimv_wmf_loader_pluginLTLIBRARIES \ - uninstall-image_loader_pluginLTLIBRARIES uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-gimv_imlib1_loader_pluginLTLIBRARIES \ - clean-gimv_jpeg_loader_pluginLTLIBRARIES \ - clean-gimv_mng_loader_pluginLTLIBRARIES \ - clean-gimv_pixbuf_loader_pluginLTLIBRARIES \ - clean-gimv_rsvg_loader_pluginLTLIBRARIES \ - clean-gimv_spi_loader_pluginLTLIBRARIES \ - clean-gimv_wmf_loader_pluginLTLIBRARIES \ - clean-image_loader_pluginLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-gimv_imlib1_loader_pluginLTLIBRARIES \ - install-gimv_jpeg_loader_pluginLTLIBRARIES \ - install-gimv_mng_loader_pluginLTLIBRARIES \ - install-gimv_pixbuf_loader_pluginLTLIBRARIES \ - install-gimv_rsvg_loader_pluginLTLIBRARIES \ - install-gimv_spi_loader_pluginLTLIBRARIES \ - install-gimv_wmf_loader_pluginLTLIBRARIES \ - install-image_loader_pluginLTLIBRARIES install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-gimv_imlib1_loader_pluginLTLIBRARIES \ - uninstall-gimv_jpeg_loader_pluginLTLIBRARIES \ - uninstall-gimv_mng_loader_pluginLTLIBRARIES \ - uninstall-gimv_pixbuf_loader_pluginLTLIBRARIES \ - uninstall-gimv_rsvg_loader_pluginLTLIBRARIES \ - uninstall-gimv_spi_loader_pluginLTLIBRARIES \ - uninstall-gimv_wmf_loader_pluginLTLIBRARIES \ - uninstall-image_loader_pluginLTLIBRARIES uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/image_loader/mng.c gimageview-0.3.0-0.20101117/plugins/image_loader/mng.c --- gimageview-0.2.27/plugins/image_loader/mng.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/mng.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mng.c,v 1.12 2004/09/21 08:44:27 makeinu Exp $ + * $Id: mng.c 1164 2007-10-20 15:04:59Z makeinu $ */ #include "mng.h" @@ -295,7 +295,7 @@ mng_anim = mng_anim_new (filename, image); if (!mng_anim) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); return NULL; } @@ -306,7 +306,7 @@ mng_readdisplay (mng_anim->MNG_handle); if (!anim->anim || !image->image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); return NULL; } diff -Nru gimageview-0.2.27/plugins/image_loader/mng.h gimageview-0.3.0-0.20101117/plugins/image_loader/mng.h --- gimageview-0.2.27/plugins/image_loader/mng.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/mng.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mng.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: mng.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __MNG_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/pcx.c gimageview-0.3.0-0.20101117/plugins/image_loader/pcx.c --- gimageview-0.2.27/plugins/image_loader/pcx.c 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pcx.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: pcx.c,v 1.8 2003/06/14 03:39:50 makeinu Exp $ + * $Id: pcx.c 935 2003-06-14 03:39:50Z makeinu $ */ #include "config.h" diff -Nru gimageview-0.2.27/plugins/image_loader/pcx.h gimageview-0.3.0-0.20101117/plugins/image_loader/pcx.h --- gimageview-0.2.27/plugins/image_loader/pcx.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pcx.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: pcx.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: pcx.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __PCX_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/pixbuf_anim.c gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_anim.c --- gimageview-0.2.27/plugins/image_loader/pixbuf_anim.c 2004-06-17 04:51:23.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_anim.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,30 +18,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: pixbuf_anim.c,v 1.7 2003/08/01 09:09:32 makeinu Exp $ + * $Id: pixbuf_anim.c 1164 2007-10-20 15:04:59Z makeinu $ */ #include "pixbuf_anim.h" -#ifdef HAVE_GDK_PIXBUF - static gint gimv_anim_gdk_pixbuf_iterate (GimvAnim *anim); static gint gimv_anim_gdk_pixbuf_get_interval (GimvAnim *anim); static void gimv_anim_gdk_pixbuf_delete_priv (GimvAnim *anim); -#ifdef USE_GTK2 static GdkPixbufAnimationIter *gimv_anim_gdk_pixbuf_set_iterator (GimvAnim *anim); static GdkPixbufAnimationIter *gimv_anim_gdk_pixbuf_get_iterator (GimvAnim *anim); -#else /* USE_GTK2 */ -static gint gimv_anim_gdk_pixbuf_get_num_frames (GimvAnim *anim); -static gint gimv_anim_gdk_pixbuf_get_current_frame_idx (GimvAnim *anim); -static gboolean gimv_anim_gdk_pixbuf_seek (GimvAnim *anim, - gint idx); -#endif /* USE_GTK2 */ /* virtual function table */ -#ifdef USE_GTK2 static GimvAnimFuncTable gdk_pixbuf_vf_table = { get_length : NULL, get_idx : NULL, @@ -50,19 +40,8 @@ seek : NULL, delete : gimv_anim_gdk_pixbuf_delete_priv, }; -#else /* USE_GTK2 */ -static GimvAnimFuncTable gdk_pixbuf_vf_table = { - get_length : gimv_anim_gdk_pixbuf_get_num_frames, - get_idx : gimv_anim_gdk_pixbuf_get_current_frame_idx, - get_interval : gimv_anim_gdk_pixbuf_get_interval, - iterate : gimv_anim_gdk_pixbuf_iterate, - seek : gimv_anim_gdk_pixbuf_seek, - delete : gimv_anim_gdk_pixbuf_delete_priv, -}; -#endif /* USE_GTK2 */ -#ifdef USE_GTK2 static GdkPixbufAnimationIter * gimv_anim_gdk_pixbuf_set_iterator (GimvAnim *anim) { @@ -151,161 +130,6 @@ g_object_unref (anim->anim); } -#else /* USE_GTK2 */ - -static gint -gimv_anim_gdk_pixbuf_get_num_frames (GimvAnim *anim) -{ - GimvImage *image = (GimvImage *) anim; - - g_return_val_if_fail (image, -1); - g_return_val_if_fail (anim->anim, -1); - - return gdk_pixbuf_animation_get_num_frames (anim->anim); -} - - -static gint -gimv_anim_gdk_pixbuf_get_current_frame_idx (GimvAnim *anim) -{ - GimvImage *image = (GimvImage *) anim; - - g_return_val_if_fail (image, -1); - g_return_val_if_fail (anim->anim, -1); - - return anim->current_frame_idx; -} - - -static gint -gimv_anim_gdk_pixbuf_iterate (GimvAnim *anim) -{ - GimvImage *image = (GimvImage *) anim; - GList *frames, *next, *prev; - GdkPixbufFrameAction action; - GdkPixbuf *prev_pixbuf, *next_pixbuf; - gint dest_width, dest_height; - gint x_offset, y_offset; - GimvImageAngle angle; - - g_return_val_if_fail (image, -1); - g_return_val_if_fail (anim->anim, -1); - - frames = gdk_pixbuf_animation_get_frames (anim->anim); - g_return_val_if_fail (frames, -1); - - prev = g_list_nth (frames, anim->current_frame_idx); - next = g_list_nth (frames, anim->current_frame_idx + 1); - if (!next) return -1; - - next_pixbuf = gdk_pixbuf_frame_get_pixbuf (next->data); - dest_width = gdk_pixbuf_get_width (next_pixbuf); - dest_height = gdk_pixbuf_get_height (next_pixbuf); - x_offset = gdk_pixbuf_frame_get_x_offset (next->data); - y_offset = gdk_pixbuf_frame_get_y_offset (next->data); - - action = gdk_pixbuf_frame_get_action (next->data); - - prev_pixbuf = gdk_pixbuf_frame_get_pixbuf (next->data); - if (!prev && action == GDK_PIXBUF_FRAME_REVERT) return -1; - - angle = image->angle; - gimv_image_rotate (image, 0); - - /* FIXME (but it is gdk-pixbuf-1.0's probrem) */ - switch (action) { - case GDK_PIXBUF_FRAME_RETAIN: - gdk_pixbuf_composite (next_pixbuf, - image->image, - x_offset, y_offset, - dest_width, dest_height, - (double) x_offset, (double) y_offset, - 1.0, 1.0, - GDK_INTERP_NEAREST, - 255); - break; - case GDK_PIXBUF_FRAME_REVERT: - case GDK_PIXBUF_FRAME_DISPOSE: - gdk_pixbuf_unref (image->image); - image->image = next_pixbuf; - gdk_pixbuf_ref (image->image); - break; - default: - return anim->current_frame_idx; - break; - } - - gimv_image_rotate (image, angle); - - anim->current_frame_idx++; - - return anim->current_frame_idx; -} - - -static gboolean -gimv_anim_gdk_pixbuf_seek (GimvAnim *anim, gint idx) -{ - GimvImage *image = (GimvImage *) anim; - GList *frames, *frame; - GimvImageAngle angle; - - g_return_val_if_fail (image, FALSE); - g_return_val_if_fail (anim->anim, FALSE); - - - frames = gdk_pixbuf_animation_get_frames (anim->anim); - g_return_val_if_fail (frames, FALSE); - - frame = g_list_nth (frames, idx); - if (!frame) return FALSE; - - anim->current_frame_idx = idx; - gdk_pixbuf_unref (image->image); - - if (gdk_pixbuf_frame_get_action (frame->data) == GDK_PIXBUF_FRAME_RETAIN) { - GdkPixbuf *pixbuf = gdk_pixbuf_frame_get_pixbuf (frame->data); - image->image = gdk_pixbuf_copy (pixbuf); - } else { - image->image = gdk_pixbuf_frame_get_pixbuf (frame->data); - gdk_pixbuf_ref (image->image); - } - - angle = image->angle; - image->angle = 0; - gimv_image_rotate (image, angle); - - return TRUE; -} - - -static gint -gimv_anim_gdk_pixbuf_get_interval (GimvAnim *anim) -{ - GimvImage *image = (GimvImage *) anim; - GList *frames, *frame; - - g_return_val_if_fail (image, -1); - g_return_val_if_fail (anim->anim, -1); - - frames = gdk_pixbuf_animation_get_frames (anim->anim); - g_return_val_if_fail (frames, FALSE); - - frame = g_list_nth (frames, anim->current_frame_idx); - if (!frame) return FALSE; - - return MAX (10, gdk_pixbuf_frame_get_delay_time (frame->data) * 10); -} - - -void -gimv_anim_gdk_pixbuf_delete_priv (GimvAnim *anim) -{ - gdk_pixbuf_animation_unref (anim->anim); -} -#endif /* USE_GTK2 */ - - GimvImage * gimv_anim_new_from_gdk_pixbuf_animation (GdkPixbufAnimation *pixbuf_anim) { @@ -313,8 +137,6 @@ GimvImage *image = NULL; GimvAnim *anim; -#ifdef USE_GTK2 - if (gdk_pixbuf_animation_is_static_image (pixbuf_anim)) { image = gimv_image_new (); pixbuf = gdk_pixbuf_animation_get_static_image (pixbuf_anim); @@ -329,7 +151,7 @@ gimv_anim_gdk_pixbuf_set_iterator (anim); iter = gimv_anim_gdk_pixbuf_get_iterator (anim); if (!iter) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); return NULL; } image->image = gdk_pixbuf_animation_iter_get_pixbuf (iter); @@ -338,36 +160,9 @@ if (image->image) { gdk_pixbuf_ref (image->image); } else { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); return NULL; } -#else - { - GList *frames = gdk_pixbuf_animation_get_frames (pixbuf_anim); - gint num = gdk_pixbuf_animation_get_num_frames (pixbuf_anim); - - if (frames && num > 1) { - anim = gimv_anim_new (); - image = (GimvImage *) anim; - anim->current_frame_idx = 0; - - pixbuf = gdk_pixbuf_frame_get_pixbuf (frames->data); - image->image = gdk_pixbuf_copy (pixbuf); - - anim->anim = pixbuf_anim; - gdk_pixbuf_animation_ref (anim->anim); - anim->table = &gdk_pixbuf_vf_table; - - } else if (frames) { - image = gimv_image_new (); - image->image = gdk_pixbuf_frame_get_pixbuf (frames->data); - gdk_pixbuf_ref (image->image); - } - } -#endif - return image; } - -#endif /* HAVE_GDK_PIXBUF */ diff -Nru gimageview-0.2.27/plugins/image_loader/pixbuf_anim.h gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_anim.h --- gimageview-0.2.27/plugins/image_loader/pixbuf_anim.h 2004-05-23 14:08:12.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_anim.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: pixbuf_anim.h,v 1.4 2003/06/13 09:43:01 makeinu Exp $ + * $Id: pixbuf_anim.h 1096 2007-10-12 05:03:50Z makeinu $ */ #ifndef __PIXBUF_ANIM_H__ @@ -26,12 +26,8 @@ #include "gimv_anim.h" -#ifdef HAVE_GDK_PIXBUF - #include GimvImage *gimv_anim_new_from_gdk_pixbuf_animation (GdkPixbufAnimation *anim); -#endif /* HAVE_GDK_PIXBUF */ - #endif /* __PIXBUF_ANIM_H__ */ diff -Nru gimageview-0.2.27/plugins/image_loader/pixbuf_loader.c gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_loader.c --- gimageview-0.2.27/plugins/image_loader/pixbuf_loader.c 2004-09-21 07:01:52.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -21,13 +21,11 @@ #include "pixbuf_loader.h" -#ifdef HAVE_GDK_PIXBUF - #include #include "pixbuf_anim.h" -#include "fileutil.h" #include "gimv_plugin.h" +#include "utils_file.h" static GimvImageLoaderPlugin gimv_pixbuf_loader[] = @@ -284,19 +282,6 @@ } -#ifndef USE_GTK2 -static void -cb_frame_done (GdkPixbufLoader *loader, - gpointer arg1, - gboolean *ret) -{ - g_return_if_fail (ret); - - *ret = TRUE; -} -#endif - - GimvImage * pixbuf_load (GimvImageLoader *loader, gpointer data) { @@ -328,35 +313,19 @@ g_return_val_if_fail (pixbuf_loader, NULL); /* set signals */ -#ifdef USE_GTK2 g_signal_connect (G_OBJECT (pixbuf_loader), "area-prepared", G_CALLBACK (cb_area_prepared), &prepared); g_signal_connect (G_OBJECT (pixbuf_loader), "area-updated", G_CALLBACK (cb_area_updated), &updated); -#else - gtk_signal_connect (GTK_OBJECT (pixbuf_loader), "area-prepared", - GTK_SIGNAL_FUNC (cb_area_prepared), - &prepared); - gtk_signal_connect (GTK_OBJECT (pixbuf_loader), "area-updated", - GTK_SIGNAL_FUNC (cb_area_updated), - &updated); - gtk_signal_connect (GTK_OBJECT (pixbuf_loader), "frame-done", - GTK_SIGNAL_FUNC (cb_frame_done), - &frame_done); -#endif /* load */ for (i = 0;; i++) { gimv_io_read (gio, buf, buf_size, &bytes); if ((gint) bytes > 0) { -#ifdef USE_GTK2 gdk_pixbuf_loader_write (pixbuf_loader, buf, bytes, NULL); -#else - gdk_pixbuf_loader_write (pixbuf_loader, buf, bytes); -#endif } else { break; } @@ -369,11 +338,7 @@ if (!prepared) goto FUNC_END; -#ifdef USE_GTK2 if (gimv_image_loader_load_as_animation(loader)) { -#else - if (gimv_image_loader_load_as_animation(loader) && frame_done) { -#endif GdkPixbufAnimation *anim; anim = gdk_pixbuf_loader_get_animation (pixbuf_loader); if (anim) { @@ -385,7 +350,7 @@ image = gimv_image_new (); image->image = gdk_pixbuf_loader_get_pixbuf (pixbuf_loader); if (!image->image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = NULL; } else { gdk_pixbuf_ref (image->image); @@ -393,13 +358,8 @@ } FUNC_END: -#ifdef USE_GTK2 gdk_pixbuf_loader_close (pixbuf_loader, NULL); g_object_unref (G_OBJECT (pixbuf_loader)); -#else - gdk_pixbuf_loader_close (pixbuf_loader); - gtk_object_unref (GTK_OBJECT (pixbuf_loader)); -#endif return image; } @@ -428,7 +388,6 @@ if (!file_exists (filename)) return NULL; -#ifdef USE_GTK2 if (gimv_image_loader_load_as_animation(loader)) { GdkPixbufAnimation *anim; anim = gdk_pixbuf_animation_new_from_file (filename, NULL); @@ -440,26 +399,11 @@ image = gimv_image_new (); image->image = gdk_pixbuf_new_from_file (filename, NULL); } -#else - if (gimv_image_loader_load_as_animation(loader)) { - GdkPixbufAnimation *anim; - anim = gdk_pixbuf_animation_new_from_file (filename); - if (anim) { - image = gimv_anim_new_from_gdk_pixbuf_animation (anim); - gdk_pixbuf_animation_unref (anim); - } - } else { - image = gimv_image_new (); - image->image = gdk_pixbuf_new_from_file (filename); - } -#endif /* USE_GTK2 */ if (image && !image->image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = NULL; } return image; } - -#endif /* HAVE_GDK_PIXBUF */ diff -Nru gimageview-0.2.27/plugins/image_loader/pixbuf_loader.h gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_loader.h --- gimageview-0.2.27/plugins/image_loader/pixbuf_loader.h 2004-05-23 14:08:15.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/pixbuf_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -26,8 +26,6 @@ # include "config.h" #endif -#ifdef HAVE_GDK_PIXBUF - #include #include "gimv_io.h" @@ -39,6 +37,4 @@ GimvImage *pixbuf_load_file (GimvImageLoader *loader, gpointer data); -#endif /* HAVE_GDK_PIXBUF */ - #endif /* __PIXBUF_LOADER_H__ */ diff -Nru gimageview-0.2.27/plugins/image_loader/png_loader.c gimageview-0.3.0-0.20101117/plugins/image_loader/png_loader.c --- gimageview-0.2.27/plugins/image_loader/png_loader.c 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/png_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: png_loader.c,v 1.10 2003/06/14 03:39:50 makeinu Exp $ + * $Id: png_loader.c 935 2003-06-14 03:39:50Z makeinu $ */ #include diff -Nru gimageview-0.2.27/plugins/image_loader/png_loader.h gimageview-0.3.0-0.20101117/plugins/image_loader/png_loader.h --- gimageview-0.2.27/plugins/image_loader/png_loader.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/png_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: png_loader.h,v 1.5 2003/06/14 03:39:50 makeinu Exp $ + * $Id: png_loader.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __PNG_LOADER_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/prefs_spi.c gimageview-0.3.0-0.20101117/plugins/image_loader/prefs_spi.c --- gimageview-0.2.27/plugins/image_loader/prefs_spi.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/prefs_spi.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,18 +18,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_spi.c,v 1.4 2004/09/21 08:44:27 makeinu Exp $ + * $Id: prefs_spi.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "charset.h" -#include "gtkutils.h" #include "gimv_plugin.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" +#include "utils_char_code.h" +#include "utils_gtk.h" #include "prefs_spi.h" #include "spi.h" @@ -225,6 +225,7 @@ gchar *titles[] = {N_("Plugin Info"), N_("File Name")}; gint titles_num = sizeof (titles)/ sizeof (gchar *); const gchar *text[32]; + GtkListStore *store; hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 0); @@ -234,71 +235,46 @@ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width(GTK_CONTAINER(scrollwin), 5); gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0); - gtk_widget_set_usize (scrollwin, -1, 200); + gtk_widget_set_size_request (scrollwin, -1, 200); -#ifdef ENABLE_TREEVIEW - { - GtkListStore *store; - - store = gtk_list_store_new (titles_num, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); - clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); - gtk_container_add (GTK_CONTAINER (scrollwin), clist); - - /* set columns */ - for (i = 0; i < titles_num; i++) { - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title (col, _(titles[i])); - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", i); - gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); - } - - for (list = plugin_list; list; list = g_list_next (list)) { - SusiePlugin *spi = list->data; - GtkTreeIter iter; - - text[0] = spi->description; -#ifdef G_PLATFORM_WIN32 - text[1] = g_module_name (spi->pe); -#else - text[1] = spi->pe->filepath; -#endif + store = gtk_list_store_new (titles_num, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING); + clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); + gtk_container_add (GTK_CONTAINER (scrollwin), clist); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - 0, text[0], - 1, text[1], - -1); - } - } -#else /* ENABLE_TREEVIEW */ - clist = gtk_clist_new (titles_num); + /* set columns */ for (i = 0; i < titles_num; i++) { - gtk_clist_set_column_title (GTK_CLIST (clist), i, _(titles[i])); - gtk_clist_set_column_auto_resize (GTK_CLIST (clist), i, TRUE); + GtkTreeViewColumn *col; + GtkCellRenderer *render; + + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title (col, _(titles[i])); + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", i); + gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); } - gtk_clist_column_titles_show (GTK_CLIST (clist)); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); - gtk_container_add (GTK_CONTAINER (scrollwin), clist); - /* set default value */ for (list = plugin_list; list; list = g_list_next (list)) { SusiePlugin *spi = list->data; + GtkTreeIter iter; text[0] = spi->description; +#ifdef G_PLATFORM_WIN32 + text[1] = g_module_name (spi->pe); +#else text[1] = spi->pe->filepath; +#endif - gtk_clist_append (GTK_CLIST (clist), text); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, text[0], + 1, text[1], + -1); } -#endif /* ENABLE_TREEVIEW */ return hbox; } diff -Nru gimageview-0.2.27/plugins/image_loader/prefs_spi.h gimageview-0.3.0-0.20101117/plugins/image_loader/prefs_spi.h --- gimageview-0.2.27/plugins/image_loader/prefs_spi.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/prefs_spi.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_spi.h,v 1.2 2003/06/13 09:43:02 makeinu Exp $ + * $Id: prefs_spi.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_SPI_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/spi.c gimageview-0.3.0-0.20101117/plugins/image_loader/spi.c --- gimageview-0.2.27/plugins/image_loader/spi.c 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/spi.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: spi.c,v 1.8 2003/06/13 09:43:02 makeinu Exp $ + * $Id: spi.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "spi.h" @@ -28,9 +28,9 @@ #include #include -#include "fileutil.h" -#include "gfileutil.h" #include "prefs_spi.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #ifdef G_PLATFORM_WIN32 static diff -Nru gimageview-0.2.27/plugins/image_loader/spi.h gimageview-0.3.0-0.20101117/plugins/image_loader/spi.h --- gimageview-0.2.27/plugins/image_loader/spi.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/spi.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: spi.h,v 1.5 2003/06/13 09:43:03 makeinu Exp $ + * $Id: spi.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __SPI_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/spi_image_loader.c gimageview-0.3.0-0.20101117/plugins/image_loader/spi_image_loader.c --- gimageview-0.2.27/plugins/image_loader/spi_image_loader.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/spi_image_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: spi_image_loader.c,v 1.8 2004/09/21 08:44:27 makeinu Exp $ + * $Id: spi_image_loader.c 1036 2004-09-21 08:44:33Z makeinu $ */ #include "spi_image_loader.h" diff -Nru gimageview-0.2.27/plugins/image_loader/spi_image_loader.h gimageview-0.3.0-0.20101117/plugins/image_loader/spi_image_loader.h --- gimageview-0.2.27/plugins/image_loader/spi_image_loader.h 2004-05-23 14:08:17.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/spi_image_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: spi_image_loader.h,v 1.4 2003/06/14 03:39:50 makeinu Exp $ + * $Id: spi_image_loader.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __SPI_IMAGE_LOADER_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/svg.c gimageview-0.3.0-0.20101117/plugins/image_loader/svg.c --- gimageview-0.2.27/plugins/image_loader/svg.c 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/svg.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,20 +18,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: svg.c,v 1.8 2003/06/18 09:26:53 makeinu Exp $ + * $Id: svg.c 1212 2009-01-13 06:34:52Z makeinu $ */ #include "svg.h" -#ifdef ENABLE_SVG - -#ifdef HAVE_GDK_PIXBUF - #include #include #include -#include "fileutil.h" #include "gimv_plugin.h" +#include "utils_file.h" static GimvImageLoaderPlugin gimv_rsvg_loader[] = @@ -111,26 +107,13 @@ h_scale = 1.0; } -#ifdef USE_GTK2 { - GError *error; + /*GError *error = NULL;*/ pixbuf = rsvg_pixbuf_from_file_at_zoom (filename, w_scale, h_scale, - &error); - } -#else /* USE_GTK2 */ - { - FILE *file; - - file = fopen (filename, "r"); - if (!file) return NULL; - - pixbuf = rsvg_render_file (file, MIN (w_scale, h_scale)); - - fclose (file); + NULL); } -#endif /* USE_GTK2 */ if (pixbuf) { image = gimv_image_new (); @@ -141,14 +124,3 @@ return NULL; } } - -#else /* HAVE_GDK_PIXBUF */ - -GimvImage * -svg_load_image (GimvImageLoader *loader, gpointer data) -{ - return NULL; -} - -#endif /* HAVE_GDK_PIXBUF */ -#endif /* ENABLE_SVG */ diff -Nru gimageview-0.2.27/plugins/image_loader/svg.h gimageview-0.3.0-0.20101117/plugins/image_loader/svg.h --- gimageview-0.2.27/plugins/image_loader/svg.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/svg.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: svg.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: svg.h 1212 2009-01-13 06:34:52Z makeinu $ */ #ifndef __SVG_H__ @@ -28,14 +28,10 @@ # include "config.h" #endif -#ifdef ENABLE_SVG - #include "gimv_image.h" #include "gimv_image_loader.h" GimvImage *svg_load_image (GimvImageLoader *loader, gpointer data); -#endif /* ENABLE_SVG */ - #endif /* __SVG_H__ */ diff -Nru gimageview-0.2.27/plugins/image_loader/tga.c gimageview-0.3.0-0.20101117/plugins/image_loader/tga.c --- gimageview-0.2.27/plugins/image_loader/tga.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/tga.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: tga.c,v 1.9 2004/09/21 08:44:27 makeinu Exp $ + * $Id: tga.c 1120 2007-10-12 16:31:37Z makeinu $ */ /* @@ -39,7 +39,6 @@ #include #include "gimv_image.h" -#include "intl.h" #include "tga.h" #include "gimv_plugin.h" diff -Nru gimageview-0.2.27/plugins/image_loader/tga.h gimageview-0.3.0-0.20101117/plugins/image_loader/tga.h --- gimageview-0.2.27/plugins/image_loader/tga.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/tga.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: tga.h,v 1.7 2003/06/14 03:39:50 makeinu Exp $ + * $Id: tga.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __TGA_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/wmf.c gimageview-0.3.0-0.20101117/plugins/image_loader/wmf.c --- gimageview-0.2.27/plugins/image_loader/wmf.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/wmf.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: wmf.c,v 1.4 2004/09/21 08:44:27 makeinu Exp $ + * $Id: wmf.c 1036 2004-09-21 08:44:33Z makeinu $ */ /* diff -Nru gimageview-0.2.27/plugins/image_loader/wmf.h gimageview-0.3.0-0.20101117/plugins/image_loader/wmf.h --- gimageview-0.2.27/plugins/image_loader/wmf.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/wmf.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: wmf.h,v 1.3 2003/06/14 03:39:50 makeinu Exp $ + * $Id: wmf.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __WMF_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/xbm.c gimageview-0.3.0-0.20101117/plugins/image_loader/xbm.c --- gimageview-0.2.27/plugins/image_loader/xbm.c 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xbm.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xbm.c,v 1.8 2003/06/14 03:39:50 makeinu Exp $ + * $Id: xbm.c 935 2003-06-14 03:39:50Z makeinu $ */ /* These codes are mostly taken from: diff -Nru gimageview-0.2.27/plugins/image_loader/xbm.h gimageview-0.3.0-0.20101117/plugins/image_loader/xbm.h --- gimageview-0.2.27/plugins/image_loader/xbm.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xbm.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xbm.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: xbm.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __XBM_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/xcf.c gimageview-0.3.0-0.20101117/plugins/image_loader/xcf.c --- gimageview-0.2.27/plugins/image_loader/xcf.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xcf.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xcf.c,v 1.11 2004/09/21 08:44:27 makeinu Exp $ + * $Id: xcf.c 1036 2004-09-21 08:44:33Z makeinu $ */ #include diff -Nru gimageview-0.2.27/plugins/image_loader/xcf.h gimageview-0.3.0-0.20101117/plugins/image_loader/xcf.h --- gimageview-0.2.27/plugins/image_loader/xcf.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xcf.h 2010-11-17 06:10:11.000000000 +0000 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xcf.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: xcf.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __XCF_H__ diff -Nru gimageview-0.2.27/plugins/image_loader/xvpics.c gimageview-0.3.0-0.20101117/plugins/image_loader/xvpics.c --- gimageview-0.2.27/plugins/image_loader/xvpics.c 2004-09-21 08:44:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xvpics.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xvpics.c,v 1.11 2004/09/21 08:44:27 makeinu Exp $ + * $Id: xvpics.c 1036 2004-09-21 08:44:33Z makeinu $ */ #include diff -Nru gimageview-0.2.27/plugins/image_loader/xvpics.h gimageview-0.3.0-0.20101117/plugins/image_loader/xvpics.h --- gimageview-0.2.27/plugins/image_loader/xvpics.h 2004-05-23 14:08:16.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_loader/xvpics.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xvpics.h,v 1.6 2003/06/14 03:39:50 makeinu Exp $ + * $Id: xvpics.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __XVPICS_H__ diff -Nru gimageview-0.2.27/plugins/image_saver/dither.c gimageview-0.3.0-0.20101117/plugins/image_saver/dither.c --- gimageview-0.2.27/plugins/image_saver/dither.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/dither.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,148 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: dither.c 1153 2007-10-18 11:21:23Z makeinu $ + */ + +#include + +#include "dither.h" + +static gint *evenerr = NULL,*odderr = NULL; +static guchar *dbuf = NULL; + + +guchar *ditherinit(gint w) +{ + ditherfinish(); + evenerr = g_malloc0 (3 * (w + 10) * sizeof(gint)); + if (!evenerr) goto ERROR0; + + odderr = g_malloc0 (3 * (w + 10) * sizeof(gint)); + if (!odderr) goto ERROR1; + + dbuf = g_malloc (w); + if (!dbuf) goto ERROR2; + + return dbuf; + +ERROR2: + g_free (odderr); + odderr = NULL; +ERROR1: + g_free (evenerr); + evenerr = NULL; +ERROR0: + return NULL; +} + + +void ditherfinish(void) +{ + if (evenerr) { + g_free (evenerr); + evenerr = NULL; + } + + if (odderr) { + g_free (odderr); + odderr = NULL; + } + + if (dbuf) { + g_free (dbuf); + dbuf = NULL; + } +} + +void ditherline(guchar *theline, gint linenum, gint width) +{ + gint x,y,lx; + gint c0, c1, c2, times2; + gint terr0, terr1, terr2, actual0, actual1, actual2; + gint start, addon, r, g, b; + gint *thiserr; + gint *nexterr; + + y = linenum; + if ((y & 1 ) == 0) { + start = 0; + addon = 1; + thiserr = evenerr + 3; + nexterr = odderr + width * 3; + } else { + start = width - 1; + addon = -1; + thiserr = odderr + 3; + nexterr = evenerr + width * 3; + } + nexterr[0] = nexterr[1] = nexterr[2] = 0; + + x = start; + for(lx = 0; lx < width; lx++) { + r = theline[x * 3]; + g = theline[x * 3 + 1]; + b = theline[x * 3 + 2]; + + terr0 = r + ((thiserr[0] + 8) >> 4); + terr1 = g + ((thiserr[1] + 8) >> 4); + terr2 = b + ((thiserr[2] + 8) >> 4); + + /* is this going to screw up on white? */ + actual0 = (terr0 >> 5) * 255/7; + actual1 = (terr1 >> 5) * 255/7; + actual2 = (terr2 >> 6) * 255/3; + + if (actual0 < 0) actual0 = 0; + if (actual0 > 255) actual0 = 255; + if (actual1 < 0) actual1 = 0; + if (actual1 > 255) actual1 = 255; + if( actual2 < 0) actual2 = 0; + if (actual2 > 255) actual2 = 255; + + c0 = terr0 - actual0; + c1 = terr1 - actual1; + c2 = terr2 - actual2; + + times2 = (c0 << 1); + nexterr[-3] = c0; c0 += times2; + nexterr[ 3] += c0; c0 += times2; + nexterr[ 0] += c0; c0 += times2; + thiserr[ 3] += c0; + + times2 = (c1 << 1); + nexterr[-2] = c1; c1 += times2; + nexterr[ 4] += c1; c1 += times2; + nexterr[ 1] += c1; c1 += times2; + thiserr[ 4] += c1; + + times2 = (c2 << 1); + nexterr[-1] = c2; c2 += times2; + nexterr[ 5] += c2; c2 += times2; + nexterr[ 2] += c2; c2 += times2; + thiserr[ 5] += c2; + + dbuf[x] = (actual0 >> 5) * 32 + (actual1 >> 5) * 4 + (actual2 >> 6); + + thiserr += 3; + nexterr -= 3; + x += addon; + } +} diff -Nru gimageview-0.2.27/plugins/image_saver/dither.h gimageview-0.3.0-0.20101117/plugins/image_saver/dither.h --- gimageview-0.2.27/plugins/image_saver/dither.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/dither.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,33 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: dither.h 1153 2007-10-18 11:21:23Z makeinu $ + */ + +#ifndef __DITHER_H__ +#define __DITHER_H__ + +guchar *ditherinit (gint w); +void ditherfinish (void); +void ditherline (guchar *theline, + gint linenum, + gint width); + +#endif /* __DITHER_H__ */ diff -Nru gimageview-0.2.27/plugins/image_saver/Makefile.am gimageview-0.3.0-0.20101117/plugins/image_saver/Makefile.am --- gimageview-0.2.27/plugins/image_saver/Makefile.am 2004-05-23 14:08:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,5 +1,7 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -lgimv @@ -23,5 +25,5 @@ libgimv_pnm_saver_la_LIBADD = $(GTK_LIBS) libgimv_xvpics_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xvpics_saver_la_SOURCES = xvpics_saver.c +libgimv_xvpics_saver_la_SOURCES = dither.c dither.h xvpics_saver.c libgimv_xvpics_saver_la_LIBADD = $(GTK_LIBS) diff -Nru gimageview-0.2.27/plugins/image_saver/Makefile.in gimageview-0.3.0-0.20101117/plugins/image_saver/Makefile.in --- gimageview-0.2.27/plugins/image_saver/Makefile.in 2004-12-28 04:01:27.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,639 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_png_saver_la_SOURCES) $(libgimv_pnm_saver_la_SOURCES) $(libgimv_xvpics_saver_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/image_saver -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(image_saver_plugindir)" -image_saver_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(image_saver_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_png_saver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_png_saver_la_OBJECTS = png_saver.lo -libgimv_png_saver_la_OBJECTS = $(am_libgimv_png_saver_la_OBJECTS) -libgimv_pnm_saver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_pnm_saver_la_OBJECTS = pnm_saver.lo -libgimv_pnm_saver_la_OBJECTS = $(am_libgimv_pnm_saver_la_OBJECTS) -libgimv_xvpics_saver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_xvpics_saver_la_OBJECTS = xvpics_saver.lo -libgimv_xvpics_saver_la_OBJECTS = \ - $(am_libgimv_xvpics_saver_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/png_saver.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/pnm_saver.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/xvpics_saver.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_png_saver_la_SOURCES) \ - $(libgimv_pnm_saver_la_SOURCES) \ - $(libgimv_xvpics_saver_la_SOURCES) -DIST_SOURCES = $(libgimv_png_saver_la_SOURCES) \ - $(libgimv_pnm_saver_la_SOURCES) \ - $(libgimv_xvpics_saver_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -lgimv -image_saver_plugin_LTLIBRARIES = \ - libgimv_png_saver.la \ - libgimv_pnm_saver.la \ - libgimv_xvpics_saver.la - -image_saver_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_SAVER_PLUGIN_DIR) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) -libgimv_png_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_png_saver_la_SOURCES = png_saver.c -libgimv_png_saver_la_LIBADD = $(GTK_LIBS) $(PNG_LIBS) -libgimv_pnm_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_pnm_saver_la_SOURCES = pnm_saver.c -libgimv_pnm_saver_la_LIBADD = $(GTK_LIBS) -libgimv_xvpics_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xvpics_saver_la_SOURCES = xvpics_saver.c -libgimv_xvpics_saver_la_LIBADD = $(GTK_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/image_saver/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/image_saver/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-image_saver_pluginLTLIBRARIES: $(image_saver_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(image_saver_plugindir)" || $(mkdir_p) "$(DESTDIR)$(image_saver_plugindir)" - @list='$(image_saver_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(image_saver_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(image_saver_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(image_saver_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(image_saver_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-image_saver_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(image_saver_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(image_saver_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(image_saver_plugindir)/$$p"; \ - done - -clean-image_saver_pluginLTLIBRARIES: - -test -z "$(image_saver_plugin_LTLIBRARIES)" || rm -f $(image_saver_plugin_LTLIBRARIES) - @list='$(image_saver_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_png_saver.la: $(libgimv_png_saver_la_OBJECTS) $(libgimv_png_saver_la_DEPENDENCIES) - $(LINK) -rpath $(image_saver_plugindir) $(libgimv_png_saver_la_LDFLAGS) $(libgimv_png_saver_la_OBJECTS) $(libgimv_png_saver_la_LIBADD) $(LIBS) -libgimv_pnm_saver.la: $(libgimv_pnm_saver_la_OBJECTS) $(libgimv_pnm_saver_la_DEPENDENCIES) - $(LINK) -rpath $(image_saver_plugindir) $(libgimv_pnm_saver_la_LDFLAGS) $(libgimv_pnm_saver_la_OBJECTS) $(libgimv_pnm_saver_la_LIBADD) $(LIBS) -libgimv_xvpics_saver.la: $(libgimv_xvpics_saver_la_OBJECTS) $(libgimv_xvpics_saver_la_DEPENDENCIES) - $(LINK) -rpath $(image_saver_plugindir) $(libgimv_xvpics_saver_la_LDFLAGS) $(libgimv_xvpics_saver_la_OBJECTS) $(libgimv_xvpics_saver_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png_saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnm_saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvpics_saver.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(image_saver_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-image_saver_pluginLTLIBRARIES \ - clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-image_saver_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-image_saver_pluginLTLIBRARIES \ - uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-image_saver_pluginLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-image_saver_pluginLTLIBRARIES install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-image_saver_pluginLTLIBRARIES uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/image_saver/png_saver.c gimageview-0.3.0-0.20101117/plugins/image_saver/png_saver.c --- gimageview-0.2.27/plugins/image_saver/png_saver.c 2004-05-23 14:08:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/png_saver.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: png_saver.c,v 1.9 2003/07/13 13:20:18 makeinu Exp $ + * $Id: png_saver.c 951 2003-07-13 13:20:18Z makeinu $ */ #include diff -Nru gimageview-0.2.27/plugins/image_saver/pnm_saver.c gimageview-0.3.0-0.20101117/plugins/image_saver/pnm_saver.c --- gimageview-0.2.27/plugins/image_saver/pnm_saver.c 2004-05-23 14:08:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_saver/pnm_saver.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: pnm_saver.c,v 1.8 2003/07/13 13:20:18 makeinu Exp $ + * $Id: pnm_saver.c 951 2003-07-13 13:20:18Z makeinu $ */ #include diff -Nru gimageview-0.2.27/plugins/image_view/gimv_mplayer.c gimageview-0.3.0-0.20101117/plugins/image_view/gimv_mplayer.c --- gimageview-0.2.27/plugins/image_view/gimv_mplayer.c 2004-09-29 08:42:14.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_mplayer.c 2010-11-17 06:10:11.000000000 +0000 @@ -44,12 +44,6 @@ #include -#if (GTK_MAJOR_VERSION == 1) && (GTK_MAJOR_VERION <= 2) -# ifndef GDK_WINDOWING_X11 -# define GDK_WINDOWING_X11 -# endif -#endif - #ifdef GDK_WINDOWING_X11 #include #endif /* GDK_WINDOWING_X11 */ @@ -58,14 +52,6 @@ #define GIMV_MPLAYER_REFRESH_RATE 100 /* 0.1 [sec] */ #define GIMV_MPLAYER_BUF_SIZE 1024 -#ifdef USE_GTK2 -# define gtk_object_class_add_signals(class, func, type) -#else -# ifndef GTK_CLASS_TYPE -# define GTK_CLASS_TYPE(object_class) object_class->type -# endif -#endif - enum { PLAY_SIGNAL, STOP_SIGNAL, @@ -115,9 +101,7 @@ /* object class */ -static void gimv_mplayer_class_init (GimvMPlayerClass *class); -static void gimv_mplayer_init (GimvMPlayer *player); -static void gimv_mplayer_destroy (GtkObject *object); +static void gimv_mplayer_dispose (GObject *object); /* widget class */ static void gimv_mplayer_realize (GtkWidget *widget); @@ -160,7 +144,6 @@ gboolean is_stderr); -static GtkWidgetClass *parent_class = NULL; static gint gimv_mplayer_signals[LAST_SIGNAL] = {0}; static GHashTable *player_context_table = NULL; @@ -168,68 +151,21 @@ static GHashTable *ao_drivers_table = NULL; -GtkType -gimv_mplayer_get_type (void) -{ - static GtkType gimv_mplayer_type = 0; - -#if (GTK_MAJOR_VERSION >= 2) - if (!gimv_mplayer_type) { - static const GTypeInfo gimv_mplayer_info = { - sizeof (GimvMPlayerClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_mplayer_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvMPlayer), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_mplayer_init, - }; - - gimv_mplayer_type - = g_type_register_static (GTK_TYPE_WIDGET, - "GimvMPlayer", - &gimv_mplayer_info, - 0); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - if (!gimv_mplayer_type) { - static const GtkTypeInfo gimv_mplayer_info = { - "GimvMPlayer", - sizeof (GimvMPlayer), - sizeof (GimvMPlayerClass), - (GtkClassInitFunc) gimv_mplayer_class_init, - (GtkObjectInitFunc) gimv_mplayer_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_mplayer_type - = gtk_type_unique (gtk_widget_get_type (), &gimv_mplayer_info); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ - - return gimv_mplayer_type; -} +G_DEFINE_TYPE (GimvMPlayer, gimv_mplayer, GTK_TYPE_WIDGET) static void gimv_mplayer_class_init (GimvMPlayerClass *class) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) class; + gobject_class = (GObjectClass *) class; widget_class = (GtkWidgetClass *) class; - parent_class = gtk_type_class (gtk_widget_get_type ()); - -#if (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) gimv_mplayer_signals[PLAY_SIGNAL] = g_signal_new ("play", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvMPlayerClass, play), NULL, NULL, @@ -238,7 +174,7 @@ gimv_mplayer_signals[STOP_SIGNAL] = g_signal_new ("stop", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvMPlayerClass, stop), NULL, NULL, @@ -247,7 +183,7 @@ gimv_mplayer_signals[PAUSE_SIGNAL] = g_signal_new ("pause", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvMPlayerClass, pause), NULL, NULL, @@ -256,7 +192,7 @@ gimv_mplayer_signals[POS_CHANGED_SIGNAL] = g_signal_new ("position-chaned", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvMPlayerClass, position_changed), NULL, NULL, @@ -265,57 +201,15 @@ gimv_mplayer_signals[IDENTIFIED_SIGNAL] = g_signal_new ("identified", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvMPlayerClass, identified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#else - gimv_mplayer_signals[PLAY_SIGNAL] - = gtk_signal_new ("play", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvMPlayerClass, play), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gimv_mplayer_signals[STOP_SIGNAL] - = gtk_signal_new ("stop", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvMPlayerClass, stop), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gimv_mplayer_signals[PAUSE_SIGNAL] - = gtk_signal_new ("pause", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvMPlayerClass, pause), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - gimv_mplayer_signals[POS_CHANGED_SIGNAL] - = gtk_signal_new ("position-changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvMPlayerClass, position_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gimv_mplayer_signals[IDENTIFIED_SIGNAL] - = gtk_signal_new ("identified", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvMPlayerClass, identified), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, gimv_mplayer_signals, LAST_SIGNAL); -#endif /* object class methods */ - object_class->destroy = gimv_mplayer_destroy; + gobject_class->dispose = gimv_mplayer_dispose; /* widget class methods */ widget_class->realize = gimv_mplayer_realize; @@ -386,7 +280,7 @@ static void -gimv_mplayer_destroy (GtkObject *object) +gimv_mplayer_dispose (GObject *object) { GimvMPlayer *player = GIMV_MPLAYER (object); @@ -412,8 +306,8 @@ /* FIXME: free player->args */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_mplayer_parent_class)->dispose) + G_OBJECT_CLASS (gimv_mplayer_parent_class)->dispose (object); } @@ -471,8 +365,8 @@ gimv_mplayer_stop (player); } - if (parent_class->unrealize) - (*parent_class->unrealize) (widget); + if (GTK_WIDGET_CLASS(gimv_mplayer_parent_class)->unrealize) + GTK_WIDGET_CLASS(gimv_mplayer_parent_class)->unrealize (widget); } @@ -630,7 +524,7 @@ GtkWidget * gimv_mplayer_new (void) { - GimvMPlayer *player = GIMV_MPLAYER (gtk_type_new (gimv_mplayer_get_type ())); + GimvMPlayer *player = GIMV_MPLAYER (g_object_new (GIMV_TYPE_MPLAYER, NULL)); return GTK_WIDGET (player); } @@ -645,7 +539,7 @@ player->pos = 0.0; player->status = GimvMPlayerStatusStop; - gtk_signal_emit (GTK_OBJECT (player), gimv_mplayer_signals[STOP_SIGNAL]); + g_signal_emit (G_OBJECT (player), gimv_mplayer_signals[STOP_SIGNAL], 0); } @@ -910,8 +804,8 @@ || !identify_supported) { player->filename = g_strdup (file); - gtk_signal_emit (GTK_OBJECT (player), - gimv_mplayer_signals[IDENTIFIED_SIGNAL]); + g_signal_emit (G_OBJECT (player), + gimv_mplayer_signals[IDENTIFIED_SIGNAL], 0); return TRUE; } else { /* error handling */ @@ -1594,8 +1488,8 @@ FALSE); if (fabs (context->player->pos - pos) > 0.1) - gtk_signal_emit (GTK_OBJECT (context->player), - gimv_mplayer_signals[POS_CHANGED_SIGNAL]); + g_signal_emit (G_OBJECT (context->player), + gimv_mplayer_signals[POS_CHANGED_SIGNAL], 0); } if (n == 0) @@ -1666,8 +1560,8 @@ } else { if (strstr (line, "PAUSE")) { player->status = GimvMPlayerStatusPause; - gtk_signal_emit (GTK_OBJECT (player), - gimv_mplayer_signals[PAUSE_SIGNAL]); + g_signal_emit (G_OBJECT (player), + gimv_mplayer_signals[PAUSE_SIGNAL], 0); } else if (len > 2 && (!strncmp (line, "A:", 2) || !strncmp (line, "V:", 2))) @@ -1681,8 +1575,8 @@ if (GTK_WIDGET_MAPPED (player)) { gimv_mplayer_send_dummy_configure (player); } - gtk_signal_emit (GTK_OBJECT (player), - gimv_mplayer_signals[PLAY_SIGNAL]); + g_signal_emit (G_OBJECT (player), + gimv_mplayer_signals[PLAY_SIGNAL], 0); } /* get movie position */ diff -Nru gimageview-0.2.27/plugins/image_view/gimv_mplayer.h gimageview-0.3.0-0.20101117/plugins/image_view/gimv_mplayer.h --- gimageview-0.2.27/plugins/image_view/gimv_mplayer.h 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_mplayer.h 2010-11-17 06:10:11.000000000 +0000 @@ -39,10 +39,12 @@ extern "C" { #endif /* __cplusplus */ -#define GIMV_MPLAYER(obj) (GTK_CHECK_CAST ((obj), gimv_mplayer_get_type (), GimvMPlayer)) -#define GIMV_MPLAYER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), gimv_mplayer_get_type (), GimvMPlayerClass)) -#define GIMV_IS_MPLAYER(obj) (GTK_CHECK_TYPE (obj, gimv_mplayer_get_type ())) -#define GIMV_IS_MPLAYER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), gimv_mplayer_get_type ())) +#define GIMV_TYPE_MPLAYER (gimv_mplayer_get_type ()) +#define GIMV_MPLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_MPLAYER, GimvMPlayer)) +#define GIMV_MPLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_MPLAYER, GimvMPlayerClass)) +#define GIMV_IS_MPLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_MPLAYER)) +#define GIMV_IS_MPLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_MPLAYER)) +#define GIMV_MPLAYER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_MPLAYER, GimvMPlayerClass)) #ifdef DATADIR @@ -142,7 +144,7 @@ }; -GtkType gimv_mplayer_get_type (void); +GType gimv_mplayer_get_type (void); GtkWidget *gimv_mplayer_new (void); gboolean gimv_mplayer_set_file (GimvMPlayer *player, const gchar *file); diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine.c gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine.c --- gimageview-0.2.27/plugins/image_view/gimv_xine.c 2004-10-03 19:41:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_xine.c,v 1.6 2004/10/03 16:26:40 makeinu Exp $ + * $Id: gimv_xine.c 1141 2007-10-17 12:14:07Z makeinu $ * * the xine engine in a widget - implementation */ @@ -59,11 +59,8 @@ # endif #endif /* defined(GDK_WINDOWING_X11) */ -static void gimv_xine_class_init (GimvXineClass *klass); -static void gimv_xine_init (GimvXine *gxine); - /* object class methods */ -static void gimv_xine_destroy (GtkObject *object); +static void gimv_xine_dispose (GObject *object); /* widget class methods */ static void gimv_xine_realize (GtkWidget *widget); @@ -73,71 +70,24 @@ static void gimv_xine_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static GtkWidgetClass *parent_class = NULL; static gint gimv_xine_signals[LAST_SIGNAL] = {0}; -GtkType -gimv_xine_get_type (void) -{ - static GtkType gimv_xine_type = 0; - -#ifdef USE_GTK2 - if (!gimv_xine_type) { - static const GTypeInfo gimv_xine_info = { - sizeof (GimvXineClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_xine_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvXine), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_xine_init, - }; - - gimv_xine_type = g_type_register_static (GTK_TYPE_WIDGET, - "GimvXine", - &gimv_xine_info, - 0); - } -#else /* USE_GTK2 */ - if (!gimv_xine_type) { - static const GtkTypeInfo gimv_xine_info = { - "GimvXine", - sizeof (GimvXine), - sizeof (GimvXineClass), - (GtkClassInitFunc) gimv_xine_class_init, - (GtkObjectInitFunc) gimv_xine_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_xine_type = - gtk_type_unique (gtk_widget_get_type (), &gimv_xine_info); - } -#endif /* USE_GTK2 */ - - return gimv_xine_type; -} +G_DEFINE_TYPE (GimvXine, gimv_xine, GTK_TYPE_WIDGET) static void gimv_xine_class_init (GimvXineClass *class) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) class; + gobject_class = (GObjectClass *) class; widget_class = (GtkWidgetClass *) class; - parent_class = gtk_type_class (gtk_widget_get_type ()); - -#if (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) gimv_xine_signals[PLAY_SIGNAL] = g_signal_new ("play", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvXineClass, play), NULL, NULL, @@ -147,7 +97,7 @@ gimv_xine_signals[STOP_SIGNAL] = g_signal_new ("stop", G_SIGNAL_RUN_FIRST, - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_STRUCT_OFFSET (GimvXineClass, stop), NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -155,7 +105,7 @@ gimv_xine_signals[PLAYBACK_FINISHED_SIGNAL] = g_signal_new ("playback_finished", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimvXineClass, playback_finished), NULL, NULL, @@ -181,53 +131,8 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); */ -#else /* (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) */ - gimv_xine_signals[PLAY_SIGNAL] - = gtk_signal_new ("play", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvXineClass, play), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gimv_xine_signals[STOP_SIGNAL] - = gtk_signal_new ("stop", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvXineClass, stop), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gimv_xine_signals[PLAYBACK_FINISHED_SIGNAL] - = gtk_signal_new ("playback_finished", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvXineClass, playback_finished), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - /* - gimv_xine_signals[NEED_NEXT_MRL_SIGNAL] - = gtk_signal_new ("need_next_mrl", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvXineClass, need_next_mrl), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - - gimv_xine_signals[BRANCHED_SIGNAL] - = gtk_signal_new ("branched", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvXineClass, branched), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - */ - - gtk_object_class_add_signals (object_class, gimv_xine_signals, LAST_SIGNAL); -#endif /* (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) */ - - object_class->destroy = gimv_xine_destroy; + gobject_class->dispose = gimv_xine_dispose; widget_class->realize = gimv_xine_realize; widget_class->unrealize = gimv_xine_unrealize; @@ -239,64 +144,27 @@ static void gimv_xine_init (GimvXine *this) { - GimvXinePrivate *priv; - this->widget.requisition.width = 8; this->widget.requisition.height = 8; - priv = this->private = g_new0 (GimvXinePrivate, 1); - - /* - * create a new xine instance, load config values - */ - -#if 0 - priv->xine = xine_new (); - - g_snprintf (priv->configfile, 255, "%s/.gimv/xinerc", getenv ("HOME")); - xine_config_load (priv->xine, priv->configfile); - - xine_init (priv->xine); -#else - priv->xine = gimv_xine_priv_get (); -#endif - - priv->stream = NULL; - priv->event_queue = NULL; - priv->vo_driver = NULL; - priv->ao_driver = NULL; - - priv->oldwidth = 0; - priv->oldheight = 0; + this->private = gimv_xine_private_new (); } static void -gimv_xine_destroy (GtkObject *object) +gimv_xine_dispose (GObject *object) { GimvXine *gtx = GIMV_XINE (object); - GimvXinePrivate *priv; g_return_if_fail (GIMV_IS_XINE (gtx)); - priv = gtx->private; - - if (priv) { - /* exit xine */ - if (priv->xine) -#if 0 - xine_exit (priv->xine); -#else - gimv_xine_priv_release (priv->xine); -#endif - priv->xine = NULL; - - g_free (gtx->private); + if (gtx->private) { + gimv_xine_private_destroy (gtx->private); gtx->private = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_xine_parent_class)->dispose) + G_OBJECT_CLASS (gimv_xine_parent_class)->dispose (object); } @@ -392,7 +260,7 @@ #endif /* defined(GDK_WINDOWING_X11) */ GimvXinePrivate *priv; - const char *video_driver_id; + const char *video_driver_id = "auto"; xine_vo_driver_t *vo_driver; g_return_val_if_fail (GIMV_IS_XINE (this), NULL); @@ -421,16 +289,10 @@ priv->display_ratio = 1.0; #endif /* defined(GDK_WINDOWING_X11) */ - if (priv->video_driver_id) { + if (priv->video_driver_id) video_driver_id = priv->video_driver_id; - } else { - /* try to init video with stored information */ - video_driver_id = xine_config_register_string (priv->xine, - "video.driver", - "auto", - "video driver to use", - NULL, 10, NULL, NULL); - } + else + video_driver_id = gimv_xine_get_default_video_out_driver_id (this); if (strcmp (video_driver_id, "auto")) { vo_driver = xine_open_video_driver (priv->xine, @@ -454,7 +316,7 @@ { GimvXinePrivate *priv; xine_ao_driver_t *ao_driver; - const char *audio_driver_id; + const char *audio_driver_id = "auto"; g_return_val_if_fail (GIMV_IS_XINE (this), NULL); priv = this->private; @@ -462,12 +324,7 @@ if (priv->audio_driver_id) audio_driver_id = priv->audio_driver_id; else - /* try to init audio with stored information */ - audio_driver_id = xine_config_register_string (priv->xine, - "audio.driver", - "auto", - "audio driver to use", - NULL, 10, NULL, NULL); + audio_driver_id = gimv_xine_get_default_audio_out_driver_id (this); if (!strcmp (audio_driver_id, "null")) return NULL; @@ -532,13 +389,8 @@ switch (event->type) { case XINE_EVENT_UI_PLAYBACK_FINISHED: -#ifdef USE_GTK2 g_signal_emit (G_OBJECT (gtx), gimv_xine_signals[PLAYBACK_FINISHED_SIGNAL], 0); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT (gtx), - gimv_xine_signals[PLAYBACK_FINISHED_SIGNAL]); -#endif /* USE_GTK2 */ break; default: @@ -705,9 +557,6 @@ gdk_window_remove_filter (NULL, filter_xine_event, this); #endif /* defined (GDK_WINDOWING_X11) */ - /* save configuration */ - /* xine_config_save (priv->xine, priv->configfile); */ - /* Hide all windows */ if (GTK_WIDGET_MAPPED (widget)) gtk_widget_unmap (widget); @@ -715,38 +564,102 @@ GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); /* This destroys widget->window and unsets the realized flag */ - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + if (GTK_WIDGET_CLASS (gimv_xine_parent_class)->unrealize) + GTK_WIDGET_CLASS (gimv_xine_parent_class)->unrealize (widget); } GtkWidget * gimv_xine_new (const gchar *video_driver_id, const gchar *audio_driver_id) { -#if (GTK_MAJOR_VERSION >= 2) - GtkWidget *this = GTK_WIDGET (g_object_new (gimv_xine_get_type (), NULL)); -#else /* (GTK_MAJOR_VERSION >= 2) */ - GtkWidget *this = GTK_WIDGET (gtk_type_new (gimv_xine_get_type ())); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + GtkWidget *this = GTK_WIDGET (g_object_new (GIMV_TYPE_XINE, NULL)); GimvXinePrivate *priv; g_return_val_if_fail (GIMV_IS_XINE (this), NULL); priv = GIMV_XINE (this)->private; - if (video_driver_id) + if (video_driver_id) { + g_free (priv->video_driver_id); priv->video_driver_id = strdup (video_driver_id); - else - priv->video_driver_id = NULL; + } - if (audio_driver_id) + if (audio_driver_id) { + g_free (priv->audio_driver_id); priv->audio_driver_id = strdup (audio_driver_id); - else - priv->audio_driver_id = NULL; + } return this; } +const char * const * +gimv_xine_get_video_out_plugins (GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return xine_list_video_output_plugins (gtx->private->xine); +} + + +const char * const * +gimv_xine_get_audio_out_plugins (GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return xine_list_audio_output_plugins (gtx->private->xine); +} + + +const gchar * +gimv_xine_get_video_out_driver_id(GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return gtx->private->video_driver_id; +} + + +const gchar * +gimv_xine_get_audio_out_driver_id(GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return gtx->private->audio_driver_id; +} + + +const gchar * +gimv_xine_get_default_video_out_driver_id(GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return xine_config_register_string (gtx->private->xine, + "video.driver", + "auto", + "video driver to use", + NULL, 10, NULL, NULL); +} + + +const gchar * +gimv_xine_get_default_audio_out_driver_id(GimvXine *gtx) +{ + g_return_val_if_fail(GIMV_IS_XINE (gtx), NULL); + g_return_val_if_fail(gtx->private, NULL); + + return xine_config_register_string (gtx->private->xine, + "audio.driver", + "auto", + "audio driver to use", + NULL, 10, NULL, NULL); +} + + static gint gimv_xine_expose (GtkWidget *widget, GdkEventExpose *event) { @@ -866,13 +779,8 @@ if(!priv->visual_anim.running) visual_anim_play(gtx); } -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(gtx), gimv_xine_signals[PLAY_SIGNAL], 0); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(gtx), - gimv_xine_signals[PLAY_SIGNAL]); -#endif /* USE_GTK2 */ } return retval; @@ -957,13 +865,8 @@ xine_stop (priv->stream); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(gtx), gimv_xine_signals[STOP_SIGNAL], 0); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(gtx), - gimv_xine_signals[STOP_SIGNAL]); -#endif /* USE_GTK2 */ } @@ -1514,7 +1417,10 @@ priv = gtx->private; g_return_if_fail (priv->xine); - xine_config_load (priv->xine, cfg_filename); + if (cfg_filename) + xine_config_load (priv->xine, cfg_filename); + else + xine_config_load (priv->xine, priv->configfile); } @@ -1529,7 +1435,11 @@ priv = gtx->private; g_return_if_fail (priv->xine); - xine_config_save (priv->xine, cfg_filename); + if (cfg_filename) + xine_config_save (priv->xine, cfg_filename); + else { + xine_config_save (priv->xine, priv->configfile); + } } diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine.h gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine.h --- gimageview-0.2.27/plugins/image_view/gimv_xine.h 2004-09-21 08:44:28.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_xine.h,v 1.4 2004/09/21 08:44:28 makeinu Exp $ + * $Id: gimv_xine.h 1141 2007-10-17 12:14:07Z makeinu $ * * the xine engine in a widget - header */ @@ -45,10 +45,12 @@ */ -#define GIMV_XINE(obj) (GTK_CHECK_CAST ((obj), gimv_xine_get_type (), GimvXine)) -#define GIMV_XINE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), gimv_xine_get_type (), GimvXineClass)) -#define GIMV_IS_XINE(obj) (GTK_CHECK_TYPE (obj, gimv_xine_get_type ())) -#define GIMV_IS_XINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), gimv_xine_get_type ())) +#define GIMV_TYPE_XINE (gimv_xine_get_type ()) +#define GIMV_XINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_XINE, GimvXine)) +#define GIMV_XINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_XINE, GimvXineClass)) +#define GIMV_IS_XINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_XINE)) +#define GIMV_IS_XINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_XINE)) +#define GIMV_XINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_XINE, GimvXineClass)) typedef enum { @@ -91,9 +93,19 @@ }; -GtkType gimv_xine_get_type (void); +GType gimv_xine_get_type (void); GtkWidget *gimv_xine_new (const gchar *video_driver_id, const gchar *audio_driver_id); +const char * const * + gimv_xine_get_video_out_plugins (GimvXine *gtx); +const char * const * + gimv_xine_get_audio_out_plugins (GimvXine *gtx); +const gchar *gimv_xine_get_video_out_driver_id(GimvXine *gtx); +const gchar *gimv_xine_get_audio_out_driver_id(GimvXine *gtx); +const gchar *gimv_xine_get_default_video_out_driver_id + (GimvXine *gtx); +const gchar *gimv_xine_get_default_audio_out_driver_id + (GimvXine *gtx); void gimv_xine_set_visibility (GimvXine *gtx, GdkVisibilityState state); void gimv_xine_resize (GimvXine *gtx, @@ -102,9 +114,6 @@ gint width, gint height); -void gimv_xine_show_name (GimvXine *gtx, - gchar *name); - gint gimv_xine_set_mrl (GimvXine *gtx, const gchar *mrl); gint gimv_xine_play (GimvXine *gtx, @@ -126,7 +135,6 @@ gint gimv_xine_is_playing (GimvXine *gtx); gint gimv_xine_is_seekable (GimvXine *gtx); -void gimv_xine_save_config (GimvXine *gtx); void gimv_xine_set_video_property (GimvXine *gtx, gint property, gint value); diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine_post.c gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_post.c --- gimageview-0.2.27/plugins/image_view/gimv_xine_post.c 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_post.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: gimv_xine_post.c,v 1.2 2003/06/13 09:43:09 makeinu Exp $ + * $Id: gimv_xine_post.c 931 2003-06-13 09:43:48Z makeinu $ * */ diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine_post.h gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_post.h --- gimageview-0.2.27/plugins/image_view/gimv_xine_post.h 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_post.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: gimv_xine_post.h,v 1.2 2003/06/13 09:43:09 makeinu Exp $ + * $Id: gimv_xine_post.h 931 2003-06-13 09:43:48Z makeinu $ * */ diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine_priv.c gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_priv.c --- gimageview-0.2.27/plugins/image_view/gimv_xine_priv.c 2004-10-03 19:59:39.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_priv.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_xine_priv.c,v 1.4 2004/10/03 16:25:22 makeinu Exp $ + * $Id: gimv_xine_priv.c 1076 2005-01-28 13:36:12Z makeinu $ * * the xine engine in a widget - implementation */ @@ -30,36 +30,79 @@ #include "gimv_xine.h" -static xine_t *xine = NULL; -static gint ref_count = 0; -static gchar configfile[256] = { 0 }; +static xine_t *priv_xine = NULL; +static guint *priv_xine_ref_count = 0; +static char configfile[256]; -xine_t * -gimv_xine_priv_get (void) + +GimvXinePrivate * +gimv_xine_private_new (void) { - if (!xine) { - xine = xine_new (); + GimvXinePrivate *priv; + + priv = g_new0 (GimvXinePrivate, 1); + + /* + * create a new xine instance, load config values + */ + + if (priv_xine_ref_count == 0) { + priv->xine = priv_xine = xine_new (); g_snprintf (configfile, 255, "%s/.gimv/xinerc", getenv ("HOME")); - xine_config_load (xine, configfile); - xine_init (xine); - ref_count = 1; - return xine; + priv->configfile = g_strdup (configfile); + xine_config_load (priv->xine, configfile); + xine_init (priv->xine); + priv_xine_ref_count++; + } else { + priv->xine = priv_xine; + priv->configfile = g_strdup (configfile); } - ref_count++; - return xine; + priv->stream = NULL; + priv->event_queue = NULL; + priv->vo_driver = NULL; + priv->ao_driver = NULL; + + priv->oldwidth = 0; + priv->oldheight = 0; + + priv->video_driver_id = 0; + priv->audio_driver_id = 0; + + return priv; } + void -gimv_xine_priv_release (xine_t *axine) +gimv_xine_private_destroy (GimvXinePrivate *priv) { - ref_count--; + if (!priv) return; - if (ref_count == 0) { - xine_config_save (axine, configfile); - xine_exit (axine); - xine = NULL; + if (priv->video_driver_id) + g_free (priv->video_driver_id); + priv->video_driver_id = NULL; + + if (priv->audio_driver_id) + g_free (priv->audio_driver_id); + priv->audio_driver_id = NULL; + + /* exit xine */ + if (priv_xine_ref_count > 0) { + /* save configuration */ + xine_config_save (priv->xine, priv->configfile); + g_free (priv->configfile); + priv->configfile = NULL; + + priv_xine_ref_count--; + if (priv_xine_ref_count == 0) { + xine_exit (priv_xine); + priv_xine = NULL; + } } + + priv->xine = NULL; + + g_free (priv); } diff -Nru gimageview-0.2.27/plugins/image_view/gimv_xine_priv.h gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_priv.h --- gimageview-0.2.27/plugins/image_view/gimv_xine_priv.h 2004-10-03 19:37:35.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/gimv_xine_priv.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_xine_priv.h,v 1.3 2003/07/12 15:53:31 makeinu Exp $ + * $Id: gimv_xine_priv.h 1183 2007-10-23 14:29:39Z makeinu $ * * the xine engine in a widget - implementation */ @@ -43,12 +43,7 @@ #include #include - -#if (GTK_MAJOR_VERSION == 1) && (GTK_MAJOR_VERION <= 2) -# ifndef GDK_WINDOWING_X11 -# define GDK_WINDOWING_X11 -# endif -#endif +#include "gimv_xine.h" #if defined (GDK_WINDOWING_X11) # include @@ -64,10 +59,6 @@ # define GIMV_XINE_DEFAULT_VISUAL_TYPE XINE_VISUAL_TYPE_NONE #endif -#include "intl.h" -#include "gtk2-compat.h" - - /* * config related constants @@ -92,7 +83,7 @@ xine_event_queue_t *event_queue; double display_ratio; - char configfile[256]; + char *configfile; char *video_driver_id; char *audio_driver_id; @@ -116,18 +107,18 @@ xine_post_t *post_video; struct { - xine_stream_t *stream; - xine_event_queue_t *event_queue; - int running; - int current; - int enabled; /* 0, 1:vpost, 2:vanim */ - - char **mrls; - int num_mrls; - - int post_plugin_num; - xine_post_t *post_output; - int post_changed; + xine_stream_t *stream; + xine_event_queue_t *event_queue; + int running; + int current; + int enabled; /* 0, 1:vpost, 2:vanim */ + + char **mrls; + int num_mrls; + + int post_plugin_num; + xine_post_t *post_output; + int post_changed; } visual_anim; }; @@ -151,10 +142,8 @@ } GimvXinePrivImage; -xine_t *gimv_xine_priv_get (void); -void gimv_xine_priv_release (xine_t *xine); - - +GimvXinePrivate *gimv_xine_private_new (void); +void gimv_xine_private_destroy (GimvXinePrivate *priv); GimvXinePrivImage *gimv_xine_priv_image_new (gint imgsize); void gimv_xine_priv_image_delete (GimvXinePrivImage *image); guchar *gimv_xine_priv_yuv2rgb (GimvXinePrivImage *image); diff -Nru gimageview-0.2.27/plugins/image_view/image_view_mplayer.c gimageview-0.3.0-0.20101117/plugins/image_view/image_view_mplayer.c --- gimageview-0.2.27/plugins/image_view/image_view_mplayer.c 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/image_view_mplayer.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: image_view_mplayer.c,v 1.5 2003/07/05 16:45:32 makeinu Exp $ + * $Id: image_view_mplayer.c 1164 2007-10-20 15:04:59Z makeinu $ */ #ifdef HAVE_CONFIG_H @@ -403,16 +403,16 @@ gtk_container_add (GTK_CONTAINER (frame), mplayer); gtk_widget_show (mplayer); - gtk_signal_connect (GTK_OBJECT (mplayer), "play", - GTK_SIGNAL_FUNC (cb_mplayer_play), iv); - gtk_signal_connect (GTK_OBJECT (mplayer), "stop", - GTK_SIGNAL_FUNC (cb_mplayer_stop), iv); - gtk_signal_connect (GTK_OBJECT (mplayer), "pause", - GTK_SIGNAL_FUNC (cb_mplayer_pause), iv); - gtk_signal_connect (GTK_OBJECT (mplayer), "position_changed", - GTK_SIGNAL_FUNC (cb_mplayer_pos_changed), iv); - gtk_signal_connect (GTK_OBJECT (mplayer), "identified", - GTK_SIGNAL_FUNC (cb_mplayer_identified), iv); + g_signal_connect (G_OBJECT (mplayer), "play", + G_CALLBACK (cb_mplayer_play), iv); + g_signal_connect (G_OBJECT (mplayer), "stop", + G_CALLBACK (cb_mplayer_stop), iv); + g_signal_connect (G_OBJECT (mplayer), "pause", + G_CALLBACK (cb_mplayer_pause), iv); + g_signal_connect (G_OBJECT (mplayer), "position_changed", + G_CALLBACK (cb_mplayer_pos_changed), iv); + g_signal_connect (G_OBJECT (mplayer), "identified", + G_CALLBACK (cb_mplayer_identified), iv); gimv_mplayer_set_video_out_driver (GIMV_MPLAYER (mplayer), gimv_prefs_mplayer_get_driver("vo")); @@ -453,14 +453,14 @@ iv->info); if (imcache) { - gimv_image_unref (imcache); - gtk_signal_emit_by_name (GTK_OBJECT (iv), - "thumbnail_created", - iv->info); + g_object_unref (G_OBJECT (imcache)); + g_signal_emit_by_name (G_OBJECT (iv), + "thumbnail_created", + iv->info); } g_free (filename); - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); g_free (tmpfile); } diff -Nru gimageview-0.2.27/plugins/image_view/image_view_xine.c gimageview-0.3.0-0.20101117/plugins/image_view/image_view_xine.c --- gimageview-0.2.27/plugins/image_view/image_view_xine.c 2004-10-03 19:21:09.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/image_view_xine.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: image_view_xine.c,v 1.8 2004/10/03 19:18:57 makeinu Exp $ + * $Id: image_view_xine.c 1179 2007-10-23 02:18:13Z makeinu $ */ #ifdef HAVE_CONFIG_H @@ -34,7 +34,7 @@ #include "gimv_thumb.h" #include "gimv_thumb_cache.h" #include "gimv_xine.h" -#include "gtkutils.h" +#include "utils_gtk.h" #include "prefs_xine.h" /* callback functions */ @@ -301,9 +301,9 @@ g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); - gtk_object_get (GTK_OBJECT (iv), - "continuance_play", &next, - NULL); + g_object_get (G_OBJECT (iv), + "continuance_play", &next, + NULL); if (next) gimv_image_view_next (iv); @@ -536,10 +536,10 @@ gtk_container_add (GTK_CONTAINER (widget), gxine); gtk_widget_show (gxine); - gtk_signal_connect (GTK_OBJECT (gxine), "playback_finished", - GTK_SIGNAL_FUNC (cb_playback_finished), iv); - gtk_signal_connect (GTK_OBJECT (gxine), "destroy", - GTK_SIGNAL_FUNC (cb_destroy), iv); + g_signal_connect (G_OBJECT (gxine), "playback_finished", + G_CALLBACK (cb_playback_finished), iv); + g_signal_connect (G_OBJECT (gxine), "destroy", + G_CALLBACK (cb_destroy), iv); return widget; } @@ -582,13 +582,13 @@ iv->info); g_free (filename); - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); if (imcache) { - gimv_image_unref (imcache); - gtk_signal_emit_by_name (GTK_OBJECT (iv), - "thumbnail_created", - iv->info); + g_object_unref (G_OBJECT (imcache)); + g_signal_emit_by_name (G_OBJECT (iv), + "thumbnail_created", + iv->info); } } diff -Nru gimageview-0.2.27/plugins/image_view/Makefile.am gimageview-0.3.0-0.20101117/plugins/image_view/Makefile.am --- gimageview-0.2.27/plugins/image_view/Makefile.am 2004-10-03 19:21:09.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,12 +1,12 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv endif -CLEANFILES = *~ .deps/* .*.swp .*.swo - if ENABLE_MPLAYER gimv_mplayer_plugin_LTLIBRARIES = libgimv_mplayer.la endif diff -Nru gimageview-0.2.27/plugins/image_view/Makefile.in gimageview-0.3.0-0.20101117/plugins/image_view/Makefile.in --- gimageview-0.2.27/plugins/image_view/Makefile.in 2004-12-28 04:01:28.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,696 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_mplayer_la_SOURCES) $(libgimv_xine_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/image_view -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(gimv_mplayer_plugindir)" "$(DESTDIR)$(gimv_xine_plugindir)" -gimv_mplayer_pluginLTLIBRARIES_INSTALL = $(INSTALL) -gimv_xine_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(gimv_mplayer_plugin_LTLIBRARIES) \ - $(gimv_xine_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_mplayer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_mplayer_la_OBJECTS = gimv_mplayer.lo image_view_mplayer.lo \ - mplayer_image_loader.lo prefs_mplayer.lo -libgimv_mplayer_la_OBJECTS = $(am_libgimv_mplayer_la_OBJECTS) -libgimv_xine_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_xine_la_OBJECTS = gimv_xine.lo gimv_xine_priv.lo \ - gimv_xine_post.lo image_view_xine.lo xine_image_loader.lo \ - prefs_xine.lo -libgimv_xine_la_OBJECTS = $(am_libgimv_xine_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gimv_mplayer.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_xine.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_xine_post.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_xine_priv.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/image_view_mplayer.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/image_view_xine.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/mplayer_image_loader.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_mplayer.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_xine.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/xine_image_loader.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_mplayer_la_SOURCES) $(libgimv_xine_la_SOURCES) -DIST_SOURCES = $(libgimv_mplayer_la_SOURCES) \ - $(libgimv_xine_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = \ - -DDATADIR=\""$(gimv_datadir)"\" - -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -CLEANFILES = *~ .deps/* .*.swp .*.swo -@ENABLE_MPLAYER_TRUE@gimv_mplayer_plugin_LTLIBRARIES = libgimv_mplayer.la -@ENABLE_XINE_TRUE@gimv_xine_plugin_LTLIBRARIES = libgimv_xine.la -gimv_mplayer_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) -gimv_xine_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) -INCLUDES = \ - $(GTK_CFLAGS) \ - $(XINE_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -libgimv_mplayer_la_LIBADD = $(GTK_LIBS) -libgimv_mplayer_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_mplayer_la_SOURCES = \ - gimv_mplayer.c gimv_mplayer.h \ - image_view_mplayer.c image_view_mplayer.h \ - mplayer_image_loader.c mplayer_image_loader.h \ - prefs_mplayer.c prefs_mplayer.h - -libgimv_xine_la_LIBADD = $(GTK_LIBS) $(XINE_LIBS) -libgimv_xine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xine_la_SOURCES = \ - gimv_xine.c gimv_xine.h \ - gimv_xine_priv.c gimv_xine_priv.h \ - gimv_xine_post.c gimv_xine_post.h \ - image_view_xine.c image_view_xine.h \ - xine_image_loader.c xine_image_loader.h \ - prefs_xine.c prefs_xine.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/image_view/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/image_view/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-gimv_mplayer_pluginLTLIBRARIES: $(gimv_mplayer_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_mplayer_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_mplayer_plugindir)" - @list='$(gimv_mplayer_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_mplayer_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_mplayer_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_mplayer_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_mplayer_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_mplayer_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_mplayer_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_mplayer_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_mplayer_plugindir)/$$p"; \ - done - -clean-gimv_mplayer_pluginLTLIBRARIES: - -test -z "$(gimv_mplayer_plugin_LTLIBRARIES)" || rm -f $(gimv_mplayer_plugin_LTLIBRARIES) - @list='$(gimv_mplayer_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-gimv_xine_pluginLTLIBRARIES: $(gimv_xine_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_xine_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_xine_plugindir)" - @list='$(gimv_xine_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_xine_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_xine_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_xine_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_xine_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_xine_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_xine_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_xine_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_xine_plugindir)/$$p"; \ - done - -clean-gimv_xine_pluginLTLIBRARIES: - -test -z "$(gimv_xine_plugin_LTLIBRARIES)" || rm -f $(gimv_xine_plugin_LTLIBRARIES) - @list='$(gimv_xine_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_mplayer.la: $(libgimv_mplayer_la_OBJECTS) $(libgimv_mplayer_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_mplayer_plugindir) $(libgimv_mplayer_la_LDFLAGS) $(libgimv_mplayer_la_OBJECTS) $(libgimv_mplayer_la_LIBADD) $(LIBS) -libgimv_xine.la: $(libgimv_xine_la_OBJECTS) $(libgimv_xine_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_xine_plugindir) $(libgimv_xine_la_LDFLAGS) $(libgimv_xine_la_OBJECTS) $(libgimv_xine_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_mplayer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_xine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_xine_post.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_xine_priv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image_view_mplayer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image_view_xine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mplayer_image_loader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_mplayer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_xine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_image_loader.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(gimv_mplayer_plugindir)" "$(DESTDIR)$(gimv_xine_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-gimv_mplayer_pluginLTLIBRARIES \ - clean-gimv_xine_pluginLTLIBRARIES clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-gimv_mplayer_pluginLTLIBRARIES \ - install-gimv_xine_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-gimv_mplayer_pluginLTLIBRARIES \ - uninstall-gimv_xine_pluginLTLIBRARIES uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-gimv_mplayer_pluginLTLIBRARIES \ - clean-gimv_xine_pluginLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-gimv_mplayer_pluginLTLIBRARIES \ - install-gimv_xine_pluginLTLIBRARIES install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-gimv_mplayer_pluginLTLIBRARIES \ - uninstall-gimv_xine_pluginLTLIBRARIES uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/image_view/mplayer_image_loader.c gimageview-0.3.0-0.20101117/plugins/image_view/mplayer_image_loader.c --- gimageview-0.2.27/plugins/image_view/mplayer_image_loader.c 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/mplayer_image_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mplayer_image_loader.c,v 1.4 2003/06/18 09:26:53 makeinu Exp $ + * $Id: mplayer_image_loader.c 1098 2007-10-12 05:21:32Z makeinu $ */ #include "mplayer_image_loader.h" @@ -73,10 +73,8 @@ } mplayer = GIMV_MPLAYER (gimv_mplayer_new ()); -#ifdef USE_GTK2 g_object_ref (G_OBJECT (mplayer)); gtk_object_sink (GTK_OBJECT (mplayer)); -#endif /* USE_GTK2 */ if (!gimv_mplayer_set_file (mplayer, filename)) goto ERROR0; len = gimv_mplayer_get_length (mplayer); diff -Nru gimageview-0.2.27/plugins/image_view/mplayer_image_loader.h gimageview-0.3.0-0.20101117/plugins/image_view/mplayer_image_loader.h --- gimageview-0.2.27/plugins/image_view/mplayer_image_loader.h 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/mplayer_image_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: mplayer_image_loader.h,v 1.3 2003/06/14 03:39:50 makeinu Exp $ + * $Id: mplayer_image_loader.h 935 2003-06-14 03:39:50Z makeinu $ */ #ifndef __MPLAYER_IMAGE_LOADER_H__ diff -Nru gimageview-0.2.27/plugins/image_view/prefs_mplayer.c gimageview-0.3.0-0.20101117/plugins/image_view/prefs_mplayer.c --- gimageview-0.2.27/plugins/image_view/prefs_mplayer.c 2004-10-03 19:21:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/prefs_mplayer.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_mplayer.c,v 1.4 2004/10/03 19:18:57 makeinu Exp $ + * $Id: prefs_mplayer.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "prefs_mplayer.h" @@ -28,9 +28,9 @@ #include #include -#include "gtkutils.h" #include "gimv_mplayer.h" #include "gimv_prefs_ui_utils.h" +#include "utils_gtk.h" #define CONF_VO_DRIVER_KEY "vo_driver" #ifdef GDK_WINDOWING_FB @@ -276,7 +276,7 @@ GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 1); gtk_widget_show (alignment); gtk_widget_show (vo_combo); - gtk_widget_set_usize (vo_combo, 100, -1); + gtk_widget_set_size_request (vo_combo, 100, -1); /* audio driver combo */ label = gtk_label_new (_("Audio driver : ")); @@ -294,7 +294,7 @@ GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 1); gtk_widget_show (alignment); gtk_widget_show (ao_combo); - gtk_widget_set_usize (ao_combo, 100, -1); + gtk_widget_set_size_request (ao_combo, 100, -1); /********************************************** @@ -321,11 +321,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (mconf.thumb_pos, 0.0, 100.0, 0.01, 0.1, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); + gtk_widget_set_size_request(spinner, 70, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner), 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &mconf.thumb_pos); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &mconf.thumb_pos); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); gtk_widget_show (spinner); @@ -337,10 +337,8 @@ /* for detecting drivers */ mplayer = gimv_mplayer_new (); -#ifdef USE_GTK2 g_object_ref (G_OBJECT (mplayer)); gtk_object_sink (GTK_OBJECT (mplayer)); -#endif /* USE_GTK2 */ /* set drivers list */ list = gimv_mplayer_get_video_out_drivers (GIMV_MPLAYER (mplayer), FALSE); @@ -353,10 +351,10 @@ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(ao_combo)->entry), mconf.ao_driver); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO(vo_combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_vo_combo_changed), NULL); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO(ao_combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_ao_combo_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO(vo_combo)->entry), "changed", + G_CALLBACK (cb_vo_combo_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO(ao_combo)->entry), "changed", + G_CALLBACK (cb_ao_combo_changed), NULL); gtk_widget_unref (mplayer); diff -Nru gimageview-0.2.27/plugins/image_view/prefs_mplayer.h gimageview-0.3.0-0.20101117/plugins/image_view/prefs_mplayer.h --- gimageview-0.2.27/plugins/image_view/prefs_mplayer.h 2004-05-23 14:08:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/prefs_mplayer.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_mplayer.h,v 1.2 2003/06/13 09:43:10 makeinu Exp $ + * $Id: prefs_mplayer.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_MPLAYER_H__ diff -Nru gimageview-0.2.27/plugins/image_view/prefs_xine.c gimageview-0.3.0-0.20101117/plugins/image_view/prefs_xine.c --- gimageview-0.2.27/plugins/image_view/prefs_xine.c 2004-10-03 19:21:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/prefs_xine.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_xine.c,v 1.4 2004/10/03 19:18:57 makeinu Exp $ + * $Id: prefs_xine.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "prefs_xine.h" @@ -26,8 +26,9 @@ #ifdef ENABLE_XINE #include -#include "gtkutils.h" #include "gimv_prefs_ui_utils.h" +#include "gimv_xine.h" +#include "utils_gtk.h" #define CONF_THUMBNAIL_ENABLE_KEY "thumbnail_enable" #define CONF_THUMBNAIL_ENABLE "FALSE" @@ -50,7 +51,7 @@ apply_fn: prefs_xine_apply, }; -typedef struct XineConf_Tag +static struct XineConf { #if 0 gchar *vo_driver; @@ -59,10 +60,13 @@ gboolean thumb; gfloat thumb_pos; gfloat delay; -} XineConf; - -static XineConf xineconf, xineconf_pre; +} xineconf, xineconf_pre; +static struct XineConfUI +{ + GimvXine *gxine; + GtkWidget *vo_combo, *ao_combo; +} xineconfui; gboolean gimv_prefs_ui_xine_get_page (guint idx, GimvPrefsWinPage **page, guint *size) @@ -161,8 +165,11 @@ GtkWidget *vo_combo, *ao_combo; GtkAdjustment *adj; GimvPluginInfo *this = gimv_xine_plugin_get_info (); - - main_vbox = gtk_vbox_new (FALSE, 0); + const char * const * drivers; + const char *driver; + GList *list = NULL; + GimvXine *gxine; + gint i; xineconf.thumb = xineconf_pre.thumb = gimv_prefs_xine_get_thumb_enable(); @@ -171,38 +178,19 @@ xineconf.delay = xineconf_pre.delay = gimv_prefs_xine_get_delay (this); + main_vbox = gtk_vbox_new (FALSE, 0); + + gxine = GIMV_XINE(gimv_xine_new(NULL, NULL)); + gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET(gxine), + FALSE, FALSE, 0); + xineconfui.gxine = gxine; + /********************************************** * Driver Frame **********************************************/ - gimv_prefs_ui_create_frame(_("Driver (Not implemented yet)"), + gimv_prefs_ui_create_frame(_("Driver"), frame, vbox, main_vbox, FALSE); -#if 0 - /* video driver combo */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER (hbox), 5); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - label = gtk_label_new (_("Video driver : ")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2); - gtk_widget_show (label); - - vo_combo = gtk_combo_new (); - gtk_box_pack_start (GTK_BOX (hbox), vo_combo, FALSE, FALSE, 2); - gtk_widget_show (vo_combo); - gtk_widget_set_usize (vo_combo, 100, -1); - - /* audio driver combo */ - label = gtk_label_new (_("Audio driver : ")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2); - gtk_widget_show (label); - - ao_combo = gtk_combo_new (); - gtk_box_pack_start (GTK_BOX (hbox), ao_combo, FALSE, FALSE, 2); - gtk_widget_show (ao_combo); - gtk_widget_set_usize (ao_combo, 100, -1); -#else alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0); gtk_widget_show (alignment); @@ -221,13 +209,25 @@ gtk_widget_show (label); vo_combo = gtk_combo_new (); + xineconfui.vo_combo = vo_combo; alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (alignment), vo_combo); gtk_table_attach (GTK_TABLE (table), alignment, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 1); gtk_widget_show (alignment); gtk_widget_show (vo_combo); - gtk_widget_set_usize (vo_combo, 100, -1); + gtk_widget_set_size_request (vo_combo, 100, -1); + + drivers = gimv_xine_get_video_out_plugins (gxine); + list = g_list_append(list, "auto"); + for (driver = drivers[0], i = 0; driver; driver = drivers[++i]) + list = g_list_append (list, (gpointer) driver); + gtk_combo_set_popdown_strings (GTK_COMBO (vo_combo), (GList *) list); + g_list_free (list); + list = NULL; + + driver = gimv_xine_get_default_video_out_driver_id (gxine); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (vo_combo)->entry), driver); /* audio driver combo */ label = gtk_label_new (_("Audio driver : ")); @@ -239,16 +239,27 @@ gtk_widget_show (label); ao_combo = gtk_combo_new (); + xineconfui.ao_combo = ao_combo; alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (alignment), ao_combo); gtk_table_attach (GTK_TABLE (table), alignment, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 1); gtk_widget_show (alignment); gtk_widget_show (ao_combo); - gtk_widget_set_usize (ao_combo, 100, -1); -#endif + gtk_widget_set_size_request (ao_combo, 100, -1); - gtk_widget_set_sensitive (frame, FALSE); + drivers = gimv_xine_get_audio_out_plugins (gxine); + list = g_list_append(list, "auto"); + for (driver = drivers[0], i = 0; driver; driver = drivers[++i]) + list = g_list_append (list, (gpointer) driver); + gtk_combo_set_popdown_strings (GTK_COMBO (ao_combo), (GList *) list); + g_list_free (list); + list = NULL; + + driver = gimv_xine_get_default_audio_out_driver_id (gxine); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (ao_combo)->entry), driver); + + /*gtk_widget_set_sensitive (frame, FALSE);*/ /********************************************** * Thumbnail Frame @@ -276,11 +287,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (xineconf.thumb_pos, 0.0, 100.0, 0.01, 0.1, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); + gtk_widget_set_size_request(spinner, 70, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner), 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &xineconf.thumb_pos); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &xineconf.thumb_pos); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); gtk_widget_show (spinner); @@ -300,11 +311,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (xineconf.delay, 0.0, 7200.0, 0.01, 0.1, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); + gtk_widget_set_size_request(spinner, 70, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner), 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &xineconf_pre.delay); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &xineconf_pre.delay); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); gtk_widget_show (spinner); @@ -322,10 +333,17 @@ gchar delay_str[32]; GimvPluginInfo *this = gimv_xine_plugin_get_info(); gchar pos_str[32], *enable; + const gchar *vo_driver = NULL; + const gchar *ao_driver = NULL; + xine_cfg_entry_t entry; switch (action) { case GIMV_PREFS_WIN_ACTION_OK: case GIMV_PREFS_WIN_ACTION_APPLY: + vo_driver = gtk_entry_get_text + (GTK_ENTRY (GTK_COMBO (xineconfui.vo_combo)->entry)); + ao_driver = gtk_entry_get_text + (GTK_ENTRY (GTK_COMBO (xineconfui.ao_combo)->entry)); enable = xineconf.thumb ? "TRUE" : "FALSE"; g_snprintf(pos_str, 32, "%f", xineconf.thumb_pos); g_snprintf(delay_str, 32, "%f", xineconf.delay); @@ -337,6 +355,29 @@ break; } + if (vo_driver) { + gimv_xine_config_lookup_entry (xineconfui.gxine, + "video.driver", + &entry); + entry.str_value = vo_driver; + gimv_xine_config_update_entry (xineconfui.gxine, + &entry); + gimv_xine_config_lookup_entry (xineconfui.gxine, + "video.driver", + &entry); + } + if (ao_driver) { + gimv_xine_config_lookup_entry (xineconfui.gxine, + "audio.driver", + &entry); + entry.str_value = ao_driver; + gimv_xine_config_update_entry (xineconfui.gxine, + &entry); + gimv_xine_config_lookup_entry (xineconfui.gxine, + "audio.driver", + &entry); + } + gimv_xine_config_save (xineconfui.gxine, NULL); gimv_plugin_prefs_save_value (this->name, GIMV_PLUGIN_IMAGE_LOADER, CONF_THUMBNAIL_ENABLE_KEY, diff -Nru gimageview-0.2.27/plugins/image_view/prefs_xine.h gimageview-0.3.0-0.20101117/plugins/image_view/prefs_xine.h --- gimageview-0.2.27/plugins/image_view/prefs_xine.h 2004-10-03 19:21:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/prefs_xine.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_xine.h,v 1.3 2004/10/03 19:18:57 makeinu Exp $ + * $Id: prefs_xine.h 1055 2004-10-03 19:18:58Z makeinu $ */ #ifndef __PREFS_UI_XINE_H__ diff -Nru gimageview-0.2.27/plugins/image_view/xine_image_loader.c gimageview-0.3.0-0.20101117/plugins/image_view/xine_image_loader.c --- gimageview-0.2.27/plugins/image_view/xine_image_loader.c 2004-10-03 19:44:15.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/xine_image_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xine_image_loader.c,v 1.1 2004/10/03 19:18:57 makeinu Exp $ + * $Id: xine_image_loader.c 1055 2004-10-03 19:18:58Z makeinu $ */ #include "xine_image_loader.h" @@ -81,12 +81,8 @@ } /* FIXME! use exist xine object */ -#if 0 - xine = xine_new (); - xine_init (xine); -#else - xine = gimv_xine_priv_get (); -#endif + xine = xine_new(); + xine_init(xine); vo_driver = xine_open_video_driver (xine, "none", XINE_VISUAL_TYPE_NONE, @@ -137,12 +133,8 @@ xine_close_audio_driver(xine, ao_driver); xine_close_video_driver(xine, vo_driver); -#if 0 /* FIXME! use exist xine object */ xine_exit (xine); -#else - gimv_xine_priv_release (xine); -#endif return image; } diff -Nru gimageview-0.2.27/plugins/image_view/xine_image_loader.h gimageview-0.3.0-0.20101117/plugins/image_view/xine_image_loader.h --- gimageview-0.2.27/plugins/image_view/xine_image_loader.h 2004-10-03 19:18:57.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/image_view/xine_image_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xine_image_loader.h,v 1.1 2004/10/03 19:18:57 makeinu Exp $ + * $Id: xine_image_loader.h 1055 2004-10-03 19:18:58Z makeinu $ */ #ifndef __XINE_IMAGE_LOADER_H__ diff -Nru gimageview-0.2.27/plugins/io_stream/gimv_bz_io.c gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_bz_io.c --- gimageview-0.2.27/plugins/io_stream/gimv_bz_io.c 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_bz_io.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_bz_io.c,v 1.8 2003/06/18 09:26:53 makeinu Exp $ + * $Id: gimv_bz_io.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "gimv_bz_io.h" @@ -29,10 +29,9 @@ #include #include -#include "fileutil.h" #include "gimv_io_mem.h" #include "gimv_plugin.h" -#include "intl.h" +#include "utils_file.h" #ifndef BUF_SIZE diff -Nru gimageview-0.2.27/plugins/io_stream/gimv_bz_io.h gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_bz_io.h --- gimageview-0.2.27/plugins/io_stream/gimv_bz_io.h 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_bz_io.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_bz_io.h,v 1.2 2003/06/13 09:43:12 makeinu Exp $ + * $Id: gimv_bz_io.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __GIMV_BZ_IO__ diff -Nru gimageview-0.2.27/plugins/io_stream/gimv_gzip_io.c gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_gzip_io.c --- gimageview-0.2.27/plugins/io_stream/gimv_gzip_io.c 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_gzip_io.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_gzip_io.c,v 1.4 2003/06/13 09:43:12 makeinu Exp $ + * $Id: gimv_gzip_io.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -26,9 +26,8 @@ #include "gimv_io.h" #include "gimv_gzip_io.h" -#include "fileutil.h" -#include "intl.h" #include "gimv_plugin.h" +#include "utils_file.h" static GimvIOStatus gimv_gzip_io_read (GimvIO *gio, diff -Nru gimageview-0.2.27/plugins/io_stream/gimv_gzip_io.h gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_gzip_io.h --- gimageview-0.2.27/plugins/io_stream/gimv_gzip_io.h 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/gimv_gzip_io.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_gzip_io.h,v 1.2 2003/06/13 09:43:12 makeinu Exp $ + * $Id: gimv_gzip_io.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __GIMV_GZIP_IO__ diff -Nru gimageview-0.2.27/plugins/io_stream/Makefile.am gimageview-0.3.0-0.20101117/plugins/io_stream/Makefile.am --- gimageview-0.2.27/plugins/io_stream/Makefile.am 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,12 +1,12 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv endif -CLEANFILES = *~ .deps/* .*.swp .*.swo - io_stream_plugin_LTLIBRARIES = \ libgimv_gzip_io.la diff -Nru gimageview-0.2.27/plugins/io_stream/Makefile.in gimageview-0.3.0-0.20101117/plugins/io_stream/Makefile.in --- gimageview-0.2.27/plugins/io_stream/Makefile.in 2004-12-28 04:01:28.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/io_stream/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,666 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_bz_io_la_SOURCES) $(libgimv_gzip_io_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/io_stream -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(gimv_bz_io_plugindir)" "$(DESTDIR)$(io_stream_plugindir)" -gimv_bz_io_pluginLTLIBRARIES_INSTALL = $(INSTALL) -io_stream_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(gimv_bz_io_plugin_LTLIBRARIES) \ - $(io_stream_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_bz_io_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_bz_io_la_OBJECTS = gimv_bz_io.lo -libgimv_bz_io_la_OBJECTS = $(am_libgimv_bz_io_la_OBJECTS) -libgimv_gzip_io_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libgimv_gzip_io_la_OBJECTS = gimv_gzip_io.lo -libgimv_gzip_io_la_OBJECTS = $(am_libgimv_gzip_io_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gimv_bz_io.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_gzip_io.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_bz_io_la_SOURCES) $(libgimv_gzip_io_la_SOURCES) -DIST_SOURCES = $(libgimv_bz_io_la_SOURCES) \ - $(libgimv_gzip_io_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -CLEANFILES = *~ .deps/* .*.swp .*.swo -io_stream_plugin_LTLIBRARIES = \ - libgimv_gzip_io.la - -@HAVE_BZLIB_TRUE@gimv_bz_io_plugin_LTLIBRARIES = libgimv_bz_io.la -io_stream_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR) -gimv_bz_io_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR) -INCLUDES = \ - $(GTK_CFLAGS) \ - $(ZLIB_CLAGS) \ - $(BZLIB_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -libgimv_bz_io_la_LIBADD = $(GTK_LIBS) $(BZLIB_LIBS) -libgimv_bz_io_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_bz_io_la_SOURCES = gimv_bz_io.c gimv_bz_io.h -libgimv_gzip_io_la_LIBADD = $(GTK_LIBS) $(ZLIB_LIBS) -libgimv_gzip_io_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_gzip_io_la_SOURCES = gimv_gzip_io.c gimv_gzip_io.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/io_stream/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/io_stream/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-gimv_bz_io_pluginLTLIBRARIES: $(gimv_bz_io_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gimv_bz_io_plugindir)" || $(mkdir_p) "$(DESTDIR)$(gimv_bz_io_plugindir)" - @list='$(gimv_bz_io_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(gimv_bz_io_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gimv_bz_io_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(gimv_bz_io_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gimv_bz_io_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gimv_bz_io_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gimv_bz_io_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gimv_bz_io_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gimv_bz_io_plugindir)/$$p"; \ - done - -clean-gimv_bz_io_pluginLTLIBRARIES: - -test -z "$(gimv_bz_io_plugin_LTLIBRARIES)" || rm -f $(gimv_bz_io_plugin_LTLIBRARIES) - @list='$(gimv_bz_io_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-io_stream_pluginLTLIBRARIES: $(io_stream_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(io_stream_plugindir)" || $(mkdir_p) "$(DESTDIR)$(io_stream_plugindir)" - @list='$(io_stream_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(io_stream_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(io_stream_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(io_stream_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(io_stream_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-io_stream_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(io_stream_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(io_stream_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(io_stream_plugindir)/$$p"; \ - done - -clean-io_stream_pluginLTLIBRARIES: - -test -z "$(io_stream_plugin_LTLIBRARIES)" || rm -f $(io_stream_plugin_LTLIBRARIES) - @list='$(io_stream_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_bz_io.la: $(libgimv_bz_io_la_OBJECTS) $(libgimv_bz_io_la_DEPENDENCIES) - $(LINK) -rpath $(gimv_bz_io_plugindir) $(libgimv_bz_io_la_LDFLAGS) $(libgimv_bz_io_la_OBJECTS) $(libgimv_bz_io_la_LIBADD) $(LIBS) -libgimv_gzip_io.la: $(libgimv_gzip_io_la_OBJECTS) $(libgimv_gzip_io_la_DEPENDENCIES) - $(LINK) -rpath $(io_stream_plugindir) $(libgimv_gzip_io_la_LDFLAGS) $(libgimv_gzip_io_la_OBJECTS) $(libgimv_gzip_io_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_bz_io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_gzip_io.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(gimv_bz_io_plugindir)" "$(DESTDIR)$(io_stream_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-gimv_bz_io_pluginLTLIBRARIES \ - clean-io_stream_pluginLTLIBRARIES clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-gimv_bz_io_pluginLTLIBRARIES \ - install-io_stream_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-gimv_bz_io_pluginLTLIBRARIES uninstall-info-am \ - uninstall-io_stream_pluginLTLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-gimv_bz_io_pluginLTLIBRARIES \ - clean-io_stream_pluginLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-gimv_bz_io_pluginLTLIBRARIES install-info \ - install-info-am install-io_stream_pluginLTLIBRARIES \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-gimv_bz_io_pluginLTLIBRARIES \ - uninstall-info-am uninstall-io_stream_pluginLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/Makefile.in gimageview-0.3.0-0.20101117/plugins/Makefile.in --- gimageview-0.2.27/plugins/Makefile.in 2004-12-28 04:01:23.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,610 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = \ - archiver \ - image_loader \ - image_saver \ - image_view \ - io_stream \ - thumbnail \ - thumbnail_view - -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# 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. -$(RECURSIVE_TARGETS): - @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; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - 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 -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/thumbnail/ee.c gimageview-0.3.0-0.20101117/plugins/thumbnail/ee.c --- gimageview-0.2.27/plugins/thumbnail/ee.c 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/ee.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,279 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Electric Eyes thumbnail support plugin for GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: ee.c,v 1.18 2003/07/13 13:20:18 makeinu Exp $ - */ - -#include -#include -#include - -#include "fileutil.h" -#include "gfileutil.h" -#include "intl.h" -#include "gimv_plugin.h" -#include "gimv_thumb_cache.h" - - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - -/* under image directory */ -#define EE_THUMNAIL_DIRECTORY ".ee" - - -typedef struct EEThumbPrefs_Tag -{ - gint width; - gint height; - gchar *dir; -} EEThumbPrefs; - - -static GimvImage *load_thumb (const gchar *filename, - const gchar *cache_type, - GimvImageInfo *info); -static GimvImage *save_thumb (const gchar *filename, - const gchar *cache_type, - GimvImage *image, - GimvImageInfo *info); -static gchar *get_path (const gchar *filename, - const gchar *cache_type); -static gboolean get_size (gint width, - gint height, - const gchar *cache_type, - gint *width_ret, - gint *height_ret); - - -static EEThumbPrefs ee_thumb_prefs [] = -{ - {180, 180, "large"}, - {256, 64, "med"}, - {256, 24, "small"}, -}; -static gint ee_thumb_prefs_num -= sizeof (ee_thumb_prefs) / sizeof (ee_thumb_prefs[0]); - -static GimvThumbCacheLoader plugin_impl[] = -{ - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Electric Eyes (Preview)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Electric Eyes (Icon)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Electric Eyes (Mini)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, -}; -static gint plugin_impl_num = sizeof (plugin_impl) / sizeof (plugin_impl[0]); - -GIMV_PLUGIN_GET_IMPL(plugin_impl, GIMV_PLUGIN_THUMB_CACHE) - -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Electric Eyes thumbnail support"), - version: "0.5.0", - author: N_("Takuro Ashie"), - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: NULL, - get_prefs_ui: NULL, -}; - - -gchar * -g_module_check_init (GModule *module) -{ - return NULL; -} - - -void -g_module_unload (GModule *module) -{ - return; -} - - -static GimvImage * -load_thumb (const gchar *filename, const gchar *cache_type, - GimvImageInfo *info) -{ - GimvImage *image; - gchar *thumb_file; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - - g_return_val_if_fail (thumb_file, NULL); - - image = gimv_image_load_file (thumb_file, FALSE); - - g_free (thumb_file); - - return image; -} - - -static GimvImage * -save_thumb (const gchar *filename, const gchar *cache_type, - GimvImage *image, GimvImageInfo *info) -{ - GimvImage *imcache; - gchar *thumb_file; - gint im_width = -1, im_height = -1, width = -1, height = -1; - gboolean success; - - /* check args */ - g_return_val_if_fail (filename, FALSE); - g_return_val_if_fail (image, FALSE); - g_return_val_if_fail (cache_type, FALSE); - - thumb_file = get_path (filename, cache_type); - g_return_val_if_fail (thumb_file, FALSE); - - /* get image width & height */ - gimv_image_get_size (image, &im_width, &im_height); - if (im_width < 1 || im_height < 1) return NULL; - - /* get thumnail width & height */ - success = get_size (im_width, im_height, cache_type, &width, &height); - if (!success || width < 1 || height < 1) return NULL; - - /* create cache directory if not found */ - success = mkdirs (thumb_file); - if (!success) return NULL; - - /* scale image */ - imcache = gimv_image_scale (image, width, height); - - /* save cache to disk */ - if (imcache) { - g_print (N_("save cache: %s\n"), thumb_file); - gimv_image_save_file (imcache, thumb_file, "ppm"); - } - - g_free (thumb_file); - - return imcache; -} - - -static gchar * -get_path (const gchar *filename, const gchar *cache_type) -{ - gchar *abspath; - gchar buf[MAX_PATH_LEN]; - gchar *size = NULL; - gint i; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - for (i = 0; (i < plugin_impl_num) && (i < ee_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - size = ee_thumb_prefs[i].dir; - break; - } - } - - g_return_val_if_fail (size, NULL); - - abspath = relpath2abs (filename); - g_return_val_if_fail (abspath, NULL); - - g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s%s", - g_getenv("HOME"), EE_THUMNAIL_DIRECTORY, size, filename); - - g_free (abspath); - - return g_strdup (buf); -} - - -static gboolean -get_size (gint width, gint height, const gchar *cache_type, - gint *width_ret, gint *height_ret) -{ - gint max_width = -1, max_height = -1; - gint i; - gboolean use_large = FALSE; - - /* check args */ - g_return_val_if_fail (width_ret && height_ret, FALSE); - *width_ret = *height_ret = -1; - - g_return_val_if_fail (cache_type, FALSE); - - if (width < 1 || height < 1) - return FALSE; - - /* get max thumbnail size */ - for (i = 0; (i < plugin_impl_num) && (i < ee_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - max_width = ee_thumb_prefs[i].width; - max_height = ee_thumb_prefs[i].height; - if (i == 0) - use_large = TRUE; - break; - } - } - g_return_val_if_fail (max_width > 0 && max_height > 0, FALSE); - - /* no need to scale */ - if (width < max_width && height < max_height) { - *width_ret = width; - *height_ret = height; - return TRUE; - } - - /* calculate width & height of thumbnail */ - if (width < height || !use_large) { - *width_ret = (gfloat) width * (gfloat) max_height / (gfloat) height; - *height_ret = max_height; - if (!use_large && width > max_width) { - *width_ret = max_width; - *height_ret = (gfloat) height * (gfloat) max_width / (gfloat) width; - } - } else { - *width_ret = max_width; - *height_ret = (gfloat) height * (gfloat) max_width / (gfloat) width; - } - - return TRUE; -} diff -Nru gimageview-0.2.27/plugins/thumbnail/gimv_thumb.c gimageview-0.3.0-0.20101117/plugins/thumbnail/gimv_thumb.c --- gimageview-0.2.27/plugins/thumbnail/gimv_thumb.c 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/gimv_thumb.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb.c,v 1.25 2003/07/13 13:20:18 makeinu Exp $ + * $Id: gimv_thumb.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -28,11 +28,11 @@ #include "gimageview.h" -#include "fileutil.h" -#include "gfileutil.h" #include "gimv_image_saver.h" #include "gimv_plugin.h" #include "gimv_thumb_cache.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #ifndef BUF_SIZE @@ -275,7 +275,7 @@ set_save_comment (saver, info); } gimv_image_saver_save (saver); - gimv_image_saver_unref (saver); + g_object_unref (G_OBJECT (saver)); } g_free (thumb_file); @@ -384,12 +384,8 @@ CACHE_GIMV_MAX_SIZE, 1.0, 5.0, 0.0); spinner = gtk_spin_button_new (adj, 0, 0); - gtk_widget_set_usize(spinner, 70, -1); + gtk_widget_set_size_request(spinner, 70, -1); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); -#ifndef USE_GTK2 - gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner), - GTK_SHADOW_OUT); -#endif gtk_signal_connect (GTK_OBJECT (adj), "value_changed", GTK_SIGNAL_FUNC (cb_gimvthumb_get_data_from_adjustment_by_int), NULL); diff -Nru gimageview-0.2.27/plugins/thumbnail/gqview.c gimageview-0.3.0-0.20101117/plugins/thumbnail/gqview.c --- gimageview-0.2.27/plugins/thumbnail/gqview.c 2004-09-21 08:44:28.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/gqview.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gqview.c,v 1.22 2004/09/21 08:44:28 makeinu Exp $ + * $Id: gqview.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -29,10 +29,10 @@ #include "gimageview.h" -#include "fileutil.h" -#include "gfileutil.h" #include "gimv_plugin.h" #include "gimv_thumb_cache.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #ifndef BUF_SIZE @@ -168,7 +168,7 @@ gint size_idx; gchar buf[8]; - size_idx = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + size_idx = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); g_snprintf (buf, 8, "%d", size_idx); gimv_plugin_prefs_save_value (this->name, GIMV_PLUGIN_THUMB_CACHE, @@ -333,10 +333,10 @@ g_snprintf (buf, BUF_SIZE, "%d x %d", gqview_thumb_size[i].width, gqview_thumb_size[i].height); menu_item = gtk_menu_item_new_with_label (buf); - gtk_object_set_data (GTK_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(cb_get_data_from_menuitem), - NULL); + g_object_set_data (G_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); + g_signal_connect(G_OBJECT(menu_item), "activate", + G_CALLBACK(cb_get_data_from_menuitem), + NULL); gtk_menu_append (GTK_MENU(menu), menu_item); gtk_widget_show (menu_item); } diff -Nru gimageview-0.2.27/plugins/thumbnail/konqueror.c gimageview-0.3.0-0.20101117/plugins/thumbnail/konqueror.c --- gimageview-0.2.27/plugins/thumbnail/konqueror.c 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/konqueror.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,310 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Konqueror thumbnail support plugin for GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: konqueror.c,v 1.19 2003/07/13 13:20:18 makeinu Exp $ - */ - -#include -#include -#include - -#include "fileutil.h" -#include "gfileutil.h" -#include "md5.h" -#include "gimv_plugin.h" -#include "gimv_thumb_cache.h" - - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - -/* under home directory */ -#define KONQ_THUMBNAIL_DIR ".kde/share/thumbnails" - -typedef struct KonqThumbPrefs_Tag -{ - gint size; - gchar *dir; -} KonqThumbPrefs; - - -static GimvImage *load_thumb (const gchar *filename, - const gchar *cache_type, - GimvImageInfo *info); -static GimvImage *save_thumb (const gchar *filename, - const gchar *cache_type, - GimvImage *image, - GimvImageInfo *info); -static gchar *get_path (const gchar *filename, - const gchar *cache_type); -static gboolean get_size (gint width, - gint height, - const gchar *cache_type, - gint *width_ret, - gint *height_ret); - - -static KonqThumbPrefs konq_thumb_prefs [] = { - {90, "large"}, - {64, "med"}, - {48, "small"}, -}; -static gint konq_thumb_prefs_num -= sizeof (konq_thumb_prefs) / sizeof (konq_thumb_prefs[0]); - - -/* plugin implement definition */ -static GimvThumbCacheLoader plugin_impl[] = { - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror (Large)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror (Medium)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror (Small)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, -}; -static gint plugin_impl_num = sizeof (plugin_impl) / sizeof (plugin_impl[0]); - -GIMV_PLUGIN_GET_IMPL(plugin_impl, GIMV_PLUGIN_THUMB_CACHE) - -/* plugin definition */ -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Konqueror(KDE2.2 or higher) thumbnail support"), - version: "0.5.0", - author: "Takuro Ashie", - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: NULL, - get_prefs_ui: NULL, -}; - - -gchar * -g_module_check_init (GModule *module) -{ - return NULL; -} - - -void -g_module_unload (GModule *module) -{ - return; -} - - - -/****************************************************************************** - * - * Plugin implement. - * - ******************************************************************************/ -static GimvImage * -load_thumb (const gchar *filename, const gchar *cache_type, - GimvImageInfo *info) -{ - GimvImage *image; - gchar *thumb_file; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - - g_return_val_if_fail (thumb_file, NULL); - - image = gimv_image_load_file (thumb_file, FALSE); - - g_free (thumb_file); - - return image; -} - - -static gchar * -get_path (const gchar *filename, const gchar *cache_type) -{ - const gchar *image_name; - gchar *abspath, *image_dir; - gchar buf[MAX_PATH_LEN]; - gchar *size = NULL; - gint i; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - for (i = 0; (i < plugin_impl_num) && (i < konq_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - size = konq_thumb_prefs[i].dir; - break; - } - } - - g_return_val_if_fail (size, NULL); - - abspath = relpath2abs (filename); - - /* get filename */ - image_name = g_basename (abspath); - if (!image_name) goto ERROR; - - /* get dir name */ - image_dir = g_dirname (abspath); - if (!image_dir) goto ERROR; - - /* These codes are commited from Teppei Tamra */ - { - unsigned char md5buf[16], tndir[MAX_PATH_LEN + 5]; - unsigned char kdetn[MAX_PATH_LEN]; - gchar *tmpstr; - size_t cnt; - - tmpstr = link2abs (image_dir); - - snprintf (tndir, MAX_PATH_LEN + 5, "file:%s/", tmpstr); - md5_buffer (tndir, strlen (tndir + 1), md5buf); - for (cnt = 0; cnt < 16; ++cnt) { - snprintf(tndir + (cnt * 2), MAX_PATH_LEN + 5, "%02x", md5buf[cnt]); - } - strncpy (kdetn, tndir, (size_t) 4); - strcpy (kdetn + 4, "/"); - strncpy (kdetn + 5, tndir + 4, (size_t) 4); - strcpy (kdetn + 9, "/"); - strcpy (kdetn + 10, tndir + 8); - - g_snprintf(buf, MAX_PATH_LEN, "%s/" KONQ_THUMBNAIL_DIR "/%s/%s/%s", - getenv("HOME"), kdetn, size, image_name); - - g_free (tmpstr); - } - - g_free (abspath); - g_free (image_dir); - return g_strdup (buf); - -ERROR: - g_free (abspath); - return NULL; -} - - -static GimvImage * -save_thumb (const gchar *filename, const gchar *cache_type, - GimvImage *image, GimvImageInfo *info) -{ - GimvImage *imcache; - gchar *thumb_file; - gint im_width = -1, im_height = -1, width = -1, height = -1; - gboolean success; - - /* check args */ - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (image, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - g_return_val_if_fail (thumb_file, NULL); - - /* get image width & height */ - gimv_image_get_size (image, &im_width, &im_height); - if (im_width < 1 || im_height < 1) return NULL; - - /* get thumnail width & height */ - success = get_size (im_width, im_height, cache_type, &width, &height); - if (!success || width < 1 || height < 1) return NULL; - - /* create cache directory if not found */ - success = mkdirs (thumb_file); - if (!success) return NULL; - - /* scale image */ - imcache = gimv_image_scale (image, width, height); - - /* save cache to disk */ - if (imcache) { - g_print ("save cache: %s\n", thumb_file); - gimv_image_save_file (imcache, thumb_file, "png"); - } - - g_free (thumb_file); - return imcache; -} - - -static gboolean -get_size (gint width, gint height, const gchar *cache_type, - gint *width_ret, gint *height_ret) -{ - gint max_size = -1; - gint i; - - /* check args */ - g_return_val_if_fail (width_ret && height_ret, FALSE); - *width_ret = *height_ret = -1; - - g_return_val_if_fail (cache_type, FALSE); - - if (width < 1 || height < 1) - return FALSE; - - /* get max thumbnail size */ - for (i = 0; (i < plugin_impl_num) && (i < konq_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - max_size = konq_thumb_prefs[i].size; - break; - } - } - g_return_val_if_fail (max_size > 0, FALSE); - - /* no need to scale */ - if (width < max_size && height < max_size) { - *width_ret = width; - *height_ret = height; - return TRUE; - } - - /* calculate width & height of thumbnail */ - if (width > height) { - *width_ret = max_size; - *height_ret = (gfloat) height * (gfloat) max_size / (gfloat) width; - } else { - *width_ret = (gfloat) width * (gfloat) max_size / (gfloat) height; - *height_ret = max_size; - } - - return TRUE; -} diff -Nru gimageview-0.2.27/plugins/thumbnail/konqueror-old.c gimageview-0.3.0-0.20101117/plugins/thumbnail/konqueror-old.c --- gimageview-0.2.27/plugins/thumbnail/konqueror-old.c 2004-05-23 14:08:19.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/konqueror-old.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Konqueror (2.0.x and 2.1.x) thumbnail support plugin for GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: konqueror-old.c,v 1.20 2003/07/13 13:20:18 makeinu Exp $ - */ - -#include -#include -#include - -#include "fileutil.h" -#include "gfileutil.h" -#include "intl.h" -#include "gimv_plugin.h" -#include "gimv_thumb_cache.h" - - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - -/* under image directory */ -#define KONQ_OLD_THUMBNAIL_DIR ".pics" - -typedef struct KonqThumbPrefs_Tag -{ - gint size; - gchar *dir; -} KonqThumbPrefs; - - -static GimvImage *load_thumb (const gchar *filename, - const gchar *cache_type, - GimvImageInfo *info); -static GimvImage *save_thumb (const gchar *filename, - const gchar *cache_type, - GimvImage *image, - GimvImageInfo *info); -static gchar *get_path (const gchar *filename, - const gchar *cache_type); -static gboolean get_size (gint width, - gint height, - const gchar *cache_type, - gint *width_ret, - gint *height_ret); - - -static KonqThumbPrefs konq_thumb_prefs [] = { - {90, "large"}, - {64, "med"}, - {48, "small"}, -}; -static gint konq_thumb_prefs_num -= sizeof (konq_thumb_prefs) / sizeof (konq_thumb_prefs[0]); - -static GimvThumbCacheLoader plugin_impl[] = { - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror old (Large)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror old (Medium)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, - - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Konqueror old (Small)"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, -}; -static gint plugin_impl_num = sizeof (plugin_impl) / sizeof (plugin_impl[0]); - -GIMV_PLUGIN_GET_IMPL(plugin_impl, GIMV_PLUGIN_THUMB_CACHE) - -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Konqueror(KDE2.1.x or belower) thumbnail support"), - version: "0.5.0", - author: N_("Takuro Ashie"), - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: NULL, - get_prefs_ui: NULL, -}; - - -gchar * -g_module_check_init (GModule *module) -{ - return NULL; -} - - -void -g_module_unload (GModule *module) -{ - return; -} - - - -/****************************************************************************** - * - * Plugin implement. - * - ******************************************************************************/ -static GimvImage * -load_thumb (const gchar *filename, const gchar *cache_type, - GimvImageInfo *info) -{ - GimvImage *image; - gchar *thumb_file; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - - g_return_val_if_fail (thumb_file, NULL); - - image = gimv_image_load_file (thumb_file, FALSE); - - g_free (thumb_file); - - return image; -} - - -static GimvImage * -save_thumb (const gchar *filename, const gchar *cache_type, - GimvImage *image, GimvImageInfo *info) -{ - GimvImage *imcache; - gchar *thumb_file; - gint im_width = -1, im_height = -1, width = -1, height = -1; - gboolean success; - - /* check args */ - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (image, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - g_return_val_if_fail (thumb_file, NULL); - - /* get image width & height */ - gimv_image_get_size (image, &im_width, &im_height); - if (im_width < 1 || im_height < 1) return NULL; - - /* get thumnail width & height */ - success = get_size (im_width, im_height, cache_type, &width, &height); - if (!success || width < 1 || height < 1) return NULL; - - /* create cache directory if not found */ - success = mkdirs (thumb_file); - if (!success) return NULL; - - /* scale image */ - imcache = gimv_image_scale (image, width, height); - - /* save cache to disk */ - if (imcache) { - g_print (N_("save cache: %s\n"), thumb_file); - gimv_image_save_file (imcache, thumb_file, "png"); - } - - g_free (thumb_file); - return imcache; -} - - -static gchar * -get_path (const gchar *filename, const gchar *cache_type) -{ - const gchar *image_name; - gchar *abspath, *image_dir; - gchar buf[MAX_PATH_LEN]; - gchar *size = NULL; - gint i; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - for (i = 0; (i < plugin_impl_num) && (i < konq_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - size = konq_thumb_prefs[i].dir; - break; - } - } - - g_return_val_if_fail (size, NULL); - - abspath = relpath2abs (filename); - - /* get filename */ - image_name = g_basename (abspath); - if (!image_name) goto ERROR; - - /* get dir name */ - image_dir = g_dirname (abspath); - if (!image_dir) goto ERROR; - - g_snprintf(buf, MAX_PATH_LEN, "%s/" KONQ_OLD_THUMBNAIL_DIR "/%s/%s", - image_dir, size, image_name); - - g_free (abspath); - g_free (image_dir); - return g_strdup (buf); - -ERROR: - g_free (abspath); - return NULL; -} - - -static gboolean -get_size (gint width, gint height, const gchar *cache_type, - gint *width_ret, gint *height_ret) -{ - gint max_size = -1; - gint i; - - /* check args */ - g_return_val_if_fail (width_ret && height_ret, FALSE); - *width_ret = *height_ret = -1; - - g_return_val_if_fail (cache_type, FALSE); - - if (width < 1 || height < 1) - return FALSE; - - /* get max thumbnail size */ - for (i = 0; (i < plugin_impl_num) && (i < konq_thumb_prefs_num); i++) { - if (!strcmp (cache_type, plugin_impl[i].label)) { - max_size = konq_thumb_prefs[i].size; - break; - } - } - g_return_val_if_fail (max_size > 0, FALSE); - - /* no need to scale */ - if (width < max_size && height < max_size) { - *width_ret = width; - *height_ret = height; - return TRUE; - } - - /* calculate width & height of thumbnail */ - if (width > height) { - *width_ret = max_size; - *height_ret = (gfloat) height * (gfloat) max_size / (gfloat) width; - } else { - *width_ret = (gfloat) width * (gfloat) max_size / (gfloat) height; - *height_ret = max_size; - } - - return TRUE; -} diff -Nru gimageview-0.2.27/plugins/thumbnail/Makefile.am gimageview-0.3.0-0.20101117/plugins/thumbnail/Makefile.am --- gimageview-0.2.27/plugins/thumbnail/Makefile.am 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,5 +1,7 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv @@ -7,12 +9,7 @@ thumbnail_plugin_LTLIBRARIES = \ libgimv_thumb.la \ - libgimv_nautilus_thumb.la \ - libgimv_nautilus-2.0_thumb.la \ - libgimv_konqueror_thumb.la \ - libgimv_konq_old_thumb.la \ libgimv_gqview_thumb.la \ - libgimv_ee_thumb.la \ libgimv_xvpics_thumb.la thumbnail_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_PLUGIN_DIR) @@ -23,30 +20,10 @@ libgimv_thumb_la_SOURCES = gimv_thumb.c libgimv_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_nautilus_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_nautilus_thumb_la_SOURCES = nautilus.c -libgimv_nautilus_thumb_la_LIBADD = $(GTK_LIBS) - -libgimv_nautilus_2_0_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_nautilus_2_0_thumb_la_SOURCES = nautilus-2.0.c -libgimv_nautilus_2_0_thumb_la_LIBADD = $(GTK_LIBS) - -libgimv_konqueror_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_konqueror_thumb_la_SOURCES = konqueror.c -libgimv_konqueror_thumb_la_LIBADD = $(GTK_LIBS) - -libgimv_konq_old_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_konq_old_thumb_la_SOURCES = konqueror-old.c -libgimv_konq_old_thumb_la_LIBADD = $(GTK_LIBS) - libgimv_gqview_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_gqview_thumb_la_SOURCES = gqview.c libgimv_gqview_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_ee_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_ee_thumb_la_SOURCES = ee.c -libgimv_ee_thumb_la_LIBADD = $(GTK_LIBS) - libgimv_xvpics_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_xvpics_thumb_la_SOURCES = xvpics.c libgimv_xvpics_thumb_la_LIBADD = $(GTK_LIBS) diff -Nru gimageview-0.2.27/plugins/thumbnail/Makefile.in gimageview-0.3.0-0.20101117/plugins/thumbnail/Makefile.in --- gimageview-0.2.27/plugins/thumbnail/Makefile.in 2004-12-28 04:01:29.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,703 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_ee_thumb_la_SOURCES) $(libgimv_gqview_thumb_la_SOURCES) $(libgimv_konq_old_thumb_la_SOURCES) $(libgimv_konqueror_thumb_la_SOURCES) $(libgimv_nautilus_2_0_thumb_la_SOURCES) $(libgimv_nautilus_thumb_la_SOURCES) $(libgimv_thumb_la_SOURCES) $(libgimv_xvpics_thumb_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/thumbnail -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(thumbnail_plugindir)" -thumbnail_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(thumbnail_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_ee_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_ee_thumb_la_OBJECTS = ee.lo -libgimv_ee_thumb_la_OBJECTS = $(am_libgimv_ee_thumb_la_OBJECTS) -libgimv_gqview_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_gqview_thumb_la_OBJECTS = gqview.lo -libgimv_gqview_thumb_la_OBJECTS = \ - $(am_libgimv_gqview_thumb_la_OBJECTS) -libgimv_konq_old_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_konq_old_thumb_la_OBJECTS = konqueror-old.lo -libgimv_konq_old_thumb_la_OBJECTS = \ - $(am_libgimv_konq_old_thumb_la_OBJECTS) -libgimv_konqueror_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_konqueror_thumb_la_OBJECTS = konqueror.lo -libgimv_konqueror_thumb_la_OBJECTS = \ - $(am_libgimv_konqueror_thumb_la_OBJECTS) -libgimv_nautilus_2_0_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_nautilus_2_0_thumb_la_OBJECTS = nautilus-2.0.lo -libgimv_nautilus_2_0_thumb_la_OBJECTS = \ - $(am_libgimv_nautilus_2_0_thumb_la_OBJECTS) -libgimv_nautilus_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_nautilus_thumb_la_OBJECTS = nautilus.lo -libgimv_nautilus_thumb_la_OBJECTS = \ - $(am_libgimv_nautilus_thumb_la_OBJECTS) -libgimv_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_thumb_la_OBJECTS = gimv_thumb.lo -libgimv_thumb_la_OBJECTS = $(am_libgimv_thumb_la_OBJECTS) -libgimv_xvpics_thumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_xvpics_thumb_la_OBJECTS = xvpics.lo -libgimv_xvpics_thumb_la_OBJECTS = \ - $(am_libgimv_xvpics_thumb_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ee.Plo ./$(DEPDIR)/gimv_thumb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gqview.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/konqueror-old.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/konqueror.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/nautilus-2.0.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/nautilus.Plo ./$(DEPDIR)/xvpics.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_ee_thumb_la_SOURCES) \ - $(libgimv_gqview_thumb_la_SOURCES) \ - $(libgimv_konq_old_thumb_la_SOURCES) \ - $(libgimv_konqueror_thumb_la_SOURCES) \ - $(libgimv_nautilus_2_0_thumb_la_SOURCES) \ - $(libgimv_nautilus_thumb_la_SOURCES) \ - $(libgimv_thumb_la_SOURCES) $(libgimv_xvpics_thumb_la_SOURCES) -DIST_SOURCES = $(libgimv_ee_thumb_la_SOURCES) \ - $(libgimv_gqview_thumb_la_SOURCES) \ - $(libgimv_konq_old_thumb_la_SOURCES) \ - $(libgimv_konqueror_thumb_la_SOURCES) \ - $(libgimv_nautilus_2_0_thumb_la_SOURCES) \ - $(libgimv_nautilus_thumb_la_SOURCES) \ - $(libgimv_thumb_la_SOURCES) $(libgimv_xvpics_thumb_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -thumbnail_plugin_LTLIBRARIES = \ - libgimv_thumb.la \ - libgimv_nautilus_thumb.la \ - libgimv_nautilus-2.0_thumb.la \ - libgimv_konqueror_thumb.la \ - libgimv_konq_old_thumb.la \ - libgimv_gqview_thumb.la \ - libgimv_ee_thumb.la \ - libgimv_xvpics_thumb.la - -thumbnail_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_PLUGIN_DIR) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) -libgimv_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_thumb_la_SOURCES = gimv_thumb.c -libgimv_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_nautilus_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_nautilus_thumb_la_SOURCES = nautilus.c -libgimv_nautilus_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_nautilus_2_0_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_nautilus_2_0_thumb_la_SOURCES = nautilus-2.0.c -libgimv_nautilus_2_0_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_konqueror_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_konqueror_thumb_la_SOURCES = konqueror.c -libgimv_konqueror_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_konq_old_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_konq_old_thumb_la_SOURCES = konqueror-old.c -libgimv_konq_old_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_gqview_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_gqview_thumb_la_SOURCES = gqview.c -libgimv_gqview_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_ee_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_ee_thumb_la_SOURCES = ee.c -libgimv_ee_thumb_la_LIBADD = $(GTK_LIBS) -libgimv_xvpics_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) -libgimv_xvpics_thumb_la_SOURCES = xvpics.c -libgimv_xvpics_thumb_la_LIBADD = $(GTK_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/thumbnail/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/thumbnail/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-thumbnail_pluginLTLIBRARIES: $(thumbnail_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(thumbnail_plugindir)" || $(mkdir_p) "$(DESTDIR)$(thumbnail_plugindir)" - @list='$(thumbnail_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(thumbnail_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thumbnail_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(thumbnail_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thumbnail_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-thumbnail_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(thumbnail_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thumbnail_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thumbnail_plugindir)/$$p"; \ - done - -clean-thumbnail_pluginLTLIBRARIES: - -test -z "$(thumbnail_plugin_LTLIBRARIES)" || rm -f $(thumbnail_plugin_LTLIBRARIES) - @list='$(thumbnail_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_ee_thumb.la: $(libgimv_ee_thumb_la_OBJECTS) $(libgimv_ee_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_ee_thumb_la_LDFLAGS) $(libgimv_ee_thumb_la_OBJECTS) $(libgimv_ee_thumb_la_LIBADD) $(LIBS) -libgimv_gqview_thumb.la: $(libgimv_gqview_thumb_la_OBJECTS) $(libgimv_gqview_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_gqview_thumb_la_LDFLAGS) $(libgimv_gqview_thumb_la_OBJECTS) $(libgimv_gqview_thumb_la_LIBADD) $(LIBS) -libgimv_konq_old_thumb.la: $(libgimv_konq_old_thumb_la_OBJECTS) $(libgimv_konq_old_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_konq_old_thumb_la_LDFLAGS) $(libgimv_konq_old_thumb_la_OBJECTS) $(libgimv_konq_old_thumb_la_LIBADD) $(LIBS) -libgimv_konqueror_thumb.la: $(libgimv_konqueror_thumb_la_OBJECTS) $(libgimv_konqueror_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_konqueror_thumb_la_LDFLAGS) $(libgimv_konqueror_thumb_la_OBJECTS) $(libgimv_konqueror_thumb_la_LIBADD) $(LIBS) -libgimv_nautilus-2.0_thumb.la: $(libgimv_nautilus_2_0_thumb_la_OBJECTS) $(libgimv_nautilus_2_0_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_nautilus_2_0_thumb_la_LDFLAGS) $(libgimv_nautilus_2_0_thumb_la_OBJECTS) $(libgimv_nautilus_2_0_thumb_la_LIBADD) $(LIBS) -libgimv_nautilus_thumb.la: $(libgimv_nautilus_thumb_la_OBJECTS) $(libgimv_nautilus_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_nautilus_thumb_la_LDFLAGS) $(libgimv_nautilus_thumb_la_OBJECTS) $(libgimv_nautilus_thumb_la_LIBADD) $(LIBS) -libgimv_thumb.la: $(libgimv_thumb_la_OBJECTS) $(libgimv_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_thumb_la_LDFLAGS) $(libgimv_thumb_la_OBJECTS) $(libgimv_thumb_la_LIBADD) $(LIBS) -libgimv_xvpics_thumb.la: $(libgimv_xvpics_thumb_la_OBJECTS) $(libgimv_xvpics_thumb_la_DEPENDENCIES) - $(LINK) -rpath $(thumbnail_plugindir) $(libgimv_xvpics_thumb_la_LDFLAGS) $(libgimv_xvpics_thumb_la_OBJECTS) $(libgimv_xvpics_thumb_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ee.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_thumb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gqview.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konqueror-old.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konqueror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-2.0.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvpics.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(thumbnail_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool \ - clean-thumbnail_pluginLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-thumbnail_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-thumbnail_pluginLTLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-thumbnail_pluginLTLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-thumbnail_pluginLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-thumbnail_pluginLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/plugins/thumbnail/nautilus-2.0.c gimageview-0.3.0-0.20101117/plugins/thumbnail/nautilus-2.0.c --- gimageview-0.2.27/plugins/thumbnail/nautilus-2.0.c 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/nautilus-2.0.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,294 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Nautilus thumbnail support plugin for GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: nautilus-2.0.c,v 1.12 2003/07/13 13:20:18 makeinu Exp $ - */ - -#include -#include -#include - -#include "fileutil.h" -#include "gfileutil.h" -#include "intl.h" -#include "gimv_plugin.h" -#include "gimv_thumb_cache.h" - - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - -/* under home directory */ -#define NAUTILUS2_THUMNAIL_DIRECTORY ".nautilus/thumbnails" -#define URI_FILE_PREFIX "file://" -#define URI_FILE_ESCAPED_PREFIX "file:%2F%2F" - -static GimvImage *load_thumb (const gchar *filename, - const gchar *cache_type, - GimvImageInfo *info); -static GimvImage *save_thumb (const gchar *filename, - const gchar *cache_type, - GimvImage *image, - GimvImageInfo *info); -static gchar *get_path (const gchar *filename, - const gchar *cache_type); -static gboolean get_size (gint width, - gint height, - const gchar *cache_type, - gint *width_ret, - gint *height_ret); - - -static GimvThumbCacheLoader plugin_impl[] = -{ - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Nautilus-2.0"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, -}; - -GIMV_PLUGIN_GET_IMPL(plugin_impl, GIMV_PLUGIN_THUMB_CACHE) - -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Nautilus-2.0 thumbnail support"), - version: "0.5.0", - author: N_("Takuro Ashie"), - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: NULL, - get_prefs_ui: NULL, -}; - - -gchar * -g_module_check_init (GModule *module) -{ - return NULL; -} - - -void -g_module_unload (GModule *module) -{ - return; -} - - -static GimvImage * -load_thumb (const gchar *filename, const gchar *cache_type, - GimvImageInfo *info) -{ - GimvImage *image; - gchar *thumb_file; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - - g_return_val_if_fail (thumb_file, NULL); - - image = gimv_image_load_file (thumb_file, FALSE); - - g_free (thumb_file); - - return image; -} - - -static GimvImage * -save_thumb (const gchar *filename, const gchar *cache_type, - GimvImage *image, GimvImageInfo *info) -{ - GimvImage *imcache; - gchar *thumb_file; - gint im_width = -1, im_height = -1, width = -1, height = -1; - gboolean success; - - /* check args */ - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (image, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - g_return_val_if_fail (thumb_file, NULL); - - /* get image width & height */ - gimv_image_get_size (image, &im_width, &im_height); - if (im_width < 1 || im_height < 1) return NULL; - - /* get thumnail width & height */ - success = get_size (im_width, im_height, cache_type, &width, &height); - if (!success || width < 1 || height < 1) return NULL; - - /* create cache directory if not found */ - success = mkdirs (thumb_file); - if (!success) return NULL; - - /* scale image */ - imcache = gimv_image_scale (image, width, height); - - /* save cache to disk */ - if (imcache) { - g_print ("save cache: %s\n", thumb_file); - gimv_image_save_file (imcache, thumb_file, "png"); - } - - g_free (thumb_file); - return imcache; -} - - -static gchar * -escape_slashes (gchar *string) -{ -#define HEX_ESCAPE '%' - - const gchar hex[16] = "0123456789ABCDEF"; - const gchar *p; - gchar *q; - gchar *result; - gchar c; - gint unacceptable; - - if (!string) return NULL; - - unacceptable = 0; - for (p = string; *p != '\0'; p++) { - c = *p; - if (c == '/') { - unacceptable++; - } - } - - result = g_malloc (p - string + unacceptable * 2 + 1); - - for (q = result, p = string; *p != '\0'; p++){ - c = *p; - - if (c == '/') { - *q++ = HEX_ESCAPE; /* means hex coming */ - *q++ = hex[c >> 4]; - *q++ = hex[c & 15]; - } else { - *q++ = c; - } - } - - *q = '\0'; - - return result; -} - - -static gchar * -get_path (const gchar *filename, const gchar *cache_type) -{ - const gchar *image_name; - gchar *abspath, *image_dir, *escaped_dir; - gchar buf[MAX_PATH_LEN]; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - g_return_val_if_fail (!strcmp (cache_type, plugin_impl[0].label), NULL); - - { - gchar *tmpstr = relpath2abs (filename); - abspath = link2abs (tmpstr); - g_free (tmpstr); - } - - /* get filename */ - image_name = g_basename (abspath); - if (!image_name) goto ERROR0; - - /* get dir name */ - image_dir = g_dirname (abspath); - if (!image_dir) goto ERROR0; - - /* escate slashes */ - escaped_dir = escape_slashes (image_dir); - if (!escaped_dir) goto ERROR1; - - if (fileutil_extension_is (image_name, ".png")) { - g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s%s/%s", - g_get_home_dir(), - NAUTILUS2_THUMNAIL_DIRECTORY, URI_FILE_ESCAPED_PREFIX, - escaped_dir, image_name); - } else { - g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s%s/%s"".png", - g_get_home_dir(), - NAUTILUS2_THUMNAIL_DIRECTORY, URI_FILE_ESCAPED_PREFIX, - escaped_dir, image_name); - } - - g_free (abspath); - g_free (image_dir); - g_free (escaped_dir); - - return g_strdup (buf); - -ERROR1: - g_free (image_dir); -ERROR0: - g_free (abspath); - return NULL; -} - - -static gboolean -get_size (gint width, gint height, const gchar *cache_type, - gint *width_ret, gint *height_ret) -{ - const gint max_size = 96; - - /* check args */ - g_return_val_if_fail (width_ret && height_ret, FALSE); - *width_ret = *height_ret = -1; - - if (width < 1 || height < 1) return FALSE; - - /* no need to scale */ - if (width < max_size && height < max_size) { - *width_ret = width; - *height_ret = height; - return TRUE; - } - - /* calculate width & height of thumbnail */ - if (width > height) { - *width_ret = max_size; - *height_ret = (gfloat) height * (gfloat) max_size / (gfloat) width; - } else { - *width_ret = (gfloat) width * (gfloat) max_size / (gfloat) height; - *height_ret = max_size; - } - - return TRUE; -} diff -Nru gimageview-0.2.27/plugins/thumbnail/nautilus.c gimageview-0.3.0-0.20101117/plugins/thumbnail/nautilus.c --- gimageview-0.2.27/plugins/thumbnail/nautilus.c 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/nautilus.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,231 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Nautilus thumbnail support plugin for GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: nautilus.c,v 1.19 2003/07/13 13:20:18 makeinu Exp $ - */ - -#include -#include -#include - -#include "fileutil.h" -#include "gfileutil.h" -#include "intl.h" -#include "gimv_plugin.h" -#include "gimv_thumb_cache.h" - - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - -/* under image directory */ -#define NAUTILUS_THUMNAIL_DIRECTORY ".thumbnails" - -static GimvImage *load_thumb (const gchar *filename, - const gchar *cache_type, - GimvImageInfo *info); -static GimvImage *save_thumb (const gchar *filename, - const gchar *cache_type, - GimvImage *image, - GimvImageInfo *info); -static gchar *get_path (const gchar *filename, - const gchar *cache_type); -static gboolean get_size (gint width, - gint height, - const gchar *cache_type, - gint *width_ret, - gint *height_ret); - - -static GimvThumbCacheLoader plugin_impl[] = -{ - {GIMV_THUMB_CACHE_LOADER_IF_VERSION, - N_("Nautilus"), - load_thumb, save_thumb, - get_path, get_size, - NULL, NULL, NULL, NULL, NULL}, -}; - -GIMV_PLUGIN_GET_IMPL(plugin_impl, GIMV_PLUGIN_THUMB_CACHE) - -GimvPluginInfo gimv_plugin_info = -{ - if_version: GIMV_PLUGIN_IF_VERSION, - name: N_("Nautilus thumbnail support"), - version: "0.5.0", - author: N_("Takuro Ashie"), - description: NULL, - get_implement: gimv_plugin_get_impl, - get_mime_type: NULL, - get_prefs_ui: NULL, -}; - - -#if 0 -gchar * -g_module_check_init (GModule *module) -{ - return NULL; -} - - -void -g_module_unload (GModule *module) -{ - return; -} -#endif - - -static GimvImage * -load_thumb (const gchar *filename, const gchar *cache_type, - GimvImageInfo *info) -{ - GimvImage *image; - gchar *thumb_file; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - - g_return_val_if_fail (thumb_file, NULL); - - image = gimv_image_load_file (thumb_file, FALSE); - - g_free (thumb_file); - - return image; -} - - -static GimvImage * -save_thumb (const gchar *filename, const gchar *cache_type, - GimvImage *image, GimvImageInfo *info) -{ - GimvImage *imcache; - gchar *thumb_file; - gint im_width = -1, im_height = -1, width = -1, height = -1; - gboolean success; - - /* check args */ - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (image, NULL); - g_return_val_if_fail (cache_type, NULL); - - thumb_file = get_path (filename, cache_type); - g_return_val_if_fail (thumb_file, NULL); - - /* get image width & height */ - gimv_image_get_size (image, &im_width, &im_height); - if (im_width < 1 || im_height < 1) return NULL; - - /* get thumnail width & height */ - success = get_size (im_width, im_height, cache_type, &width, &height); - if (!success || width < 1 || height < 1) return NULL; - - /* create cache directory if not found */ - success = mkdirs (thumb_file); - if (!success) return NULL; - - /* scale image */ - imcache = gimv_image_scale (image, width, height); - - /* save cache to disk */ - if (imcache) { - g_print ("save cache: %s\n", thumb_file); - gimv_image_save_file (imcache, thumb_file, "png"); - } - - g_free (thumb_file); - return imcache; -} - - -static gchar * -get_path (const gchar *filename, const gchar *cache_type) -{ - const gchar *image_name; - gchar *abspath, *image_dir, *dir; - gchar buf[MAX_PATH_LEN]; - - g_return_val_if_fail (filename, NULL); - g_return_val_if_fail (cache_type, NULL); - - g_return_val_if_fail (!strcmp (cache_type, plugin_impl[0].label), NULL); - - abspath = relpath2abs (filename); - - /* get filename */ - image_name = g_basename (abspath); - if (!image_name) goto ERROR; - - /* get dir name */ - dir = image_dir = g_dirname (abspath); - if (!image_dir) goto ERROR; - - g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s"".png", - image_dir, NAUTILUS_THUMNAIL_DIRECTORY, image_name); - - g_free (abspath); - g_free (image_dir); - return g_strdup (buf); - -ERROR: - g_free (abspath); - return NULL; -} - - -static gboolean -get_size (gint width, gint height, const gchar *cache_type, - gint *width_ret, gint *height_ret) -{ - const gint max_size = 96; - - /* check args */ - g_return_val_if_fail (width_ret && height_ret, FALSE); - *width_ret = *height_ret = -1; - - if (width < 1 || height < 1) return FALSE; - - /* no need to scale */ - if (width < max_size && height < max_size) { - *width_ret = width; - *height_ret = height; - return TRUE; - } - - /* calculate width & height of thumbnail */ - if (width > height) { - *width_ret = max_size; - *height_ret = (gfloat) height * (gfloat) max_size / (gfloat) width; - } else { - *width_ret = (gfloat) width * (gfloat) max_size / (gfloat) height; - *height_ret = max_size; - } - - return TRUE; -} diff -Nru gimageview-0.2.27/plugins/thumbnail/xvpics.c gimageview-0.3.0-0.20101117/plugins/thumbnail/xvpics.c --- gimageview-0.2.27/plugins/thumbnail/xvpics.c 2004-05-23 14:08:20.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail/xvpics.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: xvpics.c,v 1.23 2003/07/13 13:20:18 makeinu Exp $ + * $Id: xvpics.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -26,12 +26,11 @@ #include #include -#include "fileutil.h" -#include "gfileutil.h" -#include "intl.h" #include "gimv_image_saver.h" #include "gimv_plugin.h" #include "gimv_thumb_cache.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #ifndef BUF_SIZE @@ -211,7 +210,7 @@ if (info) gimv_image_saver_set_image_info (saver, info); gimv_image_saver_save (saver); - gimv_image_saver_unref (saver); + g_object_unref (G_OBJECT (saver)); } g_free (thumb_file); diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview2.c gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview2.c --- gimageview-0.2.27/plugins/thumbnail_view/detailview2.c 2004-12-20 14:36:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview2.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1183 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001-2004 Takuro Ashie - * - * 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: detailview2.c,v 1.13 2004/09/21 08:44:29 makeinu Exp $ - */ - -#include "detailview.h" - -/* - * For Gtk+-2.0 - */ - -#ifdef ENABLE_TREEVIEW - -#include -#include - -#include "charset.h" -#include "dnd.h" -#include "detailview_prefs.h" -#include "detailview_priv.h" -#include "fileutil.h" -#include "gimv_cell_pixmap.h" -#include "gimv_image.h" -#include "gimv_thumb.h" -#include "gimv_thumb_win.h" -#include "gtk2-compat.h" - - -enum { - COLUMN_TERMINATOR = -1, - COLUMN_THUMB_DATA, - COLUMN_PIXMAP, - COLUMN_MASK, - COLUMN_EDITABLE, - N_COLUMN -}; - - -typedef struct DetailViewData_Tag -{ - GtkWidget *treeview; - gboolean dragging; - gint press_button; - gint press_mask; - gint press_x, press_y; - gboolean set_selection; -} DetailViewData; - - -/* callback functions */ -static gboolean cb_tree_selected (GtkTreeSelection *selection, - GtkTreeModel *model, - GtkTreePath *treepath, - gboolean selected, - gpointer data); -static gboolean cb_treeview_button_press (GtkWidget *widget, - GdkEventButton *event, - GimvThumbView *tv); -static gboolean cb_treeview_motion_notify (GtkWidget *widget, - GdkEventMotion *event, - gpointer data); -static gboolean cb_treeview_button_release (GtkWidget *widget, - GdkEventButton *event, - GimvThumbView *tv); -static void cb_treeview_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); -static void cb_column_clicked (GtkTreeViewColumn *column, - GimvThumbView *tv); - -/* other private function */ -static DetailViewData *detailview_new (GimvThumbView *tv); -static void set_column_types (GimvThumbView *tv, - DetailViewData *tv_data, - GtkListStore *store, - const gchar *dest_mode); -static void detailview_set_pixmaps (GimvThumbView *tv, - const gchar *dest_mode); - - - -/****************************************************************************** - * - * Callback functions. - * - ******************************************************************************/ -static gboolean -cb_tree_selected (GtkTreeSelection *selection, GtkTreeModel *model, - GtkTreePath *treepath, gboolean selected, gpointer data) -{ - DetailViewData *tv_data; - GimvThumbView *tv = data; - GimvThumb *thumb = NULL; - GtkTreeIter iter; - gint sel_row_pos = 0; - gboolean success; - gboolean under_cursor = FALSE, under_cursor_is_selected = FALSE; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - if (tv_data->press_button <= 0 && !tv_data->set_selection) - return FALSE; - - /* get state of row under mouse cursor */ - if (!tv_data->dragging && GTK_WIDGET_MAPPED (tv_data->treeview)) { - GtkTreePath *sel_treepath; - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - tv_data->press_x, tv_data->press_y, - &sel_treepath, NULL, NULL, NULL); - if (success) { - sel_row_pos = gtk_tree_path_compare (sel_treepath, treepath); - if (!sel_row_pos) - under_cursor = TRUE; - - if (gtk_tree_selection_path_is_selected (selection, sel_treepath)) - under_cursor_is_selected = TRUE; - - gtk_tree_path_free (sel_treepath); - } - } - - /* - * For DnD and popup, should not change selection when selected path was - * pressed. - * Selection should be changed when mouse button was released. - * F*ck'in GTK! - */ - if (tv_data->press_button > 0 - && under_cursor_is_selected - && !(tv_data->press_mask & GDK_CONTROL_MASK) - && !(tv_data->press_mask & GDK_SHIFT_MASK)) - { - return FALSE; - } - - success = gtk_tree_model_get_iter (model, &iter, treepath); - g_return_val_if_fail (success, FALSE); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - - if (thumb) { - thumb->selected = !selected; - } - - tv_data->set_selection = FALSE; - - return TRUE; -} - - -static gint -cb_treeview_key_press (GtkWidget *widget, - GdkEventKey *event, - GimvThumbView *tv) -{ - DetailViewData *tv_data; - GimvThumb *thumb = NULL; - GtkTreePath *treepath; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (tv_data->treeview), - &treepath, NULL); - - if (treepath) { - GtkTreeModel *model; - GtkTreeIter iter; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - if (gtk_tree_model_get_iter (model, &iter, treepath)) { - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - } - gtk_tree_path_free (treepath); - } - - if (gimv_thumb_view_thumb_key_press_cb(widget, event, thumb)) - return FALSE; - - { - switch (event->keyval) { - case GDK_Left: - case GDK_Right: - case GDK_Up: - case GDK_Down: - return FALSE; - break; - case GDK_Return: - if (!thumb) break; - if (event->state & GDK_SHIFT_MASK || event->state & GDK_CONTROL_MASK) { - /* is there somteing to do? */ - } else { - gimv_thumb_view_set_selection_all (tv, FALSE); - } - gimv_thumb_view_set_selection (thumb, TRUE); - gimv_thumb_view_open_image (tv, thumb, 0); - break; - case GDK_space: - if (!thumb) break; - gimv_thumb_view_set_selection (thumb, !thumb->selected); - break; - case GDK_Delete: - gimv_thumb_view_delete_files (tv); - break; - default: - break; - } - } - - return FALSE; -} - - -static gboolean -cb_treeview_button_press (GtkWidget *widget, - GdkEventButton *event, - GimvThumbView *tv) -{ - DetailViewData *tv_data; - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreePath *treepath; - GtkTreeViewColumn *column; - GimvThumb *thumb = NULL; - gboolean success, retval1 = FALSE, retval2 = FALSE; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - tv_data->dragging = FALSE; - tv_data->press_button = event->button; - tv_data->press_mask = event->state; - tv_data->press_x = event->x; - tv_data->press_y = event->y; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); - - /* get state of row under mouse cursor */ - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - event->x, event->y, - &treepath, &column, NULL, NULL); - if (success) { - retval1 = gtk_tree_selection_path_is_selected (selection, treepath); - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - } - - if (thumb) { - retval2 = gimv_thumb_view_thumb_button_press_cb (widget, event, thumb); - } - - if (treepath) - gtk_tree_path_free (treepath); - - /* - if (retval1) { - return TRUE; - } else { - return retval2; - } - */ - return retval2; -} - - -static gboolean -cb_treeview_motion_notify (GtkWidget *widget, - GdkEventMotion *event, - gpointer data) -{ - DetailViewData *tv_data; - GimvThumbView *tv = data; - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreePath *treepath; - GtkTreeViewColumn *column; - GimvThumb *thumb = NULL; - gboolean success; - gint dx, dy; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - if (tv_data->dragging) return FALSE; - - dx = tv_data->press_x - event->x; - dy = tv_data->press_y - event->y; - if (abs (dx) > 2 || abs (dy) > 2) - tv_data->dragging = TRUE; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); - - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - event->x, event->y, - &treepath, &column, NULL, NULL); - if (success) { - GtkTreeIter iter; - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - } - - if (treepath) - gtk_tree_path_free (treepath); - - return gimv_thumb_view_motion_notify_cb (widget, event, thumb); -} - - -static gboolean -cb_treeview_button_release (GtkWidget *widget, - GdkEventButton *event, - GimvThumbView *tv) -{ - DetailViewData *tv_data; - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreePath *treepath; - GtkTreeViewColumn *column; - GimvThumb *thumb = NULL; - gboolean success, retval1 = FALSE, retval2 = FALSE; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - tv_data->press_button = -1; - tv_data->press_mask = -1; - tv_data->press_x = -1; - tv_data->press_y = -1; - - if (tv_data->dragging) { - tv_data->dragging = FALSE; - return FALSE; - } - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); - - /* get state of row under mouse cursor */ - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - event->x, event->y, - &treepath, &column, NULL, NULL); - if (success) { - retval1 = gtk_tree_selection_path_is_selected (selection, treepath); - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - - if (event->type == GDK_BUTTON_RELEASE - && (event->button == 1) - && !(event->state & GDK_SHIFT_MASK) - && !(event->state & GDK_CONTROL_MASK) - && !tv_data->dragging) - { - gimv_thumb_view_set_selection_all (tv, FALSE); - gimv_thumb_view_set_selection (thumb, TRUE); - } - } - - if (thumb) { - retval2 = gimv_thumb_view_thumb_button_release_cb (widget, event, thumb); - } - - if (treepath) - gtk_tree_path_free (treepath); - - /* - if (retval1) { - return TRUE; - } else { - return retval2; - } - */ - return retval2; -} - - -static gboolean -cb_treeview_scroll (GtkWidget *widget, GdkEventScroll *se, GimvThumbView *tv) -{ - GdkEventButton be; - gboolean retval = FALSE; - - g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); - - be.type = GDK_BUTTON_PRESS; - be.window = se->window; - be.send_event = se->send_event; - be.time = se->time; - be.x = se->x; - be.y = se->y; - be.axes = NULL; - be.state = se->state; - be.device = se->device; - be.x_root = se->x_root; - be.y_root = se->y_root; - switch ((se)->direction) { - case GDK_SCROLL_UP: - be.button = 4; - break; - case GDK_SCROLL_DOWN: - be.button = 5; - break; - case GDK_SCROLL_LEFT: - be.button = 6; - break; - case GDK_SCROLL_RIGHT: - be.button = 7; - break; - default: - g_warning ("invalid scroll direction!"); - be.button = 0; - break; - } - - retval = cb_treeview_button_press (widget, &be, tv); - - be.type = GDK_BUTTON_RELEASE; - retval = cb_treeview_button_release (widget, &be, tv); - - return retval; -} - - -static void -cb_treeview_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - gimv_thumb_view_drag_data_received_cb (widget, context, x, y, - seldata, info, time, data); - - /* F*ck! */ - g_signal_stop_emission_by_name (G_OBJECT (widget), "drag_data_received"); -} - - -static void -cb_column_clicked (GtkTreeViewColumn *column, GimvThumbView *tv) -{ - GimvThumbWin *tw; - DetailViewData *tv_data; - GList *col_list, *node; - gint col, idx; - GimvSortItem sort_item, current_item; - GimvSortFlag sort_flag = 0, current_flag; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - if (tv->progress) return; - - tw = tv->tw; - g_return_if_fail (GIMV_IS_THUMB_WIN (tw)); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->treeview); - - col_list = gtk_tree_view_get_columns (GTK_TREE_VIEW (tv_data->treeview)); - col = g_list_index (col_list, column); - - node = g_list_nth (detailview_title_idx_list, col - 1); - if (!node) return; - - idx = GPOINTER_TO_INT (node->data); - - switch (idx) { - case 1: - sort_item = GIMV_SORT_NAME; - break; - case 2: - sort_item = GIMV_SORT_SIZE; - break; - case 3: - sort_item = GIMV_SORT_TYPE; - break; - case 5: - sort_item = GIMV_SORT_ATIME; - break; - case 6: - sort_item = GIMV_SORT_MTIME; - break; - case 7: - sort_item = GIMV_SORT_CTIME; - break; - default: - return; - } - - current_item = gimv_thumb_win_get_sort_type (tw, ¤t_flag); - - if (current_item == sort_item) { - if (current_flag & GIMV_SORT_REVERSE) - sort_flag &= ~GIMV_SORT_REVERSE; - else - sort_flag |= GIMV_SORT_REVERSE; - } - - gimv_thumb_win_sort_thumbnail (tw, sort_item, sort_flag, - GIMV_THUMB_WIN_CURRENT_PAGE); -} - - -/****************************************************************************** - * - * private functions. - * - ******************************************************************************/ -static DetailViewData * -detailview_new (GimvThumbView *tv) -{ - DetailViewData *tv_data; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - if (!tv_data) { - tv_data = g_new0 (DetailViewData, 1); - tv_data->treeview = NULL; - tv_data->dragging = FALSE; - tv_data->press_button = -1; - tv_data->press_mask = -1; - tv_data->press_x = -1; - tv_data->press_y = -1; - tv_data->set_selection = FALSE; - g_object_set_data_full (G_OBJECT (tv), DETAIL_VIEW_LABEL, tv_data, - (GDestroyNotify) g_free); - } - - return tv_data; -} - - -static void -set_column_types (GimvThumbView *tv, DetailViewData *tv_data, - GtkListStore *store, const gchar *dest_mode) -{ - GtkTreeViewColumn *col; - GtkCellRenderer *render; - GList *node; - gint i, xpad, ypad; - - /* pixmap column */ - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title (col, ""); - /* gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); */ - /* gtk_tree_view_column_set_resizable(col, TRUE); */ - - render = gimv_cell_renderer_pixmap_new (); - xpad = GTK_CELL_RENDERER (render)->xpad; - ypad = GTK_CELL_RENDERER (render)->xpad; - - if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { - gint xsize = ICON_SIZE + xpad * 2, ysize = ICON_SIZE + ypad * 2; - gtk_cell_renderer_set_fixed_size (render, xsize, ysize); - } - - if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { - gint xsize = tv->thumb_size + xpad * 2; - gint ysize = tv->thumb_size + ypad * 2; - gtk_cell_renderer_set_fixed_size (render, xsize, ysize); - } - - gtk_tree_view_column_pack_start (col, render, FALSE); - gtk_tree_view_column_add_attribute (col, render, - "pixmap", COLUMN_PIXMAP); - gtk_tree_view_column_add_attribute (col, render, - "mask", COLUMN_MASK); - - gtk_tree_view_append_column (GTK_TREE_VIEW (tv_data->treeview), col); - - - /* other column */ - for (node = detailview_title_idx_list, i = N_COLUMN; - node; - node = g_list_next (node), i++) - { - gint idx = GPOINTER_TO_INT (node->data); - - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title (col, _(detailview_columns[idx].title)); - gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (col, detailview_columns[idx].width); - gtk_tree_view_column_set_resizable(col, TRUE); - - render = gtk_cell_renderer_text_new (); - switch (detailview_columns[idx].justification) { - case GTK_JUSTIFY_CENTER: - g_object_set(G_OBJECT(render), "xalign", 0.5, NULL); - gtk_tree_view_column_set_alignment(col, 0.5); - break; - case GTK_JUSTIFY_RIGHT: - g_object_set(G_OBJECT(render), "xalign", 1.0, NULL); - gtk_tree_view_column_set_alignment(col, 0.5); - break; - case GTK_JUSTIFY_LEFT: - g_object_set(G_OBJECT(render), "xalign", 0.0, NULL); - break; - default: - break; - } - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, - "text", i); - if (!strcmp (detailview_columns[idx].title, "Name")) { - /* - gtk_tree_view_column_add_attribute (col, render, - "editable", COLUMN_EDITABLE); - */ - } - - gtk_tree_view_append_column (GTK_TREE_VIEW (tv_data->treeview), col); - - gtk_tree_view_column_set_clickable (col, TRUE); - g_signal_connect (G_OBJECT (col), "clicked", - G_CALLBACK (cb_column_clicked), tv); - } -} - - -static void -detailview_set_pixmaps (GimvThumbView *tv, const gchar *dest_mode) -{ - GimvThumb *thumb; - GList *node; - gint i, num; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - node = g_list_first (tv->thumblist); - num = g_list_length (node); - - /* set images */ - for (i = 0 ; i < num ; i++) { - thumb = node->data; - detailview_update_thumbnail (tv, thumb, dest_mode); - node = g_list_next (node); - } -} - - - -/****************************************************************************** - * - * public functions. - * - ******************************************************************************/ -void -detailview_freeze (GimvThumbView *tv) -{ -} - - -void -detailview_thaw (GimvThumbView *tv) -{ -} - - -void -detailview_append_thumb_frame (GimvThumbView *tv, GimvThumb *thumb, - const gchar *dest_mode) -{ - DetailViewData *tv_data; - GtkTreeModel *model; - GList *data_node; - gint j, pos, colnum; - GtkTreeIter iter; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - pos = g_list_index (tv->thumblist, thumb); - colnum = detailview_title_idx_list_num + N_COLUMN; - - tv_data = g_object_get_data (G_OBJECT(tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->treeview); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - - gtk_list_store_insert (GTK_LIST_STORE (model), &iter, pos); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_THUMB_DATA, thumb, - COLUMN_TERMINATOR); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_EDITABLE, TRUE, - COLUMN_TERMINATOR); - - data_node = detailview_title_idx_list; - for (j = N_COLUMN; - j < colnum && data_node; - j++, data_node = g_list_next (data_node)) - { - gint idx = GPOINTER_TO_INT (data_node->data); - gchar *text = NULL; - - if (detailview_columns[idx].func) - text = detailview_columns[idx].func (thumb); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - j, text, - COLUMN_TERMINATOR); - - if (detailview_columns[idx].free && text) - g_free (text); - } - - detailview_set_selection (tv, thumb, thumb->selected); -} - - -void -detailview_update_thumbnail (GimvThumbView *tv, GimvThumb *thumb, - const gchar *dest_mode) -{ - DetailViewData *tv_data; - GdkPixmap *pixmap = NULL; - GdkBitmap *mask; - GList *node; - gint pos, row, col, i; - GtkTreeModel *model; - GtkTreeIter iter; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->treeview); - - node = g_list_find (tv->thumblist, thumb); - pos = g_list_position (tv->thumblist, node); - - row = pos; - col = 0; - - /* set thumbnail */ - if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { - gimv_thumb_get_icon (thumb, &pixmap, &mask); - } else if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - } - - if (!pixmap) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_PIXMAP, pixmap, - COLUMN_MASK, mask, - COLUMN_TERMINATOR); - - /* reset column data */ - node = detailview_title_idx_list; - for (i = N_COLUMN, node = detailview_title_idx_list; - node; - i++, node = g_list_next (node)) - { - gint idx = GPOINTER_TO_INT (node->data); - gchar *str; - - if (!detailview_columns[idx].need_sync) continue; - - str = detailview_columns[idx].func (thumb); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - i, str, - COLUMN_TERMINATOR); - - if (detailview_columns[idx].free) - g_free (str); - } - - return; -} - - -GList * -detailview_get_load_list (GimvThumbView *tv) -{ - GList *loadlist = NULL, *node; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - if (!strcmp (DETAIL_VIEW_LABEL, tv->summary_mode)) return NULL; - - for (node = tv->thumblist; node; node = g_list_next (node)) { - GimvThumb *thumb = node->data; - GdkPixmap *pixmap = NULL; - GdkBitmap *mask = NULL; - - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - if (!pixmap) - loadlist = g_list_append (loadlist, thumb); - } - - return loadlist; -} - - -void -detailview_remove_thumbnail (GimvThumbView *tv, GimvThumb *thumb) -{ - DetailViewData *tv_data; - GtkTreeModel *model; - GtkTreeIter iter; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data); - - pos = g_list_index (tv->thumblist, thumb); - if (pos < 0) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, pos)) - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); -} - - -void -detailview_adjust (GimvThumbView *tv, GimvThumb *thumb) -{ - DetailViewData *tv_data; - GList *node; - gint pos; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - node = g_list_find (gimv_thumb_view_get_list(), tv); - if (!node) return; - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data); - - pos = g_list_index (tv->thumblist, thumb); - if (pos < 0) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); - if (success) { - GtkTreePath *treepath; - treepath = gtk_tree_model_get_path (model, &iter); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tv_data->treeview), - treepath, NULL, - TRUE, 0.0, 0.0); - gtk_tree_path_free (treepath); - } -} - - -gboolean -detailview_set_selection (GimvThumbView *tv, GimvThumb *thumb, gboolean select) -{ - DetailViewData *tv_data; - GList *node; - gint pos; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); - - if (g_list_length (tv->thumblist) < 1) return FALSE; - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data && tv_data->treeview, FALSE); - - node = g_list_find (tv->thumblist, thumb); - pos = g_list_position (tv->thumblist, node); - - if (pos >= 0) { - GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreeIter iter; - gboolean found; - - found = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); - if (!found) return TRUE; - - thumb->selected = select; - tv_data->set_selection = TRUE; - if (thumb->selected) { - gtk_tree_selection_select_iter (selection, &iter); - } else { - gtk_tree_selection_unselect_iter (selection, &iter); - } - tv_data->set_selection = FALSE; - } - - return TRUE; -} - - -void -detailview_set_focus (GimvThumbView *tv, GimvThumb *thumb) -{ - DetailViewData *tv_data; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - if (g_list_length (tv->thumblist) < 1) return; - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->treeview); - - pos = g_list_index (tv->thumblist, thumb); - - if (pos >= 0) { - GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - GtkTreePath *path; - gboolean found; - - found = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); - if (!found) return; - path = gtk_tree_model_get_path (model, &iter); - gtk_tree_view_set_cursor (treeview, path, NULL, FALSE); - gtk_tree_path_free (path); - } else { - gtk_widget_grab_focus (tv_data->treeview); - } -} - - -GimvThumb * -detailview_get_focus (GimvThumbView *tv) -{ - GimvThumb *thumb = NULL; - DetailViewData *tv_data; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - if (g_list_length (tv->thumblist) < 1) return NULL; - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data && tv_data->treeview, NULL); - - { - GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - GtkTreePath *path; - - gtk_tree_view_get_cursor (treeview, &path, NULL); - if (path) { - if (gtk_tree_model_get_iter (model, &iter, path)) - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &thumb, - COLUMN_TERMINATOR); - gtk_tree_path_free (path); - } - } - - return thumb; -} - - -gboolean -detailview_thumbnail_is_in_viewport (GimvThumbView *tv, GimvThumb *thumb) -{ - DetailViewData *tv_data; - GList *node; - gint row, row_top, row_bottom; - GdkRectangle area; - - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreePath *treepath; - GimvThumb *tmp_thumb; - gboolean success; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - node = g_list_find (tv->thumblist, thumb); - row = g_list_position (tv->thumblist, node); - - /* widget area */ - gtkutil_get_widget_area (tv_data->treeview, &area); - - /* get row range */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - - if (!GTK_WIDGET_MAPPED (tv_data->treeview)) return FALSE; - - /* get index of top row */ - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - 0, 0, &treepath, NULL, NULL, NULL); - if (!success) return FALSE; - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &tmp_thumb, - COLUMN_TERMINATOR); - row_top = g_list_index (tv->thumblist, tmp_thumb); - gtk_tree_path_free (treepath); - - /* get index of bottom row */ - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), - 0, area.height, &treepath, - NULL, NULL, NULL); - if (!success) return FALSE; - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_THUMB_DATA, &tmp_thumb, - COLUMN_TERMINATOR); - row_bottom = g_list_index (tv->thumblist, tmp_thumb); - gtk_tree_path_free (treepath); - - /* intersect? */ - if (row >= row_top && row <= row_bottom) - return TRUE; - else - return FALSE; -} - - -GtkWidget * -detailview_create (GimvThumbView *tv, const gchar *dest_mode) -{ - DetailViewData *tv_data; - GtkListStore *store; - GtkTreeSelection *selection; - GType types[128]; - const gint ntypes = sizeof (types) / sizeof (GType); - gint i, ncolumns; - gboolean show_title; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - detailview_create_title_idx_list (); - ncolumns = detailview_title_idx_list_num + N_COLUMN; - if (ncolumns > ntypes) { - g_warning("Too many columns are specified: %d\n", ncolumns - N_COLUMN); - ncolumns = ntypes; - } - - tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); - if (!tv_data) { - tv_data = detailview_new (tv); - g_return_val_if_fail (tv_data, NULL); - } - - - /* create tree view widget */ - store = gtk_list_store_new (1, G_TYPE_STRING); /* this column is dummy */ - - /* set real columns */ - for (i = 0; i < ncolumns; i++) - types[i] = G_TYPE_STRING; - types[COLUMN_THUMB_DATA] = G_TYPE_POINTER; - types[COLUMN_PIXMAP] = GDK_TYPE_PIXMAP; - types[COLUMN_MASK] = GDK_TYPE_PIXMAP; - types[COLUMN_EDITABLE] = G_TYPE_BOOLEAN; - gtk_list_store_set_column_types (store, ncolumns, types); - - tv_data->treeview - = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tv_data->treeview), TRUE); - set_column_types (tv, tv_data, store, dest_mode); - detailview_prefs_get_value ("show_title", (gpointer) &show_title); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tv_data->treeview), - show_title); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - gtk_tree_selection_set_select_function (selection, - cb_tree_selected, - tv, NULL); - - if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->treeview, "DetailIconMode"); - } - if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->treeview, "DetailThumbMode"); - } - - gtk_widget_show (tv_data->treeview); - - g_signal_connect (G_OBJECT (tv_data->treeview), - "key-press-event", - G_CALLBACK (cb_treeview_key_press), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), - "button-press-event", - G_CALLBACK (cb_treeview_button_press), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), - "scroll-event", - G_CALLBACK (cb_treeview_scroll), tv); - /* SIGNAL_CONNECT_TRANSRATE_SCROLL (tv_data->treeview); */ - g_signal_connect (G_OBJECT (tv_data->treeview), - "button-release-event", - G_CALLBACK (cb_treeview_button_release), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), - "motion-notify-event", - G_CALLBACK (cb_treeview_motion_notify), tv); - - /* for drop file list */ - dnd_src_set (tv_data->treeview, detailview_dnd_targets, detailview_dnd_targets_num); - dnd_dest_set (tv_data->treeview, detailview_dnd_targets, detailview_dnd_targets_num); - - g_signal_connect (G_OBJECT (tv_data->treeview), "drag_begin", - G_CALLBACK (gimv_thumb_view_drag_begin_cb), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), "drag_data_get", - G_CALLBACK (gimv_thumb_view_drag_data_get_cb), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), "drag_data_received", - G_CALLBACK (cb_treeview_drag_data_received), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), "drag-data-delete", - G_CALLBACK (gimv_thumb_view_drag_data_delete_cb), tv); - g_signal_connect (G_OBJECT (tv_data->treeview), "drag_end", - G_CALLBACK (gimv_thumb_view_drag_end_cb), tv); - g_object_set_data (G_OBJECT (tv_data->treeview), "gimv-tab", tv); - - - /* set data */ - if (tv->thumblist) { - GList *node; - - for (node = tv->thumblist; node; node = g_list_next (node)) - detailview_append_thumb_frame (tv, node->data, dest_mode); - detailview_set_pixmaps (tv, dest_mode); - } - - return tv_data->treeview; -} - -#endif /* ENABLE_TREEVIEW */ diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview.c gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview.c --- gimageview-0.2.27/plugins/thumbnail_view/detailview.c 2004-09-21 08:44:29.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: detailview.c,v 1.15 2004/09/21 08:44:29 makeinu Exp $ + * $Id: detailview.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "detailview.h" @@ -26,14 +26,27 @@ #include #include -#include "dnd.h" -#include "detailview_priv.h" #include "detailview_prefs.h" -#include "fileutil.h" +#include "gimv_cell_pixmap.h" +#include "gimv_image.h" #include "gimv_image_info.h" #include "gimv_plugin.h" #include "gimv_thumb.h" #include "gimv_thumb_view.h" +#include "gimv_thumb_win.h" +#include "utils_char_code.h" +#include "utils_dnd.h" +#include "utils_file.h" + + +enum { + COLUMN_TERMINATOR = -1, + COLUMN_THUMB_DATA, + COLUMN_PIXMAP, + COLUMN_MASK, + COLUMN_EDITABLE, + N_COLUMN +}; static GimvThumbViewPlugin detailview_modes[] = { @@ -100,6 +113,29 @@ get_prefs_ui: gimv_prefs_ui_detailview_get_page, }; +/* for converting thumbnail data to string */ +typedef gchar *(*DetailViewColDataStr) (GimvThumb *thumb); + +typedef struct DetailViewColumn_Tag { + gchar *title; /* column title */ + gint width; /* Column width. Currentry, this value not used */ + gboolean free; /* Free after setting text data to columns or not */ + DetailViewColDataStr func; /* Pointer to function convert data to string */ + GtkJustification justification; + gboolean need_sync; +} DetailViewColumn; + +typedef struct DetailViewData_Tag +{ + GtkWidget *treeview; + gboolean dragging; + gint press_button; + gint press_mask; + gint press_x, press_y; + gboolean set_selection; +} DetailViewData; + + /* for setting clist text data */ static gchar *column_data_filename (GimvThumb *thumb); @@ -143,42 +179,40 @@ gint detailview_title_idx_list_num = 0; -#ifndef ENABLE_TREEVIEW - -#include "dnd.h" -#include "gimv_image.h" -#include "gimv_thumb.h" -#include "gimv_thumb_win.h" -#include "gtk2-compat.h" - -typedef struct DetailViewData_Tag -{ - GtkWidget *clist; - gint page_pos_x[3]; - gint page_pos_y[3]; - const gchar *dest_mode; - gint hilit_dir; -} DetailViewData; - /* callback functions */ -static gboolean cb_clist_button_press (GtkWidget *widget, - GdkEventButton *event, - gpointer data); -static gboolean cb_clist_motion_notify(GtkWidget *widget, - GdkEventMotion *event, - gpointer data); -static void cb_click_column (GtkWidget *widget, - gint col, - GimvThumbView *tv); +static gboolean cb_tree_selected (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *treepath, + gboolean selected, + gpointer data); +static gboolean cb_treeview_button_press (GtkWidget *widget, + GdkEventButton *event, + GimvThumbView *tv); +static gboolean cb_treeview_motion_notify (GtkWidget *widget, + GdkEventMotion *event, + gpointer data); +static gboolean cb_treeview_button_release (GtkWidget *widget, + GdkEventButton *event, + GimvThumbView *tv); +static void cb_treeview_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data); +static void cb_column_clicked (GtkTreeViewColumn *column, + GimvThumbView *tv); /* other private function */ -static DetailViewData *detailview_new (GimvThumbView *tv); -static void detailview_set_pixmaps (GimvThumbView *tv, - const gchar *dest_mode); - -static gboolean detailview_dragging = FALSE; - -#endif /* ENABLE_TREEVIEW */ +static DetailViewData *detailview_new (GimvThumbView *tv); +static void set_column_types (GimvThumbView *tv, + DetailViewData *tv_data, + GtkListStore *store, + const gchar *dest_mode); +static void detailview_set_pixmaps (GimvThumbView *tv, + const gchar *dest_mode); /****************************************************************************** @@ -422,30 +456,108 @@ } - -/* - * For Gtk+-1.2 - */ - -#ifndef ENABLE_TREEVIEW - /****************************************************************************** * * Callback functions. * ******************************************************************************/ +static gboolean +cb_tree_selected (GtkTreeSelection *selection, GtkTreeModel *model, + GtkTreePath *treepath, gboolean selected, gpointer data) +{ + DetailViewData *tv_data; + GimvThumbView *tv = data; + GimvThumb *thumb = NULL; + GtkTreeIter iter; + gint sel_row_pos = 0; + gboolean success; + gboolean under_cursor = FALSE, under_cursor_is_selected = FALSE; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data, FALSE); + + if (tv_data->press_button <= 0 && !tv_data->set_selection) + return FALSE; + + /* get state of row under mouse cursor */ + if (!tv_data->dragging && GTK_WIDGET_MAPPED (tv_data->treeview)) { + GtkTreePath *sel_treepath; + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + tv_data->press_x, tv_data->press_y, + &sel_treepath, NULL, NULL, NULL); + if (success) { + sel_row_pos = gtk_tree_path_compare (sel_treepath, treepath); + if (!sel_row_pos) + under_cursor = TRUE; + + if (gtk_tree_selection_path_is_selected (selection, sel_treepath)) + under_cursor_is_selected = TRUE; + + gtk_tree_path_free (sel_treepath); + } + } + + /* + * For DnD and popup, should not change selection when selected path was + * pressed. + * Selection should be changed when mouse button was released. + * F*ck'in GTK! + */ + if (tv_data->press_button > 0 + && under_cursor_is_selected + && !(tv_data->press_mask & GDK_CONTROL_MASK) + && !(tv_data->press_mask & GDK_SHIFT_MASK)) + { + return FALSE; + } + + success = gtk_tree_model_get_iter (model, &iter, treepath); + g_return_val_if_fail (success, FALSE); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); + + if (thumb) { + thumb->selected = !selected; + } + + tv_data->set_selection = FALSE; + + return TRUE; +} + + static gint -cb_clist_key_press (GtkWidget *widget, - GdkEventKey *event, - GimvThumbView *tv) +cb_treeview_key_press (GtkWidget *widget, + GdkEventKey *event, + GimvThumbView *tv) { + DetailViewData *tv_data; GimvThumb *thumb = NULL; + GtkTreePath *treepath; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data, FALSE); - g_return_val_if_fail (tv, FALSE); + gtk_tree_view_get_cursor (GTK_TREE_VIEW (tv_data->treeview), + &treepath, NULL); - if (GTK_CLIST (widget)->focus_row > 0) - thumb = gtk_clist_get_row_data (GTK_CLIST (widget), - GTK_CLIST (widget)->focus_row); + if (treepath) { + GtkTreeModel *model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + if (gtk_tree_model_get_iter (model, &iter, treepath)) { + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); + } + gtk_tree_path_free (treepath); + } if (gimv_thumb_view_thumb_key_press_cb(widget, event, thumb)) return FALSE; @@ -456,11 +568,7 @@ case GDK_Right: case GDK_Up: case GDK_Down: -#ifdef USE_GTK2 return FALSE; -#else /* USE_GTK2 */ - return TRUE; -#endif /* USE_GTK2 */ break; case GDK_Return: if (!thumb) break; @@ -473,6 +581,8 @@ gimv_thumb_view_open_image (tv, thumb, 0); break; case GDK_space: + if (!thumb) break; + gimv_thumb_view_set_selection (thumb, !thumb->selected); break; case GDK_Delete: gimv_thumb_view_delete_files (tv); @@ -487,323 +597,312 @@ static gboolean -cb_clist_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data) +cb_treeview_button_press (GtkWidget *widget, + GdkEventButton *event, + GimvThumbView *tv) { - GimvThumbView *tv = data; - gint row; - GimvThumb *thumb; - gboolean clear = TRUE, found = FALSE, success; - - detailview_dragging = FALSE; - - g_return_val_if_fail (tv, FALSE); + DetailViewData *tv_data; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + GtkTreePath *treepath; + GtkTreeViewColumn *column; + GimvThumb *thumb = NULL; + gboolean success, retval1 = FALSE, retval2 = FALSE; - gtk_widget_grab_focus (widget); + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - success = gtk_clist_get_selection_info (GTK_CLIST (widget), - event->x, event->y, - &row, NULL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data, FALSE); - if (event->button != 4 && event->button != 5) { - GTK_CLIST (widget)->anchor = row; - GTK_CLIST (widget)->focus_row = row; -#ifdef USE_GTK2 - GTK_CLIST_GET_CLASS (GTK_CLIST (widget))->refresh (GTK_CLIST (widget)); -#else /* USE_GTK2 */ - GTK_CLIST_CLASS (GTK_OBJECT (widget)->klass)->refresh (GTK_CLIST (widget)); -#endif /* USE_GTK2 */ + tv_data->dragging = FALSE; + tv_data->press_button = event->button; + tv_data->press_mask = event->state; + tv_data->press_x = event->x; + tv_data->press_y = event->y; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); + + /* get state of row under mouse cursor */ + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + event->x, event->y, + &treepath, &column, NULL, NULL); + if (success) { + retval1 = gtk_tree_selection_path_is_selected (selection, treepath); + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); } - if (!success) { - gimv_thumb_view_set_selection_all (tv, FALSE); - return FALSE; + if (thumb) { + retval2 = gimv_thumb_view_thumb_button_press_cb (widget, event, thumb); } - thumb = gtk_clist_get_row_data (GTK_CLIST (widget), row); - if (!thumb) return FALSE; + if (treepath) + gtk_tree_path_free (treepath); - /* set selection */ - if (event->type == GDK_BUTTON_PRESS && (event->button == 1)) { - if (event->state & GDK_SHIFT_MASK) { - if (event->state & GDK_CONTROL_MASK) - clear = FALSE; - - found = gimv_thumb_view_set_selection_multiple (tv, thumb, - TRUE, clear); - if (!found) - gimv_thumb_view_set_selection_multiple (tv, thumb, FALSE, clear); - } else if (!thumb->selected) { - if (~event->state & GDK_CONTROL_MASK) - gimv_thumb_view_set_selection_all (tv, FALSE); - gimv_thumb_view_set_selection (thumb, TRUE); - } else if (thumb->selected) { - if (event->state & GDK_CONTROL_MASK) - gimv_thumb_view_set_selection (thumb, FALSE); - } + /* + if (retval1) { + return TRUE; + } else { + return retval2; } - - return gimv_thumb_view_thumb_button_press_cb (widget, event, thumb); + */ + return retval2; } static gboolean -cb_clist_button_release (GtkWidget *widget, GdkEventButton *event, gpointer data) +cb_treeview_motion_notify (GtkWidget *widget, + GdkEventMotion *event, + gpointer data) { + DetailViewData *tv_data; GimvThumbView *tv = data; - gint row; - GimvThumb *thumb; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreePath *treepath; + GtkTreeViewColumn *column; + GimvThumb *thumb = NULL; gboolean success; + gint dx, dy; - if (!tv) goto ERROR; + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - success = gtk_clist_get_selection_info (GTK_CLIST (widget), - event->x, event->y, - &row, NULL); - - if (event->button != 4 && event->button != 5) { - GTK_CLIST (widget)->anchor = row; - GTK_CLIST (widget)->focus_row = row; -#ifdef USE_GTK2 - GTK_CLIST_GET_CLASS (GTK_CLIST (widget))->refresh (GTK_CLIST (widget)); -#else /* USE_GTK2 */ - GTK_CLIST_CLASS (GTK_OBJECT (widget)->klass)->refresh (GTK_CLIST (widget)); -#endif /* USE_GTK2 */ - } - - if (!success) { - gimv_thumb_view_set_selection_all (tv, FALSE); - goto ERROR; - } - - thumb = gtk_clist_get_row_data (GTK_CLIST (widget), row); - if (!thumb) goto ERROR; - - if (event->type == GDK_BUTTON_RELEASE - && (event->button == 1) - && !(event->state & GDK_SHIFT_MASK) - && !(event->state & GDK_CONTROL_MASK) - && !detailview_dragging) - { - gimv_thumb_view_set_selection_all (tv, FALSE); - gimv_thumb_view_set_selection (thumb, TRUE); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data, FALSE); + + if (tv_data->dragging) return FALSE; + + dx = tv_data->press_x - event->x; + dy = tv_data->press_y - event->y; + if (abs (dx) > 2 || abs (dy) > 2) + tv_data->dragging = TRUE; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); + + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + event->x, event->y, + &treepath, &column, NULL, NULL); + if (success) { + GtkTreeIter iter; + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); } - return gimv_thumb_view_thumb_button_release_cb (widget, event, thumb); + if (treepath) + gtk_tree_path_free (treepath); -ERROR: - detailview_dragging = FALSE; - return FALSE; + return gimv_thumb_view_motion_notify_cb (widget, event, thumb); } static gboolean -cb_clist_motion_notify (GtkWidget *widget, GdkEventMotion *event, gpointer data) +cb_treeview_button_release (GtkWidget *widget, + GdkEventButton *event, + GimvThumbView *tv) { - GimvThumbView *tv = data; - gint row, on_row; + DetailViewData *tv_data; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + GtkTreePath *treepath; + GtkTreeViewColumn *column; GimvThumb *thumb = NULL; + gboolean success, retval1 = FALSE, retval2 = FALSE; - detailview_dragging = TRUE; + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - g_return_val_if_fail (tv, FALSE); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data, FALSE); - on_row = gtk_clist_get_selection_info (GTK_CLIST (widget), - event->x, event->y, &row, NULL); - if (!on_row) { - thumb = gtk_clist_get_row_data (GTK_CLIST (widget), row); + tv_data->press_button = -1; + tv_data->press_mask = -1; + tv_data->press_x = -1; + tv_data->press_y = -1; + + if (tv_data->dragging) { + tv_data->dragging = FALSE; + return FALSE; } - return gimv_thumb_view_motion_notify_cb (widget, event, thumb); -} + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); + /* get state of row under mouse cursor */ + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + event->x, event->y, + &treepath, &column, NULL, NULL); + if (success) { + retval1 = gtk_tree_selection_path_is_selected (selection, treepath); + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); + + if (event->type == GDK_BUTTON_RELEASE + && (event->button == 1) + && !(event->state & GDK_SHIFT_MASK) + && !(event->state & GDK_CONTROL_MASK) + && !tv_data->dragging) + { + gimv_thumb_view_set_selection_all (tv, FALSE); + gimv_thumb_view_set_selection (thumb, TRUE); + } + } -static void -cb_click_column(GtkWidget *widget, gint col, GimvThumbView *tv) -{ - GimvThumbWin *tw; - GtkWidget *sort_item; - GList *node; - gint idx; + if (thumb) { + retval2 = gimv_thumb_view_thumb_button_release_cb (widget, event, thumb); + } - if (!tv || tv->progress) return; + if (treepath) + gtk_tree_path_free (treepath); - tw = tv->tw; - if (!tw) return; + /* + if (retval1) { + return TRUE; + } else { + return retval2; + } + */ + return retval2; +} - node = g_list_nth (detailview_title_idx_list, col - 1); - if (!node) return; - idx = GPOINTER_TO_INT (node->data); +static gboolean +cb_treeview_scroll (GtkWidget *widget, GdkEventScroll *se, GimvThumbView *tv) +{ + GdkEventButton be; + gboolean retval = FALSE; - switch (idx) { - case 1: - sort_item = tw->menuitem.sort_name; - break; - case 2: - sort_item = tw->menuitem.sort_size; - break; - case 3: - sort_item = tw->menuitem.sort_type; + g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); + + be.type = GDK_BUTTON_PRESS; + be.window = se->window; + be.send_event = se->send_event; + be.time = se->time; + be.x = se->x; + be.y = se->y; + be.axes = NULL; + be.state = se->state; + be.device = se->device; + be.x_root = se->x_root; + be.y_root = se->y_root; + switch ((se)->direction) { + case GDK_SCROLL_UP: + be.button = 4; break; - case 5: - sort_item = tw->menuitem.sort_access; + case GDK_SCROLL_DOWN: + be.button = 5; break; - case 6: - sort_item = tw->menuitem.sort_time; + case GDK_SCROLL_LEFT: + be.button = 6; break; - case 7: - sort_item = tw->menuitem.sort_change; + case GDK_SCROLL_RIGHT: + be.button = 7; break; default: - return; - } - - if (!sort_item) return; - - if (GTK_CHECK_MENU_ITEM(sort_item)->active) { - gtk_check_menu_item_set_active - (GTK_CHECK_MENU_ITEM(tw->menuitem.sort_rev), - !GTK_CHECK_MENU_ITEM(tw->menuitem.sort_rev)->active); - } else { - gtk_check_menu_item_set_active - (GTK_CHECK_MENU_ITEM(sort_item), TRUE); + g_warning ("invalid scroll direction!"); + be.button = 0; + break; } -} - - -static void -cb_select_row (GtkCList *clist, gint row, gint column, - GdkEventButton *event, gpointer user_data) -{ - GimvThumbView *tv = user_data; - GimvThumb *thumb; - GList *node; - g_return_if_fail (tv); - if (!tv->thumblist) return; + retval = cb_treeview_button_press (widget, &be, tv); - node = g_list_nth (tv->thumblist, row); - thumb = node->data; + be.type = GDK_BUTTON_RELEASE; + retval = cb_treeview_button_release (widget, &be, tv); - if (thumb) { - thumb->selected = TRUE; - } + return retval; } static void -cb_unselect_row (GtkCList *clist, gint row, gint column, - GdkEventButton *event, gpointer user_data) +cb_treeview_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, gint y, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data) { - GimvThumbView *tv = user_data; - GimvThumb *thumb; - GList *node; - - g_return_if_fail (tv); - if (!tv->thumblist) return; - - node = g_list_nth (tv->thumblist, row); - thumb = node->data; + gimv_thumb_view_drag_data_received_cb (widget, context, x, y, + seldata, info, time, data); - if (thumb) { - thumb->selected = FALSE; - } + /* F*ck! */ + g_signal_stop_emission_by_name (G_OBJECT (widget), "drag_data_received"); } -#if 0 static void -cb_drag_motion (GtkWidget *clist, GdkDragContext *context, - gint x, gint y, gint time, gpointer data) +cb_column_clicked (GtkTreeViewColumn *column, GimvThumbView *tv) { - ThumbView *tv = data; + GimvThumbWin *tw; DetailViewData *tv_data; - GimvThumb *thumb; - gint row, on_row; - - g_return_if_fail (tv); - - on_row = gtk_clist_get_selection_info (GTK_CLIST (clist), - x, y, &row, NULL); - if (!on_row) return; - - thumb = gtk_clist_get_row_data (GTK_CLIST (clist), row); - if (!thumb) return; - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - if (!tv_data) return; - - /* hilight row under cursor */ - if (thumb && gimv_thumb_is_dir (thumb) && tv_data->hilit_dir != row) { - if (tv_data->hilit_dir != -1) { - gtk_clist_set_foreground (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->fg[GTK_STATE_NORMAL])); - gtk_clist_set_background (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->base[GTK_STATE_NORMAL])); - } - - tv_data->hilit_dir = row; - - gtk_clist_set_foreground (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->fg[GTK_STATE_SELECTED])); - gtk_clist_set_background (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->bg[GTK_STATE_SELECTED])); - } -} + GList *col_list, *node; + gint col, idx; + GimvSortItem sort_item, current_item; + GimvSortFlag sort_flag = 0, current_flag; + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); -static void -cb_drag_leave (GtkWidget *clist, GdkDragContext *context, guint time, - gpointer data) -{ - ThumbView *tv = data; - DetailViewData *tv_data; + if (tv->progress) return; - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - if (!tv_data) return; + tw = tv->tw; + g_return_if_fail (GIMV_IS_THUMB_WIN (tw)); - gtk_clist_set_foreground (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->fg[GTK_STATE_NORMAL])); - gtk_clist_set_background (GTK_CLIST (clist), tv_data->hilit_dir, - &(clist->style->base[GTK_STATE_NORMAL])); - tv_data->hilit_dir = -1; -} -#endif + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_if_fail (tv_data && tv_data->treeview); + col_list = gtk_tree_view_get_columns (GTK_TREE_VIEW (tv_data->treeview)); + col = g_list_index (col_list, column); -static void -cb_drag_data_received (GtkWidget *clist, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ -#if 0 - ThumbView *tv = data; - GimvThumb *thumb; - gint row, on_row; + node = g_list_nth (detailview_title_idx_list, col - 1); + if (!node) return; - g_return_if_fail (tv); + idx = GPOINTER_TO_INT (node->data); - on_row = gtk_clist_get_selection_info (GTK_CLIST (clist), - x, y, &row, NULL); - if (!on_row) return; + switch (idx) { + case 1: + sort_item = GIMV_SORT_NAME; + break; + case 2: + sort_item = GIMV_SORT_SIZE; + break; + case 3: + sort_item = GIMV_SORT_TYPE; + break; + case 5: + sort_item = GIMV_SORT_ATIME; + break; + case 6: + sort_item = GIMV_SORT_MTIME; + break; + case 7: + sort_item = GIMV_SORT_CTIME; + break; + default: + return; + } - thumb = gtk_clist_get_row_data (GTK_CLIST (clist), row); - if (!thumb) return; + current_item = gimv_thumb_win_get_sort_type (tw, ¤t_flag); - if (gimv_thumb_is_dir (thumb)) - tv->dnd_destdir = gimv_thumb_get_image_name (thumb); -#endif + if (current_item == sort_item) { + if (current_flag & GIMV_SORT_REVERSE) + sort_flag &= ~GIMV_SORT_REVERSE; + else + sort_flag |= GIMV_SORT_REVERSE; + } - gimv_thumb_view_drag_data_received_cb (clist, context, x, y, - seldata, info, time, data); + gimv_thumb_win_sort_thumbnail (tw, sort_item, sort_flag, + GIMV_THUMB_WIN_CURRENT_PAGE); } - /****************************************************************************** * * private functions. @@ -813,22 +912,21 @@ detailview_new (GimvThumbView *tv) { DetailViewData *tv_data; - gint i, num; - g_return_val_if_fail (tv, NULL); + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); if (!tv_data) { tv_data = g_new0 (DetailViewData, 1); - tv_data->clist = NULL; - num = sizeof (tv_data->page_pos_x) / sizeof (tv_data->page_pos_x[0]); - for (i = 0; i < num; i++) { - tv_data->page_pos_x[i] = 0; - tv_data->page_pos_y[i] = 0; - } - tv_data->hilit_dir = -1; - gtk_object_set_data_full (GTK_OBJECT (tv), DETAIL_VIEW_LABEL, tv_data, - (GtkDestroyNotify) g_free); + tv_data->treeview = NULL; + tv_data->dragging = FALSE; + tv_data->press_button = -1; + tv_data->press_mask = -1; + tv_data->press_x = -1; + tv_data->press_y = -1; + tv_data->set_selection = FALSE; + g_object_set_data_full (G_OBJECT (tv), DETAIL_VIEW_LABEL, tv_data, + (GDestroyNotify) g_free); } return tv_data; @@ -836,19 +934,106 @@ static void +set_column_types (GimvThumbView *tv, DetailViewData *tv_data, + GtkListStore *store, const gchar *dest_mode) +{ + GtkTreeViewColumn *col; + GtkCellRenderer *render; + GList *node; + gint i, xpad, ypad; + + /* pixmap column */ + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title (col, ""); + /* gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); */ + /* gtk_tree_view_column_set_resizable(col, TRUE); */ + + render = gimv_cell_renderer_pixmap_new (); + xpad = GTK_CELL_RENDERER (render)->xpad; + ypad = GTK_CELL_RENDERER (render)->xpad; + + if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { + gint xsize = ICON_SIZE + xpad * 2, ysize = ICON_SIZE + ypad * 2; + gtk_cell_renderer_set_fixed_size (render, xsize, ysize); + } + + if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { + gint xsize = tv->thumb_size + xpad * 2; + gint ysize = tv->thumb_size + ypad * 2; + gtk_cell_renderer_set_fixed_size (render, xsize, ysize); + } + + gtk_tree_view_column_pack_start (col, render, FALSE); + gtk_tree_view_column_add_attribute (col, render, + "pixmap", COLUMN_PIXMAP); + gtk_tree_view_column_add_attribute (col, render, + "mask", COLUMN_MASK); + + gtk_tree_view_append_column (GTK_TREE_VIEW (tv_data->treeview), col); + + + /* other column */ + for (node = detailview_title_idx_list, i = N_COLUMN; + node; + node = g_list_next (node), i++) + { + gint idx = GPOINTER_TO_INT (node->data); + + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title (col, _(detailview_columns[idx].title)); + gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width (col, detailview_columns[idx].width); + gtk_tree_view_column_set_resizable(col, TRUE); + + render = gtk_cell_renderer_text_new (); + switch (detailview_columns[idx].justification) { + case GTK_JUSTIFY_CENTER: + g_object_set(G_OBJECT(render), "xalign", 0.5, NULL); + gtk_tree_view_column_set_alignment(col, 0.5); + break; + case GTK_JUSTIFY_RIGHT: + g_object_set(G_OBJECT(render), "xalign", 1.0, NULL); + gtk_tree_view_column_set_alignment(col, 0.5); + break; + case GTK_JUSTIFY_LEFT: + g_object_set(G_OBJECT(render), "xalign", 0.0, NULL); + break; + default: + break; + } + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, + "text", i); + if (!strcmp (detailview_columns[idx].title, "Name")) { + /* + gtk_tree_view_column_add_attribute (col, render, + "editable", COLUMN_EDITABLE); + */ + } + + gtk_tree_view_append_column (GTK_TREE_VIEW (tv_data->treeview), col); + + gtk_tree_view_column_set_clickable (col, TRUE); + g_signal_connect (G_OBJECT (col), "clicked", + G_CALLBACK (cb_column_clicked), tv); + } +} + + +static void detailview_set_pixmaps (GimvThumbView *tv, const gchar *dest_mode) { GimvThumb *thumb; GList *node; gint i, num; - if (!tv) return; + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); node = g_list_first (tv->thumblist); num = g_list_length (node); /* set images */ - for ( i = 0 ; i < num ; i++ ) { + for (i = 0 ; i < num ; i++) { thumb = node->data; detailview_update_thumbnail (tv, thumb, dest_mode); node = g_list_next (node); @@ -865,28 +1050,12 @@ void detailview_freeze (GimvThumbView *tv) { - DetailViewData *tv_data; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->clist); - - gtk_clist_freeze (GTK_CLIST (tv_data->clist)); } void detailview_thaw (GimvThumbView *tv) { - DetailViewData *tv_data; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->clist); - - gtk_clist_thaw (GTK_CLIST (tv_data->clist)); } @@ -895,57 +1064,55 @@ const gchar *dest_mode) { DetailViewData *tv_data; + GtkTreeModel *model; GList *data_node; - gint j, colnum; - gchar **image_data; - gint pos; + gint j, pos, colnum; + GtkTreeIter iter; g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->clist); + pos = g_list_index (tv->thumblist, thumb); + colnum = detailview_title_idx_list_num + N_COLUMN; - colnum = detailview_title_idx_list_num + 1; - image_data = g_malloc0 (sizeof (gchar *) * colnum); + tv_data = g_object_get_data (G_OBJECT(tv), DETAIL_VIEW_LABEL); + g_return_if_fail (tv_data && tv_data->treeview); - pos = g_list_index (tv->thumblist, thumb); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + + gtk_list_store_insert (GTK_LIST_STORE (model), &iter, pos); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_THUMB_DATA, thumb, + COLUMN_TERMINATOR); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_EDITABLE, TRUE, + COLUMN_TERMINATOR); - image_data[0] = NULL; data_node = detailview_title_idx_list; - for (j = 1; j < colnum && data_node; j++) { + for (j = N_COLUMN; + j < colnum && data_node; + j++, data_node = g_list_next (data_node)) + { gint idx = GPOINTER_TO_INT (data_node->data); - if (detailview_columns[idx].func) { - image_data[j] = detailview_columns[idx].func (thumb); - } else { - image_data[j] = NULL; - } - data_node = g_list_next (data_node); - } + gchar *text = NULL; - gtk_clist_insert (GTK_CLIST (tv_data->clist), pos, image_data); - gtk_clist_set_row_data (GTK_CLIST (tv_data->clist), pos, thumb); + if (detailview_columns[idx].func) + text = detailview_columns[idx].func (thumb); - if (thumb->selected) - gtk_clist_select_row (GTK_CLIST (tv_data->clist), pos, -1); - else - gtk_clist_unselect_row (GTK_CLIST (tv_data->clist), pos, -1); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + j, text, + COLUMN_TERMINATOR); - data_node = detailview_title_idx_list; - for (j = 1; j < colnum && data_node; j++) { - gint idx = GPOINTER_TO_INT (data_node->data); - if (detailview_columns[idx].free && image_data[j]) { - g_free (image_data[j]); - } - image_data[j] = NULL; - data_node = g_list_next (data_node); + if (detailview_columns[idx].free && text) + g_free (text); } - g_free (image_data); + detailview_set_selection (tv, thumb, thumb->selected); } void -detailview_update_thumbnail (GimvThumbView *tv, GimvThumb *thumb, +detailview_update_thumbnail (GimvThumbView *tv, GimvThumb *thumb, const gchar *dest_mode) { DetailViewData *tv_data; @@ -953,14 +1120,17 @@ GdkBitmap *mask; GList *node; gint pos, row, col, i; + GtkTreeModel *model; + GtkTreeIter iter; g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); g_return_if_fail (GIMV_IS_THUMB (thumb)); - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->clist); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_if_fail (tv_data && tv_data->treeview); - pos = g_list_index (tv->thumblist, thumb); + node = g_list_find (tv->thumblist, thumb); + pos = g_list_position (tv->thumblist, node); row = pos; col = 0; @@ -974,12 +1144,16 @@ if (!pixmap) return; - gtk_clist_set_pixmap (GTK_CLIST (tv_data->clist), - row, col, pixmap, mask); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_PIXMAP, pixmap, + COLUMN_MASK, mask, + COLUMN_TERMINATOR); /* reset column data */ node = detailview_title_idx_list; - for (i = 1, node = detailview_title_idx_list; + for (i = N_COLUMN, node = detailview_title_idx_list; node; i++, node = g_list_next (node)) { @@ -990,9 +1164,9 @@ str = detailview_columns[idx].func (thumb); - gtk_clist_set_text (GTK_CLIST (tv_data->clist), - row, i, - str); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + i, str, + COLUMN_TERMINATOR); if (detailview_columns[idx].free) g_free (str); @@ -1029,18 +1203,23 @@ detailview_remove_thumbnail (GimvThumbView *tv, GimvThumb *thumb) { DetailViewData *tv_data; + GtkTreeModel *model; + GtkTreeIter iter; gint pos; g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); g_return_if_fail (GIMV_IS_THUMB (thumb)); - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); g_return_if_fail (tv_data); pos = g_list_index (tv->thumblist, thumb); if (pos < 0) return; - gtk_clist_remove (GTK_CLIST (tv_data->clist), pos); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, pos)) + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } @@ -1050,20 +1229,31 @@ DetailViewData *tv_data; GList *node; gint pos; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; - g_return_if_fail (tv); + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); node = g_list_find (gimv_thumb_view_get_list(), tv); if (!node) return; - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); g_return_if_fail (tv_data); - node = g_list_find (tv->thumblist, thumb); - if (!node) return; - pos = g_list_position (tv->thumblist, node); + pos = g_list_index (tv->thumblist, thumb); + if (pos < 0) return; - gtk_clist_moveto (GTK_CLIST (tv_data->clist), pos, 0, 0, 0); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); + if (success) { + GtkTreePath *treepath; + treepath = gtk_tree_model_get_path (model, &iter); + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tv_data->treeview), + treepath, NULL, + TRUE, 0.0, 0.0); + gtk_tree_path_free (treepath); + } } @@ -1071,6 +1261,7 @@ detailview_set_selection (GimvThumbView *tv, GimvThumb *thumb, gboolean select) { DetailViewData *tv_data; + GList *node; gint pos; g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); @@ -1078,17 +1269,30 @@ if (g_list_length (tv->thumblist) < 1) return FALSE; - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data && tv_data->clist, FALSE); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data && tv_data->treeview, FALSE); - pos = g_list_index (tv->thumblist, thumb); + node = g_list_find (tv->thumblist, thumb); + pos = g_list_position (tv->thumblist, node); + + if (pos >= 0) { + GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); + GtkTreeModel *model = gtk_tree_view_get_model (treeview); + GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); + GtkTreeIter iter; + gboolean found; + + found = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); + if (!found) return TRUE; - if (pos >= 0) { thumb->selected = select; - if (thumb->selected) - gtk_clist_select_row (GTK_CLIST (tv_data->clist), pos, -1); - else - gtk_clist_unselect_row (GTK_CLIST (tv_data->clist), pos, -1); + tv_data->set_selection = TRUE; + if (thumb->selected) { + gtk_tree_selection_select_iter (selection, &iter); + } else { + gtk_tree_selection_unselect_iter (selection, &iter); + } + tv_data->set_selection = FALSE; } return TRUE; @@ -1100,198 +1304,224 @@ { DetailViewData *tv_data; gint pos; - GtkCList *clist; - g_return_if_fail (tv); + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + if (g_list_length (tv->thumblist) < 1) return; - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_if_fail (tv_data && tv_data->clist); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_if_fail (tv_data && tv_data->treeview); pos = g_list_index (tv->thumblist, thumb); - clist = GTK_CLIST (tv_data->clist); - - clist->anchor = pos; - clist->focus_row = pos; -#ifdef USE_GTK2 - GTK_CLIST_GET_CLASS (clist)->refresh (clist); -#else /* USE_GTK2 */ - GTK_CLIST_CLASS (GTK_OBJECT (clist)->klass)->refresh (clist); -#endif /* USE_GTK2 */ + if (pos >= 0) { + GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); + GtkTreeModel *model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + GtkTreePath *path; + gboolean found; + + found = gtk_tree_model_iter_nth_child (model, &iter, NULL, pos); + if (!found) return; + path = gtk_tree_model_get_path (model, &iter); + gtk_tree_view_set_cursor (treeview, path, NULL, FALSE); + gtk_tree_path_free (path); + } else { + gtk_widget_grab_focus (tv_data->treeview); + } } GimvThumb * detailview_get_focus (GimvThumbView *tv) { + GimvThumb *thumb = NULL; DetailViewData *tv_data; - gint pos; - GtkCList *clist; - GList *node; - g_return_val_if_fail (tv, NULL); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); - g_return_val_if_fail (tv_data && tv_data->clist, NULL); - - clist = GTK_CLIST (tv_data->clist); + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + if (g_list_length (tv->thumblist) < 1) return NULL; - pos = clist->focus_row; - if (pos < 0) return NULL; + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); + g_return_val_if_fail (tv_data && tv_data->treeview, NULL); - node = g_list_nth (tv->thumblist, pos); - if (node) - return node->data; + { + GtkTreeView *treeview = GTK_TREE_VIEW (tv_data->treeview); + GtkTreeModel *model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + GtkTreePath *path; + + gtk_tree_view_get_cursor (treeview, &path, NULL); + if (path) { + if (gtk_tree_model_get_iter (model, &iter, path)) + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &thumb, + COLUMN_TERMINATOR); + gtk_tree_path_free (path); + } + } - return NULL; + return thumb; } -#define CELL_SPACING 1 gboolean detailview_thumbnail_is_in_viewport (GimvThumbView *tv, GimvThumb *thumb) { DetailViewData *tv_data; GList *node; - gint row; - GtkCList *clist; - GdkRectangle area, row_area, intersect_area; + gint row, row_top, row_bottom; + GdkRectangle area; + + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreePath *treepath; + GimvThumb *tmp_thumb; + gboolean success; - g_return_val_if_fail (tv, FALSE); + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); g_return_val_if_fail (tv_data, FALSE); - clist = GTK_CLIST (tv_data->clist); node = g_list_find (tv->thumblist, thumb); row = g_list_position (tv->thumblist, node); /* widget area */ - gtkutil_get_widget_area (tv_data->clist, &area); + gtkutil_get_widget_area (tv_data->treeview, &area); + + /* get row range */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv_data->treeview)); - /* row area */ - row_area.x = 0; - row_area.y = (clist->row_height * (row + 1)) - + ((row + 1) * CELL_SPACING) - + clist->voffset; - row_area.width = area.width; - row_area.height = clist->row_height + CELL_SPACING * 2; + if (!GTK_WIDGET_MAPPED (tv_data->treeview)) return FALSE; + + /* get index of top row */ + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + 0, 0, &treepath, NULL, NULL, NULL); + if (!success) return FALSE; + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &tmp_thumb, + COLUMN_TERMINATOR); + row_top = g_list_index (tv->thumblist, tmp_thumb); + gtk_tree_path_free (treepath); + + /* get index of bottom row */ + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tv_data->treeview), + 0, area.height, &treepath, + NULL, NULL, NULL); + if (!success) return FALSE; + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_THUMB_DATA, &tmp_thumb, + COLUMN_TERMINATOR); + row_bottom = g_list_index (tv->thumblist, tmp_thumb); + gtk_tree_path_free (treepath); /* intersect? */ - if (gdk_rectangle_intersect (&area, &row_area, &intersect_area)) + if (row >= row_top && row <= row_bottom) return TRUE; else return FALSE; } -#undef CELL_SPACING GtkWidget * detailview_create (GimvThumbView *tv, const gchar *dest_mode) { - gint i, num; DetailViewData *tv_data; - GList *node; + GtkListStore *store; + GtkTreeSelection *selection; + GType types[128]; + const gint ntypes = sizeof (types) / sizeof (GType); + gint i, ncolumns; gboolean show_title; - g_return_val_if_fail (tv, NULL); + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + + detailview_create_title_idx_list (); + ncolumns = detailview_title_idx_list_num + N_COLUMN; + if (ncolumns > ntypes) { + g_warning("Too many columns are specified: %d\n", ncolumns - N_COLUMN); + ncolumns = ntypes; + } - tv_data = gtk_object_get_data (GTK_OBJECT (tv), DETAIL_VIEW_LABEL); + tv_data = g_object_get_data (G_OBJECT (tv), DETAIL_VIEW_LABEL); if (!tv_data) { tv_data = detailview_new (tv); g_return_val_if_fail (tv_data, NULL); } - detailview_create_title_idx_list (); - - /* create clist widget */ - num = detailview_title_idx_list_num + 1; - tv_data->clist = gtk_clist_new (num); - - if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->clist, "DetailIconMode"); - } - if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->clist, "DetailThumbMode"); - } - - gtk_clist_set_selection_mode(GTK_CLIST (tv_data->clist), - GTK_SELECTION_MULTIPLE); - gtk_clist_set_button_actions (GTK_CLIST (tv_data->clist), 0, GTK_BUTTON_IGNORED); - gtk_clist_set_shadow_type (GTK_CLIST (tv_data->clist), GTK_SHADOW_OUT); - /* gtk_clist_set_button_actions (GTK_CLIST (clist), 0, GTK_BUTTON_SELECTS); */ - gtk_widget_show (tv_data->clist); - - gtk_signal_connect_after (GTK_OBJECT (tv_data->clist), "key-press-event", - GTK_SIGNAL_FUNC (cb_clist_key_press), tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->clist),"button_press_event", - GTK_SIGNAL_FUNC (cb_clist_button_press), tv); - SIGNAL_CONNECT_TRANSRATE_SCROLL (tv_data->clist); - gtk_signal_connect_after (GTK_OBJECT (tv_data->clist),"button_release_event", - GTK_SIGNAL_FUNC (cb_clist_button_release), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist),"motion_notify_event", - GTK_SIGNAL_FUNC (cb_clist_motion_notify), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "click_column", - GTK_SIGNAL_FUNC (cb_click_column), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "select-row", - GTK_SIGNAL_FUNC (cb_select_row), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "unselect-row", - GTK_SIGNAL_FUNC (cb_unselect_row), tv); - /* for drop file list */ - dnd_src_set (tv_data->clist, detailview_dnd_targets, detailview_dnd_targets_num); - dnd_dest_set (tv_data->clist, detailview_dnd_targets, detailview_dnd_targets_num); - - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_begin", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_begin_cb), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_data_get", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_data_get_cb), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_data_received", - GTK_SIGNAL_FUNC (cb_drag_data_received), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag-data-delete", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_data_delete_cb), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_end", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_end_cb), tv); -#if 0 - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_motion", - GTK_SIGNAL_FUNC (cb_drag_motion), tv); - gtk_signal_connect (GTK_OBJECT (tv_data->clist), "drag_leave", - GTK_SIGNAL_FUNC (cb_drag_leave), tv); -#endif - gtk_object_set_data (GTK_OBJECT (tv_data->clist), "gimv-tab", tv); + /* create tree view widget */ + store = gtk_list_store_new (1, G_TYPE_STRING); /* this column is dummy */ - gtk_clist_set_use_drag_icons (GTK_CLIST (tv_data->clist), FALSE); + /* set real columns */ + for (i = 0; i < ncolumns; i++) + types[i] = G_TYPE_STRING; + types[COLUMN_THUMB_DATA] = G_TYPE_POINTER; + types[COLUMN_PIXMAP] = GDK_TYPE_PIXMAP; + types[COLUMN_MASK] = GDK_TYPE_PIXMAP; + types[COLUMN_EDITABLE] = G_TYPE_BOOLEAN; + gtk_list_store_set_column_types (store, ncolumns, types); - for (i = 0; i < num; i++) { - gtk_clist_set_column_auto_resize (GTK_CLIST (tv_data->clist), i, TRUE); - } - - /* set column titles */ - node = detailview_title_idx_list; - for (i = 1; node; i++) { - gint idx = GPOINTER_TO_INT (node->data); - gtk_clist_set_column_title (GTK_CLIST (tv_data->clist), - i, _(detailview_columns[idx].title)); - gtk_clist_set_column_justification(GTK_CLIST (tv_data->clist), i, - detailview_columns[idx].justification); - node = g_list_next (node); - } + tv_data->treeview + = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tv_data->treeview), TRUE); + set_column_types (tv, tv_data, store, dest_mode); detailview_prefs_get_value ("show_title", (gpointer) &show_title); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tv_data->treeview), + show_title); - if (show_title) - gtk_clist_column_titles_show (GTK_CLIST (tv_data->clist)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_data->treeview)); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + gtk_tree_selection_set_select_function (selection, + cb_tree_selected, + tv, NULL); if (!strcmp (DETAIL_ICON_LABEL, dest_mode)) { - gtk_clist_set_column_width (GTK_CLIST(tv_data->clist), 0, ICON_SIZE); - gtk_clist_set_row_height (GTK_CLIST(tv_data->clist), ICON_SIZE); + gtk_widget_set_name (tv_data->treeview, "DetailIconMode"); } if (!strcmp (DETAIL_THUMB_LABEL, dest_mode)) { - gtk_clist_set_column_width (GTK_CLIST (tv_data->clist), 0, tv->thumb_size); - gtk_clist_set_row_height (GTK_CLIST (tv_data->clist), tv->thumb_size); + gtk_widget_set_name (tv_data->treeview, "DetailThumbMode"); } + gtk_widget_show (tv_data->treeview); + + g_signal_connect (G_OBJECT (tv_data->treeview), + "key-press-event", + G_CALLBACK (cb_treeview_key_press), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), + "button-press-event", + G_CALLBACK (cb_treeview_button_press), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), + "scroll-event", + G_CALLBACK (cb_treeview_scroll), tv); + /* SIGNAL_CONNECT_TRANSRATE_SCROLL (tv_data->treeview); */ + g_signal_connect (G_OBJECT (tv_data->treeview), + "button-release-event", + G_CALLBACK (cb_treeview_button_release), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), + "motion-notify-event", + G_CALLBACK (cb_treeview_motion_notify), tv); + + /* for drop file list */ + dnd_src_set (tv_data->treeview, detailview_dnd_targets, detailview_dnd_targets_num); + dnd_dest_set (tv_data->treeview, detailview_dnd_targets, detailview_dnd_targets_num); + + g_signal_connect (G_OBJECT (tv_data->treeview), "drag_begin", + G_CALLBACK (gimv_thumb_view_drag_begin_cb), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), "drag_data_get", + G_CALLBACK (gimv_thumb_view_drag_data_get_cb), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), "drag_data_received", + G_CALLBACK (cb_treeview_drag_data_received), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), "drag-data-delete", + G_CALLBACK (gimv_thumb_view_drag_data_delete_cb), tv); + g_signal_connect (G_OBJECT (tv_data->treeview), "drag_end", + G_CALLBACK (gimv_thumb_view_drag_end_cb), tv); + g_object_set_data (G_OBJECT (tv_data->treeview), "gimv-tab", tv); + + /* set data */ if (tv->thumblist) { GList *node; @@ -1301,7 +1531,5 @@ detailview_set_pixmaps (tv, dest_mode); } - return tv_data->clist; + return tv_data->treeview; } - -#endif /* ENABLE_TREEVIEW */ diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview.h gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview.h --- gimageview-0.2.27/plugins/thumbnail_view/detailview.h 2004-09-21 08:44:29.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: detailview.h,v 1.11 2004/09/21 08:44:29 makeinu Exp $ + * $Id: detailview.h 1036 2004-09-21 08:44:33Z makeinu $ */ #ifndef __DETAILVIEW_H__ diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview_prefs.c gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_prefs.c --- gimageview-0.2.27/plugins/thumbnail_view/detailview_prefs.c 2004-05-23 14:08:12.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_prefs.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,12 +18,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: detailview_prefs.c,v 1.2 2003/06/13 09:43:16 makeinu Exp $ + * $Id: detailview_prefs.c 1120 2007-10-12 16:31:37Z makeinu $ */ #include "detailview_prefs.h" -#include "intl.h" #include "gimv_prefs_win.h" #include "gimv_prefs_ui_utils.h" #include "detailview.h" diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview_prefs.h gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_prefs.h --- gimageview-0.2.27/plugins/thumbnail_view/detailview_prefs.h 2004-05-23 14:08:12.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_prefs.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: detailview_prefs.h,v 1.2 2003/06/13 09:43:16 makeinu Exp $ + * $Id: detailview_prefs.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __DETAILVIEW_PREFS_H__ diff -Nru gimageview-0.2.27/plugins/thumbnail_view/detailview_priv.h gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_priv.h --- gimageview-0.2.27/plugins/thumbnail_view/detailview_priv.h 2004-05-23 14:08:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/detailview_priv.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: detailview_priv.h,v 1.3 2003/06/18 09:26:54 makeinu Exp $ + * $Id: detailview_priv.h 939 2003-06-18 09:26:56Z makeinu $ */ #ifndef __DETAILVIEW_PRIVATE_H__ diff -Nru gimageview-0.2.27/plugins/thumbnail_view/Makefile.am gimageview-0.3.0-0.20101117/plugins/thumbnail_view/Makefile.am --- gimageview-0.2.27/plugins/thumbnail_view/Makefile.am 2004-05-23 14:08:12.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,5 +1,7 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +CLEANFILES = *~ .*.swp .*.swo + if PLATFORM_WIN32 no_undefined = -no-undefined GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv @@ -20,5 +22,5 @@ libgimv_thumbview_detail_la_LIBADD = $(GTK_LIBS) libgimv_thumbview_detail_la_SOURCES = \ detailview_prefs.c detailview_prefs.h \ - detailview.c detailview2.c detailview.h \ + detailview.c detailview.h \ detailview_priv.h diff -Nru gimageview-0.2.27/plugins/thumbnail_view/Makefile.in gimageview-0.3.0-0.20101117/plugins/thumbnail_view/Makefile.in --- gimageview-0.2.27/plugins/thumbnail_view/Makefile.in 2004-12-28 04:01:30.000000000 +0000 +++ gimageview-0.3.0-0.20101117/plugins/thumbnail_view/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,626 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_thumbview_detail_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = plugins/thumbnail_view -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(thumbview_plugindir)" -thumbview_pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(thumbview_plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_thumbview_detail_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_thumbview_detail_la_OBJECTS = detailview_prefs.lo \ - detailview.lo detailview2.lo -libgimv_thumbview_detail_la_OBJECTS = \ - $(am_libgimv_thumbview_detail_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/detailview.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/detailview2.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/detailview_prefs.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_thumbview_detail_la_SOURCES) -DIST_SOURCES = $(libgimv_thumbview_detail_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -@PLATFORM_WIN32_TRUE@GIMV_LIBS = -L$(top_builddir)/src -Wl,-lgimv -thumbview_plugin_LTLIBRARIES = \ - libgimv_thumbview_detail.la - -thumbview_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_VIEW_PLUGIN_DIR) -INCLUDES = \ - $(GTK_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -libgimv_thumbview_detail_la_LDFLAGS = \ - -module -avoid-version $(no_undefined) $(GIMV_LIBS) - -libgimv_thumbview_detail_la_LIBADD = $(GTK_LIBS) -libgimv_thumbview_detail_la_SOURCES = \ - detailview_prefs.c detailview_prefs.h \ - detailview.c detailview2.c detailview.h \ - detailview_priv.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/thumbnail_view/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/thumbnail_view/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-thumbview_pluginLTLIBRARIES: $(thumbview_plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(thumbview_plugindir)" || $(mkdir_p) "$(DESTDIR)$(thumbview_plugindir)" - @list='$(thumbview_plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(thumbview_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thumbview_plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(thumbview_pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thumbview_plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-thumbview_pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(thumbview_plugin_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thumbview_plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thumbview_plugindir)/$$p"; \ - done - -clean-thumbview_pluginLTLIBRARIES: - -test -z "$(thumbview_plugin_LTLIBRARIES)" || rm -f $(thumbview_plugin_LTLIBRARIES) - @list='$(thumbview_plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_thumbview_detail.la: $(libgimv_thumbview_detail_la_OBJECTS) $(libgimv_thumbview_detail_la_DEPENDENCIES) - $(LINK) -rpath $(thumbview_plugindir) $(libgimv_thumbview_detail_la_LDFLAGS) $(libgimv_thumbview_detail_la_OBJECTS) $(libgimv_thumbview_detail_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/detailview.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/detailview2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/detailview_prefs.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(thumbview_plugindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool \ - clean-thumbview_pluginLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-thumbview_pluginLTLIBRARIES - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-thumbview_pluginLTLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-thumbview_pluginLTLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-thumbview_pluginLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-thumbview_pluginLTLIBRARIES - -# 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: Binary files /tmp/_fC1Glvxqt/gimageview-0.2.27/po/fr.gmo and /tmp/XIUpKTSmVp/gimageview-0.3.0-0.20101117/po/fr.gmo differ diff -Nru gimageview-0.2.27/po/fr.po gimageview-0.3.0-0.20101117/po/fr.po --- gimageview-0.2.27/po/fr.po 2004-12-28 04:33:45.000000000 +0000 +++ gimageview-0.3.0-0.20101117/po/fr.po 2010-11-17 06:10:11.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-28 13:33+0900\n" +"POT-Creation-Date: 2004-10-04 04:09+0900\n" "PO-Revision-Date: 2003-01-07 22:00GMT\n" "Last-Translator: Migrec \n" "Language-Team: français \n" @@ -175,8 +175,8 @@ #: src/gimv_image_view.c:286 src/gimv_image_view.c:303 #: src/gimv_image_view.c:337 src/gimv_image_view.c:339 #: src/gimv_image_win.c:308 src/gimv_image_win.c:318 src/gimv_image_win.c:320 -#: src/gimv_thumb_win.c:467 src/gimv_thumb_win.c:483 src/gimv_thumb_win.c:498 -#: src/gimv_thumb_win.c:518 src/gimv_thumb_win.c:520 src/gimv_thumb_view.c:185 +#: src/gimv_thumb_win.c:444 src/gimv_thumb_win.c:450 src/gimv_thumb_win.c:465 +#: src/gimv_thumb_win.c:485 src/gimv_thumb_win.c:487 src/gimv_thumb_view.c:185 #: src/gimv_thumb_view.c:188 src/gimv_thumb_view.c:194 msgid "/---" msgstr "/---" @@ -227,7 +227,7 @@ #: src/gtkutils.c:460 src/prefs_ui/prefs_ui_common.c:182 #: src/prefs_ui/prefs_ui_etc.c:194 src/prefs_ui/prefs_ui_etc.c:200 #: src/prefs_ui/prefs_ui_etc.c:401 src/gimv_thumb_view.c:1016 -#: src/gimv_thumb_view.c:1081 src/gimv_thumb_view.c:2435 +#: src/gimv_thumb_view.c:1081 src/gimv_thumb_view.c:2429 #: plugins/image_view/image_view_xine.c:725 #: plugins/image_view/image_view_xine.c:737 #: plugins/image_view/image_view_xine.c:763 @@ -324,7 +324,7 @@ msgstr "Ouverture des fichiers images en cours..." #. cancel button -#: src/fileload.c:223 src/gimv_thumb_win.c:1609 src/gtk_prop.c:223 +#: src/fileload.c:223 src/gimv_thumb_win.c:1566 src/gtk_prop.c:223 #: src/gtkutils.c:671 msgid "Skip" msgstr "Sauter" @@ -332,7 +332,7 @@ #. stop button #. close button #: src/fileload.c:230 src/gimv_image_view.c:2192 src/gimv_image_view.c:2193 -#: src/gimv_image_win.c:1008 src/gimv_thumb_win.c:1621 src/gimv_dupl_win.c:306 +#: src/gimv_image_win.c:1008 src/gimv_thumb_win.c:1578 src/gimv_dupl_win.c:306 msgid "Stop" msgstr "Arrêter" @@ -460,7 +460,7 @@ "\n" "Ecraser ?" -#: src/gfileutil.c:561 src/gfileutil.c:1012 src/gimv_thumb_view.c:2413 +#: src/gfileutil.c:561 src/gfileutil.c:1012 src/gimv_thumb_view.c:2407 msgid "File exist!!" msgstr "Le fichier existe !!" @@ -1065,11 +1065,11 @@ msgid "Default Image Viewer" msgstr "Echelle par défaut de l'image" -#: src/gimv_image_win.c:273 src/gimv_thumb_win.c:380 +#: src/gimv_image_win.c:273 src/gimv_thumb_win.c:357 msgid "/_File" msgstr "/_Fichier" -#: src/gimv_image_win.c:274 src/gimv_thumb_win.c:381 +#: src/gimv_image_win.c:274 src/gimv_thumb_win.c:358 msgid "/_File/_Open..." msgstr "/_Fichier/_Ouvrir..." @@ -1081,7 +1081,7 @@ msgid "/_File/Open _Thumbnail Window" msgstr "/_Fichier/Ouvrir une fenêtre de vigne_ttes" -#: src/gimv_image_win.c:277 src/gimv_image_win.c:279 src/gimv_thumb_win.c:385 +#: src/gimv_image_win.c:277 src/gimv_image_win.c:279 src/gimv_thumb_win.c:362 msgid "/_File/---" msgstr "/_Fichier/---" @@ -1093,11 +1093,11 @@ msgid "/_File/_Close" msgstr "/_Fichier/Fermer" -#: src/gimv_image_win.c:281 src/gimv_thumb_win.c:388 +#: src/gimv_image_win.c:281 src/gimv_thumb_win.c:365 msgid "/_File/_Quit" msgstr "/_Fichier/_Quitter" -#: src/gimv_image_win.c:283 src/gimv_thumb_win.c:390 +#: src/gimv_image_win.c:283 src/gimv_thumb_win.c:367 msgid "/_Edit" msgstr "/_Edition" @@ -1115,16 +1115,16 @@ msgid "/_Edit/Create _Thumbnail" msgstr "/_Edition/Créer les vigne_ttes" -#: src/gimv_image_win.c:287 src/gimv_thumb_win.c:393 src/gimv_thumb_win.c:397 -#: src/gimv_thumb_win.c:406 +#: src/gimv_image_win.c:287 src/gimv_thumb_win.c:370 src/gimv_thumb_win.c:374 +#: src/gimv_thumb_win.c:383 msgid "/_Edit/---" msgstr "/_Edition/---" -#: src/gimv_image_win.c:288 src/gimv_thumb_win.c:407 +#: src/gimv_image_win.c:288 src/gimv_thumb_win.c:384 msgid "/_Edit/_Options..." msgstr "/_Edition/_Options..." -#: src/gimv_image_win.c:290 src/gimv_thumb_win.c:409 +#: src/gimv_image_win.c:290 src/gimv_thumb_win.c:386 msgid "/_View" msgstr "/_Affichage" @@ -1132,11 +1132,11 @@ msgid "/_Move" msgstr "/_Déplacer" -#: src/gimv_image_win.c:296 src/gimv_thumb_win.c:448 +#: src/gimv_image_win.c:296 src/gimv_thumb_win.c:425 msgid "/_Help" msgstr "/Aide" -#: src/gimv_image_win.c:309 src/gimv_thumb_win.c:487 +#: src/gimv_image_win.c:309 src/gimv_thumb_win.c:454 msgid "/_Menu Bar" msgstr "/Barre de _menu" @@ -1149,7 +1149,7 @@ msgid "/Slide Show _Player" msgstr "/Diaporama" -#: src/gimv_image_win.c:312 src/gimv_thumb_win.c:490 +#: src/gimv_image_win.c:312 src/gimv_thumb_win.c:457 msgid "/St_atus Bar" msgstr "/B_arre d'état" @@ -1157,21 +1157,21 @@ msgid "/_Scroll Bar" msgstr "/Barre de défilement" -#: src/gimv_image_win.c:314 src/gimv_thumb_win.c:493 +#: src/gimv_image_win.c:314 src/gimv_thumb_win.c:460 msgid "/_Player" msgstr "/Lecteur" -#: src/gimv_image_win.c:315 src/gimv_thumb_win.c:494 +#: src/gimv_image_win.c:315 src/gimv_thumb_win.c:461 #, fuzzy msgid "/_Player/_Show" msgstr "/Lecteur" -#: src/gimv_image_win.c:316 src/gimv_thumb_win.c:495 +#: src/gimv_image_win.c:316 src/gimv_thumb_win.c:462 #, fuzzy msgid "/_Player/_Hide" msgstr "/Lecteur" -#: src/gimv_image_win.c:317 src/gimv_thumb_win.c:496 +#: src/gimv_image_win.c:317 src/gimv_thumb_win.c:463 #, fuzzy msgid "/_Player/_Auto" msgstr "/Lecteur" @@ -1180,7 +1180,7 @@ msgid "/_Fit to Image" msgstr "/Adapter à l'image" -#: src/gimv_image_win.c:322 src/gimv_thumb_win.c:500 +#: src/gimv_image_win.c:322 src/gimv_thumb_win.c:467 msgid "/Ma_ximize" msgstr "/Ma_ximiser" @@ -1204,7 +1204,7 @@ msgid "/_Last" msgstr "/Dernier" -#: src/gimv_image_win.c:577 src/gimv_thumb_win.c:751 +#: src/gimv_image_win.c:577 src/gimv_thumb_win.c:713 msgid "New Window" msgstr "Nouvelle fenêtre" @@ -1224,26 +1224,26 @@ msgid "180 degrees" msgstr "" -#: src/gimv_image_win.c:802 src/gimv_thumb_win.c:1550 +#: src/gimv_image_win.c:802 src/gimv_thumb_win.c:1507 msgid "Open" msgstr "Ouvrir" -#: src/gimv_image_win.c:803 src/gimv_image_win.c:804 src/gimv_thumb_win.c:1551 -#: src/gimv_thumb_win.c:1552 +#: src/gimv_image_win.c:803 src/gimv_image_win.c:804 src/gimv_thumb_win.c:1508 +#: src/gimv_thumb_win.c:1509 msgid "File Open" msgstr "Ouvrir un fichier" -#: src/gimv_image_win.c:812 src/gimv_thumb_win.c:1561 +#: src/gimv_image_win.c:812 src/gimv_thumb_win.c:1518 msgid "Prefs" msgstr "Préférences" #: src/gimv_image_win.c:813 src/gimv_image_win.c:814 src/gimv_prefs_win.c:810 -#: src/gimv_thumb_win.c:1562 src/gimv_thumb_win.c:1563 +#: src/gimv_thumb_win.c:1519 src/gimv_thumb_win.c:1520 #: src/prefs_ui/prefs_ui_etc.c:582 msgid "Preference" msgstr "Préférences" -#: src/gimv_image_win.c:824 src/gimv_image_win.c:990 src/gimv_thumb_win.c:1574 +#: src/gimv_image_win.c:824 src/gimv_image_win.c:990 src/gimv_thumb_win.c:1531 msgid "Prev" msgstr "Préc" @@ -1252,7 +1252,7 @@ msgstr "Image précédente" #: src/gimv_image_win.c:836 src/gimv_image_win.c:1017 -#: src/gimv_image_win.c:1018 src/gimv_thumb_win.c:1585 +#: src/gimv_image_win.c:1018 src/gimv_thumb_win.c:1542 msgid "Next" msgstr "Suivant" @@ -1601,7 +1601,7 @@ #. OK Button #. ok buttons #: src/gimv_prefs_win.c:863 src/gtkutils.c:763 src/gtkutils.c:1062 -#: src/help.c:728 src/prefs_ui/prefs_ui_etc.c:149 +#: src/help.c:727 src/prefs_ui/prefs_ui_etc.c:149 msgid "OK" msgstr "OK" @@ -1615,449 +1615,413 @@ msgid "Cancel" msgstr "Annuler" -#: src/gimv_thumb_win.c:382 +#: src/gimv_thumb_win.c:359 msgid "/_File/New _Image Window" msgstr "/_Fichier/Nouvelle fenêtre d'_image" -#: src/gimv_thumb_win.c:383 +#: src/gimv_thumb_win.c:360 msgid "/_File/New _Window" msgstr "/_Fichier/Nou_velle fenêtre" -#: src/gimv_thumb_win.c:384 +#: src/gimv_thumb_win.c:361 msgid "/_File/New _Tab" msgstr "/_Fichier/Nouvel ongle_t" -#: src/gimv_thumb_win.c:386 +#: src/gimv_thumb_win.c:363 msgid "/_File/Close Ta_b" msgstr "/_Fichier/Fermer l'on_glet" -#: src/gimv_thumb_win.c:387 +#: src/gimv_thumb_win.c:364 msgid "/_File/_Close Window" msgstr "/_Fichier/Fermer la fenêtr_e" -#: src/gimv_thumb_win.c:391 +#: src/gimv_thumb_win.c:368 msgid "/_Edit/_Select All" msgstr "/_Edition/Tout _sélectionner" -#: src/gimv_thumb_win.c:392 +#: src/gimv_thumb_win.c:369 msgid "/_Edit/U_nselect All" msgstr "/_Edition/Tout désélectio_nner" -#: src/gimv_thumb_win.c:394 +#: src/gimv_thumb_win.c:371 msgid "/_Edit/_Refresh List" msgstr "/_Edition/_Rafraîchir la liste" -#: src/gimv_thumb_win.c:395 +#: src/gimv_thumb_win.c:372 msgid "/_Edit/Reload _Cache" msgstr "/_Edition/Recharger le _cache" -#: src/gimv_thumb_win.c:396 +#: src/gimv_thumb_win.c:373 msgid "/_Edit/_Update All Thumbnail" msgstr "/_Edition/Act_ualiser toutes les vignettes" #. #. {N_("/_Edit/Clear cache for _this tab"), NULL, cb_clear_cache, CLEAR_CACHE_TAB, NULL}, #. -#: src/gimv_thumb_win.c:401 +#: src/gimv_thumb_win.c:378 msgid "/_Edit/R_ename..." msgstr "/_Edition/R_enommer..." -#: src/gimv_thumb_win.c:402 +#: src/gimv_thumb_win.c:379 msgid "/_Edit/Co_py Files To..." msgstr "/_Edition/Co_pier les fichiers vers..." -#: src/gimv_thumb_win.c:403 +#: src/gimv_thumb_win.c:380 msgid "/_Edit/_Move Files To..." msgstr "/_Edition/Dé_placer les fichiers vers..." -#: src/gimv_thumb_win.c:404 +#: src/gimv_thumb_win.c:381 msgid "/_Edit/_Link Files To..." msgstr "/_Edition/_Lier les fichiers vers..." -#: src/gimv_thumb_win.c:405 +#: src/gimv_thumb_win.c:382 msgid "/_Edit/Remo_ve file..." msgstr "/_Edition/Suppr_imer le fichier..." -#: src/gimv_thumb_win.c:411 src/gimv_thumb_win.c:491 +#: src/gimv_thumb_win.c:388 src/gimv_thumb_win.c:458 msgid "/_Tab" msgstr "/Ongle_t" -#: src/gimv_thumb_win.c:412 +#: src/gimv_thumb_win.c:389 msgid "/_Tab/_Tab Position" msgstr "/Ongle_t/Position de l'ongle_t" -#: src/gimv_thumb_win.c:413 +#: src/gimv_thumb_win.c:390 msgid "/_Tab/_Tab Position/_Top" msgstr "/Ongle_t/Position de l'ongle_t/Hau_t" -#: src/gimv_thumb_win.c:414 +#: src/gimv_thumb_win.c:391 msgid "/_Tab/_Tab Position/_Bottom" msgstr "/Ongle_t/Position de l'ongle_t/_Bas" -#: src/gimv_thumb_win.c:415 +#: src/gimv_thumb_win.c:392 msgid "/_Tab/_Tab Position/_Left" msgstr "/Ongle_t/Position de l'ongle_t/_Gauche" -#: src/gimv_thumb_win.c:416 +#: src/gimv_thumb_win.c:393 msgid "/_Tab/_Tab Position/_Right" msgstr "/Ongle_t/Position de l'ongle_t/D_roite" -#: src/gimv_thumb_win.c:417 src/gimv_thumb_win.c:422 +#: src/gimv_thumb_win.c:394 src/gimv_thumb_win.c:399 msgid "/_Tab/---" msgstr "/Ongle_t/---" -#: src/gimv_thumb_win.c:418 +#: src/gimv_thumb_win.c:395 msgid "/_Tab/_First Page" msgstr "/Ongle_t/_Première page" -#: src/gimv_thumb_win.c:419 +#: src/gimv_thumb_win.c:396 msgid "/_Tab/_Last Page" msgstr "/Ongle_t/_Dernière Page" -#: src/gimv_thumb_win.c:420 +#: src/gimv_thumb_win.c:397 msgid "/_Tab/_Next Page" msgstr "/Ongle_t/Page suiva_nte" -#: src/gimv_thumb_win.c:421 +#: src/gimv_thumb_win.c:398 msgid "/_Tab/_Previous Page" msgstr "/Ongle_t/_Page précédante" -#: src/gimv_thumb_win.c:423 +#: src/gimv_thumb_win.c:400 msgid "/_Tab/Move tab for_ward" msgstr "/Ongle_t/Déplacer l'onglet en a_vant" -#: src/gimv_thumb_win.c:424 +#: src/gimv_thumb_win.c:401 msgid "/_Tab/Move tab _backward" msgstr "/Ongle_t/Déplacer l'onglet e_n arrière" -#: src/gimv_thumb_win.c:425 +#: src/gimv_thumb_win.c:402 msgid "/_Tab/_Detach tab" msgstr "/Ongle_t/_Détacher l'onglet" -#: src/gimv_thumb_win.c:427 +#: src/gimv_thumb_win.c:404 #, fuzzy msgid "/_Action" msgstr "Lieu" -#: src/gimv_thumb_win.c:428 +#: src/gimv_thumb_win.c:405 #, fuzzy msgid "/_Action/_Focus" msgstr "Lieu" -#: src/gimv_thumb_win.c:429 +#: src/gimv_thumb_win.c:406 #, fuzzy msgid "/_Action/_Focus/_Directory View" msgstr "/Vue _du répertoire" -#: src/gimv_thumb_win.c:430 +#: src/gimv_thumb_win.c:407 #, fuzzy msgid "/_Action/_Focus/_Thumbnail View" msgstr "Vue vignettes" -#: src/gimv_thumb_win.c:431 +#: src/gimv_thumb_win.c:408 #, fuzzy msgid "/_Action/_Focus/_Preview" msgstr "/A_perçu" -#: src/gimv_thumb_win.c:432 +#: src/gimv_thumb_win.c:409 msgid "/_Action/_Focus/_Location Entry" msgstr "" -#: src/gimv_thumb_win.c:434 +#: src/gimv_thumb_win.c:411 #, fuzzy msgid "/_Action/_Directory View" msgstr "/Vue _du répertoire" -#: src/gimv_thumb_win.c:435 +#: src/gimv_thumb_win.c:412 #, fuzzy msgid "/_Action/_Thumbnail View" msgstr "Vue vignettes" -#: src/gimv_thumb_win.c:436 +#: src/gimv_thumb_win.c:413 #, fuzzy msgid "/_Action/_Preview" msgstr "/A_perçu" -#: src/gimv_thumb_win.c:437 +#: src/gimv_thumb_win.c:414 #, fuzzy msgid "/_Action/_Preview/_Next" msgstr "/A_perçu" -#: src/gimv_thumb_win.c:438 +#: src/gimv_thumb_win.c:415 #, fuzzy msgid "/_Action/_Preview/_Previous" msgstr "/A_perçu" -#: src/gimv_thumb_win.c:441 +#: src/gimv_thumb_win.c:418 #, fuzzy msgid "/Too_l" msgstr "/Barre d'ou_tils" -#: src/gimv_thumb_win.c:442 +#: src/gimv_thumb_win.c:419 #, fuzzy msgid "/Too_l/_Clear all cache" msgstr "/_Edition/Nettoyer tout le c_ache" -#: src/gimv_thumb_win.c:443 src/gimv_thumb_win.c:445 +#: src/gimv_thumb_win.c:420 src/gimv_thumb_win.c:422 #, fuzzy msgid "/Too_l/---" msgstr "/_Fichier/---" -#: src/gimv_thumb_win.c:444 +#: src/gimv_thumb_win.c:421 #, fuzzy msgid "/Too_l/_Find duplicates" msgstr "/_Edition/Trouver des doublons" -#: src/gimv_thumb_win.c:446 +#: src/gimv_thumb_win.c:423 msgid "/Too_l/_Wallpaper setting" msgstr "" -#: src/gimv_thumb_win.c:456 +#: src/gimv_thumb_win.c:433 msgid "/_Sort File List" msgstr "/Trier la liste de_s fichiers" -#: src/gimv_thumb_win.c:457 +#: src/gimv_thumb_win.c:434 msgid "/_Layout" msgstr "/Disposition" -#: src/gimv_thumb_win.c:458 +#: src/gimv_thumb_win.c:435 msgid "/_Layout/Layout_0" msgstr "/Disposition/Disposition _0" -#: src/gimv_thumb_win.c:459 +#: src/gimv_thumb_win.c:436 msgid "/_Layout/Layout_1" msgstr "/Disposition/Disposition _1" -#: src/gimv_thumb_win.c:460 +#: src/gimv_thumb_win.c:437 msgid "/_Layout/Layout_2" msgstr "/Disposition/Disposition _2" -#: src/gimv_thumb_win.c:461 +#: src/gimv_thumb_win.c:438 msgid "/_Layout/Layout_3" msgstr "/Disposition/Disposition _3" -#: src/gimv_thumb_win.c:462 +#: src/gimv_thumb_win.c:439 msgid "/_Layout/Layout_4" msgstr "/Disposition/Disposition _4" -#: src/gimv_thumb_win.c:463 +#: src/gimv_thumb_win.c:440 msgid "/_Layout/_Custom" msgstr "/Disposition/Personnalisée" -#: src/gimv_thumb_win.c:464 +#: src/gimv_thumb_win.c:441 msgid "/_Layout/---" msgstr "/Disposition/---" -#: src/gimv_thumb_win.c:465 +#: src/gimv_thumb_win.c:442 msgid "/_Layout/Window _Composition" msgstr "/Disposition/_Composition de la fenêtre" -#: src/gimv_thumb_win.c:469 +#: src/gimv_thumb_win.c:446 msgid "/S_lideshow" msgstr "/Diaporama" -#: src/gimv_thumb_win.c:470 -#, fuzzy -msgid "/Slideshow Opt_ions" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:471 -#, fuzzy -msgid "/Slideshow Opt_ions/Start from the _first" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:472 -#, fuzzy -msgid "/Slideshow Opt_ions/Start from the se_lected" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:474 -#, fuzzy -msgid "/Slideshow Opt_ions/_Random order" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:476 src/gimv_thumb_win.c:478 -#, fuzzy -msgid "/Slideshow Opt_ions/---" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:477 -#, fuzzy -msgid "/Slideshow Opt_ions/_Selected only" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:479 -#, fuzzy -msgid "/Slideshow Opt_ions/Images _and movies" -msgstr "/Diaporama" - -#: src/gimv_thumb_win.c:480 +#: src/gimv_thumb_win.c:447 #, fuzzy -msgid "/Slideshow Opt_ions/_Images only" +msgid "/Slideshow (S_elected)" msgstr "/Diaporama" -#: src/gimv_thumb_win.c:481 -#, fuzzy -msgid "/Slideshow Opt_ions/_Movies only" -msgstr "/Diaporama" +#: src/gimv_thumb_win.c:448 +msgid "/Slideshow (_from the selected)" +msgstr "" -#: src/gimv_thumb_win.c:485 +#: src/gimv_thumb_win.c:452 msgid "/_Directory View" msgstr "/Vue _du répertoire" -#: src/gimv_thumb_win.c:486 +#: src/gimv_thumb_win.c:453 msgid "/_Preview" msgstr "/A_perçu" -#: src/gimv_thumb_win.c:488 +#: src/gimv_thumb_win.c:455 msgid "/T_ool Bar" msgstr "/Barre d'_outils" -#: src/gimv_thumb_win.c:489 +#: src/gimv_thumb_win.c:456 msgid "/Dir_View Tool Bar" msgstr "/Barre d'outils des répertoires" -#: src/gimv_thumb_win.c:492 +#: src/gimv_thumb_win.c:459 msgid "/Ta_b (Preview)" msgstr "/Onglet (Aperçu)" -#: src/gimv_thumb_win.c:509 +#: src/gimv_thumb_win.c:476 msgid "/by _Name" msgstr "/par _nom" -#: src/gimv_thumb_win.c:510 +#: src/gimv_thumb_win.c:477 msgid "/by _Access Time" msgstr "/par heure d'_accès" -#: src/gimv_thumb_win.c:511 +#: src/gimv_thumb_win.c:478 msgid "/by _Modification Time" msgstr "/par heure de _modification" -#: src/gimv_thumb_win.c:512 +#: src/gimv_thumb_win.c:479 msgid "/by _Change Time" msgstr "/par heure de _changement" -#: src/gimv_thumb_win.c:513 +#: src/gimv_thumb_win.c:480 msgid "/by _Size" msgstr "/par _taille" -#: src/gimv_thumb_win.c:514 +#: src/gimv_thumb_win.c:481 msgid "/by _Type" msgstr "/par t_ype" -#: src/gimv_thumb_win.c:515 +#: src/gimv_thumb_win.c:482 msgid "/by Image _Width" msgstr "/par largeur d'image" -#: src/gimv_thumb_win.c:516 +#: src/gimv_thumb_win.c:483 msgid "/by Image _Height" msgstr "/par _hauteur d'image" -#: src/gimv_thumb_win.c:517 +#: src/gimv_thumb_win.c:484 msgid "/by Image Ar_ea" msgstr "par surfac_e d'image" -#: src/gimv_thumb_win.c:519 +#: src/gimv_thumb_win.c:486 msgid "/_Reverse Order" msgstr "/Inve_rser l'odre" -#: src/gimv_thumb_win.c:521 +#: src/gimv_thumb_win.c:488 msgid "/Case _insensitive" msgstr "/Insens_ible à la case" -#: src/gimv_thumb_win.c:522 +#: src/gimv_thumb_win.c:489 msgid "/_Directory insensitive" msgstr "/Insensible aux répertoires" -#: src/gimv_thumb_win.c:654 +#: src/gimv_thumb_win.c:616 #, fuzzy msgid " -Thumbnail Window-" msgstr "/Fenêtre des vignettes" -#: src/gimv_thumb_win.c:935 +#: src/gimv_thumb_win.c:892 #, c-format msgid "Composition %d" msgstr "Composition %d" -#: src/gimv_thumb_win.c:1575 src/gimv_thumb_win.c:1576 +#: src/gimv_thumb_win.c:1532 src/gimv_thumb_win.c:1533 msgid "Go to previous page" msgstr "Aller à la page précédente" -#: src/gimv_thumb_win.c:1586 src/gimv_thumb_win.c:1587 +#: src/gimv_thumb_win.c:1543 src/gimv_thumb_win.c:1544 msgid "Go to next page" msgstr "Aller à la page suivante" -#: src/gimv_thumb_win.c:1598 +#: src/gimv_thumb_win.c:1555 msgid "Reload" msgstr "Recharger" -#: src/gimv_thumb_win.c:1599 src/gimv_thumb_win.c:1600 +#: src/gimv_thumb_win.c:1556 src/gimv_thumb_win.c:1557 msgid "Reload Cache" msgstr "Recharger le cache" -#: src/gimv_thumb_win.c:1610 src/gimv_thumb_win.c:1611 +#: src/gimv_thumb_win.c:1567 src/gimv_thumb_win.c:1568 msgid "Skip creating current thumbnail table" msgstr "Sauter la création des vignettes de la table courante" -#: src/gimv_thumb_win.c:1622 src/gimv_thumb_win.c:1623 +#: src/gimv_thumb_win.c:1579 src/gimv_thumb_win.c:1580 msgid "Stop creating thumbnails" msgstr "Arrêter la création des vignettes" -#: src/gimv_thumb_win.c:1639 +#: src/gimv_thumb_win.c:1596 msgid "Thumbnail Size" msgstr "Taille de la vignette" -#: src/gimv_thumb_win.c:1649 +#: src/gimv_thumb_win.c:1606 msgid "Quit" msgstr "Quitter" -#: src/gimv_thumb_win.c:1650 src/gimv_thumb_win.c:1651 +#: src/gimv_thumb_win.c:1607 src/gimv_thumb_win.c:1608 msgid "Exit this program" msgstr "Quitter ce programme" #. create image view and attach to comment view notebook #. Show Preview or not -#: src/gimv_thumb_win.c:2078 src/prefs_ui/prefs_ui_thumbwin.c:468 +#: src/gimv_thumb_win.c:2035 src/prefs_ui/prefs_ui_thumbwin.c:468 msgid "Preview" msgstr "Aperçu" -#: src/gimv_thumb_win.c:3521 +#: src/gimv_thumb_win.c:3416 msgid "Empty" msgstr "Vide" -#: src/gimv_thumb_win.c:3528 src/gimv_thumb_win.c:3631 +#: src/gimv_thumb_win.c:3423 src/gimv_thumb_win.c:3526 #, c-format msgid "%d/%d files" msgstr "fichiers %d/%d" -#: src/gimv_thumb_win.c:3562 +#: src/gimv_thumb_win.c:3457 #, c-format msgid "Dir View: %s" msgstr "Vue du répertoire : %s" -#: src/gimv_thumb_win.c:3564 +#: src/gimv_thumb_win.c:3459 #, c-format msgid "Archive View: %s" msgstr "Vue de l'archive : %s" -#: src/gimv_thumb_win.c:3579 +#: src/gimv_thumb_win.c:3474 msgid "Collection View" msgstr "Vue de la collection" -#: src/gimv_thumb_win.c:3589 +#: src/gimv_thumb_win.c:3484 msgid "Loading in another tab..." msgstr "Chargement dans un autre onglet..." -#: src/gimv_thumb_win.c:3597 +#: src/gimv_thumb_win.c:3492 #, fuzzy, c-format msgid "%d/%d page %d/%d files %ld/%ld kB" msgstr "page %d/%d fichiers %d/%d %d/%d ko" -#: src/gimv_thumb_win.c:3830 +#: src/gimv_thumb_win.c:3725 msgid "New Tab" msgstr "Nouvel onglet" -#: src/gimv_thumb_win.c:3872 +#: src/gimv_thumb_win.c:3767 #, c-format msgid "NewTab %d" msgstr "Nouvel Onglet %d" @@ -2267,7 +2231,6 @@ " sheepman\n" " MINAMI Hirokazu\n" " Brent Baccala\n" -" Christian Hammers\n" " And all GImageView users" msgstr "" "Programmation principale :\n" @@ -2289,27 +2252,27 @@ " jissama\n" " Et à tous les utilisateurs de GImageView" -#: src/help.c:128 +#: src/help.c:127 msgid "/_Manual" msgstr "/_Manuel" -#: src/help.c:129 +#: src/help.c:128 msgid "/_Document" msgstr "/_Document" -#: src/help.c:130 +#: src/help.c:129 msgid "/_Document/_HTML" msgstr "/_Document/_HTML" -#: src/help.c:131 +#: src/help.c:130 msgid "/_Document/Plain _Text" msgstr "/_Document/_Texte brut" -#: src/help.c:132 +#: src/help.c:131 msgid "/_About" msgstr "/_A propos" -#: src/help.c:446 +#: src/help.c:445 #, c-format msgid "" "Plugin Name : %s\n" @@ -2322,7 +2285,7 @@ "Auteur : %s\n" "\n" -#: src/help.c:524 +#: src/help.c:523 #, fuzzy, c-format msgid "" "Operating System : %s %s %s\n" @@ -2332,42 +2295,42 @@ "Version de GTK+ : %d.%d.%d\n" "Version de libpng : %s\n" -#: src/help.c:533 +#: src/help.c:532 #, c-format msgid "libmng version : %s\n" msgstr "Version de libmng : %s\n" -#: src/help.c:539 +#: src/help.c:538 #, c-format msgid "gdk-pixbuf version : %s\n" msgstr "Version de gdk-pixbuf : %s\n" -#: src/help.c:545 +#: src/help.c:544 #, c-format msgid "librsvg version : %s\n" msgstr "Version de librsvg : %s\n" -#: src/help.c:619 +#: src/help.c:618 msgid "Web Site: " msgstr "Site Web : " -#: src/help.c:673 +#: src/help.c:672 msgid "License" msgstr "Licence" -#: src/help.c:680 +#: src/help.c:679 msgid "Authors" msgstr "Auteurs" -#: src/help.c:688 +#: src/help.c:687 msgid "System Info" msgstr "Informations système" -#: src/help.c:695 plugins/image_loader/prefs_spi.c:225 +#: src/help.c:694 plugins/image_loader/prefs_spi.c:225 msgid "Plugin Info" msgstr "Informations sur les greffons" -#: src/help.c:716 +#: src/help.c:715 #, c-format msgid "About %s" msgstr "A propos de %s" @@ -3599,15 +3562,15 @@ msgid "No files specified!!" msgstr "Pas de fichier spécifié !!" -#: src/gimv_thumb_view.c:2378 +#: src/gimv_thumb_view.c:2372 msgid "Rename a file" msgstr "Renommer un fichier" -#: src/gimv_thumb_view.c:2379 +#: src/gimv_thumb_view.c:2373 msgid "New file name: " msgstr "Nom du nouveau fichier :" -#: src/gimv_thumb_view.c:2407 +#: src/gimv_thumb_view.c:2401 #, c-format msgid "" "File exist : %s\n" @@ -3618,7 +3581,7 @@ "\n" "Ecraser ?" -#: src/gimv_thumb_view.c:2429 +#: src/gimv_thumb_view.c:2423 #, c-format msgid "" "Faild to rename file :\n" @@ -3627,22 +3590,22 @@ "N'a pas pu renommer le fichier :\n" "%s" -#: src/gimv_thumb_view.c:2448 +#: src/gimv_thumb_view.c:2442 #, c-format msgid "Faild to rename cache file :%s\n" msgstr "N'a pas pu renommer le fichier cache : %s\n" -#: src/gimv_thumb_view.c:2458 +#: src/gimv_thumb_view.c:2452 #, c-format msgid "Faild to rename comment file :%s\n" msgstr "N'a pas pu renommer le fichier de commentaire : %s\n" -#: src/gimv_thumb_view.c:3659 src/gimv_thumb_view.c:3735 +#: src/gimv_thumb_view.c:3653 src/gimv_thumb_view.c:3729 #, c-format msgid "Collection %d" msgstr "Collection %d." -#: src/gimv_thumb_view.c:3729 +#: src/gimv_thumb_view.c:3723 #, fuzzy, c-format msgid "%s (Collection)" msgstr "Collection %d." diff -Nru gimageview-0.2.27/po/gimageview.pot gimageview-0.3.0-0.20101117/po/gimageview.pot --- gimageview-0.2.27/po/gimageview.pot 2004-12-28 04:33:43.000000000 +0000 +++ gimageview-0.3.0-0.20101117/po/gimageview.pot 1970-01-01 00:00:00.000000000 +0000 @@ -1,3999 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-28 13:33+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: etc/gimageview.desktop.in.h:1 plugins/thumbnail/gimv_thumb.c:84 -msgid "GImageView" -msgstr "" - -#: etc/gimageview.desktop.in.h:2 -msgid "Image Viewer" -msgstr "" - -#. file load -#: src/argparse.c:39 -msgid "Scan directory at start up" -msgstr "" - -#: src/argparse.c:40 -msgid "Scan directory recursively (use with \"-d\")" -msgstr "" - -#: src/argparse.c:41 -msgid "Read dotfile when scanning directory (use with \"-d\")" -msgstr "" - -#. Ignore filename extension or not -#: src/argparse.c:42 src/prefs_ui/prefs_ui_common.c:809 -msgid "Ignore file name extension" -msgstr "" - -#. image window -#: src/argparse.c:45 -msgid "Specify image scale on image window [%]" -msgstr "" - -#: src/argparse.c:46 -msgid "Keep original image on memory or not" -msgstr "" - -#: src/argparse.c:47 -msgid "Show menu bar on image view window" -msgstr "" - -#: src/argparse.c:48 -msgid "Show tool bar on image view window" -msgstr "" - -#. -#: src/argparse.c:51 -msgid "Open empty image window at start up" -msgstr "" - -#: src/argparse.c:52 -msgid "Open thumbnail window at start up" -msgstr "" - -#. default window -#: src/argparse.c:55 -msgid "Open all images in imageview window" -msgstr "" - -#: src/argparse.c:56 -msgid "Open all images in thumbnail window" -msgstr "" - -#: src/argparse.c:57 -msgid "Open images files in slide show" -msgstr "" - -#: src/argparse.c:58 -msgid "Interval of slideshow (use with \"-S\") [sec]" -msgstr "" - -#. etc -#: src/argparse.c:61 -msgid "Print version infomation" -msgstr "" - -#: src/argparse.c:62 -msgid "Show this message" -msgstr "" - -#: src/argparse.c:141 -#, c-format -msgid "Unknown option: \"-%s\"\n" -msgstr "" - -#: src/argparse.c:161 -msgid "" -"Copyright (C) 2001 Takuro Ashie\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -msgstr "" - -#: src/argparse.c:186 -#, c-format -msgid "" -"Copyright (C) 2001 Takuro Ashie\n" -"\n" -"Usage: %s [OPTION...] [Image Files...]\n" -"\n" -msgstr "" - -#. error -#: src/argparse.c:261 -#, c-format -msgid "Unknown option: \"--%s\"\n" -msgstr "" - -#: src/argparse.c:317 -#, c-format -msgid "Unknown option: \"-%c\"\n" -msgstr "" - -#: src/charset.c:145 src/prefs_ui/prefs_ui_imagewin.c:138 -#: src/prefs_ui/prefs_ui_thumbwin.c:135 src/prefs_ui/prefs_ui_thumbwin.c:144 -#: src/prefs_ui/prefs_ui_thumbwin.c:154 src/prefs_ui/prefs_ui_thumbwin.c:168 -#: src/prefs_ui/prefs_ui_thumbwin.c:179 -msgid "None" -msgstr "" - -#: src/charset.c:146 -msgid "Japanese" -msgstr "" - -#: src/compare_filesize.c:60 -msgid "File Size" -msgstr "" - -#: src/compare_md5.c:152 -msgid "md5sum" -msgstr "" - -#: src/compare_similar.c:305 -msgid "Similarity" -msgstr "" - -#: src/dirview.c:212 -msgid "/_Load Thumbnail" -msgstr "" - -#: src/dirview.c:213 -msgid "/Load Thumbnail re_cursively" -msgstr "" - -#: src/dirview.c:214 -msgid "/Load Thumbnail recursively in _one tab" -msgstr "" - -#: src/dirview.c:215 src/dirview.c:218 src/dirview.c:220 src/dnd.c:64 -#: src/dnd.c:68 src/gimv_image_view.c:281 src/gimv_image_view.c:283 -#: src/gimv_image_view.c:286 src/gimv_image_view.c:303 -#: src/gimv_image_view.c:337 src/gimv_image_view.c:339 -#: src/gimv_image_win.c:308 src/gimv_image_win.c:318 src/gimv_image_win.c:320 -#: src/gimv_thumb_win.c:467 src/gimv_thumb_win.c:483 src/gimv_thumb_win.c:498 -#: src/gimv_thumb_win.c:518 src/gimv_thumb_win.c:520 src/gimv_thumb_view.c:185 -#: src/gimv_thumb_view.c:188 src/gimv_thumb_view.c:194 -msgid "/---" -msgstr "" - -#: src/dirview.c:216 -msgid "/_Go to here" -msgstr "" - -#: src/dirview.c:217 -msgid "/_Refresh Tree" -msgstr "" - -#: src/dirview.c:219 src/gimv_thumb_view.c:189 -msgid "/_Property..." -msgstr "" - -#: src/dirview.c:221 -msgid "/_Make Directory..." -msgstr "" - -#: src/dirview.c:222 -msgid "/Re_name Directory..." -msgstr "" - -#: src/dirview.c:223 -msgid "/_Delete Directory..." -msgstr "" - -#: src/dirview.c:1526 src/fileload.c:442 src/gimv_thumb_view.c:1079 -#, c-format -msgid "Permission denied: %s" -msgstr "" - -#. gtk_object_remove_data (GTK_OBJECT (archive), "progress-bar"); -#: src/dirview.c:1529 src/exif_view.c:246 src/exif_view.c:253 -#: src/fileload.c:444 src/fileload.c:587 src/fileload.c:597 src/fileload.c:718 -#: src/gfileutil.c:463 src/gfileutil.c:477 src/gfileutil.c:499 -#: src/gfileutil.c:546 src/gfileutil.c:676 src/gfileutil.c:698 -#: src/gfileutil.c:729 src/gfileutil.c:740 src/gfileutil.c:751 -#: src/gfileutil.c:792 src/gfileutil.c:803 src/gfileutil.c:987 -#: src/gfileutil.c:1003 src/gfileutil.c:1055 src/gfileutil.c:1067 -#: src/gfileutil.c:1082 src/gfileutil.c:1148 src/gfileutil.c:1200 -#: src/gfileutil.c:1214 src/gfileutil.c:1233 src/gfileutil.c:1247 -#: src/gfileutil.c:1483 src/gfileutil.c:1490 src/gfileutil.c:1631 -#: src/gfileutil.c:1721 src/gfileutil.c:1725 src/gfileutil.c:1808 -#: src/gfileutil.c:1828 src/gfileutil.c:1866 src/gfileutil.c:1888 -#: src/gfileutil.c:1897 src/gfileutil.c:1927 src/gfileutil.c:1952 -#: src/gtkutils.c:460 src/prefs_ui/prefs_ui_common.c:182 -#: src/prefs_ui/prefs_ui_etc.c:194 src/prefs_ui/prefs_ui_etc.c:200 -#: src/prefs_ui/prefs_ui_etc.c:401 src/gimv_thumb_view.c:1016 -#: src/gimv_thumb_view.c:1081 src/gimv_thumb_view.c:2435 -#: plugins/image_view/image_view_xine.c:725 -#: plugins/image_view/image_view_xine.c:737 -#: plugins/image_view/image_view_xine.c:763 -msgid "Error!!" -msgstr "" - -#: src/dirview.c:1988 src/dirview.c:1989 src/dirview.c:1990 -msgid "Home" -msgstr "" - -#: src/dirview.c:1998 src/dirview.c:1999 src/dirview.c:2000 -#: src/gimv_elist.c:985 -msgid "Up" -msgstr "" - -#: src/dirview.c:2008 src/dirview.c:2009 src/dirview.c:2010 -msgid "Refresh" -msgstr "" - -#: src/dirview.c:2018 -msgid "Dotfile" -msgstr "" - -#: src/dirview.c:2019 src/dirview.c:2020 -msgid "Show/Hide dotfile" -msgstr "" - -#: src/dnd.c:63 -msgid "/Open in new tab" -msgstr "" - -#: src/dnd.c:65 -msgid "/Move" -msgstr "" - -#: src/dnd.c:66 -msgid "/Copy" -msgstr "" - -#: src/dnd.c:67 -msgid "/Symbolic Link" -msgstr "" - -#: src/dnd.c:69 -msgid "/Cancel" -msgstr "" - -#: src/exif_view.c:147 -#, c-format -msgid "%s EXIF data" -msgstr "" - -#. button -#. -#. * 2004-06-17 Takuro Ashie -#. * This code causes clash on latest Gtk+2. -#. -#. -#. * Change the Cancel buttons caption to Close. -#. -#: src/exif_view.c:159 src/fileload.c:1079 -msgid "Close" -msgstr "" - -#: src/exif_view.c:239 -msgid "Tag" -msgstr "" - -#: src/exif_view.c:239 src/gimv_comment_view.c:531 -msgid "Value" -msgstr "" - -#: src/exif_view.c:246 src/exif_view.c:253 -msgid "EXIF data not found." -msgstr "" - -#. Thumbnail page -#. radio button -#. ********************************************* -#. * Thumbnail Frame -#. ********************************************* -#: src/exif_view.c:344 src/gimv_dupl_win.c:281 -#: plugins/image_view/prefs_mplayer.c:303 plugins/image_view/prefs_xine.c:256 -msgid "Thumbnail" -msgstr "" - -#: src/fileload.c:204 -msgid "*Loading Image Files* - GImageView - " -msgstr "" - -#. label -#: src/fileload.c:210 -msgid "Now Opening Image Files..." -msgstr "" - -#. cancel button -#: src/fileload.c:223 src/gimv_thumb_win.c:1609 src/gtk_prop.c:223 -#: src/gtkutils.c:671 -msgid "Skip" -msgstr "" - -#. stop button -#. close button -#: src/fileload.c:230 src/gimv_image_view.c:2192 src/gimv_image_view.c:2193 -#: src/gimv_image_win.c:1008 src/gimv_thumb_win.c:1621 src/gimv_dupl_win.c:306 -msgid "Stop" -msgstr "" - -#: src/fileload.c:311 src/gfileutil.c:185 src/gfileutil.c:187 -#, c-format -msgid "filename = %s\n" -msgstr "" - -#: src/fileload.c:315 -#, c-format -msgid "The file is archive: %s\n" -msgstr "" - -#: src/fileload.c:496 -#, c-format -msgid "No image files in this directory: %s\n" -msgstr "" - -#: src/fileload.c:588 -msgid "Command not found!!\n" -msgstr "" - -#: src/fileload.c:591 -msgid "Canceled" -msgstr "" - -#: src/fileload.c:592 -msgid "" -"Processing the archive file was\n" -"canceled by user." -msgstr "" - -#: src/fileload.c:596 -msgid "An error occured while processing archive file...\n" -msgstr "" - -#: src/fileload.c:598 -msgid "" -"An error occured while processing\n" -"archive file..." -msgstr "" - -#: src/fileload.c:719 -msgid "Cannot load this archive file.\n" -msgstr "" - -#: src/fileload.c:952 -msgid "File name not specified!!\n" -msgstr "" - -#: src/fileload.c:974 -msgid "Not an image (or unsupported) file!!\n" -msgstr "" - -#: src/fileload.c:1013 -msgid "Load file(s)" -msgstr "" - -#: src/fileload.c:1056 -msgid "Open selected files" -msgstr "" - -#: src/fileload.c:1063 -msgid "Thumbnail for selected files" -msgstr "" - -#: src/gfileutil.c:152 src/gfileutil.c:154 -#, c-format -msgid "scandir = %s\n" -msgstr "" - -#: src/gfileutil.c:200 src/gfileutil.c:202 -#, c-format -msgid "dirname = %s\n" -msgstr "" - -#: src/gfileutil.c:461 src/gfileutil.c:738 src/gfileutil.c:985 -#: src/gfileutil.c:1198 -#, c-format -msgid "" -"Can't find source file :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:474 src/gfileutil.c:496 -#, c-format -msgid "" -"Can't move file : %s\n" -"Permission denied: %s\n" -msgstr "" - -#: src/gfileutil.c:545 src/gfileutil.c:1001 -#, c-format -msgid "" -"Same file :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:553 src/gfileutil.c:1231 src/gfileutil.c:1887 -#, c-format -msgid "File exist : %s" -msgstr "" - -#: src/gfileutil.c:554 -msgid "ERROR!!" -msgstr "" - -#: src/gfileutil.c:558 src/gfileutil.c:1009 -#, c-format -msgid "" -"The file exists : %s\n" -"Overwrite?" -msgstr "" - -#: src/gfileutil.c:561 src/gfileutil.c:1012 src/gimv_thumb_view.c:2413 -msgid "File exist!!" -msgstr "" - -#: src/gfileutil.c:673 -#, c-format -msgid "" -"Faild to remove file :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:694 -#, c-format -msgid "" -"Faild to move file :\n" -"From : %s\n" -"To : %s" -msgstr "" - -#: src/gfileutil.c:727 -#, c-format -msgid "%s is link!!.\n" -msgstr "" - -#: src/gfileutil.c:749 -#, c-format -msgid "%s is not directory!!.\n" -msgstr "" - -#: src/gfileutil.c:788 -#, c-format -msgid "" -"Can't copy directory : %s\n" -"Permission denied: %s\n" -msgstr "" - -#: src/gfileutil.c:801 -#, c-format -msgid "File exists!! : %s\n" -msgstr "" - -#: src/gfileutil.c:872 -msgid "Copy directory" -msgstr "" - -#: src/gfileutil.c:895 src/gfileutil.c:1389 -#, c-format -msgid "Copying %s ..." -msgstr "" - -#: src/gfileutil.c:901 -msgid "Copying directory" -msgstr "" - -#: src/gfileutil.c:1053 -#, c-format -msgid "" -"Can't open file for read :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:1065 -#, c-format -msgid "" -"Can't open file for write :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:1080 -#, c-format -msgid "" -"An error occured while copying file :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:1144 -#, c-format -msgid "" -"Can't copy file : %s\n" -"Permission denied: %s\n" -msgstr "" - -#: src/gfileutil.c:1211 -#, c-format -msgid "" -"Can't create link : %s\n" -"Permission denied: %s\n" -msgstr "" - -#: src/gfileutil.c:1243 -#, c-format -msgid "" -"Faild to create link :\n" -"From : %s\n" -"To : %s" -msgstr "" - -#: src/gfileutil.c:1368 -#, c-format -msgid "Moving %s ..." -msgstr "" - -#: src/gfileutil.c:1369 -msgid "Moving files" -msgstr "" - -#: src/gfileutil.c:1390 -msgid "Copying files" -msgstr "" - -#: src/gfileutil.c:1424 -#, c-format -msgid "Creating Link %s ..." -msgstr "" - -#: src/gfileutil.c:1425 -msgid "Creating Links" -msgstr "" - -#: src/gfileutil.c:1481 -#, c-format -msgid "Directory doesn't exist!!: %s" -msgstr "" - -#: src/gfileutil.c:1488 -#, c-format -msgid "Permission denied!!: %s" -msgstr "" - -#: src/gfileutil.c:1559 -msgid "Move files to..." -msgstr "" - -#: src/gfileutil.c:1560 -msgid "Move files to: " -msgstr "" - -#: src/gfileutil.c:1563 -msgid "Copy files to..." -msgstr "" - -#: src/gfileutil.c:1564 -msgid "Copy files to: " -msgstr "" - -#: src/gfileutil.c:1567 -msgid "Link files to..." -msgstr "" - -#: src/gfileutil.c:1568 -msgid "Link files to: " -msgstr "" - -#: src/gfileutil.c:1630 -#, c-format -msgid "Directory not exist : %s" -msgstr "" - -#: src/gfileutil.c:1638 -#, c-format -msgid "" -"%s is symbolic link.\n" -"Remove link ?" -msgstr "" - -#: src/gfileutil.c:1640 src/gfileutil.c:1652 src/gfileutil.c:1663 -msgid "Confirm Deleting Directory" -msgstr "" - -#: src/gfileutil.c:1650 -#, c-format -msgid "" -"Delete %s\n" -"OK?" -msgstr "" - -#: src/gfileutil.c:1660 -#, c-format -msgid "" -"%s is not empty\n" -"Delete all files under %s ?" -msgstr "" - -#: src/gfileutil.c:1692 src/gfileutil.c:1793 -#, c-format -msgid "Deleting %s ..." -msgstr "" - -#: src/gfileutil.c:1719 -#, c-format -msgid "" -"Faild to remove directory :\n" -"%s is not empty." -msgstr "" - -#: src/gfileutil.c:1724 -#, c-format -msgid "Faild to remove directory : %s" -msgstr "" - -#: src/gfileutil.c:1757 -#, c-format -msgid "" -"Delete these %d files.\n" -"OK?" -msgstr "" - -#: src/gfileutil.c:1760 -msgid "Confirm Deleting Files" -msgstr "" - -#: src/gfileutil.c:1769 -msgid "Delete File" -msgstr "" - -#: src/gfileutil.c:1770 -msgid "Deleting Files" -msgstr "" - -#: src/gfileutil.c:1807 src/gfileutil.c:1865 -#, c-format -msgid "Permission denied : %s" -msgstr "" - -#: src/gfileutil.c:1826 -#, c-format -msgid "" -"Faild to delete file :\n" -"%s" -msgstr "" - -#: src/gfileutil.c:1870 -msgid "Make directory" -msgstr "" - -#: src/gfileutil.c:1871 src/gfileutil.c:1937 -msgid "New directory name: " -msgstr "" - -#: src/gfileutil.c:1884 -#, c-format -msgid "Directory exist : %s" -msgstr "" - -#: src/gfileutil.c:1896 -#, c-format -msgid "Faild to create directory : %s" -msgstr "" - -#: src/gfileutil.c:1926 -#, c-format -msgid "Directory not exist :%s" -msgstr "" - -#: src/gfileutil.c:1936 -msgid "Rename directory" -msgstr "" - -#: src/gfileutil.c:1951 -#, c-format -msgid "Faild to rename directory : %s" -msgstr "" - -#: src/gimageview.c:230 -msgid "No image file is specified!!" -msgstr "" - -#: src/gimageview.c:232 -msgid "If you want to scan directory, use \"-d\" option." -msgstr "" - -#: src/gimageview.c:237 -msgid "No window is opened!! Quiting..." -msgstr "" - -#: src/gimv_comment.c:74 -msgid "Subject" -msgstr "" - -#: src/gimv_comment.c:75 -msgid "Date" -msgstr "" - -#: src/gimv_comment.c:76 -msgid "Location" -msgstr "" - -#: src/gimv_comment.c:77 -msgid "Model" -msgstr "" - -#: src/gimv_comment.c:78 -msgid "Comment Time" -msgstr "" - -#: src/gimv_comment.c:79 -msgid "URL" -msgstr "" - -#: src/gimv_comment.c:80 -msgid "Path in Archive" -msgstr "" - -#: src/gimv_comment.c:81 src/gimv_dupl_win.c:124 -msgid "Modification Time" -msgstr "" - -#: src/gimv_comment.c:82 -msgid "Image Type" -msgstr "" - -#: src/gimv_comment.c:83 -msgid "Image Size" -msgstr "" - -#: src/gimv_comment.c:417 -msgid "Can't open comment file for read." -msgstr "" - -#: src/gimv_comment.c:788 plugins/thumbnail/gimv_thumb.c:261 -msgid "cannot make dir\n" -msgstr "" - -#: src/gimv_comment.c:794 -msgid "Can't open comment file for write." -msgstr "" - -#: src/gimv_comment_view.c:531 -msgid "Key" -msgstr "" - -#: src/gimv_comment_view.c:533 -msgid "Data" -msgstr "" - -#: src/gimv_comment_view.c:618 -msgid "Key: " -msgstr "" - -#: src/gimv_comment_view.c:630 -msgid "Value: " -msgstr "" - -#. "Note" page -#: src/gimv_comment_view.c:674 -msgid "Note" -msgstr "" - -#: src/gimv_comment_view.c:1101 src/gimv_comment_view.c:1104 -msgid "_Save" -msgstr "" - -#. GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); -#: src/gimv_comment_view.c:1112 src/gimv_comment_view.c:1115 -msgid "_Reset" -msgstr "" - -#. GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); -#: src/gimv_comment_view.c:1123 src/gimv_comment_view.c:1126 -msgid "_Delete" -msgstr "" - -#: src/gimv_comment_view.c:1174 -#, c-format -msgid "Edit Comment (%s)" -msgstr "" - -#: src/gimv_comment_view.c:1213 src/gimv_comment_view.c:1216 -msgid "_Prev" -msgstr "" - -#: src/gimv_comment_view.c:1224 src/gimv_comment_view.c:1227 -msgid "_Next" -msgstr "" - -#: src/gimv_image_view.c:277 src/gimv_image_view.c:296 -#: src/gimv_image_view.c:320 src/gimv_image_view.c:331 -#: src/gimv_image_win.c:304 -msgid "/tear" -msgstr "" - -#: src/gimv_image_view.c:278 src/gimv_image_win.c:305 -msgid "/_Zoom" -msgstr "" - -#: src/gimv_image_view.c:279 src/gimv_image_win.c:306 -msgid "/_Rotate" -msgstr "" - -#: src/gimv_image_view.c:280 src/gimv_image_win.c:307 -msgid "/Ignore _Alpha Channel" -msgstr "" - -#: src/gimv_image_view.c:282 src/gimv_image_win.c:294 -msgid "/M_ovie" -msgstr "" - -#: src/gimv_image_view.c:284 src/gimv_image_win.c:319 -msgid "/_View modes" -msgstr "" - -#: src/gimv_image_view.c:285 -msgid "/Show _Scrollbar" -msgstr "" - -#: src/gimv_image_view.c:287 -msgid "/Create _Thumbnail" -msgstr "" - -#: src/gimv_image_view.c:288 -msgid "/Memory _Buffer" -msgstr "" - -#: src/gimv_image_view.c:297 -msgid "/Zoom _In" -msgstr "" - -#: src/gimv_image_view.c:298 -msgid "/Zoom _Out" -msgstr "" - -#: src/gimv_image_view.c:299 -msgid "/_Fit to Window" -msgstr "" - -#: src/gimv_image_view.c:300 -msgid "/_Fit _Width" -msgstr "" - -#: src/gimv_image_view.c:301 -msgid "/_Fit _Height" -msgstr "" - -#: src/gimv_image_view.c:302 -msgid "/Keep _aspect ratio" -msgstr "" - -#: src/gimv_image_view.c:304 -msgid "/10%(_1)" -msgstr "" - -#: src/gimv_image_view.c:305 -msgid "/25%(_2)" -msgstr "" - -#: src/gimv_image_view.c:306 -msgid "/50%(_3)" -msgstr "" - -#: src/gimv_image_view.c:307 -msgid "/75%(_4)" -msgstr "" - -#: src/gimv_image_view.c:308 -msgid "/100%(_5)" -msgstr "" - -#: src/gimv_image_view.c:309 -msgid "/125%(_6)" -msgstr "" - -#: src/gimv_image_view.c:310 -msgid "/150%(_7)" -msgstr "" - -#: src/gimv_image_view.c:311 -msgid "/175%(_8)" -msgstr "" - -#: src/gimv_image_view.c:312 -msgid "/200%(_9)" -msgstr "" - -#: src/gimv_image_view.c:321 -msgid "/Rotate 90 degrees CW" -msgstr "" - -#: src/gimv_image_view.c:322 -msgid "/Rotate 90 degrees CCW" -msgstr "" - -#: src/gimv_image_view.c:323 -msgid "/Rotate 180 degrees" -msgstr "" - -#: src/gimv_image_view.c:332 -msgid "/_Play" -msgstr "" - -#: src/gimv_image_view.c:333 -msgid "/_Stop" -msgstr "" - -#: src/gimv_image_view.c:334 -msgid "/P_ause" -msgstr "" - -#: src/gimv_image_view.c:335 -msgid "/_Forward" -msgstr "" - -#: src/gimv_image_view.c:336 -msgid "/_Reverse" -msgstr "" - -#: src/gimv_image_view.c:338 -msgid "/_Continuance" -msgstr "" - -#: src/gimv_image_view.c:340 -msgid "/_Eject" -msgstr "" - -#: src/gimv_image_view.c:2106 -#, c-format -msgid "File not exist: %s\n" -msgstr "" - -#: src/gimv_image_view.c:2108 -#, c-format -msgid "Not an image (or unsupported) file: %s\n" -msgstr "" - -#: src/gimv_image_view.c:2171 -msgid "RW" -msgstr "" - -#: src/gimv_image_view.c:2172 -msgid "Reverse" -msgstr "" - -#: src/gimv_image_view.c:2181 src/gimv_image_view.c:2182 -#: src/gimv_image_win.c:999 -msgid "Play" -msgstr "" - -#: src/gimv_image_view.c:2202 -msgid "FF" -msgstr "" - -#: src/gimv_image_view.c:2203 -msgid "Forward" -msgstr "" - -#: src/gimv_image_view.c:2212 src/gimv_image_view.c:2213 -msgid "Eject" -msgstr "" - -#: src/gimv_image_view.h:40 -msgid "Default Image Viewer" -msgstr "" - -#: src/gimv_image_win.c:273 src/gimv_thumb_win.c:380 -msgid "/_File" -msgstr "" - -#: src/gimv_image_win.c:274 src/gimv_thumb_win.c:381 -msgid "/_File/_Open..." -msgstr "" - -#: src/gimv_image_win.c:275 -msgid "/_File/Open _Image Window" -msgstr "" - -#: src/gimv_image_win.c:276 -msgid "/_File/Open _Thumbnail Window" -msgstr "" - -#: src/gimv_image_win.c:277 src/gimv_image_win.c:279 src/gimv_thumb_win.c:385 -msgid "/_File/---" -msgstr "" - -#: src/gimv_image_win.c:278 -msgid "/_File/Memory _Buffer" -msgstr "" - -#: src/gimv_image_win.c:280 -msgid "/_File/_Close" -msgstr "" - -#: src/gimv_image_win.c:281 src/gimv_thumb_win.c:388 -msgid "/_File/_Quit" -msgstr "" - -#: src/gimv_image_win.c:283 src/gimv_thumb_win.c:390 -msgid "/_Edit" -msgstr "" - -#: src/gimv_image_win.c:284 -msgid "/_Edit/Edit _Comment..." -msgstr "" - -#: src/gimv_image_win.c:285 -msgid "/_Edit/Scan E_XIF Data..." -msgstr "" - -#: src/gimv_image_win.c:286 -msgid "/_Edit/Create _Thumbnail" -msgstr "" - -#: src/gimv_image_win.c:287 src/gimv_thumb_win.c:393 src/gimv_thumb_win.c:397 -#: src/gimv_thumb_win.c:406 -msgid "/_Edit/---" -msgstr "" - -#: src/gimv_image_win.c:288 src/gimv_thumb_win.c:407 -msgid "/_Edit/_Options..." -msgstr "" - -#: src/gimv_image_win.c:290 src/gimv_thumb_win.c:409 -msgid "/_View" -msgstr "" - -#: src/gimv_image_win.c:292 -msgid "/_Move" -msgstr "" - -#: src/gimv_image_win.c:296 src/gimv_thumb_win.c:448 -msgid "/_Help" -msgstr "" - -#: src/gimv_image_win.c:309 src/gimv_thumb_win.c:487 -msgid "/_Menu Bar" -msgstr "" - -#: src/gimv_image_win.c:310 -msgid "/_Tool Bar" -msgstr "" - -#: src/gimv_image_win.c:311 -msgid "/Slide Show _Player" -msgstr "" - -#: src/gimv_image_win.c:312 src/gimv_thumb_win.c:490 -msgid "/St_atus Bar" -msgstr "" - -#: src/gimv_image_win.c:313 -msgid "/_Scroll Bar" -msgstr "" - -#: src/gimv_image_win.c:314 src/gimv_thumb_win.c:493 -msgid "/_Player" -msgstr "" - -#: src/gimv_image_win.c:315 src/gimv_thumb_win.c:494 -msgid "/_Player/_Show" -msgstr "" - -#: src/gimv_image_win.c:316 src/gimv_thumb_win.c:495 -msgid "/_Player/_Hide" -msgstr "" - -#: src/gimv_image_win.c:317 src/gimv_thumb_win.c:496 -msgid "/_Player/_Auto" -msgstr "" - -#: src/gimv_image_win.c:321 -msgid "/_Fit to Image" -msgstr "" - -#: src/gimv_image_win.c:322 src/gimv_thumb_win.c:500 -msgid "/Ma_ximize" -msgstr "" - -#: src/gimv_image_win.c:323 -msgid "/F_ull Screen" -msgstr "" - -#: src/gimv_image_win.c:330 -msgid "/_Next" -msgstr "" - -#: src/gimv_image_win.c:331 -msgid "/_Previous" -msgstr "" - -#: src/gimv_image_win.c:332 -msgid "/_First" -msgstr "" - -#: src/gimv_image_win.c:333 -msgid "/_Last" -msgstr "" - -#: src/gimv_image_win.c:577 src/gimv_thumb_win.c:751 -msgid "New Window" -msgstr "" - -#: src/gimv_image_win.c:789 src/prefs_ui/prefs_ui_imagewin.c:60 -msgid "90 degrees CCW" -msgstr "" - -#: src/gimv_image_win.c:790 src/prefs_ui/prefs_ui_imagewin.c:59 -msgid "0 degrees" -msgstr "" - -#: src/gimv_image_win.c:791 src/prefs_ui/prefs_ui_imagewin.c:62 -msgid "90 degrees CW" -msgstr "" - -#: src/gimv_image_win.c:792 src/prefs_ui/prefs_ui_imagewin.c:61 -msgid "180 degrees" -msgstr "" - -#: src/gimv_image_win.c:802 src/gimv_thumb_win.c:1550 -msgid "Open" -msgstr "" - -#: src/gimv_image_win.c:803 src/gimv_image_win.c:804 src/gimv_thumb_win.c:1551 -#: src/gimv_thumb_win.c:1552 -msgid "File Open" -msgstr "" - -#: src/gimv_image_win.c:812 src/gimv_thumb_win.c:1561 -msgid "Prefs" -msgstr "" - -#: src/gimv_image_win.c:813 src/gimv_image_win.c:814 src/gimv_prefs_win.c:810 -#: src/gimv_thumb_win.c:1562 src/gimv_thumb_win.c:1563 -#: src/prefs_ui/prefs_ui_etc.c:582 -msgid "Preference" -msgstr "" - -#: src/gimv_image_win.c:824 src/gimv_image_win.c:990 src/gimv_thumb_win.c:1574 -msgid "Prev" -msgstr "" - -#: src/gimv_image_win.c:825 src/gimv_image_win.c:826 -msgid "Previous Image" -msgstr "" - -#: src/gimv_image_win.c:836 src/gimv_image_win.c:1017 -#: src/gimv_image_win.c:1018 src/gimv_thumb_win.c:1585 -msgid "Next" -msgstr "" - -#: src/gimv_image_win.c:837 src/gimv_image_win.c:838 -msgid "Next Image" -msgstr "" - -#: src/gimv_image_win.c:850 src/gimv_image_win.c:851 src/gimv_image_win.c:852 -msgid "No Zoom" -msgstr "" - -#: src/gimv_image_win.c:860 src/gimv_image_win.c:861 src/gimv_image_win.c:862 -#: src/prefs_ui/prefs_ui_imagewin.c:142 src/prefs_ui/prefs_ui_thumbwin.c:185 -msgid "Zoom in" -msgstr "" - -#: src/gimv_image_win.c:870 src/gimv_image_win.c:871 src/gimv_image_win.c:872 -#: src/prefs_ui/prefs_ui_imagewin.c:143 src/prefs_ui/prefs_ui_thumbwin.c:186 -msgid "Zoom out" -msgstr "" - -#: src/gimv_image_win.c:880 src/gimv_image_win.c:881 src/gimv_image_win.c:882 -msgid "Zoom fit" -msgstr "" - -#: src/gimv_image_win.c:900 -msgid "X Scale" -msgstr "" - -#: src/gimv_image_win.c:915 -msgid "Y Scale" -msgstr "" - -#: src/gimv_image_win.c:921 src/gimv_image_win.c:922 src/gimv_image_win.c:923 -msgid "Zoom" -msgstr "" - -#: src/gimv_image_win.c:936 -msgid "Rotate" -msgstr "" - -#: src/gimv_image_win.c:936 -msgid "Rotate the image" -msgstr "" - -#: src/gimv_image_win.c:944 -msgid "Resize" -msgstr "" - -#: src/gimv_image_win.c:945 src/gimv_image_win.c:946 -msgid "Fit Window Size to Image" -msgstr "" - -#: src/gimv_image_win.c:955 -msgid "Full" -msgstr "" - -#: src/gimv_image_win.c:956 src/gimv_image_win.c:957 -msgid "Fullscreen" -msgstr "" - -#: src/gimv_image_win.c:981 src/gimv_image_win.c:982 -msgid "First" -msgstr "" - -#: src/gimv_image_win.c:991 -msgid "Previous" -msgstr "" - -#: src/gimv_image_win.c:1000 -msgid "Play Slide Show" -msgstr "" - -#: src/gimv_image_win.c:1009 -msgid "Stop Slide Show" -msgstr "" - -#: src/gimv_image_win.c:1026 src/gimv_image_win.c:1027 -msgid "Last" -msgstr "" - -#: src/gimv_image_win.c:1138 -#, c-format -msgid "%s (%s) - %s - " -msgstr "" - -#: src/gimv_image_win.c:1141 -#, c-format -msgid "* %s (%s) - %s - *" -msgstr "" - -#: src/gimv_image_win.c:1146 -#, c-format -msgid "- %s -" -msgstr "" - -#: src/gimv_image_win.c:1148 -#, c-format -msgid "* - %s - *" -msgstr "" - -#: src/gimv_image_win.c:1162 -msgid "NONE" -msgstr "" - -#: src/gimv_image_win.c:1163 -msgid "UNKNOWN" -msgstr "" - -#: src/gimv_image_win.c:1189 -#, c-format -msgid "%s (Buffer ON)" -msgstr "" - -#: src/gimv_image_win.c:1191 -#, c-format -msgid "%s (Buffer OFF)" -msgstr "" - -#: src/gimv_image_win.c:1196 -msgid "(Buffer ON)" -msgstr "" - -#: src/gimv_image_win.c:1198 -msgid "(Buffer OFF)" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:124 -msgid "Normal" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:125 -msgid "Shift" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:126 -msgid "Control" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:127 -msgid "Mod1" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:189 -#, c-format -msgid "Mouse Button %d (Wheel up)" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:191 -#, c-format -msgid "Mouse Button %d (Wheel down)" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:193 -#, c-format -msgid "Mouse Button %d Double Click" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:196 src/prefs_ui/prefs_ui_thumbwin.c:125 -msgid "Left" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:196 -msgid "Middle" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:196 src/prefs_ui/prefs_ui_thumbwin.c:126 -msgid "Right" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:198 -#, c-format -msgid "Mouse Button %d (%s)" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:243 -msgid "Pressed" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:246 -msgid "Released" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:386 -msgid "Select directory" -msgstr "" - -#. show directory -#: src/gimv_prefs_ui_utils.c:420 src/prefs_ui/prefs_ui_thumbwin.c:746 -msgid "Directory" -msgstr "" - -#: src/gimv_prefs_ui_utils.c:454 -msgid "Directory to add : " -msgstr "" - -#: src/gimv_prefs_ui_utils.c:463 -msgid "Select" -msgstr "" - -#: src/gimv_prefs_win.c:65 -msgid "/Infomation" -msgstr "" - -#: src/gimv_prefs_win.c:66 -msgid "/Common" -msgstr "" - -#: src/gimv_prefs_win.c:67 -msgid "/Common/Filtering" -msgstr "" - -#: src/gimv_prefs_win.c:68 -msgid "/Common/Character set" -msgstr "" - -#: src/gimv_prefs_win.c:70 -msgid "/Image Window" -msgstr "" - -#: src/gimv_prefs_win.c:71 -msgid "/Image Window/Image" -msgstr "" - -#: src/gimv_prefs_win.c:72 -msgid "/Image Window/Mouse Buttton" -msgstr "" - -#: src/gimv_prefs_win.c:74 -msgid "/Thumbnail Window" -msgstr "" - -#. -#. {N_("/Thumbnail Window/Toolbar"), 0, NULL, NULL, prefs_thumbview_toolbar_page, NULL}, -#. -#: src/gimv_prefs_win.c:78 -msgid "/Thumbnail Window/Tab" -msgstr "" - -#: src/gimv_prefs_win.c:79 -msgid "/Thumbnail Window/Thumbnail View" -msgstr "" - -#: src/gimv_prefs_win.c:80 -msgid "/Thumbnail Window/Thumbnail View/Mouse Buttton" -msgstr "" - -#: src/gimv_prefs_win.c:81 -msgid "/Thumbnail Window/Thumbnail View/Album" -msgstr "" - -#: src/gimv_prefs_win.c:83 -msgid "/Thumbnail Window/Directory View" -msgstr "" - -#: src/gimv_prefs_win.c:84 -msgid "/Thumbnail Window/Directory View/Mouse Buttton" -msgstr "" - -#: src/gimv_prefs_win.c:85 -msgid "/Thumbnail Window/Preview" -msgstr "" - -#: src/gimv_prefs_win.c:86 -msgid "/Thumbnail Window/Preview/Mouse Buttton" -msgstr "" - -#: src/gimv_prefs_win.c:88 -msgid "/Movie and Audio" -msgstr "" - -#: src/gimv_prefs_win.c:90 -msgid "/Slide Show" -msgstr "" - -#: src/gimv_prefs_win.c:91 -msgid "/Thumbnail Cache" -msgstr "" - -#: src/gimv_prefs_win.c:92 -msgid "/Comment" -msgstr "" - -#: src/gimv_prefs_win.c:93 -msgid "/Search" -msgstr "" - -#: src/gimv_prefs_win.c:94 -msgid "/Drag and Drop" -msgstr "" - -#: src/gimv_prefs_win.c:95 -msgid "/External Program" -msgstr "" - -#: src/gimv_prefs_win.c:96 -msgid "/External Program/Scripts" -msgstr "" - -#: src/gimv_prefs_win.c:98 -msgid "/Plugin" -msgstr "" - -#: src/gimv_prefs_win.c:99 -msgid "/Plugin/Image Loader" -msgstr "" - -#: src/gimv_prefs_win.c:100 -msgid "/Plugin/Image Saver" -msgstr "" - -#: src/gimv_prefs_win.c:101 -msgid "/Plugin/IO Stream" -msgstr "" - -#: src/gimv_prefs_win.c:102 -msgid "/Plugin/Archiver" -msgstr "" - -#: src/gimv_prefs_win.c:103 -msgid "/Plugin/Thumbnail" -msgstr "" - -#: src/gimv_prefs_win.c:104 -msgid "/Plugin/Image View" -msgstr "" - -#: src/gimv_prefs_win.c:105 -msgid "/Plugin/Thumbnail View" -msgstr "" - -#. dialog buttons -#. button -#. OK Button -#. ok buttons -#: src/gimv_prefs_win.c:863 src/gtkutils.c:763 src/gtkutils.c:1062 -#: src/help.c:728 src/prefs_ui/prefs_ui_etc.c:149 -msgid "OK" -msgstr "" - -#: src/gimv_prefs_win.c:874 -msgid "Apply" -msgstr "" - -#. cancel button -#: src/gimv_prefs_win.c:883 src/gtk_prop.c:204 src/gtkutils.c:375 -#: src/gtkutils.c:688 src/gtkutils.c:865 src/gtkutils.c:1070 -msgid "Cancel" -msgstr "" - -#: src/gimv_thumb_win.c:382 -msgid "/_File/New _Image Window" -msgstr "" - -#: src/gimv_thumb_win.c:383 -msgid "/_File/New _Window" -msgstr "" - -#: src/gimv_thumb_win.c:384 -msgid "/_File/New _Tab" -msgstr "" - -#: src/gimv_thumb_win.c:386 -msgid "/_File/Close Ta_b" -msgstr "" - -#: src/gimv_thumb_win.c:387 -msgid "/_File/_Close Window" -msgstr "" - -#: src/gimv_thumb_win.c:391 -msgid "/_Edit/_Select All" -msgstr "" - -#: src/gimv_thumb_win.c:392 -msgid "/_Edit/U_nselect All" -msgstr "" - -#: src/gimv_thumb_win.c:394 -msgid "/_Edit/_Refresh List" -msgstr "" - -#: src/gimv_thumb_win.c:395 -msgid "/_Edit/Reload _Cache" -msgstr "" - -#: src/gimv_thumb_win.c:396 -msgid "/_Edit/_Update All Thumbnail" -msgstr "" - -#. -#. {N_("/_Edit/Clear cache for _this tab"), NULL, cb_clear_cache, CLEAR_CACHE_TAB, NULL}, -#. -#: src/gimv_thumb_win.c:401 -msgid "/_Edit/R_ename..." -msgstr "" - -#: src/gimv_thumb_win.c:402 -msgid "/_Edit/Co_py Files To..." -msgstr "" - -#: src/gimv_thumb_win.c:403 -msgid "/_Edit/_Move Files To..." -msgstr "" - -#: src/gimv_thumb_win.c:404 -msgid "/_Edit/_Link Files To..." -msgstr "" - -#: src/gimv_thumb_win.c:405 -msgid "/_Edit/Remo_ve file..." -msgstr "" - -#: src/gimv_thumb_win.c:411 src/gimv_thumb_win.c:491 -msgid "/_Tab" -msgstr "" - -#: src/gimv_thumb_win.c:412 -msgid "/_Tab/_Tab Position" -msgstr "" - -#: src/gimv_thumb_win.c:413 -msgid "/_Tab/_Tab Position/_Top" -msgstr "" - -#: src/gimv_thumb_win.c:414 -msgid "/_Tab/_Tab Position/_Bottom" -msgstr "" - -#: src/gimv_thumb_win.c:415 -msgid "/_Tab/_Tab Position/_Left" -msgstr "" - -#: src/gimv_thumb_win.c:416 -msgid "/_Tab/_Tab Position/_Right" -msgstr "" - -#: src/gimv_thumb_win.c:417 src/gimv_thumb_win.c:422 -msgid "/_Tab/---" -msgstr "" - -#: src/gimv_thumb_win.c:418 -msgid "/_Tab/_First Page" -msgstr "" - -#: src/gimv_thumb_win.c:419 -msgid "/_Tab/_Last Page" -msgstr "" - -#: src/gimv_thumb_win.c:420 -msgid "/_Tab/_Next Page" -msgstr "" - -#: src/gimv_thumb_win.c:421 -msgid "/_Tab/_Previous Page" -msgstr "" - -#: src/gimv_thumb_win.c:423 -msgid "/_Tab/Move tab for_ward" -msgstr "" - -#: src/gimv_thumb_win.c:424 -msgid "/_Tab/Move tab _backward" -msgstr "" - -#: src/gimv_thumb_win.c:425 -msgid "/_Tab/_Detach tab" -msgstr "" - -#: src/gimv_thumb_win.c:427 -msgid "/_Action" -msgstr "" - -#: src/gimv_thumb_win.c:428 -msgid "/_Action/_Focus" -msgstr "" - -#: src/gimv_thumb_win.c:429 -msgid "/_Action/_Focus/_Directory View" -msgstr "" - -#: src/gimv_thumb_win.c:430 -msgid "/_Action/_Focus/_Thumbnail View" -msgstr "" - -#: src/gimv_thumb_win.c:431 -msgid "/_Action/_Focus/_Preview" -msgstr "" - -#: src/gimv_thumb_win.c:432 -msgid "/_Action/_Focus/_Location Entry" -msgstr "" - -#: src/gimv_thumb_win.c:434 -msgid "/_Action/_Directory View" -msgstr "" - -#: src/gimv_thumb_win.c:435 -msgid "/_Action/_Thumbnail View" -msgstr "" - -#: src/gimv_thumb_win.c:436 -msgid "/_Action/_Preview" -msgstr "" - -#: src/gimv_thumb_win.c:437 -msgid "/_Action/_Preview/_Next" -msgstr "" - -#: src/gimv_thumb_win.c:438 -msgid "/_Action/_Preview/_Previous" -msgstr "" - -#: src/gimv_thumb_win.c:441 -msgid "/Too_l" -msgstr "" - -#: src/gimv_thumb_win.c:442 -msgid "/Too_l/_Clear all cache" -msgstr "" - -#: src/gimv_thumb_win.c:443 src/gimv_thumb_win.c:445 -msgid "/Too_l/---" -msgstr "" - -#: src/gimv_thumb_win.c:444 -msgid "/Too_l/_Find duplicates" -msgstr "" - -#: src/gimv_thumb_win.c:446 -msgid "/Too_l/_Wallpaper setting" -msgstr "" - -#: src/gimv_thumb_win.c:456 -msgid "/_Sort File List" -msgstr "" - -#: src/gimv_thumb_win.c:457 -msgid "/_Layout" -msgstr "" - -#: src/gimv_thumb_win.c:458 -msgid "/_Layout/Layout_0" -msgstr "" - -#: src/gimv_thumb_win.c:459 -msgid "/_Layout/Layout_1" -msgstr "" - -#: src/gimv_thumb_win.c:460 -msgid "/_Layout/Layout_2" -msgstr "" - -#: src/gimv_thumb_win.c:461 -msgid "/_Layout/Layout_3" -msgstr "" - -#: src/gimv_thumb_win.c:462 -msgid "/_Layout/Layout_4" -msgstr "" - -#: src/gimv_thumb_win.c:463 -msgid "/_Layout/_Custom" -msgstr "" - -#: src/gimv_thumb_win.c:464 -msgid "/_Layout/---" -msgstr "" - -#: src/gimv_thumb_win.c:465 -msgid "/_Layout/Window _Composition" -msgstr "" - -#: src/gimv_thumb_win.c:469 -msgid "/S_lideshow" -msgstr "" - -#: src/gimv_thumb_win.c:470 -msgid "/Slideshow Opt_ions" -msgstr "" - -#: src/gimv_thumb_win.c:471 -msgid "/Slideshow Opt_ions/Start from the _first" -msgstr "" - -#: src/gimv_thumb_win.c:472 -msgid "/Slideshow Opt_ions/Start from the se_lected" -msgstr "" - -#: src/gimv_thumb_win.c:474 -msgid "/Slideshow Opt_ions/_Random order" -msgstr "" - -#: src/gimv_thumb_win.c:476 src/gimv_thumb_win.c:478 -msgid "/Slideshow Opt_ions/---" -msgstr "" - -#: src/gimv_thumb_win.c:477 -msgid "/Slideshow Opt_ions/_Selected only" -msgstr "" - -#: src/gimv_thumb_win.c:479 -msgid "/Slideshow Opt_ions/Images _and movies" -msgstr "" - -#: src/gimv_thumb_win.c:480 -msgid "/Slideshow Opt_ions/_Images only" -msgstr "" - -#: src/gimv_thumb_win.c:481 -msgid "/Slideshow Opt_ions/_Movies only" -msgstr "" - -#: src/gimv_thumb_win.c:485 -msgid "/_Directory View" -msgstr "" - -#: src/gimv_thumb_win.c:486 -msgid "/_Preview" -msgstr "" - -#: src/gimv_thumb_win.c:488 -msgid "/T_ool Bar" -msgstr "" - -#: src/gimv_thumb_win.c:489 -msgid "/Dir_View Tool Bar" -msgstr "" - -#: src/gimv_thumb_win.c:492 -msgid "/Ta_b (Preview)" -msgstr "" - -#: src/gimv_thumb_win.c:509 -msgid "/by _Name" -msgstr "" - -#: src/gimv_thumb_win.c:510 -msgid "/by _Access Time" -msgstr "" - -#: src/gimv_thumb_win.c:511 -msgid "/by _Modification Time" -msgstr "" - -#: src/gimv_thumb_win.c:512 -msgid "/by _Change Time" -msgstr "" - -#: src/gimv_thumb_win.c:513 -msgid "/by _Size" -msgstr "" - -#: src/gimv_thumb_win.c:514 -msgid "/by _Type" -msgstr "" - -#: src/gimv_thumb_win.c:515 -msgid "/by Image _Width" -msgstr "" - -#: src/gimv_thumb_win.c:516 -msgid "/by Image _Height" -msgstr "" - -#: src/gimv_thumb_win.c:517 -msgid "/by Image Ar_ea" -msgstr "" - -#: src/gimv_thumb_win.c:519 -msgid "/_Reverse Order" -msgstr "" - -#: src/gimv_thumb_win.c:521 -msgid "/Case _insensitive" -msgstr "" - -#: src/gimv_thumb_win.c:522 -msgid "/_Directory insensitive" -msgstr "" - -#: src/gimv_thumb_win.c:654 -msgid " -Thumbnail Window-" -msgstr "" - -#: src/gimv_thumb_win.c:935 -#, c-format -msgid "Composition %d" -msgstr "" - -#: src/gimv_thumb_win.c:1575 src/gimv_thumb_win.c:1576 -msgid "Go to previous page" -msgstr "" - -#: src/gimv_thumb_win.c:1586 src/gimv_thumb_win.c:1587 -msgid "Go to next page" -msgstr "" - -#: src/gimv_thumb_win.c:1598 -msgid "Reload" -msgstr "" - -#: src/gimv_thumb_win.c:1599 src/gimv_thumb_win.c:1600 -msgid "Reload Cache" -msgstr "" - -#: src/gimv_thumb_win.c:1610 src/gimv_thumb_win.c:1611 -msgid "Skip creating current thumbnail table" -msgstr "" - -#: src/gimv_thumb_win.c:1622 src/gimv_thumb_win.c:1623 -msgid "Stop creating thumbnails" -msgstr "" - -#: src/gimv_thumb_win.c:1639 -msgid "Thumbnail Size" -msgstr "" - -#: src/gimv_thumb_win.c:1649 -msgid "Quit" -msgstr "" - -#: src/gimv_thumb_win.c:1650 src/gimv_thumb_win.c:1651 -msgid "Exit this program" -msgstr "" - -#. create image view and attach to comment view notebook -#. Show Preview or not -#: src/gimv_thumb_win.c:2078 src/prefs_ui/prefs_ui_thumbwin.c:468 -msgid "Preview" -msgstr "" - -#: src/gimv_thumb_win.c:3521 -msgid "Empty" -msgstr "" - -#: src/gimv_thumb_win.c:3528 src/gimv_thumb_win.c:3631 -#, c-format -msgid "%d/%d files" -msgstr "" - -#: src/gimv_thumb_win.c:3562 -#, c-format -msgid "Dir View: %s" -msgstr "" - -#: src/gimv_thumb_win.c:3564 -#, c-format -msgid "Archive View: %s" -msgstr "" - -#: src/gimv_thumb_win.c:3579 -msgid "Collection View" -msgstr "" - -#: src/gimv_thumb_win.c:3589 -msgid "Loading in another tab..." -msgstr "" - -#: src/gimv_thumb_win.c:3597 -#, c-format -msgid "%d/%d page %d/%d files %ld/%ld kB" -msgstr "" - -#: src/gimv_thumb_win.c:3830 -msgid "New Tab" -msgstr "" - -#: src/gimv_thumb_win.c:3872 -#, c-format -msgid "NewTab %d" -msgstr "" - -#: src/gtk_prop.c:191 -msgid "Properties" -msgstr "" - -#. ok and cancel buttons -#: src/gtk_prop.c:203 -msgid "Ok" -msgstr "" - -#: src/gtk_prop.c:224 -msgid "All" -msgstr "" - -#. date and size page -#: src/gtk_prop.c:241 -msgid "Info" -msgstr "" - -#: src/gtk_prop.c:246 -msgid "Name :" -msgstr "" - -#: src/gtk_prop.c:283 -msgid "Type :" -msgstr "" - -#: src/gtk_prop.c:305 -#, c-format -msgid "%ld Bytes" -msgstr "" - -#: src/gtk_prop.c:307 -msgid "Size :" -msgstr "" - -#: src/gtk_prop.c:319 -msgid "Access Time :" -msgstr "" - -#: src/gtk_prop.c:331 -msgid "Modification Time :" -msgstr "" - -#: src/gtk_prop.c:343 -msgid "Change Time :" -msgstr "" - -#: src/gtk_prop.c:352 -msgid "Permissions" -msgstr "" - -#: src/gtk_prop.c:356 src/gtk_prop.c:483 -msgid "Owner :" -msgstr "" - -#: src/gtk_prop.c:357 src/gtk_prop.c:389 src/gtk_prop.c:420 -msgid "Read" -msgstr "" - -#: src/gtk_prop.c:363 src/gtk_prop.c:395 src/gtk_prop.c:426 -msgid "Write" -msgstr "" - -#: src/gtk_prop.c:369 src/gtk_prop.c:401 src/gtk_prop.c:432 -msgid "Execute" -msgstr "" - -#: src/gtk_prop.c:375 -msgid "Set UID" -msgstr "" - -#: src/gtk_prop.c:388 src/gtk_prop.c:494 -msgid "Group :" -msgstr "" - -#: src/gtk_prop.c:407 -msgid "Set GID" -msgstr "" - -#: src/gtk_prop.c:419 -msgid "Other :" -msgstr "" - -#: src/gtk_prop.c:438 -msgid "Sticky" -msgstr "" - -#: src/gtk_prop.c:472 -msgid "Owner" -msgstr "" - -#: src/gtk_prop.c:477 src/gtk_prop.c:488 -msgid "unknown" -msgstr "" - -#. buttons -#: src/gtkutils.c:344 src/gtkutils.c:652 -msgid "Yes" -msgstr "" - -#: src/gtkutils.c:355 src/gtkutils.c:662 -msgid "Yes to All" -msgstr "" - -#: src/gtkutils.c:365 -msgid "No" -msgstr "" - -#: src/gtkutils.c:458 -#, c-format -msgid "The file exists : %s" -msgstr "" - -#: src/gtkutils.c:550 -msgid "Show destination" -msgstr "" - -#: src/gtkutils.c:557 -msgid "Show both images" -msgstr "" - -#: src/gtkutils.c:565 -msgid "Show source" -msgstr "" - -#: src/gtkutils.c:638 -msgid "Rename" -msgstr "" - -#: src/gtkutils.c:679 -msgid "Skip all" -msgstr "" - -#: src/gtkutils.c:1200 src/prefs_ui/prefs_ui_etc.c:989 -#: src/prefs_ui/prefs_ui_imagewin.c:351 src/prefs_ui/prefs_ui_imagewin.c:366 -msgid "Choose Color" -msgstr "" - -#: src/help.c:78 -#, c-format -msgid "" -"Copyright (C) 2001 %s <%s>\n" -"\n" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2, or (at your option)\n" -"any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -"See the GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" -"MA 02111-1307, USA." -msgstr "" - -#: src/help.c:95 -msgid "" -"Main Program :\n" -" Takuro Ashie \n" -"Document :\n" -" Nyan2 \n" -"Logo :\n" -" eins \n" -"Translate :\n" -"\n" -"Special Thanks :\n" -" horam\n" -" TAM\n" -" Hiroyuki Komatsu\n" -" Kazuki Iwamoto\n" -" katsu\n" -" kourin\n" -" jissama\n" -" shitamori\n" -" knee\n" -" matsu\n" -" Shlomi Fish\n" -" Jin Suh\n" -" sheepman\n" -" MINAMI Hirokazu\n" -" Brent Baccala\n" -" Christian Hammers\n" -" And all GImageView users" -msgstr "" - -#: src/help.c:128 -msgid "/_Manual" -msgstr "" - -#: src/help.c:129 -msgid "/_Document" -msgstr "" - -#: src/help.c:130 -msgid "/_Document/_HTML" -msgstr "" - -#: src/help.c:131 -msgid "/_Document/Plain _Text" -msgstr "" - -#: src/help.c:132 -msgid "/_About" -msgstr "" - -#: src/help.c:446 -#, c-format -msgid "" -"Plugin Name : %s\n" -"Version : %s\n" -"Author : %s\n" -"\n" -msgstr "" - -#: src/help.c:524 -#, c-format -msgid "" -"Operating System : %s %s %s\n" -"GTK+ version : %d.%d.%d\n" -msgstr "" - -#: src/help.c:533 -#, c-format -msgid "libmng version : %s\n" -msgstr "" - -#: src/help.c:539 -#, c-format -msgid "gdk-pixbuf version : %s\n" -msgstr "" - -#: src/help.c:545 -#, c-format -msgid "librsvg version : %s\n" -msgstr "" - -#: src/help.c:619 -msgid "Web Site: " -msgstr "" - -#: src/help.c:673 -msgid "License" -msgstr "" - -#: src/help.c:680 -msgid "Authors" -msgstr "" - -#: src/help.c:688 -msgid "System Info" -msgstr "" - -#: src/help.c:695 plugins/image_loader/prefs_spi.c:225 -msgid "Plugin Info" -msgstr "" - -#: src/help.c:716 -#, c-format -msgid "About %s" -msgstr "" - -#: src/prefs.c:523 -#, c-format -msgid "" -"Can't open rc file: %s\n" -"Use default setting ..." -msgstr "" - -#: src/prefs.c:591 -#, c-format -msgid "Directory \"%s\" not found. Created it ..." -msgstr "" - -#: src/prefs.c:594 -#, c-format -msgid "\"%s\" found, but it's not directory. Abort creating ..." -msgstr "" - -#: src/prefs.c:603 -msgid "Can't open rc file for write." -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:71 -msgid "Image View" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:72 -msgid "Thumbnail View" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:79 -msgid "Nearest" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:80 -msgid "Tiles" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:81 -msgid "Bilinear" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:82 -msgid "Hyperbolic" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:89 -msgid "Never convert" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:90 -msgid "Locale" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:91 -msgid "Auto detect" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:92 -msgid "Any" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:139 src/prefs_ui/prefs_ui_common.c:147 -#: src/prefs_ui/prefs_ui_common.c:154 src/prefs_ui/prefs_ui_etc.c:171 -#: src/prefs_ui/prefs_ui_etc.c:179 src/prefs_ui/prefs_ui_etc.c:186 -msgid "Error" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:140 -msgid "" -"String includes invalid character!\n" -"Only ASCII is available." -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:148 src/prefs_ui/prefs_ui_etc.c:180 -msgid "Sorry, cannot include \",\" character!" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:155 src/prefs_ui/prefs_ui_etc.c:187 -msgid "Sorry, cannot include \";\" character!" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:181 src/prefs_ui/prefs_ui_etc.c:400 -#, c-format -msgid "\"%s\" is already defined." -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:243 src/prefs_ui/prefs_ui_common.c:281 -#: src/prefs_ui/prefs_ui_common.c:775 src/prefs_ui/prefs_ui_etc.c:682 -msgid "Enable" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:243 src/prefs_ui/prefs_ui_common.c:284 -#: src/prefs_ui/prefs_ui_common.c:774 src/prefs_ui/prefs_ui_common.c:775 -msgid "Disable" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:244 src/prefs_ui/prefs_ui_common.c:427 -#: src/prefs_ui/prefs_ui_etc.c:261 src/prefs_ui/prefs_ui_etc.c:430 -msgid "System defined" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:288 src/prefs_ui/prefs_ui_common.c:430 -#: src/prefs_ui/prefs_ui_etc.c:259 src/prefs_ui/prefs_ui_etc.c:433 -msgid "User defined" -msgstr "" - -#. ********************************************* -#. * Default Open Window Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:549 -msgid "Default Open Window" -msgstr "" - -#. File Open Window Selection -#: src/prefs_ui/prefs_ui_common.c:561 -msgid "File Open Window" -msgstr "" - -#. Directory Open Window Selection -#: src/prefs_ui/prefs_ui_common.c:573 -msgid "Directory Open Window" -msgstr "" - -#. Archive Open Window Selection -#: src/prefs_ui/prefs_ui_common.c:585 -msgid "Archive Open Window" -msgstr "" - -#. ********************************************* -#. * Scan Directory Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:601 -msgid "Directory scan" -msgstr "" - -#. Ignore filename extension or not -#: src/prefs_ui/prefs_ui_common.c:604 -msgid "Scan directories recursively" -msgstr "" - -#. follow symbolic link -#: src/prefs_ui/prefs_ui_common.c:611 -msgid "Follow symbolic link" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:615 -msgid "Do not follow symbolic link" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:624 -msgid "Do not follow link to parent directory" -msgstr "" - -#. ********************************************* -#. * Image Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:652 src/prefs_ui/prefs_ui_etc.c:907 -#: src/prefs_ui/prefs_ui_imagewin.c:397 src/prefs_ui/prefs_ui_thumbwin.c:1024 -msgid "Image" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:658 -msgid "Interpolation type for scaling" -msgstr "" - -#. ********************************************* -#. * Start up Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:669 -msgid "Start up" -msgstr "" - -#. Open thumbnail window or not -#: src/prefs_ui/prefs_ui_common.c:672 -msgid "Open thumbnail window" -msgstr "" - -#. Scan (or not) Directory -#: src/prefs_ui/prefs_ui_common.c:679 -msgid "Ignore directory" -msgstr "" - -#. No warning -#: src/prefs_ui/prefs_ui_common.c:686 -msgid "No warning" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:710 -msgid "Extension" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:710 -msgid "File Type" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:710 src/prefs_ui/prefs_ui_etc.c:613 -msgid "Status" -msgstr "" - -#. ********************************************* -#. * Image Types Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:719 -msgid "File Types" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:740 -msgid "Extension: " -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:758 -msgid "File Type: " -msgstr "" - -#. Ignore filename extension or not -#: src/prefs_ui/prefs_ui_common.c:801 -msgid "Read dotfiles" -msgstr "" - -#. ********************************************* -#. * Common Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:838 -msgid "Common" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:849 -msgid "Locale character set: " -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:866 -msgid "Internal character set: " -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:882 -msgid "Language for auto detecting" -msgstr "" - -#. ********************************************* -#. * Filename Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_common.c:893 -msgid "File name" -msgstr "" - -#: src/prefs_ui/prefs_ui_common.c:898 -msgid "Character set of file name" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:140 -msgid "Preference - Cache Writing -" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:172 -msgid "" -"Key string includes invalid character!\n" -"Only ASCII (except space) is available." -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:193 -msgid "\"Key name\" must be defined." -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:199 -msgid "\"Display name\" must be defined." -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:539 -msgid "Cache reading" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:540 -msgid "Available cache type" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:541 -msgid "Cache type to use" -msgstr "" - -#. ********************************************* -#. * Cache writing frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:553 -msgid "Cache writing" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:562 -msgid "Cache type for save" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:611 -msgid "Key Name" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:612 -msgid "Displayed Name" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:614 src/prefs_ui/prefs_ui_etc.c:690 -#: src/prefs_ui/prefs_ui_imagewin.c:315 src/prefs_ui/prefs_ui_thumbwin.c:536 -msgid "Auto" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:615 src/prefs_ui/prefs_ui_etc.c:698 -msgid "Display" -msgstr "" - -#. ********************************************* -#. * Key Name definition frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:626 -msgid "Key Name Definition" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:650 -msgid "Key Name: " -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:667 -msgid "Displayed Name: " -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:683 src/prefs_ui/prefs_ui_etc.c:691 -#: src/prefs_ui/prefs_ui_etc.c:699 src/prefs_ui/prefs_ui_progs.c:66 -#: src/prefs_ui/prefs_ui_progs.c:104 src/prefs_ui/prefs_ui_progs.c:259 -msgid "TRUE" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:683 src/prefs_ui/prefs_ui_etc.c:691 -#: src/prefs_ui/prefs_ui_etc.c:699 src/prefs_ui/prefs_ui_progs.c:68 -#: src/prefs_ui/prefs_ui_progs.c:259 -msgid "FALSE" -msgstr "" - -#. ********************************************* -#. * Charset Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:726 -msgid "Character set" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:732 -msgid "Character set: " -msgstr "" - -#. ********************************************* -#. * Find duplicates -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:768 -msgid "Find duplicates" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:775 src/gimv_dupl_win.c:122 -msgid "Accuracy" -msgstr "" - -#. ********************************************* -#. * Behabior of selecting -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:790 -msgid "Behabior when select thumbnail on result window" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:797 -msgid "Select the thumbnail on thumbnail view" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:803 -msgid "Show the image in preview" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:809 -msgid "Show the image in new window" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:815 -msgid "Show the image in shared window" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:851 -msgid "Image change interval" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:863 plugins/image_view/prefs_xine.c:311 -msgid "[sec]" -msgstr "" - -#. repeat -#: src/prefs_ui/prefs_ui_etc.c:867 -msgid "Repeat slide show" -msgstr "" - -#. ********************************************* -#. * Show/Hide Frame -#. ********************************************* -#. Show/Hide frame -#. ********************************************* -#. * Show/Hide Frame -#. ********************************************* -#. ********************************************* -#. * Shoe/Hide Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:877 src/prefs_ui/prefs_ui_imagewin.c:240 -#: src/prefs_ui/prefs_ui_thumbwin.c:445 src/prefs_ui/prefs_ui_thumbwin.c:740 -#: src/prefs_ui/prefs_ui_thumbwin.c:848 -msgid "Show/Hide" -msgstr "" - -#. Show Menubar or not -#: src/prefs_ui/prefs_ui_etc.c:880 -msgid "Show menubar" -msgstr "" - -#. Show Toolbar or not -#. show/hide toolbar -#: src/prefs_ui/prefs_ui_etc.c:886 src/prefs_ui/prefs_ui_thumbwin.c:851 -msgid "Show toolbar" -msgstr "" - -#. Show Player toolbar or not -#: src/prefs_ui/prefs_ui_etc.c:892 -msgid "Show player toolbar" -msgstr "" - -#. Show Statusbar or not -#: src/prefs_ui/prefs_ui_etc.c:898 -msgid "Show statusbar" -msgstr "" - -#. Zoom menu -#. Default zoom action menu -#. Zoom menu -#: src/prefs_ui/prefs_ui_etc.c:916 src/prefs_ui/prefs_ui_imagewin.c:406 -#: src/prefs_ui/prefs_ui_thumbwin.c:1033 -msgid "Zoom:" -msgstr "" - -#. Rotate menu -#. Rotate on image change -#. Rotate menu -#: src/prefs_ui/prefs_ui_etc.c:931 src/prefs_ui/prefs_ui_imagewin.c:421 -#: src/prefs_ui/prefs_ui_thumbwin.c:1048 -msgid "Rotation:" -msgstr "" - -#. Keep Aspect Ratio -#: src/prefs_ui/prefs_ui_etc.c:946 -msgid "Keep aspect rario" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:956 src/prefs_ui/prefs_ui_imagewin.c:446 -#: src/prefs_ui/prefs_ui_thumbwin.c:1076 -msgid "Default Image Scale" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:967 src/prefs_ui/prefs_ui_imagewin.c:457 -#: src/prefs_ui/prefs_ui_thumbwin.c:1086 -msgid "%" -msgstr "" - -#. ********************************************* -#. * Back Ground Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:977 src/prefs_ui/prefs_ui_imagewin.c:338 -msgid "Back Ground" -msgstr "" - -#: src/prefs_ui/prefs_ui_etc.c:983 -msgid "Use specified color" -msgstr "" - -#. ********************************************* -#. * File Operation frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_etc.c:1019 -msgid "File operation" -msgstr "" - -#. Drag and Drop to external proccess -#: src/prefs_ui/prefs_ui_etc.c:1022 -msgid "Enable DnD to external proccess (Experimental)" -msgstr "" - -#. Drag and Drop from external proccess -#: src/prefs_ui/prefs_ui_etc.c:1029 -msgid "Enable DnD from extenal proccess (Experimental)" -msgstr "" - -#. Always refresh list when DnD end -#: src/prefs_ui/prefs_ui_etc.c:1036 -msgid "Always refresh list when DnD end" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:63 src/prefs_ui/prefs_ui_imagewin.c:72 -msgid "Do not change" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:65 -msgid "Automatic EXIF" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:71 -msgid "Default image scale" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:73 -msgid "Fit image to window" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:74 -msgid "Fit image to window (zoom out only)" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:75 -msgid "Fit image to width" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:76 -msgid "Fit image to height" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:139 src/prefs_ui/prefs_ui_thumbwin.c:180 -msgid "Next image" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:140 src/prefs_ui/prefs_ui_thumbwin.c:181 -msgid "Previous image" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:141 src/prefs_ui/prefs_ui_thumbwin.c:155 -#: src/prefs_ui/prefs_ui_thumbwin.c:171 src/prefs_ui/prefs_ui_thumbwin.c:184 -msgid "Popup menu" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:144 src/prefs_ui/prefs_ui_thumbwin.c:187 -msgid "Fit image size to frame" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:145 src/prefs_ui/prefs_ui_thumbwin.c:188 -msgid "Rotate CCW" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:146 src/prefs_ui/prefs_ui_thumbwin.c:189 -msgid "Rotate CW" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:147 src/prefs_ui/prefs_ui_thumbwin.c:190 -msgid "Open navigate window" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:148 src/prefs_ui/prefs_ui_thumbwin.c:191 -msgid "Scroll up" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:149 src/prefs_ui/prefs_ui_thumbwin.c:192 -msgid "Scroll down" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:150 src/prefs_ui/prefs_ui_thumbwin.c:193 -msgid "Scroll left" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:151 src/prefs_ui/prefs_ui_thumbwin.c:194 -msgid "Scroll right" -msgstr "" - -#. ********************************************* -#. * Window Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_imagewin.c:175 src/prefs_ui/prefs_ui_thumbwin.c:399 -msgid "Window" -msgstr "" - -#. Save window state on exit -#: src/prefs_ui/prefs_ui_imagewin.c:178 src/prefs_ui/prefs_ui_thumbwin.c:402 -msgid "Save window state on exit" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:189 -msgid "Initial window size: " -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:192 src/prefs_ui/prefs_ui_thumbwin.c:412 -msgid "width" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:204 src/prefs_ui/prefs_ui_thumbwin.c:423 -msgid "height" -msgstr "" - -#. Auto resize window to image size -#: src/prefs_ui/prefs_ui_imagewin.c:217 -msgid "Auto resize to image size" -msgstr "" - -#. Open New Window or not -#: src/prefs_ui/prefs_ui_imagewin.c:224 -msgid "Open each file in separate window" -msgstr "" - -#. Raise window or not -#: src/prefs_ui/prefs_ui_imagewin.c:231 -msgid "Raise window when open image in shared window" -msgstr "" - -#. Show Menubar or not -#: src/prefs_ui/prefs_ui_imagewin.c:255 src/prefs_ui/prefs_ui_thumbwin.c:484 -msgid "Menubar" -msgstr "" - -#. Show Toolbar or not -#: src/prefs_ui/prefs_ui_imagewin.c:263 src/prefs_ui/prefs_ui_thumbwin.c:492 -msgid "Toolbar" -msgstr "" - -#. Show Player toolbar or not -#: src/prefs_ui/prefs_ui_imagewin.c:271 -msgid "Slide show player" -msgstr "" - -#. Show Statusbar or not -#: src/prefs_ui/prefs_ui_imagewin.c:279 src/prefs_ui/prefs_ui_thumbwin.c:500 -msgid "Statusbar" -msgstr "" - -#. Show Scrollbar or not -#: src/prefs_ui/prefs_ui_imagewin.c:287 -msgid "Scrollbar" -msgstr "" - -#. player -#: src/prefs_ui/prefs_ui_imagewin.c:295 src/prefs_ui/prefs_ui_thumbwin.c:516 -msgid "Player toolbar :" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:299 src/prefs_ui/prefs_ui_thumbwin.c:520 -msgid "Show" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:307 src/prefs_ui/prefs_ui_thumbwin.c:528 -msgid "Hide" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:345 -msgid "Specify back ground color" -msgstr "" - -#: src/prefs_ui/prefs_ui_imagewin.c:360 -msgid "Specify back ground color of fullscreen" -msgstr "" - -#. Keep Aspect Ratio -#: src/prefs_ui/prefs_ui_imagewin.c:436 src/prefs_ui/prefs_ui_thumbwin.c:1066 -msgid "Keep aspect ratio" -msgstr "" - -#. keep original image on memory or not -#: src/prefs_ui/prefs_ui_imagewin.c:461 src/prefs_ui/prefs_ui_thumbwin.c:1098 -msgid "Keep original image on memory" -msgstr "" - -#: src/prefs_ui/prefs_ui_movie.c:91 -msgid "Default view mode for movie and audio: " -msgstr "" - -#: src/prefs_ui/prefs_ui_movie.c:108 -msgid "No movie plugins are available." -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:70 -msgid "Directories list to search plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:71 -msgid "Select plugin directory" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:75 -msgid "Use default directories list to search plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:104 -msgid "Plugin Name" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:104 -msgid "Version" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:104 -msgid "Module Name" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:219 -msgid "Image Loader Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:225 -msgid "Image Saver Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:231 -msgid "IO Stream Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:237 -msgid "Archiver Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:243 -msgid "Thumbnail Cache Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:249 -msgid "Image View Embeder Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_plugin.c:255 -msgid "Thumbnail View Embeder Plugins" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:192 -msgid "Program Name" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:193 -msgid "Command" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:194 src/prefs_ui/prefs_ui_progs.c:258 -msgid "Dialog" -msgstr "" - -#. ********************************************* -#. * Viewer/Editor frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_progs.c:209 -msgid "Graphic Viewer/Editor" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:230 -msgid "Program Name: " -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:245 src/prefs_ui/prefs_ui_progs.c:272 -#: src/prefs_ui/prefs_ui_progs.c:300 -msgid "Command: " -msgstr "" - -#. ********************************************* -#. * Web Browser frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_progs.c:266 -msgid "Web Browser" -msgstr "" - -#. ********************************************* -#. * Text Viewer frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_progs.c:287 -msgid "Text Viewer" -msgstr "" - -#. use internal text viewer or not -#: src/prefs_ui/prefs_ui_progs.c:291 -msgid "Use internal viewer" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:334 -msgid "Directories list to search scripts" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:335 -msgid "Select scripts directory" -msgstr "" - -#: src/prefs_ui/prefs_ui_progs.c:339 -msgid "Use default directories list to search scripts" -msgstr "" - -#. Show dialog -#: src/prefs_ui/prefs_ui_progs.c:348 -msgid "Show dialog befor execute script" -msgstr "" - -#. ********************************************* -#. * Thumbnail Album Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_thumbalbum.c:47 src/thumbnail_view_album.c:70 -msgid "Album" -msgstr "" - -#. Row Spacing spinner -#: src/prefs_ui/prefs_ui_thumbalbum.c:60 -msgid "Row Spacing" -msgstr "" - -#. Column Spacing spinner -#: src/prefs_ui/prefs_ui_thumbalbum.c:74 -msgid "Column Spacing" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:106 -msgid "Layout0" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:107 -msgid "Layout1" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:108 -msgid "Layout2" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:109 -msgid "Layout3" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:110 -msgid "Layout4" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:111 -msgid "Custom" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:117 src/gimv_dupl_win.c:288 -msgid "Icon" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:118 -msgid "Text" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:119 -msgid "Both" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:127 -msgid "Top" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:128 -msgid "Bottom" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:136 -msgid "Solid" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:137 -msgid "Dotted" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:138 -msgid "Tabbed" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:145 -msgid "Square" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:146 -msgid "Triangle" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:147 -msgid "Circular" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:156 -msgid "Open (Auto select window)" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:157 -msgid "Open (Auto & Force)" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:158 -msgid "Open in preview" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:159 -msgid "Open in preview (Force)" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:160 src/prefs_ui/prefs_ui_thumbwin.c:183 -msgid "Open in new window" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:161 src/prefs_ui/prefs_ui_thumbwin.c:182 -msgid "Open in shared window" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:162 -msgid "Open in shared window (Force)" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:169 -msgid "Load thumbnails" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:170 -msgid "Load thumbnails recursively" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:172 -msgid "Change top directory" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:173 -msgid "Load recursively in a tab" -msgstr "" - -#. Toolbar Style -#: src/prefs_ui/prefs_ui_thumbwin.c:435 -msgid "Default Layout" -msgstr "" - -#. Show Directory or not -#: src/prefs_ui/prefs_ui_thumbwin.c:460 -msgid "Directory view" -msgstr "" - -#. Show Preview Tab or not -#: src/prefs_ui/prefs_ui_thumbwin.c:476 -msgid "Preview Tab" -msgstr "" - -#. Show Tab or not -#. ********************************************* -#. * Tab Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_thumbwin.c:508 src/prefs_ui/prefs_ui_thumbwin.c:660 -msgid "Tab" -msgstr "" - -#. Raise window or not -#: src/prefs_ui/prefs_ui_thumbwin.c:557 -msgid "Raise window when opening thumbnails" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:570 -msgid "Toolbar Style" -msgstr "" - -#. "Loading" frame -#: src/prefs_ui/prefs_ui_thumbwin.c:580 -msgid "Loading" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:587 -msgid "GUI redraw interval while loading: Every" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:598 -msgid "files" -msgstr "" - -#. show detail of progress -#: src/prefs_ui/prefs_ui_thumbwin.c:602 -msgid "Show detail of loading progress" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:627 -msgid "Not implemented yet." -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:665 -msgid "Tab Position" -msgstr "" - -#. Move to new tab automatically or not -#: src/prefs_ui/prefs_ui_thumbwin.c:678 -msgid "Move to new tab automatically" -msgstr "" - -#. show tab close button -#: src/prefs_ui/prefs_ui_thumbwin.c:685 -msgid "Show close button" -msgstr "" - -#. show full path in tab -#: src/prefs_ui/prefs_ui_thumbwin.c:695 -msgid "Show full path" -msgstr "" - -#. force open tab -#: src/prefs_ui/prefs_ui_thumbwin.c:705 -msgid "Open new tab whether image is exist or not in the directory" -msgstr "" - -#. show archive -#: src/prefs_ui/prefs_ui_thumbwin.c:753 -msgid "Archive" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:766 -msgid "Default display mode" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:782 -msgid "Thumnail Size" -msgstr "" - -#. show/hide dot file -#: src/prefs_ui/prefs_ui_thumbwin.c:858 -msgid "Show dot file" -msgstr "" - -#. show/hide dot file -#: src/prefs_ui/prefs_ui_thumbwin.c:865 -msgid "Show \".\" directory whether hide dotfile or not." -msgstr "" - -#. show/hide dot file -#: src/prefs_ui/prefs_ui_thumbwin.c:872 -msgid "Show \"..\" directory whether hide dotfile or not." -msgstr "" - -#. ********************************************* -#. * Style Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_thumbwin.c:889 -msgid "Style" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:895 -msgid "Tree line style" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:907 -msgid "Tree expander style" -msgstr "" - -#. ********************************************* -#. * Drag and Drop Frame -#. ********************************************* -#: src/prefs_ui/prefs_ui_thumbwin.c:919 -msgid "Drag and Drop" -msgstr "" - -#. auto scroll -#: src/prefs_ui/prefs_ui_thumbwin.c:922 -msgid "Enable auto scroll." -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:932 -msgid "Auto scroll interval" -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:944 src/prefs_ui/prefs_ui_thumbwin.c:970 -msgid "[ms]" -msgstr "" - -#. auto expand -#: src/prefs_ui/prefs_ui_thumbwin.c:948 -msgid "Enable auto expand directory tree." -msgstr "" - -#: src/prefs_ui/prefs_ui_thumbwin.c:958 -msgid "Lag time for auto expand" -msgstr "" - -#. Show Scrollbar or not -#: src/prefs_ui/prefs_ui_thumbwin.c:1090 -msgid "Show scrollbar" -msgstr "" - -#: src/gimv_dupl_win.c:121 src/thumbnail_view_album.c:790 -#: plugins/thumbnail_view/detailview.c:121 -msgid "Name" -msgstr "" - -#: src/gimv_dupl_win.c:123 plugins/thumbnail_view/detailview.c:122 -msgid "Size (byte)" -msgstr "" - -#. window -#: src/gimv_dupl_win.c:181 -msgid "Find Duplicates - result" -msgstr "" - -#. Select All -#: src/gimv_dupl_win.c:297 -msgid "Select All" -msgstr "" - -#: src/gimv_dupl_win.c:409 -msgid "Finding similar images..." -msgstr "" - -#: src/gimv_dupl_win.c:426 -msgid "Completed" -msgstr "" - -#: src/text_viewer.c:71 -#, c-format -msgid "Can't open text file: %s\n" -msgstr "" - -#: src/text_viewer.c:117 -msgid "File Name: " -msgstr "" - -#: src/gimv_thumb_view.c:180 -msgid "/_Open" -msgstr "" - -#: src/gimv_thumb_view.c:181 -msgid "/Open in New _Window" -msgstr "" - -#: src/gimv_thumb_view.c:182 -msgid "/Open in S_hared Window" -msgstr "" - -#: src/gimv_thumb_view.c:183 -msgid "/Open in E_xternal Program" -msgstr "" - -#: src/gimv_thumb_view.c:184 -msgid "/_Scripts" -msgstr "" - -#: src/gimv_thumb_view.c:186 -msgid "/_Update Thumbnail" -msgstr "" - -#: src/gimv_thumb_view.c:187 -msgid "/Remo_ve from List" -msgstr "" - -#: src/gimv_thumb_view.c:191 -msgid "/Scan E_XIF Data..." -msgstr "" - -#: src/gimv_thumb_view.c:193 -msgid "/_Edit Comment..." -msgstr "" - -#: src/gimv_thumb_view.c:195 -msgid "/Re_name..." -msgstr "" - -#: src/gimv_thumb_view.c:196 -msgid "/_Copy Files To..." -msgstr "" - -#: src/gimv_thumb_view.c:197 -msgid "/_Move Files To..." -msgstr "" - -#: src/gimv_thumb_view.c:198 -msgid "/_Link Files To..." -msgstr "" - -#: src/gimv_thumb_view.c:199 -msgid "/_Remove file..." -msgstr "" - -#: src/gimv_thumb_view.c:478 -msgid "Execute command" -msgstr "" - -#: src/gimv_thumb_view.c:479 src/gimv_thumb_view.c:548 -msgid "Please enter options:" -msgstr "" - -#: src/gimv_thumb_view.c:547 -msgid "Execute script" -msgstr "" - -#: src/gimv_thumb_view.c:1016 -msgid "No files specified!!" -msgstr "" - -#: src/gimv_thumb_view.c:2378 -msgid "Rename a file" -msgstr "" - -#: src/gimv_thumb_view.c:2379 -msgid "New file name: " -msgstr "" - -#: src/gimv_thumb_view.c:2407 -#, c-format -msgid "" -"File exist : %s\n" -"\n" -"Overwrite?" -msgstr "" - -#: src/gimv_thumb_view.c:2429 -#, c-format -msgid "" -"Faild to rename file :\n" -"%s" -msgstr "" - -#: src/gimv_thumb_view.c:2448 -#, c-format -msgid "Faild to rename cache file :%s\n" -msgstr "" - -#: src/gimv_thumb_view.c:2458 -#, c-format -msgid "Faild to rename comment file :%s\n" -msgstr "" - -#: src/gimv_thumb_view.c:3659 src/gimv_thumb_view.c:3735 -#, c-format -msgid "Collection %d" -msgstr "" - -#: src/gimv_thumb_view.c:3729 -#, c-format -msgid "%s (Collection)" -msgstr "" - -#: src/thumbnail_view_album.c:86 -msgid "Album 2" -msgstr "" - -#: src/thumbnail_view_album.c:102 -msgid "Album 3" -msgstr "" - -#: src/thumbnail_view_album.c:716 -#, c-format -msgid "Name : %s" -msgstr "" - -#: src/thumbnail_view_album.c:735 -#, c-format -msgid "Size : %s bytes" -msgstr "" - -#: src/thumbnail_view_album.c:737 -#, c-format -msgid "%s bytes" -msgstr "" - -#: src/thumbnail_view_album.c:753 -msgid "Time : " -msgstr "" - -#: src/thumbnail_view_album.c:772 -#, c-format -msgid "Type: %s" -msgstr "" - -#: src/thumbnail_view_album.c:791 -msgid "Size" -msgstr "" - -#: src/thumbnail_view_album.c:792 -msgid "Time" -msgstr "" - -#: src/thumbnail_view_album.c:793 plugins/thumbnail_view/detailview.c:123 -msgid "Type" -msgstr "" - -#: plugins/archiver/lha-ext.c:52 -msgid "LHA archive support" -msgstr "" - -#: plugins/archiver/lha-ext.c:54 plugins/archiver/rar-ext.c:54 -#: plugins/archiver/tar-ext.c:89 plugins/archiver/zip-ext.c:57 -#: plugins/image_loader/bmp.c:130 plugins/image_loader/imlib_loader.c:176 -#: plugins/image_loader/mag.c:93 plugins/image_loader/mng.c:136 -#: plugins/image_loader/pcx.c:92 plugins/image_loader/pixbuf_loader.c:255 -#: plugins/image_loader/png_loader.c:76 -#: plugins/image_loader/spi_image_loader.c:53 plugins/image_loader/svg.c:80 -#: plugins/image_loader/tga.c:112 plugins/image_loader/wmf.c:80 -#: plugins/image_loader/xbm.c:92 plugins/image_loader/xcf.c:270 -#: plugins/image_loader/xvpics.c:50 plugins/image_saver/png_saver.c:49 -#: plugins/image_saver/pnm_saver.c:51 plugins/image_saver/xvpics_saver.c:49 -#: plugins/image_view/image_view_mplayer.c:240 -#: plugins/image_view/image_view_xine.c:265 plugins/io_stream/gimv_bz_io.c:59 -#: plugins/io_stream/gimv_gzip_io.c:66 plugins/thumbnail/ee.c:109 -#: plugins/thumbnail/gimv_thumb.c:99 plugins/thumbnail/gqview.c:107 -#: plugins/thumbnail/konqueror-old.c:105 plugins/thumbnail/nautilus.c:78 -#: plugins/thumbnail/nautilus-2.0.c:80 plugins/thumbnail/xvpics.c:83 -#: plugins/thumbnail_view/detailview.c:96 -msgid "Takuro Ashie" -msgstr "" - -#: plugins/archiver/rar-ext.c:52 -msgid "RAR archive support" -msgstr "" - -#: plugins/archiver/tar-ext.c:87 -msgid "TAR archive support" -msgstr "" - -#: plugins/archiver/zip-ext.c:55 -msgid "ZIP archive support" -msgstr "" - -#: plugins/image_loader/bmp.c:101 plugins/image_loader/bmp.c:108 -#: plugins/image_loader/bmp.c:115 -msgid "Windows Bitmap Image" -msgstr "" - -#: plugins/image_loader/bmp.c:128 -msgid "Windows Bitmap Image Loader" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:84 -#: plugins/image_loader/imlib_loader.c:91 -#: plugins/image_loader/imlib_loader.c:98 -#: plugins/image_loader/pixbuf_loader.c:121 -#: plugins/image_loader/pixbuf_loader.c:128 -#: plugins/image_loader/pixbuf_loader.c:135 -msgid "The BMP image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:105 -#: plugins/image_loader/pixbuf_loader.c:142 -msgid "The GIF image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:112 -#: plugins/image_loader/pixbuf_loader.c:156 -msgid "The JPEG image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:119 -#: plugins/image_loader/pixbuf_loader.c:163 -msgid "The PNG image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:126 -#: plugins/image_loader/pixbuf_loader.c:170 -msgid "Portable Any Map Image" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:133 -#: plugins/image_loader/pixbuf_loader.c:177 -msgid "The PBM image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:140 -#: plugins/image_loader/pixbuf_loader.c:184 -msgid "The PGM image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:147 -#: plugins/image_loader/pixbuf_loader.c:191 -msgid "The PPM image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:154 -#: plugins/image_loader/pixbuf_loader.c:219 -msgid "The TIFF image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:161 -#: plugins/image_loader/pixbuf_loader.c:240 -msgid "The XPM image format" -msgstr "" - -#: plugins/image_loader/imlib_loader.c:174 -msgid "Imlib1 Image Loader" -msgstr "" - -#: plugins/image_loader/mag.c:91 -msgid "MAG Image Loader" -msgstr "" - -#: plugins/image_loader/mng.c:134 -msgid "MNG Image Loader" -msgstr "" - -#: plugins/image_loader/pcx.c:90 -msgid "PCX Image Loader" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:114 -msgid "The ANI image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:149 -msgid "The ICO image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:198 -#: plugins/image_loader/pixbuf_loader.c:205 -msgid "The Sun raster image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:212 -msgid "The Targa image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:226 -msgid "The WBMP image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:233 -msgid "The XBM image format" -msgstr "" - -#: plugins/image_loader/pixbuf_loader.c:253 -msgid "GdkPixbuf Image Loader" -msgstr "" - -#: plugins/image_loader/png_loader.c:74 -msgid "PNG Image Loader" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:60 -msgid "/Plugin/Susie plugin" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:68 -msgid "/Plugin/Susie plugin/Import filter" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:76 -msgid "/Plugin/Susie plugin/Archive extractor" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:192 -msgid "Directories list to search susie plugins" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:193 -msgid "Select susie plugin directory" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:197 -msgid "Use default directories list to search susie plugins" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:225 -msgid "File Name" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:316 -msgid "Import filters" -msgstr "" - -#: plugins/image_loader/prefs_spi.c:339 -msgid "Archive Extractor" -msgstr "" - -#: plugins/image_loader/spi_image_loader.c:51 -msgid "Susie Plugin Image Loader" -msgstr "" - -#: plugins/image_loader/svg.c:78 -msgid "SVG Image Loader" -msgstr "" - -#: plugins/image_loader/tga.c:110 -msgid "TGA Image Loader" -msgstr "" - -#: plugins/image_loader/wmf.c:78 -msgid "WMF Image Loader" -msgstr "" - -#: plugins/image_loader/xbm.c:90 -msgid "XBM Image Loader" -msgstr "" - -#: plugins/image_loader/xcf.c:268 -msgid "XCF Image Loader" -msgstr "" - -#: plugins/image_loader/xvpics.c:48 -msgid "XV thumbnail Image Loader" -msgstr "" - -#: plugins/image_saver/png_saver.c:47 -msgid "PNG Image Saver" -msgstr "" - -#: plugins/image_saver/pnm_saver.c:49 -msgid "PNM Image Saver" -msgstr "" - -#: plugins/image_saver/xvpics_saver.c:47 -msgid "XVPICS Image Saver" -msgstr "" - -#: plugins/image_view/image_view_mplayer.c:77 -msgid "Movie Player (MPlayer)" -msgstr "" - -#: plugins/image_view/image_view_mplayer.c:238 -msgid "MPlayer Embeder & Movie Frame Loader" -msgstr "" - -#: plugins/image_view/image_view_xine.c:102 -msgid "Movie Player (Xine)" -msgstr "" - -#: plugins/image_view/image_view_xine.c:263 -msgid "Xine Embeder & Movie Frame Loader" -msgstr "" - -#: plugins/image_view/image_view_xine.c:725 -msgid "Please stop first." -msgstr "" - -#: plugins/image_view/image_view_xine.c:737 -msgid "No available plugin found." -msgstr "" - -#: plugins/image_view/image_view_xine.c:742 -msgid "Available plugins" -msgstr "" - -#: plugins/image_view/image_view_xine.c:742 -msgid "Plugin: " -msgstr "" - -#: plugins/image_view/image_view_xine.c:763 -msgid "No available MRL found." -msgstr "" - -#: plugins/image_view/prefs_mplayer.c:69 -msgid "/Movie and Audio/MPlayer" -msgstr "" - -#. ********************************************* -#. * Driver Frame -#. ********************************************* -#: plugins/image_view/prefs_mplayer.c:253 -msgid "Driver" -msgstr "" - -#. video driver combo -#: plugins/image_view/prefs_mplayer.c:264 plugins/image_view/prefs_xine.c:187 -#: plugins/image_view/prefs_xine.c:215 -msgid "Video driver : " -msgstr "" - -#. audio driver combo -#: plugins/image_view/prefs_mplayer.c:282 plugins/image_view/prefs_xine.c:197 -#: plugins/image_view/prefs_xine.c:233 -msgid "Audio driver : " -msgstr "" - -#. use this feature or not -#: plugins/image_view/prefs_mplayer.c:306 -msgid "Enable creating thumbnail of movie using MPlayer" -msgstr "" - -#: plugins/image_view/prefs_mplayer.c:318 plugins/image_view/prefs_xine.c:273 -msgid "Stream position : " -msgstr "" - -#: plugins/image_view/prefs_mplayer.c:332 plugins/image_view/prefs_xine.c:287 -msgid "[%]" -msgstr "" - -#: plugins/image_view/prefs_xine.c:45 -msgid "/Movie and Audio/Xine" -msgstr "" - -#. ********************************************* -#. * Driver Frame -#. ********************************************* -#: plugins/image_view/prefs_xine.c:177 -msgid "Driver (Not implemented yet)" -msgstr "" - -#. use this feature or not -#: plugins/image_view/prefs_xine.c:260 -msgid "Enable creating thumbnail of movie using Xine" -msgstr "" - -#: plugins/image_view/prefs_xine.c:297 -msgid "Delay time to create thumbnail from starting play : " -msgstr "" - -#: plugins/io_stream/gimv_bz_io.c:57 -msgid "BZIP2 Compressed Stream Support" -msgstr "" - -#: plugins/io_stream/gimv_gzip_io.c:64 -msgid "GZIP Compressed Stream Support" -msgstr "" - -#: plugins/thumbnail/ee.c:83 -msgid "Electric Eyes (Preview)" -msgstr "" - -#: plugins/thumbnail/ee.c:89 -msgid "Electric Eyes (Icon)" -msgstr "" - -#: plugins/thumbnail/ee.c:95 -msgid "Electric Eyes (Mini)" -msgstr "" - -#: plugins/thumbnail/ee.c:107 -msgid "Electric Eyes thumbnail support" -msgstr "" - -#: plugins/thumbnail/ee.c:187 plugins/thumbnail/gqview.c:242 -#: plugins/thumbnail/konqueror-old.c:189 -#, c-format -msgid "save cache: %s\n" -msgstr "" - -#: plugins/thumbnail/gimv_thumb.c:97 -msgid "GImageView thumbnail support" -msgstr "" - -#: plugins/thumbnail/gimv_thumb.c:247 -msgid "image size invalid\n" -msgstr "" - -#: plugins/thumbnail/gimv_thumb.c:254 -msgid "cache size invalid\n" -msgstr "" - -#: plugins/thumbnail/gimv_thumb.c:380 -msgid "GImageVIew thumbnail size" -msgstr "" - -#: plugins/thumbnail/gqview.c:93 -msgid "GQview" -msgstr "" - -#: plugins/thumbnail/gqview.c:105 -msgid "GQview thumbnail support" -msgstr "" - -#: plugins/thumbnail/gqview.c:326 -msgid "GQview thumbnail size" -msgstr "" - -#: plugins/thumbnail/konqueror-old.c:79 -msgid "Konqueror old (Large)" -msgstr "" - -#: plugins/thumbnail/konqueror-old.c:85 -msgid "Konqueror old (Medium)" -msgstr "" - -#: plugins/thumbnail/konqueror-old.c:91 -msgid "Konqueror old (Small)" -msgstr "" - -#: plugins/thumbnail/konqueror-old.c:103 -msgid "Konqueror(KDE2.1.x or belower) thumbnail support" -msgstr "" - -#: plugins/thumbnail/konqueror.c:81 -msgid "Konqueror (Large)" -msgstr "" - -#: plugins/thumbnail/konqueror.c:87 -msgid "Konqueror (Medium)" -msgstr "" - -#: plugins/thumbnail/konqueror.c:93 -msgid "Konqueror (Small)" -msgstr "" - -#: plugins/thumbnail/konqueror.c:106 -msgid "Konqueror(KDE2.2 or higher) thumbnail support" -msgstr "" - -#: plugins/thumbnail/nautilus.c:65 -msgid "Nautilus" -msgstr "" - -#: plugins/thumbnail/nautilus.c:76 -msgid "Nautilus thumbnail support" -msgstr "" - -#: plugins/thumbnail/nautilus-2.0.c:67 -msgid "Nautilus-2.0" -msgstr "" - -#: plugins/thumbnail/nautilus-2.0.c:78 -msgid "Nautilus-2.0 thumbnail support" -msgstr "" - -#: plugins/thumbnail/xvpics.c:70 -msgid "XV thumbnail" -msgstr "" - -#: plugins/thumbnail/xvpics.c:81 -msgid "XV thumbnail support" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:41 -msgid "Detail" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:57 -msgid "Detail + Icon" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:73 -msgid "Detail + Thumbnail" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:94 -msgid "Thumbnail View Detail Mode" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:124 -msgid "Cache type" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:125 -msgid "Access time" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:126 -msgid "Modification time" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:127 -msgid "Change time" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:128 -msgid "User" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:129 -msgid "Group" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:130 -msgid "Mode" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:131 -msgid "Image size" -msgstr "" - -#: plugins/thumbnail_view/detailview.c:335 -msgid "Unknwon" -msgstr "" - -#: plugins/thumbnail_view/detailview_prefs.c:56 -msgid "/Thumbnail Window/Thumbnail View/Detail View" -msgstr "" - -#: plugins/thumbnail_view/detailview_prefs.c:108 -msgid "Column Order" -msgstr "" - -#: plugins/thumbnail_view/detailview_prefs.c:109 -msgid "Possible columns" -msgstr "" - -#: plugins/thumbnail_view/detailview_prefs.c:110 -msgid "Displayed columns" -msgstr "" - -#. show/hide column title -#: plugins/thumbnail_view/detailview_prefs.c:121 -msgid "Show Column Title" -msgstr "" - -#: src/gimv_elist.c:997 -msgid "Down" -msgstr "" - -#: src/gimv_elist.c:1024 -msgid "New" -msgstr "" - -#: src/gimv_elist.c:1028 -msgid "Add" -msgstr "" - -#: src/gimv_elist.c:1032 -msgid "Change" -msgstr "" - -#: src/gimv_elist.c:1036 -msgid "Delete" -msgstr "" Binary files /tmp/_fC1Glvxqt/gimageview-0.2.27/po/ja.gmo and /tmp/XIUpKTSmVp/gimageview-0.3.0-0.20101117/po/ja.gmo differ diff -Nru gimageview-0.2.27/po/ja.po gimageview-0.3.0-0.20101117/po/ja.po --- gimageview-0.2.27/po/ja.po 2004-12-28 04:33:45.000000000 +0000 +++ gimageview-0.3.0-0.20101117/po/ja.po 2010-11-17 06:10:11.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: GImageView 0.1.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-28 13:33+0900\n" +"POT-Creation-Date: 2004-12-28 13:26+0900\n" "PO-Revision-Date: 2004-12-28 13:27+0900\n" "Last-Translator: Takuro Ashie \n" "Language-Team: Japanese \n" diff -Nru gimageview-0.2.27/po/Makefile.in.in gimageview-0.3.0-0.20101117/po/Makefile.in.in --- gimageview-0.2.27/po/Makefile.in.in 2004-05-23 14:07:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/po/Makefile.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` - -CC = @CC@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ - -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --pot - - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -$(POFILES) $(GMOFILES) - -POTFILES = \ - -CATALOGS = @CATALOGS@ - -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo - -.c.o: - $(COMPILE) $< - -.po.pox: - $(MAKE) $(PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', -# otherwise packages like GCC can not be built if only parts of the source -# have been downloaded. - -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in - $(GENPOT) - - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi -install-data-no: all -install-data-yes: all - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ - fi; \ - done - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ - done - if test "$(PACKAGE)" = "gettext"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi - -check: all - -dvi info tags TAGS ID: - -mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.new.po - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: - $(MAKE) update-po - @$(MAKE) dist2 -# This is a separate target because 'update-po' must be executed before. -dist2: $(DISTFILES) - dists="$(DISTFILES)"; \ - for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(PACKAGE).pot - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ - cd $(srcdir); \ - catalogs='$(GMOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - cp $$lang.po $$lang.old.po; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang ; then \ - rm -f $$lang.old.po; \ - else \ - echo "msgmerge for $$cat failed!"; \ - mv $$lang.old.po $$lang.po; \ - fi; \ - done - $(MAKE) update-gmo - -.po: Makefile - $(MAKE) $(PACKAGE).pot; - PATH=`pwd`/../src:$$PATH; \ - echo; printf "$*: "; \ - if $(MSGMERGE) $*; then \ - rm -f $*.old.po; \ - else \ - echo "msgmerge for * failed!"; \ - mv $*.old.po $*.po; \ - fi; \ - msgfmt --statistics $*.po; echo; - - -update-gmo: Makefile $(GMOFILES) - @: - -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/src/argparse.c gimageview-0.3.0-0.20101117/src/argparse.c --- gimageview-0.2.27/src/argparse.c 2004-09-22 14:26:22.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/argparse.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: argparse.c,v 1.14 2004/09/22 14:26:22 makeinu Exp $ + * $Id: argparse.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -28,8 +28,8 @@ #include "gimageview.h" #include "argparse.h" -#include "charset.h" #include "prefs.h" +#include "utils_char_code.h" ArgsVal args_val; diff -Nru gimageview-0.2.27/src/argparse.h gimageview-0.3.0-0.20101117/src/argparse.h --- gimageview-0.2.27/src/argparse.h 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/argparse.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: argparse.h,v 1.6 2002/10/02 19:05:00 makeinu Exp $ + * $Id: argparse.h 555 2002-10-02 19:05:10Z makeinu $ */ #ifndef __ARGPARSE_H__ diff -Nru gimageview-0.2.27/src/auto_completion.c gimageview-0.3.0-0.20101117/src/auto_completion.c --- gimageview-0.2.27/src/auto_completion.c 2004-05-23 14:07:46.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/auto_completion.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,537 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: auto_completion.c,v 1.3 2003/06/13 09:43:23 makeinu Exp $ - */ - -/* - * These codes are mostly taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "auto_completion.h" -#include "charset.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "gtk2-compat.h" -#include "prefs.h" - -#define MAX_VISIBLE_ROWS 8 -#define CLIST_ROW_PAD 5 - -static gchar *ac_dir = NULL; -static gchar *ac_path = NULL; -static gchar ac_show_dot = FALSE; -static GList *ac_subdirs = NULL; -static GList *ac_alternatives = NULL; - -static GtkWidget *ac_window = NULL; -static GtkWidget *ac_clist = NULL; -static GtkWidget *ac_entry = NULL; -#ifdef ENABLE_TREEVIEW -static GtkListStore *ac_list_store = NULL; -#endif /* ENABLE_TREEVIEW */ - -static void -ac_dir_free (void) -{ - if (!ac_dir) return; - - g_free (ac_dir); - ac_dir = NULL; -} - - -static void -ac_path_free (void) -{ - if (!ac_path) return; - - g_free (ac_path); - ac_path = NULL; -} - - -static void -ac_subdirs_free (void) -{ - if (!ac_subdirs) return; - - g_list_foreach (ac_subdirs, (GFunc) g_free, NULL); - g_list_free (ac_subdirs); - ac_subdirs = NULL; -} - - -static void -ac_alternatives_free (void) -{ - if (!ac_alternatives) return; - - g_list_foreach (ac_alternatives, (GFunc) g_free, NULL); - g_list_free (ac_alternatives); - ac_alternatives = NULL; -} - - -void -auto_compl_reset (void) -{ - ac_dir_free (); - ac_path_free (); - ac_subdirs_free (); - ac_alternatives_free (); -} - - -gint -auto_compl_get_n_alternatives (const gchar *path) -{ - gchar *dir; - const gchar *filename; - gint path_len; - GList *scan; - gint n; - gint flags = GETDIR_FOLLOW_SYMLINK; - gboolean show_dot; - - if (path == NULL) return 0; - - filename = g_basename (path); - if (filename && filename[0] == '.') { - show_dot = TRUE; - flags = flags | GETDIR_READ_DOT; - } else { - show_dot = FALSE; - } - - if (strcmp (path, "/") == 0) - dir = g_strdup ("/"); - else - dir = g_dirname (path); - - if (!isdir (dir)) { - g_free (dir); - return 0; - } - - if ((ac_dir == NULL) || strcmp (dir, ac_dir) || ac_show_dot != show_dot) { - ac_dir_free (); - ac_subdirs_free (); - - ac_dir = charset_to_internal (dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - if (!ac_dir && dir) - ac_dir = g_strdup (dir); - - get_dir (dir, flags, NULL, &ac_subdirs); - if (ac_show_dot != show_dot) - ac_show_dot = show_dot; - } - - ac_path_free (); - ac_alternatives_free (); - - ac_path = g_strdup (path); - path_len = strlen (ac_path); - n = 0; - - for (scan = ac_subdirs; scan; scan = scan->next) { - const gchar *subdir = (gchar*) scan->data; - gchar *subdir_internal; - - subdir_internal = charset_to_internal (subdir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (!subdir_internal && subdir) - subdir_internal = g_strdup (subdir); - - if (strncmp (path, subdir_internal, path_len) != 0) { - g_free (subdir_internal); - continue; - } - - ac_alternatives = g_list_prepend (ac_alternatives, - subdir_internal); - - n++; - } - - g_free (dir); - ac_alternatives = g_list_reverse (ac_alternatives); - - return n; -} - - -static gint -get_common_prefix_length (void) -{ - gint n; - GList *scan; - gchar c1, c2; - - g_return_val_if_fail (ac_path != NULL, 0); - g_return_val_if_fail (ac_alternatives != NULL, 0); - - /* if the number of alternatives is 1 return its length. */ - if (ac_alternatives->next == NULL) - return strlen ((gchar*) ac_alternatives->data); - - n = strlen (ac_path); - while (TRUE) { - scan = ac_alternatives; - - c1 = ((gchar*) scan->data) [n]; - - if (c1 == 0) - return n; - - /* check that all other alternatives have the same - * character at position n. */ - - scan = scan->next; - - for (; scan; scan = scan->next) { - c2 = ((gchar*) scan->data) [n]; - if (c1 != c2) - return n; - } - - n++; - } - - return -1; -} - - -gchar * -auto_compl_get_common_prefix (void) -{ - gchar *alternative; - gint n; - - if (ac_path == NULL) - return NULL; - - if (ac_alternatives == NULL) - return NULL; - - n = get_common_prefix_length (); - alternative = (gchar*) ac_alternatives->data; - - return g_strndup (alternative, n); -} - - -GList * -auto_compl_get_alternatives (void) -{ - return ac_alternatives; -} - - -static gboolean -ac_window_button_press_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer *data) -{ - GtkWidget *event_widget; - gint x, y, w, h; - - event_widget = gtk_get_event_widget ((GdkEvent *)event); - - gdk_window_get_origin (ac_window->window, &x, &y); - gdk_window_get_size (ac_window->window, &w, &h); - - /* Checks if the button press happened inside the window, - * if not closes the window. */ - if ((event->x >= 0) && (event->x <= w) - && (event->y >= 0) && (event->y <= h)) { - /* In window. */ - return FALSE; - } - - auto_compl_hide_alternatives (); - - return TRUE; -} - - -static gboolean -ac_window_key_press_cb (GtkWidget *widget, - GdkEventKey *event, - gpointer *data) -{ - if (event->keyval == GDK_Escape) { - auto_compl_hide_alternatives (); - return TRUE; - } - - /* allow keyboard navigation in the alternatives clist */ - if (event->keyval == GDK_Up - || event->keyval == GDK_Down - || event->keyval == GDK_Page_Up - || event->keyval == GDK_Page_Down - || event->keyval == GDK_space) - return FALSE; - - if (event->keyval == GDK_Return) { - event->keyval = GDK_space; - return FALSE; - } - - auto_compl_hide_alternatives (); - gtk_widget_event (ac_entry, (GdkEvent*) event); - return TRUE; -} - - -#ifdef ENABLE_TREEVIEW -static void -cb_tree_cursor_changed (GtkTreeView *treeview, gpointer data) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - gchar *text, *full_path; - - g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); - - selection = gtk_tree_view_get_selection (treeview); - gtk_tree_selection_get_selected (selection, &model, &iter); - gtk_tree_model_get (model, &iter, - 0, &text, - -1); - if (!text) return; - - full_path = g_strconcat (ac_dir, "/", text, NULL); - gtk_entry_set_text (GTK_ENTRY (ac_entry), full_path); - - g_free (text); - g_free (full_path); - - gtk_editable_set_position (GTK_EDITABLE (ac_entry), -1); -} -#else /* ENABLE_TREEVIEW */ -static void -ac_clist_select_row_cb (GtkCList *clist, - gint row, - gint column, - GdkEventButton *event, - gpointer *data) -{ - gchar *text; - gchar *full_path; - - auto_compl_hide_alternatives (); - - gtk_clist_get_text (GTK_CLIST (ac_clist), row, column, &text); - full_path = g_strconcat (ac_dir, "/", text, NULL); - gtk_entry_set_text (GTK_ENTRY (ac_entry), full_path); - g_free (full_path); - -#ifdef USE_GTK2 - gtk_editable_set_position (GTK_EDITABLE (ac_entry), -1); -#endif -} -#endif /* ENABLE_TREEVIEW */ - - -/* displays a list of alternatives under the entry widget. */ -void -auto_compl_show_alternatives (GtkWidget *entry) -{ - gint x, y, w, h; - GList *scan; - gint n, width; - - if (ac_window == NULL) { - GtkWidget *scroll; - GtkWidget *frame; - - ac_window = gtk_window_new (GTK_WINDOW_POPUP); - -#ifdef ENABLE_TREEVIEW - { - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - ac_list_store = gtk_list_store_new (1, G_TYPE_STRING); - ac_clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (ac_list_store)); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (ac_clist), TRUE); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ac_clist), FALSE); - - col = gtk_tree_view_column_new(); - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, FALSE); - gtk_tree_view_column_add_attribute (col, render, "text", 0); - - gtk_tree_view_append_column (GTK_TREE_VIEW (ac_clist), col); - } -#else /* ENABLE_TREEVIEW */ - { - GdkFont *font; - gint row_height; - ac_clist = gtk_clist_new (1); - font = gtk_style_get_font (GTK_WIDGET (ac_clist)->style); - row_height = (font->ascent + font->descent + CLIST_ROW_PAD); - gtk_clist_set_row_height (GTK_CLIST (ac_clist), row_height); - } -#endif /* ENABLE_TREEVIEW */ - - scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - - frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); - - gtk_container_add (GTK_CONTAINER (ac_window), frame); - gtk_container_add (GTK_CONTAINER (frame), scroll); - gtk_container_add (GTK_CONTAINER (scroll), ac_clist); - - gtk_signal_connect (GTK_OBJECT (ac_window), - "button-press-event", - GTK_SIGNAL_FUNC(ac_window_button_press_cb), - NULL); - gtk_signal_connect (GTK_OBJECT (ac_window), - "key-press-event", - GTK_SIGNAL_FUNC(ac_window_key_press_cb), - NULL); - -#ifdef ENABLE_TREEVIEW - g_signal_connect (G_OBJECT (ac_clist), - "cursor_changed", - G_CALLBACK (cb_tree_cursor_changed), - NULL); -#else /* ENABLE_TREEVIEW */ - gtk_signal_connect (GTK_OBJECT (ac_clist), - "select_row", - GTK_SIGNAL_FUNC(ac_clist_select_row_cb), - NULL); -#endif /* ENABLE_TREEVIEW */ - } - - ac_entry = entry; - width = 0; - n = 0; - -#ifdef ENABLE_TREEVIEW - { - GtkTreeIter iter; - - gtk_list_store_clear (ac_list_store); - - for (scan = ac_alternatives; scan; scan = scan->next) { - gtk_list_store_append (ac_list_store, &iter); - gtk_list_store_set (ac_list_store, &iter, - 0, g_basename (scan->data), - -1); - - if (n == 0) { - GtkTreeSelection *selection; - GtkTreePath *treepath; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ac_clist)); - treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (ac_list_store), - &iter); - gtk_tree_selection_select_path (selection, treepath); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (ac_clist), - treepath, NULL, - TRUE, 0.0, 0.0); - gtk_tree_path_free (treepath); - } - - n++; - } - } -#else /* ENABLE_TREEVIEW */ - gtk_clist_freeze (GTK_CLIST (ac_clist)); - gtk_clist_clear (GTK_CLIST (ac_clist)); - - for (scan = ac_alternatives; scan; scan = scan->next) { - gchar *text[] = {NULL, NULL}; - - text[0] = (gchar *) g_basename (scan->data); - - gtk_clist_append (GTK_CLIST (ac_clist), text); - width = MAX (width, - gdk_string_width ( - gtk_style_get_font (GTK_WIDGET (ac_clist)->style), - text[0])); - - n++; - } - - gtk_clist_set_column_width (GTK_CLIST (ac_clist), 0, width); - gtk_clist_thaw (GTK_CLIST (ac_clist)); -#endif /* ENABLE_TREEVIEW */ - - gdk_window_get_geometry (entry->window, &x, &y, &w, &h, NULL); - gdk_window_get_deskrelative_origin (entry->window, &x, &y); - gtk_widget_set_uposition (ac_window, x, y + h); - gtk_widget_set_usize (ac_window, w, 200); - - gtk_widget_show_all (ac_window); - gdk_pointer_grab (ac_window->window, - TRUE, - (GDK_POINTER_MOTION_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK), - NULL, - NULL, - GDK_CURRENT_TIME); - gdk_keyboard_grab (ac_window->window, - FALSE, - GDK_CURRENT_TIME); - gtk_grab_add (ac_window); -} - - -void -auto_compl_hide_alternatives (void) -{ - if (ac_window && GTK_WIDGET_VISIBLE (ac_window)) { - gdk_pointer_ungrab (GDK_CURRENT_TIME); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); - gtk_grab_remove (ac_window); - gtk_widget_hide (ac_window); - } -} diff -Nru gimageview-0.2.27/src/auto_completion.h gimageview-0.3.0-0.20101117/src/auto_completion.h --- gimageview-0.2.27/src/auto_completion.h 2004-05-23 14:07:46.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/auto_completion.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GThumb - * - * Copyright (C) 2001 The 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 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 Street #330, Boston, MA 02111-1307, USA. - * - * $Id: auto_completion.h,v 1.2 2003/06/13 09:43:23 makeinu Exp $ - */ - -#ifndef AUTO_COMPLETION_H -#define AUTO_COMPLETION_H - -#include -#include - -void auto_compl_reset (void); - -gint auto_compl_get_n_alternatives (const gchar *path); - -gchar * auto_compl_get_common_prefix (void); - -GList * auto_compl_get_alternatives (void); - -void auto_compl_show_alternatives (GtkWidget *entry); - -void auto_compl_hide_alternatives (void); - - -#endif /* AUTO_COMPLETION_H */ diff -Nru gimageview-0.2.27/src/charset.c gimageview-0.3.0-0.20101117/src/charset.c --- gimageview-0.2.27/src/charset.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/charset.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,710 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: charset.c,v 1.11 2004/09/21 08:44:31 makeinu Exp $ - */ - -#include -#include "charset.h" -#include "intl.h" -#include "japanese.h" - -#ifdef USE_GTK2 -# -#else -# ifdef HAVE_ICONV -# include -# include -# include -# endif /* HAVE_ICONV */ -# -# ifdef HAVE_LIBCHARSET -# include -# elif defined (HAVE_LANGINFO_CODESET) -# include -# elif defined (USE_INCLUDED_LIBINTL) -extern const char *locale_charset (void); -# else -# endif /* HAVE_LIBCHARSET */ -#endif /* USE_GTK2 */ - - -CharsetDetectLocaleFn charset_locale_fn_table[] = { - japanese_locale_charset, -}; - - -#ifndef USE_GTK2 -#ifndef HAVE_ICONV - -/* See lib/encodings.def in libiconv */ - -gchar *charset_ascii_defs[] = { - CHARSET_ASCII, - "ASCII", - "ISO646-US", - "ISO_646.IRV:1991", - "ISO-IR-6", - "ANSI_X3.4-1968", - "ANSI_X3.4-1986", - "CP367", - "IBM367", - "US", - "csASCII", -}; -gint charset_ascii_defs_num = sizeof (charset_ascii_defs) / sizeof (gchar*); - -CharsetConvFn charset_conv_fn_table[] = { - japanese_conv, -}; -#endif /* HAVE_ICONV */ -#endif /* USE_GTK2 */ - - -static gboolean -is_default_codeset (const gchar *charset) -{ - if (!charset && !*charset) - return TRUE; - - if (!g_strcasecmp ("default", charset) - || !g_strcasecmp ("none", charset) - || !g_strcasecmp ("auto", charset) - || !g_strcasecmp ("auto detect", charset) - || !g_strcasecmp ("auto-detect", charset) - || !g_strcasecmp ("auto_detect", charset)) - { - return TRUE; - } - - return FALSE; -} - - -/****************************************************************************** - * - * known character set list - * - ******************************************************************************/ -static const gchar *knwon_charset_items[] = { - "default", - CHARSET_ASCII, - CHARSET_JIS, - CHARSET_EUC_JP, - CHARSET_SJIS, - CHARSET_UTF8, -}; - -static GList *known_charset_list = NULL; - -/* FIXME */ -GList * -charset_get_known_list (const gchar *lang) -{ - gint i, num = sizeof (knwon_charset_items) / sizeof (gchar *); - - if (known_charset_list) return known_charset_list; - - for (i = 0; i < num; i++) { - known_charset_list = g_list_append (known_charset_list, - (gpointer) knwon_charset_items[i]); - } - - return known_charset_list; -} - - -/****************************************************************************** - * - * auto detect method for each language. - * - ******************************************************************************/ -CharsetAutoDetectFn auto_detect_fn_table[] ={ - NULL, - japanese_detect_charset, -}; - -const gchar *charset_auto_detect_labels[] = { - N_("None"), - N_("Japanese"), - NULL -}; - - -CharsetAutoDetectFn -charset_get_auto_detect_func (CharsetAutoDetectType type) -{ - guint num = sizeof (auto_detect_fn_table) / sizeof (CharsetAutoDetectFn); - - if (type < 0 || type > num) return NULL; - - return auto_detect_fn_table[type]; -} - - -/****************************************************************************** - * - * detecting locale & internal charset. - * - ******************************************************************************/ -gchar *charset_locale = NULL; -gchar *charset_internal = NULL; - - -const gchar * -get_lang (void) -{ - const gchar *lang = NULL; - - lang = g_getenv ("LANGUAGE"); - - if (!lang) - lang = g_getenv ("LC_ALL"); - - if (!lang) - lang = g_getenv ("LC_CTYPE"); - - if (!lang) - lang = g_getenv ("LC_MESSAGES"); - - if (!lang) - lang = g_getenv ("LANG"); - - if (!lang) - lang = "C"; - - return lang; -} - - -void -charset_set_locale_charset (const gchar *charset) -{ - if (charset_locale) - g_free (charset_locale); - - if (charset && *charset) { - if (is_default_codeset (charset)) { - charset_locale = NULL; - } else { - charset_locale = g_strdup (charset); - } - } else { - charset_locale = NULL; - } -} - - -void -charset_set_internal_charset (const gchar *charset) -{ - if (charset_internal) - g_free (charset_internal); - - if (charset && *charset) { - if (is_default_codeset (charset)) { - charset_internal = NULL; - } else { - charset_internal = g_strdup (charset); - } - } else { - charset_internal = NULL; - } -} - - -const gchar * -charset_get_locale (void) -{ - const gchar *charset; - - if (charset_locale && *charset_locale) - return charset_locale; - -#ifdef USE_GTK2 - if (!g_get_charset (&charset)) - charset = NULL; -#elif defined (HAVE_LIBCHARSET) - charset = locale_charset (); -#elif defined (HAVE_LANGINFO_CODESET) && defined (HAVE_GLIBC21) - charset = nl_langinfo (CODESET); -#elif defined (USE_INCLUDED_LIBINTL) - charset = locale_charset (); -#else -#endif /* USE_GTK2 */ - - if (!charset || !*charset) { - gint i, num = sizeof (charset_locale_fn_table) / sizeof (CharsetDetectLocaleFn); - const gchar *lang; - - lang = get_lang (); - - for (i = 0; i < num; i++) { - charset = charset_locale_fn_table[i] (lang); - if (charset) break; - } - } - - if (charset && *charset) { - if (charset_locale) - g_free (charset_locale); - charset_locale = g_strdup (charset); - - return charset_locale; - } - - return CHARSET_ASCII; -} - - -const gchar * -charset_get_internal (void) -{ - const gchar *charset; - - if (charset_internal && *charset_internal) - return charset_internal; - -#ifdef USE_GTK2 - charset = CHARSET_UTF8; -#else /* USE_GTK2 */ - charset = charset_get_locale (); -#endif /* USE_GTK2 */ - - if (charset && *charset) { - if (charset_internal) - g_free (charset_internal); - charset_internal = g_strdup (charset); - - return charset_internal; - - } else { - return CHARSET_ASCII; - } -} - - - -/****************************************************************************** - * - * any code -> internal converter - * - ******************************************************************************/ -gchar * -charset_to_internal (const gchar *src, - const gchar *src_codeset, - CharsetAutoDetectFn func, - CharsetToInternalTypes type) -{ - g_return_val_if_fail (src, NULL); - - switch (type) { - case CHARSET_TO_INTERNAL_NEVER: - return g_strdup (src); - case CHARSET_TO_INTERNAL_LOCALE: - return charset_locale_to_internal (src); - case CHARSET_TO_INTERNAL_AUTO: - return charset_to_internal_auto (src, func); - case CHARSET_TO_INTERNAL_ANY: - if (is_default_codeset (src_codeset)) { - src_codeset = charset_get_locale (); - } - return charset_conv (src, src_codeset, charset_get_internal ()); - default: - break; - } - - return g_strdup (src); -} - - -gchar * -charset_locale_to_internal (const gchar *src) -{ - g_return_val_if_fail (src, NULL); - -#ifdef USE_GTK2 - { - gssize len = -1; - gsize bytes_read, bytes_written; - - return g_locale_to_utf8 (src, len, &bytes_read, &bytes_written, NULL); - } -#else /* USE_GTK2 */ - return charset_conv (src, charset_get_locale (), charset_get_internal ()); -#endif /* USE_GTK2 */ -} - - -gchar * -charset_to_internal_auto (const gchar *src, CharsetAutoDetectFn func) -{ - const gchar *charset = charset_get_internal(); - if (charset) - return charset_conv_auto (src, charset, func); - - return g_strdup (src); -} - - - -/****************************************************************************** - * - * any code -> locale converter - * - ******************************************************************************/ -gchar * -charset_to_locale (const gchar *src, - const gchar *src_codeset, - CharsetAutoDetectFn func, - CharsetToLocaleTypes type) -{ - g_return_val_if_fail (src, NULL); - - switch (type) { - case CHARSET_TO_LOCALE_NEVER: - return g_strdup (src); - case CHARSET_TO_LOCALE_INTERNAL: - return charset_internal_to_locale (src); - case CHARSET_TO_LOCALE_AUTO: - return charset_to_locale_auto (src, func); - case CHARSET_TO_LOCALE_ANY: - if (is_default_codeset (src_codeset)) - src_codeset = charset_get_internal (); - return charset_conv (src, src_codeset, charset_get_locale ()); - default: - break; - } - - return g_strdup (src); -} - - -gchar * -charset_internal_to_locale (const gchar *src) -{ - g_return_val_if_fail (src, NULL); - -#ifdef USE_GTK2 - { - gssize len = -1; - gsize bytes_read, bytes_written; - return g_locale_from_utf8 (src, len, &bytes_read, &bytes_written, NULL); - } -#else /* USE_GTK2 */ - return charset_conv (src, charset_get_internal (), charset_get_locale ()); -#endif /* USE_GTK2 */ -} - - -gchar * -charset_to_locale_auto (const gchar *src, CharsetAutoDetectFn func) -{ - const gchar *dest_charset; - - dest_charset = charset_get_locale (); - if (dest_charset) - return charset_conv_auto (src, dest_charset, func); - else - return g_strdup (src); - - return g_strdup (src); -} - - - -/****************************************************************************** - * - * internal -> any code converter - * - ******************************************************************************/ -gchar * -charset_from_internal (const gchar *src, - const gchar *dest_codeset) -{ - g_return_val_if_fail (src, NULL); - g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); - - return charset_conv (src, charset_get_internal (), dest_codeset); -} - - - -/****************************************************************************** - * - * locale -> any code converter - * - ******************************************************************************/ -gchar * -charset_from_locale (const gchar *src, - const gchar *dest_codeset) -{ - g_return_val_if_fail (src, NULL); - g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); - - return charset_conv (src, charset_get_locale (), dest_codeset); -} - - - -/****************************************************************************** - * - * any -> any code converter - * - ******************************************************************************/ -gchar * -charset_conv (const gchar *src, - const gchar *src_codeset, - const gchar *dest_codeset) -{ - g_return_val_if_fail (src, NULL); - g_return_val_if_fail (src_codeset && *src_codeset, g_strdup (src)); - g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); - -#ifdef USE_GTK2 - { - gint rbytes, wbytes; - return g_convert (src, -1, dest_codeset, src_codeset, - &rbytes, &wbytes, NULL); - } -#else /* USE_GTK2 */ -# ifdef HAVE_ICONV - { - unsigned char *buf, *ret; - iconv_t cd; - size_t insize = 0; - size_t outsize = 0; - size_t nconv = 0; -#ifdef ICONV_CONST - ICONV_CONST char *inptr; -#else /* ICONV_CONST */ - char *inptr; -#endif - char *outptr; - - buf = g_malloc (strlen (src) * 4 + 1); - if (!buf) return NULL; - - insize = strlen (src); - inptr = (char *) src; - outsize = strlen (src) * 4 ; - outptr = buf; - - cd = iconv_open (dest_codeset, src_codeset); - if (cd == (iconv_t) -1) { - switch (errno) { - case EINVAL: - g_free (buf); - return g_strdup (src); - default: - break; - } - } - - nconv = iconv (cd, &inptr, &insize, &outptr, &outsize); - if (nconv == (size_t) -1) { - switch (errno) { - case EINVAL: - g_free (buf); - return g_strdup (src); - break; - default: - break; - } - } else { - iconv (cd, NULL, NULL, &outptr, &outsize); - } - - *outptr = '\0'; - iconv_close (cd); - - ret = g_strdup (buf); - g_free(buf); - - return ret; - } -#else /* HAVE_ICONV */ - { - gint i, num = sizeof (charset_conv_fn_table) / sizeof (CharsetConvFn); - gchar *ret; - - for (i = 0; i < num; i++) { - ret = charset_conv_fn_table[i] (src, src_codeset, dest_codeset); - if (ret) return ret; - } - } -#endif /* HAVE_ICONV */ -#endif /* USE_GTK2 */ - - return g_strdup (src); -} - - -gchar * -charset_conv_auto (const gchar *src, - const gchar *dest_codeset, - CharsetAutoDetectFn func) -{ - const gchar *src_codeset; - - g_return_val_if_fail (src, NULL); - g_return_val_if_fail (func, g_strdup (src)); - g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); - - src_codeset = func (src); - - g_return_val_if_fail (src_codeset && *src_codeset, g_strdup (src)); - - return charset_conv (src, src_codeset, dest_codeset); -} - - - -/****************************************************************************** - * - * these codes are taken from GLib-2.0.0 (glib/gutf8.c) - * - * Copyright (C) 1999 Tom Tromey - * Copyright (C) 2000 Red Hat, Inc. - * - *****************************************************************************/ -#ifndef USE_GTK2 - -#define UTF8_COMPUTE(Char, Mask, Len) \ - if (Char < 128) \ - { \ - Len = 1; \ - Mask = 0x7f; \ - } \ - else if ((Char & 0xe0) == 0xc0) \ - { \ - Len = 2; \ - Mask = 0x1f; \ - } \ - else if ((Char & 0xf0) == 0xe0) \ - { \ - Len = 3; \ - Mask = 0x0f; \ - } \ - else if ((Char & 0xf8) == 0xf0) \ - { \ - Len = 4; \ - Mask = 0x07; \ - } \ - else if ((Char & 0xfc) == 0xf8) \ - { \ - Len = 5; \ - Mask = 0x03; \ - } \ - else if ((Char & 0xfe) == 0xfc) \ - { \ - Len = 6; \ - Mask = 0x01; \ - } \ - else \ - Len = -1; - - -#define UTF8_LENGTH(Char) \ - ((Char) < 0x80 ? 1 : \ - ((Char) < 0x800 ? 2 : \ - ((Char) < 0x10000 ? 3 : \ - ((Char) < 0x200000 ? 4 : \ - ((Char) < 0x4000000 ? 5 : 6))))) - - -#define UTF8_GET(Result, Chars, Count, Mask, Len) \ - (Result) = (Chars)[0] & (Mask); \ - for ((Count) = 1; (Count) < (Len); ++(Count)) \ - { \ - if (((Chars)[(Count)] & 0xc0) != 0x80) \ - { \ - (Result) = -1; \ - break; \ - } \ - (Result) <<= 6; \ - (Result) |= ((Chars)[(Count)] & 0x3f); \ - } - -#define UNICODE_VALID(Char) \ - ((Char) < 0x110000 && \ - ((Char) < 0xD800 || (Char) >= 0xE000) && \ - (Char) != 0xFFFE && (Char) != 0xFFFF) - - -gboolean -g_utf8_validate (const gchar *str, - gssize max_len, - const gchar **end) -{ - const gchar *p; - - g_return_val_if_fail (str != NULL, FALSE); - - if (end) - *end = str; - - p = str; - - while ((max_len < 0 || (p - str) < max_len) && *p) { - int i, mask = 0, len; - gunichar result; - unsigned char c = (unsigned char) *p; - - UTF8_COMPUTE (c, mask, len); - - if (len == -1) - break; - - /* check that the expected number of bytes exists in str */ - if (max_len >= 0 && - ((max_len - (p - str)) < len)) - break; - - UTF8_GET (result, p, i, mask, len); - - if (UTF8_LENGTH (result) != len) /* Check for overlong UTF-8 */ - break; - - if (result == (gunichar)-1) - break; - - if (!UNICODE_VALID (result)) - break; - - p += len; - } - - if (end) - *end = p; - - /* - * See that we covered the entire length if a length was - * passed in, or that we ended on a nul if not - */ - if (max_len >= 0 && p != (str + max_len)) - return FALSE; - else if (max_len < 0 && *p != '\0') - return FALSE; - else - return TRUE; -} - -#endif /* USE_GTK2 */ diff -Nru gimageview-0.2.27/src/charset.h gimageview-0.3.0-0.20101117/src/charset.h --- gimageview-0.2.27/src/charset.h 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/charset.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: charset.h,v 1.10 2004/09/21 08:44:31 makeinu Exp $ - */ - -#ifndef __CHARSET_H__ -#define __CHARSET_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - - -#ifdef USE_GTK2 -#else -typedef guint32 gunichar; - -gboolean g_utf8_validate (const gchar *str, - gssize max_len, - const gchar **end); -#endif - - -#define CHARSET_ASCII "US-ASCII" -#define CHARSET_UTF8 "UTF-8" - -/* japanese character set */ -#define CHARSET_SJIS "SHIFT_JIS" -#define CHARSET_EUC_JP "EUC-JP" -#define CHARSET_JIS "ISO-2022-JP" - -/* for detecting locale charset */ -typedef const gchar *(*CharsetDetectLocaleFn) (const gchar *locale); -/* for auto detecting charset */ -typedef const gchar *(*CharsetAutoDetectFn) (const gchar *string); -/* for alternative character set conversion method */ -typedef gchar *(*CharsetConvFn) (const gchar *string, - const gchar *src_codeset, - const gchar *dest_codeset); - - -typedef enum { - CHARSET_TO_INTERNAL_NEVER, /* do not convert */ - CHARSET_TO_INTERNAL_LOCALE, /* convert to locale charset */ - CHARSET_TO_INTERNAL_AUTO, /* use auto detect function */ - CHARSET_TO_INTERNAL_ANY /* convert from specified charset */ -} CharsetToInternalTypes; - -typedef enum { - CHARSET_TO_LOCALE_NEVER, - CHARSET_TO_LOCALE_INTERNAL, - CHARSET_TO_LOCALE_AUTO, - CHARSET_TO_LOCALE_ANY -} CharsetToLocaleTypes; - -typedef enum { - CHARSET_AUTODETECT_NONE, - CHARSET_AUTODETECT_JAPANESE -} CharsetAutoDetectType; - -extern const gchar *charset_auto_detect_labels[]; - - -GList *charset_get_known_list (const gchar *lang); -const gchar *get_lang (void); - -/* wrapper for nl_langinfo() */ -void charset_set_locale_charset (const gchar *charset); -void charset_set_internal_charset (const gchar *charset); -const gchar *charset_get_locale (void); -const gchar *charset_get_internal (void); -CharsetAutoDetectFn charset_get_auto_detect_func (CharsetAutoDetectType type); - - -/* - * any code -> internal converter - */ - -/* wrapper for all converter */ -/* src_codeset can be NULL if type is not CHARSET_TO_INTERNAL_ANY */ -/* func can be NULL if type is not CHARSET_TO_INTERNAL_AUTO */ -gchar *charset_to_internal (const gchar *src, - const gchar *src_codeset, - CharsetAutoDetectFn func, - CharsetToInternalTypes type); - -gchar *charset_locale_to_internal (const gchar *src); -gchar *charset_to_internal_auto (const gchar *src, - CharsetAutoDetectFn func); - -/* - * any code -> locale converter - */ - -/* wrapper for all converter */ -/* src_codeset can be NULL if type is not CHARSET_TO_INTERNAL_ANY */ -/* func can be NULL if type is not CHARSET_TO_INTERNAL_AUTO */ -gchar *charset_to_locale (const gchar *src, - const gchar *src_codeset, - CharsetAutoDetectFn func, - CharsetToLocaleTypes type); - -gchar *charset_internal_to_locale (const gchar *src); -gchar *charset_to_locale_auto (const gchar *src, - CharsetAutoDetectFn func); - -/* - * internal -> any code converter - */ -gchar *charset_from_internal (const gchar *src, - const gchar *dest_codeset); - -/* - * locale -> any code converter - */ -gchar *charset_from_locale (const gchar *src, - const gchar *dest_codeset); - -/* - * any -> any code converter - */ -gchar *charset_conv (const gchar *src, - const gchar *src_codeset, - const gchar *dest_codeset); -gchar *charset_conv_auto (const gchar *src, - const gchar *dest_codeset, - CharsetAutoDetectFn func); - -#endif /* __CHARSET_H__ */ diff -Nru gimageview-0.2.27/src/compare_filesize.c gimageview-0.3.0-0.20101117/src/compare_filesize.c --- gimageview-0.2.27/src/compare_filesize.c 2004-05-23 14:07:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/compare_filesize.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: compare_filesize.c,v 1.3 2003/06/18 09:26:55 makeinu Exp $ + * $Id: compare_filesize.c 939 2003-06-18 09:26:56Z makeinu $ */ #include "gimv_dupl_finder.h" diff -Nru gimageview-0.2.27/src/compare_md5.c gimageview-0.3.0-0.20101117/src/compare_md5.c --- gimageview-0.2.27/src/compare_md5.c 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/compare_md5.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: compare_md5.c,v 1.4 2004/04/08 10:38:50 makeinu Exp $ + * $Id: compare_md5.c 1180 2007-10-23 14:16:14Z makeinu $ */ /* @@ -37,7 +37,7 @@ #include "gimv_dupl_finder.h" #include "gimv_image_info.h" #include "gimv_thumb.h" -#include "md5.h" +#include "utils_md5.h" /* Most systems do not distinguish between external and internal diff -Nru gimageview-0.2.27/src/compare_similar.c gimageview-0.3.0-0.20101117/src/compare_similar.c --- gimageview-0.2.27/src/compare_similar.c 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/compare_similar.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: compare_similar.c,v 1.4 2004/04/08 10:38:50 makeinu Exp $ + * $Id: compare_similar.c 1164 2007-10-20 15:04:59Z makeinu $ */ /* @@ -212,7 +212,7 @@ if (!image) return NULL; data = image_sim_new_from_image (image); - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); return data; } diff -Nru gimageview-0.2.27/src/cursors/hand-closed-data.xbm gimageview-0.3.0-0.20101117/src/cursors/hand-closed-data.xbm --- gimageview-0.2.27/src/cursors/hand-closed-data.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/hand-closed-data.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -/* Made with Gimp */ -#define hand_closed_data_width 20 -#define hand_closed_data_height 20 -static char hand_closed_data_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x80, 0x3f, 0x00, - 0x80, 0xff, 0x00, 0x80, 0xff, 0x00, 0xb0, 0xff, 0x00, 0xf0, 0xff, 0x00, - 0xe0, 0xff, 0x00, 0xe0, 0x7f, 0x00, 0xc0, 0x7f, 0x00, 0x80, 0x3f, 0x00, - 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/cursors/hand-closed-mask.xbm gimageview-0.3.0-0.20101117/src/cursors/hand-closed-mask.xbm --- gimageview-0.2.27/src/cursors/hand-closed-mask.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/hand-closed-mask.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -/* Made with Gimp */ -#define hand_closed_mask_width 20 -#define hand_closed_mask_height 20 -static char hand_closed_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x80, 0x3f, 0x00, 0xc0, 0xff, 0x00, - 0xc0, 0xff, 0x01, 0xf0, 0xff, 0x01, 0xf8, 0xff, 0x01, 0xf8, 0xff, 0x01, - 0xf0, 0xff, 0x01, 0xf0, 0xff, 0x00, 0xe0, 0xff, 0x00, 0xc0, 0x7f, 0x00, - 0x80, 0x7f, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/cursors/hand-open-data.xbm gimageview-0.3.0-0.20101117/src/cursors/hand-open-data.xbm --- gimageview-0.2.27/src/cursors/hand-open-data.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/hand-open-data.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -/* Made with Gimp */ -#define hand_open_data_width 20 -#define hand_open_data_height 20 -static char hand_open_data_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, - 0x60, 0x36, 0x00, 0x60, 0x36, 0x00, 0xc0, 0x36, 0x01, 0xc0, 0xb6, 0x01, - 0x80, 0xbf, 0x01, 0x98, 0xff, 0x01, 0xb8, 0xff, 0x00, 0xf0, 0xff, 0x00, - 0xe0, 0xff, 0x00, 0xe0, 0x7f, 0x00, 0xc0, 0x7f, 0x00, 0x80, 0x3f, 0x00, - 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/cursors/hand-open-mask.xbm gimageview-0.3.0-0.20101117/src/cursors/hand-open-mask.xbm --- gimageview-0.2.27/src/cursors/hand-open-mask.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/hand-open-mask.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -/* Made with Gimp */ -#define hand_open_mask_width 20 -#define hand_open_mask_height 20 -static char hand_open_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x3f, 0x00, - 0xf0, 0x7f, 0x00, 0xf0, 0x7f, 0x01, 0xe0, 0xff, 0x03, 0xe0, 0xff, 0x03, - 0xd8, 0xff, 0x03, 0xfc, 0xff, 0x03, 0xfc, 0xff, 0x01, 0xf8, 0xff, 0x01, - 0xf0, 0xff, 0x01, 0xf0, 0xff, 0x00, 0xe0, 0xff, 0x00, 0xc0, 0x7f, 0x00, - 0x80, 0x7f, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/cursors/Makefile.am gimageview-0.3.0-0.20101117/src/cursors/Makefile.am --- gimageview-0.2.27/src/cursors/Makefile.am 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -EXTRA_DIST = \ - hand-closed-data.xbm \ - hand-closed-mask.xbm \ - hand-open-data.xbm \ - hand-open-mask.xbm \ - void-data.xbm \ - void-mask.xbm diff -Nru gimageview-0.2.27/src/cursors/Makefile.in gimageview-0.3.0-0.20101117/src/cursors/Makefile.in --- gimageview-0.2.27/src/cursors/Makefile.in 2004-12-28 04:01:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,470 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = src/cursors -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = \ - hand-closed-data.xbm \ - hand-closed-mask.xbm \ - hand-open-data.xbm \ - hand-open-mask.xbm \ - void-data.xbm \ - void-mask.xbm - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/cursors/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/cursors/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/src/cursors/void-data.xbm gimageview-0.3.0-0.20101117/src/cursors/void-data.xbm --- gimageview-0.2.27/src/cursors/void-data.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/void-data.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -/* Created with The GIMP */ -#define void_data_width 1 -#define void_data_height 1 -static unsigned char void_data_bits[] = { - 0x00 }; diff -Nru gimageview-0.2.27/src/cursors/void-mask.xbm gimageview-0.3.0-0.20101117/src/cursors/void-mask.xbm --- gimageview-0.2.27/src/cursors/void-mask.xbm 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors/void-mask.xbm 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -/* Created with The GIMP */ -#define void_mask_width 1 -#define void_mask_height 1 -static unsigned char void_mask_bits[] = { - 0x00 }; diff -Nru gimageview-0.2.27/src/cursors.c gimageview-0.3.0-0.20101117/src/cursors.c --- gimageview-0.2.27/src/cursors.c 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* Eye of Gnome image viewer - mouse cursors - * - * Copyright (C) 2000 The Free Software Foundation - * - * Author: Federico Mena-Quintero - * - * 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: cursors.c,v 1.4 2002/10/03 12:27:36 makeinu Exp $ - */ - -#include -#include "cursors.h" - - - -/* Cursor definitions. Keep in sync with the CursorType enumeration in - * cursors.h. - */ - -#include "cursors/hand-open-data.xbm" -#include "cursors/hand-open-mask.xbm" -#include "cursors/hand-closed-data.xbm" -#include "cursors/hand-closed-mask.xbm" -#include "cursors/void-data.xbm" -#include "cursors/void-mask.xbm" - -static struct { - char *data; - char *mask; - int data_width; - int data_height; - int mask_width; - int mask_height; - int hot_x, hot_y; -} cursors[] = { - { hand_open_data_bits, hand_open_mask_bits, - hand_open_data_width, hand_open_data_height, - hand_open_mask_width, hand_open_mask_height, - hand_open_data_width / 2, hand_open_data_height / 2 }, - { hand_closed_data_bits, hand_closed_mask_bits, - hand_closed_data_width, hand_closed_data_height, - hand_closed_mask_width, hand_closed_mask_height, - hand_closed_data_width / 2, hand_closed_data_height / 2 }, - { void_data_bits, void_mask_bits, - void_data_width, void_data_height, - void_mask_width, void_mask_height, void_data_width / 2, void_data_height / 2 }, - { NULL, NULL, 0, 0, 0, 0 } -}; - - - -/** - * cursor_get: - * @window: Window whose screen and colormap determine the cursor's. - * @type: A cursor type. - * - * Creates a cursor. - * - * Return value: The newly-created cursor. - **/ -GdkCursor * -cursor_get (GdkWindow *window, CursorType type) -{ - GdkBitmap *data; - GdkBitmap *mask; - GdkColor black, white; - GdkCursor *cursor; - - g_return_val_if_fail (window != NULL, NULL); - g_return_val_if_fail (type >= 0 && type < CURSOR_NUM_CURSORS, NULL); - - g_assert (cursors[type].data_width == cursors[type].mask_width); - g_assert (cursors[type].data_height == cursors[type].mask_height); - - data = gdk_bitmap_create_from_data (window, - cursors[type].data, - cursors[type].data_width, - cursors[type].data_height); - mask = gdk_bitmap_create_from_data (window, - cursors[type].mask, - cursors[type].mask_width, - cursors[type].mask_height); - - g_assert (data != NULL && mask != NULL); - - gdk_color_black (gdk_window_get_colormap (window), &black); - gdk_color_white (gdk_window_get_colormap (window), &white); - - cursor = gdk_cursor_new_from_pixmap (data, mask, &white, &black, - cursors[type].hot_x, cursors[type].hot_y); - g_assert (cursor != NULL); - - gdk_bitmap_unref (data); - gdk_bitmap_unref (mask); - - return cursor; -} diff -Nru gimageview-0.2.27/src/cursors.h gimageview-0.3.0-0.20101117/src/cursors.h --- gimageview-0.2.27/src/cursors.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/cursors.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* Eye of Gnome image viewer - mouse cursors - * - * Copyright (C) 2000 The Free Software Foundation - * - * Author: Federico Mena-Quintero - * - * 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: cursors.h,v 1.5 2003/06/13 09:43:24 makeinu Exp $ - */ - -#ifndef CURSORS_H -#define CURSORS_H - -#include - - - -typedef enum { - CURSOR_HAND_OPEN, - CURSOR_HAND_CLOSED, - CURSOR_VOID, - CURSOR_NUM_CURSORS -} CursorType; - -GdkCursor *cursor_get (GdkWindow *window, CursorType type); - - - -#endif diff -Nru gimageview-0.2.27/src/dirview2.c gimageview-0.3.0-0.20101117/src/dirview2.c --- gimageview-0.2.27/src/dirview2.c 2004-12-20 14:53:45.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dirview2.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,2067 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2002 Takuro Ashie - * - * 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: dirview2.c,v 1.38 2004/12/20 14:53:45 makeinu Exp $ - */ - -#include "dirview.h" - -#ifdef ENABLE_TREEVIEW - -#include - -#include "charset.h" -#include "dirview_priv.h" -#include "dnd.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "gtk2-compat.h" -#include "gtk_prop.h" -#include "gimv_icon_stock.h" -#include "gimv_thumb_win.h" -#include "menu.h" -#include "prefs.h" - - -typedef enum { - COLUMN_TERMINATOR = -1, - COLUMN_LABEL, - COLUMN_FULLPATH, - COLUMN_ICON_OPEN, - COLUMN_ICON_CLOSE, - COLUMN_IS_DUMMY, - N_COLUMN -} TreeStoreColumn; - - -/* callback functions */ -static void cb_dirview_destroyed (GtkWidget *widget, - DirView *dv); -static gboolean cb_button_press (GtkWidget *widget, - GdkEventButton *event, - DirView *dv); -static gboolean cb_button_release (GtkWidget *widget, - GdkEventButton *event, - DirView *dv); -static gboolean cb_scroll (GtkWidget *widget, - GdkEventScroll *se, - DirView *dv); -static gboolean cb_key_press (GtkWidget *widget, - GdkEventKey *event, - DirView *dv); -static void cb_tree_expand (GtkTreeView *treeview, - GtkTreeIter *parent_iter, - GtkTreePath *treepath, - gpointer data); - - -/* callback functions for popup menu */ -static void cb_open_thumbnail (DirView *dv, - ScanSubDirType scan_subdir, - GtkWidget *menuitem); -static void cb_go_to_here (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_refresh_dir_tree (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_file_property (DirView *tv, - guint action, - GtkWidget *menuitem); -static void cb_mkdir (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_rename_dir (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_delete_dir (DirView *dv, - guint action, - GtkWidget *menuitem); - -/* Callback functions for toolbar buttons */ -static void cb_home_button (GtkWidget *widget, - DirView *dv); -static void cb_up_button (GtkWidget *widget, - DirView *dv); -static void cb_refresh_button (GtkWidget *widget, - DirView *dv); -static void cb_dotfile_button (GtkWidget *widget, - DirView *dv); - -/* Callback functions for DnD */ -static void cb_drag_data_get (GtkWidget *dirtree, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); -static void cb_drag_data_received (GtkWidget *dirtree, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *seldata, - guint info, - guint32 time, - gpointer data); -static void cb_drag_end (GtkWidget *dirtree, - GdkDragContext *context, - gpointer data); -static void cb_toolbar_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data); -static gboolean cb_drag_motion (GtkWidget *widget, - GdkDragContext *drag_context, - gint x, - gint y, - guint time, - gpointer data); -static void cb_toolbar_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); -static void cb_com_swap_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); - -/* other private functions */ -static void get_icon_pixbufs (void); -static void set_columns_type (GtkTreeView *tree_view); -static void dirview_create_treeview (DirView *dv, - const gchar *root); -static GtkWidget *dirview_create_toolbar (DirView *dv); -static void insert_dummy_row (GtkTreeStore *store, - GtkTreeIter *parent_iter); -static void insert_row (GtkTreeStore *store, - GtkTreeIter *iter, - GtkTreeIter *parent_iter, - const gchar *label, - const gchar *fullpath); -static gboolean get_iter_from_path (DirView *dv, - const gchar *str, - GtkTreeIter *iter); -static void adjust_tree (GtkTreeView *treeview, - GtkTreeIter *iter); -static void adjust_tree_idle (DirView *dv, - GtkTreeIter *iter); -static void get_expanded_dirs (GtkTreeView *treeview, - GtkTreePath *treepath, - gpointer data); -static void refresh_dir_tree (DirView *dv, - GtkTreeIter *parent_iter); -static void dirview_popup_menu (DirView *dv, - GdkEventButton *event); -static gboolean dirview_button_action (DirView *dv, - GdkEventButton *event, - gint num); - - -static GtkItemFactoryEntry dirview_popup_items [] = -{ - {N_("/_Load Thumbnail"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_NONE, NULL}, - {N_("/Load Thumbnail re_cursively"), NULL, cb_open_thumbnail, SCAN_SUB_DIR, NULL}, - {N_("/Load Thumbnail recursively in _one tab"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_ONE_TAB, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Go to here"), NULL, cb_go_to_here, 0, NULL}, - {N_("/_Refresh Tree"), NULL, cb_refresh_dir_tree, 0, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Property..."), NULL, cb_file_property, 0, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Make Directory..."), NULL, cb_mkdir, 0, NULL}, - {N_("/Re_name Directory..."), NULL, cb_rename_dir, 0, NULL}, - {N_("/_Delete Directory..."), NULL, cb_delete_dir, 0, NULL}, - {NULL, NULL, NULL, 0, NULL}, -}; - - -static GdkPixbuf *folder = NULL; -static GdkPixbuf *ofolder = NULL; -static GdkPixbuf *lfolder = NULL; -static GdkPixbuf *lofolder = NULL; -static GdkPixbuf *go_folder = NULL; -static GdkPixbuf *up_folder = NULL; -static GdkPixbuf *lock_folder = NULL; - - - -/****************************************************************************** - * - * Callback functions - * - ******************************************************************************/ -static void -cb_dirview_destroyed (GtkWidget *widget, DirView *dv) -{ - g_return_if_fail (dv); - - if (dv->priv->button_action_id) - gtk_idle_remove (dv->priv->button_action_id); - dv->priv->button_action_id = 0; - - if (dv->priv->swap_com_id) - gtk_idle_remove (dv->priv->swap_com_id); - dv->priv->swap_com_id = 0; - - if (dv->priv->adjust_tree_id) - gtk_idle_remove (dv->priv->adjust_tree_id); - dv->priv->adjust_tree_id = 0; - - g_free (dv->root_dir); - g_free (dv->priv); - g_free (dv); -} - - -static gboolean -cb_button_press (GtkWidget *widget, GdkEventButton *event, DirView *dv) -{ - gint num; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (event, FALSE); - - num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); - if (event->type == GDK_2BUTTON_PRESS) { - dv->priv->button_2pressed_queue = num; - } else if (num > 0) { - return dirview_button_action (dv, event, num); - } - - return FALSE; -} - - -static gboolean -cb_button_release (GtkWidget *widget, GdkEventButton *event, DirView *dv) -{ - gint num; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (event, FALSE); - - if (dv->priv->button_2pressed_queue) { - num = dv->priv->button_2pressed_queue; - if (num > 0) - num = 0 - num; - dv->priv->button_2pressed_queue = 0; - } else { - num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); - } - if (num < 0) - return dirview_button_action (dv, event, num); - - return FALSE; -} - - -static gboolean -cb_scroll (GtkWidget *widget, GdkEventScroll *se, DirView *dv) -{ - GdkEventButton be; - gboolean retval = FALSE; - gint num; - - g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); - - be.type = GDK_BUTTON_PRESS; - be.window = se->window; - be.send_event = se->send_event; - be.time = se->time; - be.x = se->x; - be.y = se->y; - be.axes = NULL; - be.state = se->state; - be.device = se->device; - be.x_root = se->x_root; - be.y_root = se->y_root; - switch ((se)->direction) { - case GDK_SCROLL_UP: - be.button = 4; - break; - case GDK_SCROLL_DOWN: - be.button = 5; - break; - case GDK_SCROLL_LEFT: - be.button = 6; - break; - case GDK_SCROLL_RIGHT: - be.button = 7; - break; - default: - g_warning ("invalid scroll direction!"); - be.button = 0; - break; - } - - num = prefs_mouse_get_num_from_event (&be, conf.dirview_mouse_button); - if (num > 0) - retval = dirview_button_action (dv, &be, num); - - be.type = GDK_BUTTON_RELEASE; - if (num < 0) - retval = dirview_button_action (dv, &be, num); - - return retval; -} - - -static gboolean -cb_key_press (GtkWidget *widget, GdkEventKey *event, DirView *dv) -{ - guint keyval, popup_key; - GdkModifierType modval, popup_mod; - gboolean success; - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreePath *treepath; - gboolean retval = FALSE; - gchar *label, *path; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE); - - keyval = event->keyval; - modval = event->state; - - if (akey.common_popup_menu || *akey.common_popup_menu) - gtk_accelerator_parse (akey.common_popup_menu, &popup_key, &popup_mod); - else - return FALSE; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); - g_return_val_if_fail (selection, FALSE); - - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return FALSE; - treepath = gtk_tree_model_get_path (model, &iter); - if (!treepath) return FALSE; - - gtk_tree_model_get (model, &iter, - COLUMN_LABEL, &label, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - if (keyval == popup_key && (!popup_mod || (modval & popup_mod))) { - dirview_popup_menu (dv, NULL); - } else { - switch (keyval) { - case GDK_KP_Enter: - case GDK_Return: - case GDK_ISO_Enter: - { - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, - LOAD_CACHE, conf.scan_dir_recursive); - } - retval = TRUE; - break; - } - case GDK_space: - if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), treepath)) - gtk_tree_view_collapse_row (GTK_TREE_VIEW (widget), treepath); - else - gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), treepath, FALSE); - retval = TRUE; - break; - case GDK_Right: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root (dv, path); - } else { - gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), treepath, FALSE); - } - retval = TRUE; - break; - case GDK_Left: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root_to_parent (dv); - } else { - gtk_tree_view_collapse_row (GTK_TREE_VIEW (widget), treepath); - } - retval = TRUE; - break; - case GDK_Up: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root_to_parent (dv); - retval = TRUE; - } - break; - case GDK_Down: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root (dv, path); - retval = TRUE; - } - break; - } - } - - g_free (label); - g_free (path); - gtk_tree_path_free(treepath); - - return retval; -} - - -static void -cb_tree_expand (GtkTreeView *treeview, - GtkTreeIter *parent_iter, - GtkTreePath *treepath, - gpointer data) -{ - DirView *dv = data; - GtkTreeStore *store; - GtkTreeIter child_iter, iter; - gchar *parent_dir; - gboolean dummy; - GList *subdir_list = NULL, *node; - GetDirFlags flags; - - g_return_if_fail (dv); - - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - - gtk_tree_model_iter_children (GTK_TREE_MODEL (store), - &child_iter, parent_iter); - gtk_tree_model_get (GTK_TREE_MODEL (store), &child_iter, - COLUMN_IS_DUMMY, &dummy, - COLUMN_TERMINATOR); - if (!dummy) return; - - gtk_tree_model_get (GTK_TREE_MODEL (store), parent_iter, - COLUMN_FULLPATH, &parent_dir, - COLUMN_TERMINATOR); - - flags = GETDIR_FOLLOW_SYMLINK | GETDIR_READ_DOT; - get_dir (parent_dir, flags, NULL, &subdir_list); - - if (dv->show_dotfile || conf.dirview_show_current_dir) { - insert_row (store, &iter, parent_iter, ".", parent_dir); - } - - if (dv->show_dotfile || conf.dirview_show_parent_dir) { - gchar *end, *grandparent = remove_slash(parent_dir); - - end = strrchr (grandparent, '/'); - if (end) *(end + 1) = '\0'; - - insert_row (store, &iter, parent_iter, "..", grandparent); - - g_free (grandparent); - } - - for (node = subdir_list; node; node = g_list_next (node)) { - gchar *path = node->data; - gboolean dot_file_check; - - dot_file_check = g_basename(path)[0] != '.' - || (dv->show_dotfile && g_basename(path)[0] == '.') - || (conf.dirview_show_current_dir && !strcmp (g_basename(path), ".")) - || (conf.dirview_show_parent_dir && !strcmp (g_basename(path), "..")); - - if (isdir (path) && dot_file_check) { - insert_row (store, &iter, parent_iter, g_basename (path), path); - } - } - g_list_foreach (subdir_list, (GFunc) g_free, NULL); - g_list_free (subdir_list); - - gtk_tree_store_remove (store, &child_iter); - - g_free (parent_dir); -} - - - -/****************************************************************************** - * - * Callback functions for popup menu - * - ******************************************************************************/ -static void -cb_open_thumbnail (DirView *dv, ScanSubDirType scan_subdir, GtkWidget *menuitem) -{ - gchar *path; - - path = dirview_get_selected_path (dv); - if (!path) return; - - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, scan_subdir); - - g_free (path); -} - - -static void -cb_go_to_here (DirView *dv, guint action, GtkWidget *menuitem) -{ - gchar *path; - - path = dirview_get_selected_path (dv); - if (!path) return; - - dirview_change_root (dv, path); - - g_free (path); -} - - -static void -cb_refresh_dir_tree (DirView *dv, guint action, GtkWidget *menuitem) -{ - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - gboolean success; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; - - refresh_dir_tree (dv, &iter); -} - - -static void -cb_file_property (DirView *dv, guint action, GtkWidget *menuitem) -{ - GimvImageInfo *info; - gchar *path, *tmpstr; - - g_return_if_fail (dv); - - tmpstr = dirview_get_selected_path (dv); - if (!tmpstr) return; - - path = remove_slash (tmpstr); - g_free(tmpstr); - - info = gimv_image_info_get (path); - if (!info) { - g_free (path); - return; - } - - dlg_prop_from_image_info (info, 0); - - gimv_image_info_unref (info); - g_free (path); -} - - -static void -cb_mkdir (DirView *dv, guint action, GtkWidget *menuitem) -{ - gchar *parent_path; - gboolean success; - GtkTreeIter iter; - - g_return_if_fail (dv); - - parent_path = dirview_get_selected_path (dv); - if (!parent_path) return; - - success = make_dir_dialog ( - parent_path, - GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - if (success) { - if (get_iter_from_path (dv, parent_path, &iter)) - refresh_dir_tree (dv, &iter); - else - refresh_dir_tree (dv, NULL); - } - - g_free (parent_path); -} - - -static void -cb_rename_dir (DirView *dv, guint action, GtkWidget *menuitem) -{ - gboolean success; - gchar *path; - - g_return_if_fail (dv); - - path = dirview_get_selected_path (dv); - if (!path) return; - - success = rename_dir_dialog - (path, GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - if (success) { - gchar *tmp_path, *parent_dir; - GtkTreeIter iter; - - tmp_path = remove_slash (path); - parent_dir = g_dirname (tmp_path); - - if (get_iter_from_path (dv, parent_dir, &iter)) - refresh_dir_tree (dv, &iter); - else - refresh_dir_tree (dv, NULL); - - g_free (tmp_path); - g_free (parent_dir); - } -} - - -static void -cb_delete_dir (DirView *dv, guint action, GtkWidget *menuitem) -{ - gchar *path, *parent_dir; - GtkTreeIter iter; - - g_return_if_fail (dv); - - path = dirview_get_selected_path (dv); - if (!path) return; - - if (path [strlen (path) - 1] == '/') - path [strlen (path) - 1] = '\0'; - - delete_dir (path, GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - g_free (path); - - parent_dir = g_dirname (path); - - /* refresh dir tree */ - if (get_iter_from_path (dv, parent_dir, &iter)) - refresh_dir_tree (dv, &iter); - else - refresh_dir_tree (dv, NULL); - - g_free (parent_dir); -} - - - -/****************************************************************************** - * - * Callback functions for toolbar buttons. - * - ******************************************************************************/ -static void -cb_home_button (GtkWidget *widget, DirView *dv) -{ - g_return_if_fail (dv); - - dirview_go_home (dv); -} - - -static void -cb_up_button (GtkWidget *widget, DirView *dv) -{ - dirview_change_root_to_parent (dv); -} - - -static void -cb_refresh_button (GtkWidget *widget, DirView *dv) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success; - - g_return_if_fail (widget && dv); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - success = gtk_tree_model_get_iter_first (model, &iter); - if (!success) return; - - refresh_dir_tree (dv, &iter); -} - - -static void -cb_dotfile_button (GtkWidget *widget, DirView *dv) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success; - - g_return_if_fail (widget && dv); - - dv->show_dotfile = !dv->show_dotfile; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - success = gtk_tree_model_get_iter_first (model, &iter); - if (!success) return; - - refresh_dir_tree (dv, &iter); -} - - -/****************************************************************************** - * - * Callback functions for DnD - * - ******************************************************************************/ -static void -cb_drag_data_get (GtkWidget *dirtree, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - DirView *dv = data; - gchar *path, *urilist; - - g_return_if_fail (dv); - - path = dirview_get_selected_path(dv); - if (!path) return; - if (!*path) { - g_free (path); - return; - } - - if (path [strlen (path) - 1] == '/') - path [strlen (path) - 1] = '\0'; - urilist = g_strconcat ("file://", path, "\r\n", NULL); - - gtk_selection_data_set(seldata, seldata->target, - 8, urilist, strlen(urilist)); - - g_free (path); - g_free (urilist); -} - - -static gboolean -cb_drag_motion (GtkWidget *widget, - GdkDragContext *drag_context, - gint x, gint y, guint time, - gpointer data) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreePath *dest_path = NULL; - GtkTreeViewDropPosition pos; - gboolean success, retval = FALSE; - /* DirView *dv = data; */ - - g_return_val_if_fail(GTK_IS_TREE_VIEW(widget), FALSE); - g_return_val_if_fail(data, FALSE); - - success = gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), - x, y, - &dest_path, &pos); - if (!success) return FALSE; - - model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); - gtk_tree_model_get_iter(model, &iter, dest_path); - /* - gtk_tree_model_get(model, &iter, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - */ - - if (pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE || - pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) - { - gdk_drag_status(drag_context, GDK_ACTION_MOVE, time); - } - else if (pos == GTK_TREE_VIEW_DROP_BEFORE || - pos == GTK_TREE_VIEW_DROP_AFTER) - { - gdk_drag_status(drag_context, 0, time); - retval = TRUE; - } - - if (dest_path) - gtk_tree_path_free(dest_path); - - return retval; -} - - -static void -cb_drag_data_received (GtkWidget *dirtree, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint32 time, - gpointer data) -{ - DirView *dv = data; - GtkTreePath *treepath; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success; - gchar *path; - - g_return_if_fail (dv); - - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dirtree), - x, y, - &treepath, NULL, - NULL, NULL); - if (!success) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dirtree)); - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - if (path && *path) { - if (iswritable (path)) { - dnd_file_operation (path, context, seldata, time, dv->tw); - success = gtk_tree_model_get_iter_first (model, &iter); - if (success) - refresh_dir_tree (dv, &iter); - else - refresh_dir_tree (dv, NULL); - } else { - gchar error_message[BUF_SIZE], *dir_internal; - - dir_internal = charset_to_internal (path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - g_snprintf (error_message, BUF_SIZE, - _("Permission denied: %s"), - dir_internal); - gtkutil_message_dialog ( - _("Error!!"), error_message, - GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - g_free (dir_internal); - } - } - - gtk_tree_path_free (treepath); - g_free (path); -} - - -static void -cb_drag_end (GtkWidget *dirtree, GdkDragContext *context, gpointer data) -{ - DirView *dv = data; - GtkTreeModel *model; - GtkTreeIter iter; - - g_return_if_fail (dirtree && dv); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dirtree)); - if (gtk_tree_model_get_iter_first (model, &iter)) - refresh_dir_tree (dv, &iter); - else - refresh_dir_tree (dv, NULL); -} - - -static void -cb_toolbar_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data) -{ - GdkColormap *colormap; - GimvIcon *icon; - - icon = gimv_icon_stock_get_icon ("paper"); - colormap = gdk_colormap_get_system (); - gtk_drag_set_icon_pixmap (context, colormap, - icon->pixmap, icon->mask, - 0, 0); -} - - -static void -cb_toolbar_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - switch (info) { - case TARGET_GIMV_COMPONENT: - gtk_selection_data_set(seldata, seldata->target, - 8, "dummy", strlen("dummy")); - break; - } -} - - -typedef struct SwapCom_Tag -{ - GimvThumbWin *tw; - gint src; - gint dest; -} SwapCom; - - -static gint -idle_thumbwin_swap_component (gpointer data) -{ - SwapCom *swap = data; - gimv_thumb_win_swap_component (swap->tw, swap->src, swap->dest); - return FALSE; -} - - -static void -cb_com_swap_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - GimvThumbWin *tw = data; - GtkWidget *src_widget; - gpointer p; - gint src, dest; - - switch (info) { - case TARGET_GIMV_COMPONENT: - src_widget = gtk_drag_get_source_widget (context); - if (gdk_window_get_toplevel (src_widget->window) - != gdk_window_get_toplevel (widget->window)) - { - return; - } - - p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); - src = GPOINTER_TO_INT (p); - if (!src) return; - - p = g_object_get_data (G_OBJECT (widget), "gimv-component"); - dest = GPOINTER_TO_INT (p); - if (!dest) return; - - { - SwapCom *swap = g_new0 (SwapCom, 1); - swap->tw = tw; - swap->src = src; - swap->dest = dest; - /* to avoid gtk's bug, exec redraw after exit this callback function */ - gtk_idle_add_full (/* GTK_PRIORITY_REDRAW */G_PRIORITY_LOW, - idle_thumbwin_swap_component, NULL, swap, - (GtkDestroyNotify) g_free); - } - - break; - - default: - break; - } -} - - - -/****************************************************************************** - * - * Other private functions - * - ******************************************************************************/ -static void -get_icon_pixbufs (void) -{ - if (!folder) { - folder = gimv_icon_stock_get_pixbuf ("folder"); - if (folder) g_object_ref (folder); - } - - if (!ofolder) { - ofolder = gimv_icon_stock_get_pixbuf ("folder-open"); - if (ofolder) g_object_ref (ofolder); - } - - if (!lfolder) { - lfolder = gimv_icon_stock_get_pixbuf ("folder-link"); - if (lfolder) g_object_ref (lfolder); - } - - if (!lofolder) { - lofolder = gimv_icon_stock_get_pixbuf ("folder-link-open"); - if (lofolder) g_object_ref (lofolder); - } - - if (!go_folder) { - go_folder = gimv_icon_stock_get_pixbuf ("folder-go"); - if (go_folder) g_object_ref (go_folder); - } - - if (!up_folder) { - up_folder = gimv_icon_stock_get_pixbuf ("folder-up"); - if (up_folder) g_object_ref (up_folder); - } - - if (!lock_folder) { - lock_folder = gimv_icon_stock_get_pixbuf ("folder-lock"); - if (lock_folder) g_object_ref (lock_folder); - } -} - - -static void -set_columns_type (GtkTreeView *tree_view) -{ - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - gtk_tree_view_set_rules_hint (tree_view, FALSE); - gtk_tree_view_set_rules_hint (tree_view, TRUE); - - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title (col, "Directory Name"); - - render = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (col, render, FALSE); - gtk_tree_view_column_add_attribute (col, render, - "pixbuf", COLUMN_ICON_CLOSE); - gtk_tree_view_column_add_attribute (col, render, - "pixbuf-expander-open", - COLUMN_ICON_OPEN); - gtk_tree_view_column_add_attribute (col, render, - "pixbuf-expander-closed", - COLUMN_ICON_CLOSE); - - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_LABEL); - - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), col); - gtk_tree_view_set_expander_column (tree_view, col); -} - - -static void -dirview_create_treeview (DirView *dv, const gchar *root) -{ - GtkTreeStore *store; - GtkTreeIter root_iter; - GtkTreePath *treepath; - - get_icon_pixbufs(); - - store = gtk_tree_store_new (N_COLUMN, - G_TYPE_STRING, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - GDK_TYPE_PIXBUF, - G_TYPE_BOOLEAN); - - dv->dirtree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - - insert_row (store, &root_iter, NULL, root, root); - - g_object_unref (G_OBJECT (store)); - - g_signal_connect (G_OBJECT (dv->dirtree), "row-expanded", - G_CALLBACK (cb_tree_expand), dv); - g_signal_connect (G_OBJECT (dv->dirtree),"button_press_event", - G_CALLBACK (cb_button_press), dv); - g_signal_connect (G_OBJECT (dv->dirtree),"button_release_event", - G_CALLBACK (cb_button_release), dv); - g_signal_connect (G_OBJECT(dv->dirtree), "scroll-event", - G_CALLBACK(cb_scroll), dv); - g_signal_connect (G_OBJECT (dv->dirtree), "key_press_event", - G_CALLBACK (cb_key_press), dv); - - /* for DnD */ - gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (dv->dirtree), - GDK_BUTTON1_MASK - | GDK_BUTTON2_MASK - | GDK_BUTTON3_MASK, - dnd_types_uri, - dnd_types_uri_num, - GDK_ACTION_ASK | GDK_ACTION_COPY - | GDK_ACTION_MOVE | GDK_ACTION_LINK); - gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (dv->dirtree), - dnd_types_uri, - dnd_types_uri_num, - GDK_ACTION_ASK | GDK_ACTION_COPY - | GDK_ACTION_MOVE | GDK_ACTION_LINK); - g_signal_connect (G_OBJECT (dv->dirtree), "drag_data_get", - G_CALLBACK (cb_drag_data_get), dv); - g_signal_connect (G_OBJECT (dv->dirtree), "drag_motion", - G_CALLBACK (cb_drag_motion), dv); - g_signal_connect (G_OBJECT (dv->dirtree), "drag_data_received", - G_CALLBACK (cb_drag_data_received), dv); - g_signal_connect (G_OBJECT (dv->dirtree), "drag_end", - G_CALLBACK (cb_drag_end), dv); - - set_columns_type (GTK_TREE_VIEW (dv->dirtree)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dv->dirtree), FALSE); - - gtk_container_add (GTK_CONTAINER (dv->scroll_win), dv->dirtree); - gtk_widget_show (dv->dirtree); - - treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); - gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, FALSE); - - gtk_tree_path_free (treepath); - - adjust_tree_idle (dv, NULL); -} - - -static GtkWidget * -dirview_create_toolbar (DirView *dv) -{ - GtkWidget *toolbar; - GtkWidget *button; - GtkWidget *iconw; - - g_return_val_if_fail (dv, NULL); - - toolbar = gtkutil_create_toolbar (); - - /* file open button */ - iconw = gimv_icon_stock_get_widget ("small_home"); - button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), - _("Home"), - _("Home"), - _("Home"), - iconw, - G_CALLBACK (cb_home_button), - dv); - - /* preference button */ - iconw = gimv_icon_stock_get_widget ("small_up"); - button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), - _("Up"), - _("Up"), - _("Up"), - iconw, - G_CALLBACK (cb_up_button), - dv); - - /* refresh button */ - iconw = gimv_icon_stock_get_widget ("small_refresh"); - button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), - _("Refresh"), - _("Refresh"), - _("Refresh"), - iconw, - G_CALLBACK (cb_refresh_button), - dv); - - /* preference button */ - iconw = gimv_icon_stock_get_widget ("dotfile"); - button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), - _("Dotfile"), - _("Show/Hide dotfile"), - _("Show/Hide dotfile"), - iconw, - G_CALLBACK (cb_dotfile_button), - dv); - - gtk_widget_show_all (toolbar); - gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); - - return toolbar; -} - - -/* - * remove all children, and insert dummy row. - */ -static void -insert_dummy_row (GtkTreeStore *store, GtkTreeIter *parent_iter) -{ - GtkTreeIter iter; - gboolean success; - - g_return_if_fail (store); - - gtk_tree_store_prepend (store, &iter, parent_iter); - gtk_tree_store_set (store, &iter, - COLUMN_IS_DUMMY, TRUE, - COLUMN_TERMINATOR); - - success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), - &iter, - parent_iter, - 1); - if (!success) return; - - while (gtk_tree_store_is_ancestor (store, parent_iter, &iter)) { - gtk_tree_store_remove (store, &iter); - } -} - - -/* - * fullpath shouldn't be terminated with "/" character. - */ -static void -insert_row (GtkTreeStore *store, - GtkTreeIter *iter, GtkTreeIter *parent_iter, - const gchar *label, const gchar *fullpath) -{ - GdkPixbuf *icon, *oicon; - gchar *path, *tmpstr; - gchar *label_internal; - - g_return_if_fail (store); - g_return_if_fail (iter); - g_return_if_fail (label && *label); - g_return_if_fail (fullpath && *fullpath); - - path = remove_slash (fullpath); - - if (!strcmp (label, ".")) { - icon = go_folder; - oicon = go_folder; - } else if (!strcmp (label, "..")) { - icon = up_folder; - oicon = up_folder; - } else if (access(path, R_OK)) { - icon = lock_folder; - oicon = lock_folder; - } else if (islink(path)) { - icon = lfolder; - oicon = lofolder; - } else if (isdir(path)) { - icon = folder; - oicon = ofolder; - } else { - return; - } - - tmpstr = add_slash (path); - g_free(path); - path = tmpstr; - - /* convert charset */ - label_internal = charset_to_internal (label, conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - gtk_tree_store_append (store, iter, parent_iter); - gtk_tree_store_set (store, iter, - COLUMN_LABEL, label_internal, - COLUMN_FULLPATH, path, - COLUMN_ICON_OPEN, oicon, - COLUMN_ICON_CLOSE, icon, - COLUMN_IS_DUMMY, FALSE, - COLUMN_TERMINATOR); - - if (strcmp (label, ".") && strcmp (label, "..") && !access(path, R_OK)) - insert_dummy_row (store, iter); - - g_free (label_internal); - g_free (path); -} - - -static gboolean -is_in_view (GtkTreeView *treeview, GtkTreePath *treepath) -{ - GdkRectangle widget_area, cell_area; - - if (!GTK_WIDGET_REALIZED (treeview)) - return FALSE; - - /* widget area */ - gtkutil_get_widget_area (GTK_WIDGET (treeview), &widget_area); - - gtk_tree_view_get_cell_area(treeview, treepath, NULL, &cell_area); - - if (cell_area.y >= 0 && cell_area.y < widget_area.height) - return TRUE; - else - return FALSE; -} - - -static void -adjust_tree (GtkTreeView *treeview, GtkTreeIter *iter) -{ - GtkTreeModel *model; - GtkTreePath *treepath; - GtkTreeSelection *selection; - GtkTreeIter tmp_iter; - gboolean success; - - model = gtk_tree_view_get_model (treeview); - selection = gtk_tree_view_get_selection (treeview); - - if (iter) { - treepath = gtk_tree_model_get_path (model, iter); - tmp_iter = *iter; - } else { - treepath = gtk_tree_path_new_from_string ("0"); - success = gtk_tree_model_get_iter (model, &tmp_iter, treepath); - if (!success) goto FUNC_END; - } - - gtk_tree_selection_select_path (selection, treepath); - if (!is_in_view(treeview, treepath)) - gtk_tree_view_scroll_to_cell (treeview, treepath, NULL, - TRUE, 0.0, 0.0); - - FUNC_END: - gtk_tree_path_free (treepath); - treepath = NULL; -} - - -static gboolean -get_iter_from_path (DirView *dv, const gchar *str, GtkTreeIter *iter) -{ - GtkTreeModel *model; - GtkTreeIter parent_iter, child_iter; - GtkTreePath *treepath; - GtkTreeSelection *selection; - gchar *destpath; - gint len_src, len_dest; - gboolean go_next, retval = FALSE; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (iter, FALSE); - - destpath = add_slash (str); - if (!destpath) return FALSE; - - len_src = strlen (dv->root_dir); - len_dest = strlen (destpath); - - if (len_dest < len_src || strncmp (dv->root_dir, destpath, len_src)) { - goto ERROR; - } - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); - - go_next = gtk_tree_model_get_iter_from_string (model, &parent_iter, "0"); - if (!go_next) goto ERROR; - treepath = gtk_tree_model_get_path (model, &parent_iter); - - if (!strcmp (destpath, dv->root_dir)) { - gtk_tree_path_free (treepath); - g_free (destpath); - return gtk_tree_model_get_iter_first (model, iter); - } - - gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, FALSE); - gtk_tree_path_free (treepath); - treepath = NULL; - - go_next = gtk_tree_model_get_iter_from_string (model, &parent_iter, "0:0"); - - while (go_next) { - gint len; - gchar *path, *label; - - gtk_tree_model_get (model, &parent_iter, - COLUMN_LABEL, &label, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - len = strlen (path); /* path will be terminated by "/" */ - - /* It is just the directory! */ - if (!strcmp (label, ".") || !strcmp (label, "..")) { - go_next = gtk_tree_model_iter_next (model, &parent_iter); - } else if (!strcmp (destpath, path)) { - *iter = parent_iter; - go_next = FALSE; - retval = TRUE; - - /* It is the parent directory of the destpath */ - } else if (!strncmp (destpath, path, len)) { - treepath = gtk_tree_model_get_path (model, &parent_iter); - go_next = gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, - FALSE); - go_next = gtk_tree_model_iter_children (model, - &child_iter, - &parent_iter); - parent_iter = child_iter; - - gtk_tree_path_free (treepath); - treepath = NULL; - - /* No match. Search the next... */ - } else { - go_next = gtk_tree_model_iter_next (model, &parent_iter); - } - - g_free (path); - g_free (label); - } - - - g_free (destpath); - return retval; - - ERROR: - g_free (destpath); - return FALSE; -} - - -struct AdjustTreeIdle { - DirView *dv; - GtkTreeView *treeview; - gboolean has_iter; - GtkTreeIter iter; -}; - - -static gint -idle_adjust_tree (gpointer data) -{ - struct AdjustTreeIdle *idle = data; - - idle->dv->priv->adjust_tree_id = 0; - if (idle->has_iter) - adjust_tree (idle->treeview, &idle->iter); - else - adjust_tree (idle->treeview, NULL); - - return FALSE; -} - - -static void -adjust_tree_idle (DirView *dv, GtkTreeIter *iter) -{ - GtkTreeView *treeview = GTK_TREE_VIEW (dv->dirtree); - struct AdjustTreeIdle *idle; - - g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); - - idle = g_new0(struct AdjustTreeIdle, 1); - - idle->dv = dv; - idle->treeview = treeview; - if (iter) { - idle->iter = *iter; - idle->has_iter = TRUE; - } else { - idle->has_iter = FALSE; - } - - dv->priv->adjust_tree_id = - gtk_idle_add_full (G_PRIORITY_DEFAULT, - idle_adjust_tree, NULL, idle, - (GtkDestroyNotify) g_free); -} - - -static void -get_expanded_dirs (GtkTreeView *treeview, GtkTreePath *treepath, gpointer data) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GList **list; - gchar *path; - - g_return_if_fail (data); - list = data; - - model = gtk_tree_view_get_model (treeview); - - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - g_return_if_fail (path && *path); - - *list = g_list_append (*list, path); -} - - -static void -refresh_dir_tree (DirView *dv, GtkTreeIter *parent_iter) -{ - GtkTreeView *treeview; - GtkTreeStore *store; - GtkTreeIter root_iter, iter; - GtkTreePath *treepath; - gchar *root_dir, *selected_path; - GList *expand_list = NULL, *node; - gboolean selected; - - g_return_if_fail (dv); - - selected_path = dirview_get_selected_path (dv); - if (!selected_path) selected_path = g_strdup (dv->root_dir); - - /* get expanded directory list */ - gtk_tree_view_map_expanded_rows (GTK_TREE_VIEW (dv->dirtree), - get_expanded_dirs, - &expand_list); - - /* replace root node */ - root_dir = g_strdup (dv->root_dir); -#if 1 /* almost same with dirview_change_root () */ - g_free (dv->root_dir); - dv->root_dir = add_slash (root_dir); - - treeview = GTK_TREE_VIEW (dv->dirtree); - - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - gtk_tree_store_clear (store); - insert_row (store, &root_iter, NULL, dv->root_dir, dv->root_dir); - - treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); - - gtk_tree_path_free (treepath); -#endif - g_free (root_dir); - - /* restore expanded directory */ - for (node = expand_list; node; node = g_list_next (node)) { - dirview_expand_dir (dv, node->data, FALSE); - } - - g_list_foreach (expand_list, (GFunc) g_free, NULL); - g_list_free (expand_list); - - /* adjust tree pos */ - selected = get_iter_from_path (dv, selected_path, &iter); - if (selected) - adjust_tree_idle (dv, &iter); - - g_free (selected_path); -} - - -static void -dirview_popup_menu (DirView *dv, GdkEventButton *event) -{ - GtkTreeModel *model; - GtkTreePath *treepath; - GtkTreeIter iter; - gboolean success; - gchar *path, *parent, *tmpstr, *label; - - GtkItemFactory *ifactory; - GtkWidget *dirview_popup, *menuitem; - gint n_menu_items; - guint button; - guint32 time; - GtkMenuPositionFunc pos_fn = NULL; - - g_return_if_fail (dv); - - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dv->dirtree), - event->x, event->y, - &treepath, NULL, NULL, NULL); - if (!success) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_LABEL, &label, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - tmpstr = remove_slash (path); - parent = g_dirname (tmpstr); - g_free (tmpstr); - - if (event) { - button = event->button; - time = event->time; - } else { - button = 0; - time = GDK_CURRENT_TIME; - pos_fn = menu_calc_popup_position; - } - - if (dv->popup_menu) { - gtk_widget_unref (dv->popup_menu); - dv->popup_menu = NULL; - } - - n_menu_items = sizeof(dirview_popup_items) - / sizeof(dirview_popup_items[0]) - 1; - dirview_popup = menu_create_items(NULL, dirview_popup_items, - n_menu_items, "", dv); - - - /* set sensitive */ - ifactory = gtk_item_factory_from_widget (dirview_popup); - - if (!strcmp (label, ".") || !strcmp (label, "..")) - { - menuitem = gtk_item_factory_get_item (ifactory, "/Refresh Tree"); - gtk_widget_set_sensitive (menuitem, FALSE); - menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - if (!iswritable (path)) { - menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - if (!parent || !strcmp (parent, ".") || !iswritable (parent) - || !strcmp (label, ".") || !strcmp (label, "..")) - { - menuitem = gtk_item_factory_get_item (ifactory, "/Rename Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - menuitem = gtk_item_factory_get_item (ifactory, "/Delete Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - gtk_tree_path_free (treepath); - g_free (label); - g_free (path); - g_free (parent); - - /* popup menu */ - gtk_menu_popup(GTK_MENU (dirview_popup), NULL, NULL, - pos_fn, dv->dirtree->window, button, time); - - dv->popup_menu = dirview_popup; - - g_object_ref (G_OBJECT (dv->popup_menu)); - gtk_object_sink (GTK_OBJECT (dv->popup_menu)); -} - - -typedef struct ButtonActionData_Tag -{ - DirView *dv; - gchar *path, *label; - gint action_num; -} ButtonActionData; - - -static void -free_button_action_data (ButtonActionData *data) -{ - g_free (data->path); - g_free (data->label); - g_free (data); -} - - -static gboolean -idle_dirview_button_action (gpointer data) -{ - ButtonActionData *bdata = data; - DirView *dv = bdata->dv; - gchar *path = bdata->path, *label = bdata->label; - - dv->priv->button_action_id = 0; - - switch (abs (bdata->action_num)) { - case MouseActLoadThumb: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_NONE); - } - break; - case MouseActLoadThumbRecursive: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR); - } - break; - case MouseActLoadThumbRecursiveInOneTab: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_ONE_TAB); - } - break; - case MouseActChangeTop: - dirview_change_root (dv, path); - break; - default: - break; - } - - free_button_action_data (bdata); - - return FALSE; -} - - -static gboolean -dirview_button_action (DirView *dv, GdkEventButton *event, gint num) -{ - gchar *path = NULL, *label; - GtkTreeSelection *selection; - GtkTreeModel *model; - gboolean success, retval = FALSE; - GtkTreePath *treepath; - GtkTreeViewColumn *treecolumn; - gint cell_x, cell_y; - GtkTreeIter iter; - - success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dv->dirtree), - event->x, event->y, - &treepath, &treecolumn, - &cell_x, &cell_y); - if (!success) return FALSE; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); - gtk_tree_selection_select_path (selection, treepath); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - gtk_tree_model_get_iter (model, &iter, treepath); - gtk_tree_model_get (model, &iter, - COLUMN_LABEL, &label, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - switch (abs(num)) { - case MouseActLoadThumb: - case MouseActLoadThumbRecursive: - case MouseActLoadThumbRecursiveInOneTab: - case MouseActChangeTop: - { - ButtonActionData *data = g_new0 (ButtonActionData, 1); - - data->dv = dv; - data->path = path; - data->label = label; - data->action_num = num; - - dv->priv->button_action_id - = gtk_idle_add (idle_dirview_button_action, data); - - gtk_tree_path_free (treepath); - - return FALSE; - break; - } - case MouseActPopupMenu: - dirview_popup_menu (dv, event); - if (num > 0) retval = TRUE; - break; - default: - break; - } - - g_free (path); - g_free (label); - gtk_tree_path_free (treepath); - - return retval; -} - - - -/****************************************************************************** - * - * Public functions - * - ******************************************************************************/ -void -dirview_change_root (DirView *dv, const gchar *root_dir) -{ - GtkTreeView *treeview; - GtkTreeStore *store; - GtkTreeIter root_iter; - GtkTreePath *treepath; - gchar *dest_dir; - - g_return_if_fail (dv); - g_return_if_fail (root_dir && *root_dir); - - dest_dir = add_slash (root_dir); - - if (!isdir (dest_dir)) { - g_free (dest_dir); - return; - } - - g_free (dv->root_dir); - dv->root_dir = dest_dir; - - treeview = GTK_TREE_VIEW (dv->dirtree); - - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - gtk_tree_store_clear (store); - insert_row (store, &root_iter, NULL, dv->root_dir, dv->root_dir); - - treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); - gtk_tree_view_expand_row (treeview, treepath, FALSE); - - gtk_tree_path_free (treepath); - - adjust_tree_idle (dv, NULL); -} - - -void -dirview_change_root_to_parent (DirView *dv) -{ - gchar *end; - gchar *root; - - g_return_if_fail (dv); - - root = g_strdup (dv->root_dir); - end = strrchr (root, '/'); - if (end && end != root) *end = '\0'; - end = strrchr (root, '/'); - if (end) *(end + 1) = '\0'; - - dirview_change_dir (dv, root); - g_free (root); -} - - -void -dirview_change_dir (DirView *dv, const gchar *str) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gchar *destpath; - gboolean success; - - g_return_if_fail (dv); - - destpath = add_slash (str); - if (!destpath) return; - - if (!isdir (destpath)) { - g_free (destpath); - return; - } - - /* FIXME */ - /* if selected path in directory view is same as str, adjust to it */ - /* END FIXME */ - - success = get_iter_from_path (dv, destpath, &iter); - - if (success) { - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - adjust_tree_idle (dv, &iter); - } else { - dirview_change_root (dv, str); - } - - g_free (destpath); -} - - -void -dirview_go_home (DirView *dv) -{ - const gchar *home = g_getenv ("HOME"); - - dirview_change_root (dv, home); - dirview_change_dir (dv, home); -} - - -void -dirview_refresh_list (DirView *dv) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - success = gtk_tree_model_get_iter_first (model, &iter); - if (!success) return; - - refresh_dir_tree (dv, &iter); -} - - -gchar * -dirview_get_selected_path (DirView *dv) -{ - gboolean success; - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - gchar *path; - - g_return_val_if_fail (dv, NULL); - g_return_val_if_fail (dv->dirtree, NULL); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); - g_return_val_if_fail (selection, NULL); - - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return NULL; - - gtk_tree_model_get (model, &iter, - COLUMN_FULLPATH, &path, - COLUMN_TERMINATOR); - - return path; -} - - -void -dirview_expand_dir (DirView *dv, const gchar *dir, gboolean open_all) -{ - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreePath *treepath; - gboolean success; - - success = get_iter_from_path (dv, dir, &iter); - if (!success) return; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); - treepath = gtk_tree_model_get_path (model, &iter); - - gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, open_all); - - gtk_tree_path_free (treepath); -} - - -gboolean -dirview_set_opened_mark (DirView *dv, const gchar *path) -{ - /* note implemented yet */ - return TRUE; -} - - -gboolean -dirview_unset_opened_mark (DirView *dv, const gchar *path) -{ - /* note implemented yet */ - return TRUE; -} - - -void -dirview_show_toolbar (DirView *dv) -{ - g_return_if_fail (dv); - - dv->show_toolbar = TRUE; - gtk_widget_show (dv->toolbar_eventbox); -} - - -void -dirview_hide_toolbar (DirView *dv) -{ - g_return_if_fail (dv); - - dv->show_toolbar = FALSE; - gtk_widget_hide (dv->toolbar_eventbox); -} - - -DirView * -dirview_create (const gchar *root_dir, - GtkWidget *parent_win, - GimvThumbWin *tw) -{ - DirView *dv; - GtkWidget *eventbox; - const gchar *home = g_getenv ("HOME"); - - dv = g_new0 (DirView, 1); - dv->priv = g_new0 (DirViewPrivate,1); - - if (root_dir) - dv->root_dir = add_slash (root_dir); - else - dv->root_dir = add_slash (home); - - dv->dirtree = NULL; - dv->popup_menu = NULL; - dv->tw = tw; - dv->show_toolbar = conf.dirview_show_toolbar; - dv->show_dotfile = conf.dirview_show_dotfile; - dv->priv->hilit_dir = -1; - dv->priv->scroll_timer_id = 0; - dv->priv->drag_tree_row = NULL; - dv->priv->button_action_id = 0; - dv->priv->swap_com_id = 0; - dv->priv->adjust_tree_id = 0; - - /* main vbox */ - dv->container = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (dv->container, "DirView"); - gtk_widget_show (dv->container); - - dnd_dest_set (dv->container, dnd_types_component, dnd_types_component_num); - g_object_set_data (G_OBJECT (dv->container), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); - g_signal_connect (G_OBJECT (dv->container), "destroy", - G_CALLBACK (cb_dirview_destroyed), dv); - - g_signal_connect (G_OBJECT (dv->container), "drag_data_received", - G_CALLBACK (cb_com_swap_drag_data_received), dv->tw); - - /* toolbar */ - eventbox = dv->toolbar_eventbox = gtk_event_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (eventbox), 1); - gtk_box_pack_start (GTK_BOX (dv->container), eventbox, FALSE, FALSE, 0); - gtk_widget_show (eventbox); - - dv->toolbar = dirview_create_toolbar (dv); - gtk_container_add (GTK_CONTAINER (eventbox), dv->toolbar); - - if (!dv->show_toolbar) - gtk_widget_hide (dv->toolbar_eventbox); - - dnd_src_set (eventbox, dnd_types_component, dnd_types_component_num); - g_object_set_data (G_OBJECT (eventbox), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); - g_signal_connect (G_OBJECT (eventbox), "drag_begin", - G_CALLBACK (cb_toolbar_drag_begin), tw); - g_signal_connect (G_OBJECT (eventbox), "drag_data_get", - G_CALLBACK (cb_toolbar_drag_data_get), tw); - - /* scrolled window */ - dv->scroll_win = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (dv->scroll_win), 1); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dv->scroll_win), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(dv->scroll_win), - GTK_SHADOW_IN); - gtk_box_pack_start(GTK_BOX(dv->container), dv->scroll_win, TRUE, TRUE, 0); - gtk_widget_show (dv->scroll_win); - - /* ctree */ - dirview_create_treeview (dv, dv->root_dir); - - return dv; -} - -#endif /* ENABLE_TREEVIEW */ diff -Nru gimageview-0.2.27/src/dirview.c gimageview-0.3.0-0.20101117/src/dirview.c --- gimageview-0.2.27/src/dirview.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dirview.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,2138 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dirview.c,v 1.81 2004/09/21 08:44:31 makeinu Exp $ - */ - -/* - * These codes are mostly taken from G-thumB. - * G-thumB code Copyright (C) 1999-2000 MIZUNO Takehiko - */ - -#include "dirview.h" - -#ifndef ENABLE_TREEVIEW - -#include -#include -#include -#include -#include -#include -#include - -#include "gimageview.h" -#include "charset.h" -#include "dirview_priv.h" -#include "dnd.h" -#include "fileload.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "gtk2-compat.h" -#include "gtk_prop.h" -#include "gtkutils.h" -#include "gimv_icon_stock.h" -#include "gimv_thumb_win.h" -#include "menu.h" -#include "prefs.h" - - -/* for auto-scroll and auto-expand at drag */ -#define SCROLL_EDGE 20 -typedef gboolean (*desirable_fn) (DirView *dv, gint x, gint y); -typedef gboolean (*scroll_fn) (gpointer data); - - -typedef enum { - DirNodeScannedFlag = 1 << 0, - DirNodeOpenedFlag = 1 << 1 -} DirNodeFlags; - - -typedef struct DirNode_Tag -{ - DirNodeFlags flags; - gboolean scanned; - gchar *path; -} DirNode; - - -/* private functions */ -static gint comp_func_dirnode (gconstpointer node_data, - gconstpointer comp_data); -static GtkCTreeNode *dirview_find_directory (DirView *dv, - const gchar *path); - -static void dirview_create_ctree (DirView *dv); -static void adjust_ctree (GtkWidget *widget, - GtkCTreeNode *node); -GtkCTreeNode *dirview_insert_dummy_node (DirView *dv, - GtkCTreeNode *parent); -GtkCTreeNode *dirview_insert_node (DirView *dv, - GtkCTreeNode *parent, - const gchar *path); -static void expand_dir (DirView *dv, - GtkCTreeNode *parent); -static GList *get_expanded_list (DirView *dv); -static void refresh_dir_tree (DirView *dv, - GtkCTreeNode *parent); -static void dirview_popup_menu (DirView *dv, - GtkCTreeNode *node, - GdkEventButton *event); -static gboolean dirview_button_action (DirView *dv, - GdkEventButton *event, - gint num); - -/* for drag motion */ -static void dirview_setup_drag_scroll (DirView *dv, - gint x, - gint y, - desirable_fn desirable, - scroll_fn scroll); -static void dirview_cancel_drag_scroll (DirView *dv); -static gboolean dirview_scrolling_is_desirable (DirView *dv, - gint x, - gint y); -static gboolean timeout_dirview_scroll (gpointer data); -static gint timeout_auto_expand_directory (gpointer data); - - -/* callback functions */ -static void cb_dirtree_destroy (GtkWidget *widget, - DirView *dv); -static void cb_dirview_destroyed (GtkWidget *widget, - DirView *dv); -static void cb_node_destroy (gpointer data); -static void cb_expand (GtkWidget *widget, - GtkCTreeNode *parent, - DirView *dv); -static void cb_collapse (GtkWidget *widget, - GtkCTreeNode *parent, - DirView *dv); -static gboolean cb_button_press (GtkWidget *widget, - GdkEventButton *event, - DirView *dv); -static gboolean cb_button_release (GtkWidget *widget, - GdkEventButton *event, - DirView *dv); -static gboolean cb_key_press (GtkWidget *widget, - GdkEventKey *event, - DirView *dv); - -/* callback functions for popup menu */ -static void cb_open_thumbnail (DirView *dv, - ScanSubDirType scan_subdir, - GtkWidget *menuitem); -static void cb_go_to_here (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_refresh_dir_tree (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_file_property (DirView *tv, - guint action, - GtkWidget *menuitem); -static void cb_mkdir (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_rename_dir (DirView *dv, - guint action, - GtkWidget *menuitem); -static void cb_delete_dir (DirView *dv, - guint action, - GtkWidget *menuitem); - -/* callback functions for toolbar buttons */ -static void cb_home_button (GtkWidget *widget, - DirView *dv); -static void cb_up_button (GtkWidget *widget, - DirView *dv); -static void cb_refresh_button (GtkWidget *widget, - DirView *dv); -static void cb_dotfile_button (GtkWidget *widget, - DirView *dv); - -/* callback functions for DnD */ -static void cb_drag_motion (GtkWidget *dirtree, - GdkDragContext *context, - gint x, - gint y, - gint time, - gpointer data); -static void cb_drag_leave (GtkWidget *dirtree, - GdkDragContext *context, - guint time, - gpointer data); -static void cb_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); -static void cb_drag_data_received (GtkWidget *dirtree, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *seldata, - guint info, - guint32 time, - gpointer data); -static void cb_drag_end (GtkWidget *dirtree, - GdkDragContext *context, - gpointer data); -static void cb_com_swap_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); - - -static GtkItemFactoryEntry dirview_popup_items [] = -{ - {N_("/_Load Thumbnail"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_NONE, NULL}, - {N_("/Load Thumbnail re_cursively"), NULL, cb_open_thumbnail, SCAN_SUB_DIR, NULL}, - {N_("/Load Thumbnail recursively in _one tab"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_ONE_TAB, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Go to here"), NULL, cb_go_to_here, 0, NULL}, - {N_("/_Refresh Tree"), NULL, cb_refresh_dir_tree, 0, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Property..."), NULL, cb_file_property, 0, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/_Make Directory..."), NULL, cb_mkdir, 0, NULL}, - {N_("/Re_name Directory..."), NULL, cb_rename_dir, 0, NULL}, - {N_("/_Delete Directory..."), NULL, cb_delete_dir, 0, NULL}, - {NULL, NULL, NULL, 0, NULL}, -}; - - -extern GtkItemFactoryEntry dnd_file_popup_items []; - - -/****************************************************************************** - * - * Private functions - * - ******************************************************************************/ -static gint -comp_func_dirnode (gconstpointer node_data, gconstpointer comp_data) -{ - const DirNode *dirnode = node_data; - const gchar *node_path; - const gchar *comp_path = comp_data; - - g_return_val_if_fail (comp_path && *comp_path, -1); - - if (!dirnode) return -1; - - node_path = dirnode->path; - if (!node_path || !*node_path) return -1; - - return strcmp (node_path, comp_path); -} - - -static GtkCTreeNode * -dirview_find_directory (DirView *dv, const gchar *path) -{ - GtkCTreeNode *parent, *node; - - g_return_val_if_fail (dv, NULL); - g_return_val_if_fail (path && path, NULL); - - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - if (!parent) return NULL; - node = gtk_ctree_find_by_row_data_custom (GTK_CTREE (dv->dirtree), - parent, - (gpointer) path, - comp_func_dirnode); - return node; -} - - -/* - * dirview_create_ctree: - * @ create a new GtkCTree widget. - * - * dv : Pointer to the DirView struct. - */ -static void -dirview_create_ctree (DirView *dv) -{ - GtkWidget *dirtree; - GtkCTreeNode *root_node; - gchar *root_dir; - - g_return_if_fail (dv); - - root_dir = add_slash (dv->root_dir); - g_free (dv->root_dir); - dv->root_dir = root_dir; - - dirtree = dv->dirtree = gtk_ctree_new (1,0); - gtk_clist_set_column_auto_resize (GTK_CLIST (dirtree), 0, TRUE); - gtk_clist_set_selection_mode (GTK_CLIST (dirtree), GTK_SELECTION_BROWSE); - gtk_ctree_set_line_style (GTK_CTREE (dirtree), conf.dirview_line_style); - gtk_ctree_set_expander_style (GTK_CTREE (dirtree), conf.dirview_expander_style); - gtk_clist_set_row_height (GTK_CLIST (dirtree), 18); - - gtk_container_add (GTK_CONTAINER (dv->scroll_win), dirtree); - - gtk_signal_connect (GTK_OBJECT (dirtree), "tree_expand", - GTK_SIGNAL_FUNC (cb_expand), dv); - gtk_signal_connect (GTK_OBJECT (dirtree), "tree_collapse", - GTK_SIGNAL_FUNC (cb_collapse), dv); - - gtk_signal_connect (GTK_OBJECT (dirtree),"button_press_event", - GTK_SIGNAL_FUNC (cb_button_press), dv); - gtk_signal_connect (GTK_OBJECT (dirtree),"button_release_event", - GTK_SIGNAL_FUNC (cb_button_release), dv); - - gtk_signal_connect (GTK_OBJECT(dirtree), "key-press-event", - GTK_SIGNAL_FUNC (cb_key_press), dv); - - gtk_signal_connect (GTK_OBJECT (dv->dirtree), "destroy", - GTK_SIGNAL_FUNC (cb_dirtree_destroy), dv); - - /* for drag file list */ - dnd_src_set (dirtree, dnd_types_uri, dnd_types_uri_num); - dnd_dest_set (dirtree, dnd_types_archive, dnd_types_archive_num); - gtk_signal_connect (GTK_OBJECT (dirtree), "drag_motion", - GTK_SIGNAL_FUNC (cb_drag_motion), dv); - gtk_signal_connect (GTK_OBJECT (dirtree), "drag_leave", - GTK_SIGNAL_FUNC (cb_drag_leave), dv); - gtk_signal_connect (GTK_OBJECT (dirtree), "drag_data_get", - GTK_SIGNAL_FUNC (cb_drag_data_get), dv); - gtk_signal_connect (GTK_OBJECT (dirtree), "drag_data_received", - GTK_SIGNAL_FUNC (cb_drag_data_received), dv); - gtk_signal_connect (GTK_OBJECT (dirtree), "drag_end", - GTK_SIGNAL_FUNC (cb_drag_end), dv); - - root_node = dirview_insert_node (dv, NULL, dv->root_dir); - if (root_dir) - gtk_ctree_expand (GTK_CTREE (dirtree), root_node); - - gtk_widget_show (dirtree); -} - - -/* - * adjust_ctree: - * @ set position of viewport - * - * dirtree : ctree widget. - * parent : ctree node that contain direcotry to expand. - */ -static void -adjust_ctree (GtkWidget *dirtree, GtkCTreeNode *node) -{ - gint row = GTK_CLIST (dirtree)->rows - g_list_length ((GList*)node); - - GTK_CLIST (dirtree)->focus_row = row; - gtk_ctree_select (GTK_CTREE (dirtree), node); - - gtk_clist_freeze (GTK_CLIST (dirtree)); - if (gtk_ctree_node_is_visible (GTK_CTREE (dirtree), node) != GTK_VISIBILITY_FULL) - gtk_ctree_node_moveto (GTK_CTREE (dirtree), node, 0, 0, 0); - gtk_clist_thaw (GTK_CLIST (dirtree)); -} - - -/* - * dirview_insert_dummy_node: - * @ insert dummy node to display expander. - * - * dv : Pointer to the Dir View struct. - * parnt : Parent node to insert dummy node. - * Return : Pointer to the new GtkCTreeNode. - */ -GtkCTreeNode * -dirview_insert_dummy_node (DirView *dv, GtkCTreeNode *parent) -{ - GtkCTreeNode *node = NULL; - gchar *dummy = "dummy", *node_text; - DirNode *dirdata; - gboolean is_leaf, expanded; - - dirdata = gtk_ctree_node_get_row_data (GTK_CTREE (dv->dirtree), parent); - gtk_ctree_get_node_info (GTK_CTREE (dv->dirtree), parent, &node_text, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - - if (!expanded && !(dirdata->flags & DirNodeScannedFlag) - && !GTK_CTREE_ROW (parent)->children - && strcmp (node_text, ".") && strcmp (node_text, "..")) - { - gtk_ctree_insert_node (GTK_CTREE (dv->dirtree), - parent, NULL, &dummy, - 4, NULL, NULL, NULL, NULL, FALSE, FALSE); - } - - return node; -} - - -/* - * dirview_insert_node: - * @ insert new node to the dirview. - * - * dv : Pointer to the Dir View struct. - * parnt : Parent node to insert new node. - * path : Dir name to insert. - * Return : Pointer to the new GtkCTreeNode. - */ -GtkCTreeNode * -dirview_insert_node (DirView *dv, GtkCTreeNode *parent, const gchar *path) -{ - GtkCTreeNode *node = NULL; - DirNode *dirnode; - GimvIcon *folder, *ofolder; - gchar *dir, *internal_str; - const gchar *filename, *text; - - g_return_val_if_fail (dv && path, NULL); - - dir = remove_slash (path); - filename = g_basename (dir); - - if (isdir (path) - && (!(!dv->show_dotfile && (filename[0] == '.')) - || (conf.dirview_show_current_dir && !strcmp (filename, ".")) - || (conf.dirview_show_parent_dir && !strcmp (filename, "..")) - || !parent)) - { - dirnode = g_new0 (DirNode, 1); - dirnode->flags = 0; - if (!strcmp(filename, ".") || !strcmp(filename, "..")) { - gchar *tmpstr = relpath2abs (path); - dirnode->path = add_slash (tmpstr); - g_free (tmpstr); - } else { - dirnode->path = add_slash (path); - } - - if (parent) - text = filename; - else - text = path; - - if (islink (path)) - folder = gimv_icon_stock_get_icon ("folder-link"); - else if (!strcmp (filename, ".")) - folder = gimv_icon_stock_get_icon ("folder-go"); - else if (!strcmp (filename, "..")) - folder = gimv_icon_stock_get_icon ("folder-up"); - else if (access(path, R_OK)) - folder = gimv_icon_stock_get_icon ("folder-lock"); - else - folder = gimv_icon_stock_get_icon ("folder"); - - if (islink (path)) - ofolder = gimv_icon_stock_get_icon ("folder-link-open"); - else - ofolder = gimv_icon_stock_get_icon ("folder-open"); - - internal_str = charset_to_internal (text, conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - node = gtk_ctree_insert_node (GTK_CTREE (dv->dirtree), parent, - NULL, (gchar **) &internal_str, 4, - folder->pixmap, folder->mask, - ofolder->pixmap, ofolder->mask, - FALSE, FALSE); - - g_free (internal_str); - - gtk_ctree_node_set_row_data_full (GTK_CTREE (dv->dirtree), node, - dirnode, cb_node_destroy); - - /* set expander */ - if (!access(path, R_OK)) - dirview_insert_dummy_node (dv, node); - - /* set mark */ - if (gimv_thumb_view_find_opened_dir (dirnode->path)) { - dirview_set_opened_mark (dv, dirnode->path); - } - } - - g_free (dir); - - return node; -} - - -/* - * expand_dir: - * @ Expand specified direcotry tree. - * - * dv : Pointer to the DirView struct. - * parent : ctree node that contain direcotry to expand. - */ -static void -expand_dir (DirView *dv, GtkCTreeNode *parent) -{ - GtkWidget *dirtree; - DirNode *parent_dirnode; - DIR *dir; - struct dirent *dirent; - gchar *path; - - g_return_if_fail (dv); - - dirtree = dv->dirtree; - if (!dirtree) return; - - parent_dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(dirtree), parent); - - dir = opendir (parent_dirnode->path); - if (dir) { - while ((dirent = readdir(dir))) { - path = g_strconcat (parent_dirnode->path, dirent->d_name, NULL); - if (isdir (path)) - dirview_insert_node (dv, parent, path); - g_free (path); - } - closedir (dir); - gtk_ctree_sort_node (GTK_CTREE(dirtree), parent); - } - - parent_dirnode->flags |= DirNodeScannedFlag; -} - - -GList * -get_expanded_list (DirView *dv) -{ - GList *list = NULL; - GtkCTreeNode *node; - gchar *text; - gboolean is_leaf, expanded; - DirNode *dirnode; - - g_return_val_if_fail (dv, NULL); - g_return_val_if_fail (dv->dirtree, NULL); - - node = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - for (; node; node = GTK_CTREE_NODE_NEXT (node)) { - gtk_ctree_get_node_info (GTK_CTREE (dv->dirtree), node, &text, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - - if (expanded) { - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE (dv->dirtree), node); - list = g_list_append (list, g_strdup (dirnode->path)); - } - } - - return list; -} - - -/* - * refresh_dir_tree: - * @ Refresh sub direcotry list. - * - * dv : Pointer to the DirView struct. - * parent : ctree node that contain direcotry to refresh. - */ -static void -refresh_dir_tree (DirView *dv, GtkCTreeNode *parent) -{ - GList *expand_list, *node; - GtkCTreeNode *treenode; - gchar *root_dir, *selected_path; - - g_return_if_fail (dv); - - selected_path = dirview_get_selected_path (dv); - if (!selected_path) selected_path = g_strdup (dv->root_dir); - - /* get expanded directory list */ - expand_list = get_expanded_list (dv); - - /* replace root node */ - root_dir = g_strdup (dv->root_dir); - dirview_change_root (dv, root_dir); - g_free (root_dir); - - /* restore expanded directory */ - for (node = expand_list; node; node = g_list_next (node)) { - dirview_expand_dir (dv, node->data, FALSE); - } - - /* restore selection */ - treenode = dirview_find_directory (dv, selected_path); - if (treenode) - adjust_ctree (dv->dirtree, treenode); - - g_list_foreach (expand_list, (GFunc) g_free, NULL); - g_list_free (expand_list); - - g_free (selected_path); -} - - -static void -dirview_popup_menu (DirView *dv, GtkCTreeNode *node, GdkEventButton *event) -{ - GtkWidget *dirview_popup, *menuitem; - GtkItemFactory *ifactory; - DirNode *dirnode; - gint n_menu_items; - gchar *path, *parent, *node_text; - gboolean expanded, is_leaf; - GtkMenuPositionFunc pos_fn = NULL; - guint button; - guint32 time; - - g_return_if_fail (dv); - g_return_if_fail (dv->dirtree); - - if (!node) { - GList *sel_list; - sel_list = GTK_CLIST (dv->dirtree)->selection; - if (!sel_list) return; - - node = sel_list->data; - } - - if (event) { - button = event->button; - time = event->time; - } else { - button = 0; - time = GDK_CURRENT_TIME; - pos_fn = menu_calc_popup_position; - } - - gtk_ctree_get_node_info (GTK_CTREE (dv->dirtree), node, &node_text, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(dv->dirtree), node); - - if (dv->popup_menu) { - gtk_widget_unref (dv->popup_menu); - dv->popup_menu = NULL; - } - - n_menu_items = sizeof(dirview_popup_items) - / sizeof(dirview_popup_items[0]) - 1; - dirview_popup = menu_create_items(NULL, dirview_popup_items, - n_menu_items, "", dv); - - /* set sensitive */ - ifactory = gtk_item_factory_from_widget (dirview_popup); - - if (!strcmp (node_text, ".") || !strcmp (node_text, "..")) - { - menuitem = gtk_item_factory_get_item (ifactory, "/Refresh Tree"); - gtk_widget_set_sensitive (menuitem, FALSE); - menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - if (!iswritable (dirnode->path)) { - menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - path = g_strdup (dirnode->path); - if (path [strlen (path) - 1] == '/') - path [strlen (path) - 1] = '\0'; - parent = g_dirname (path); - - if (!parent || !strcmp (parent, ".") || !iswritable (parent) - || !strcmp (node_text, ".") || !strcmp (node_text, "..")) - { - menuitem = gtk_item_factory_get_item (ifactory, "/Rename Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - menuitem = gtk_item_factory_get_item (ifactory, "/Delete Directory..."); - gtk_widget_set_sensitive (menuitem, FALSE); - } - - g_free (path); - g_free (parent); - - /* popup menu */ - gtk_menu_popup(GTK_MENU (dirview_popup), NULL, NULL, - pos_fn, dv->dirtree->window, button, time); - - dv->popup_menu = dirview_popup; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (dv->popup_menu)); - gtk_object_sink (GTK_OBJECT (dv->popup_menu)); -#endif -} - - -typedef struct ButtonActionData_Tag -{ - DirView *dv; - gchar *path, *label; - gint action_num; -} ButtonActionData; - - -static void -free_button_action_data (ButtonActionData *data) -{ - g_free (data->path); - g_free (data->label); - g_free (data); -} - - -static gboolean -idle_dirview_button_action (gpointer data) -{ - ButtonActionData *bdata = data; - DirView *dv = bdata->dv; - gchar *path = bdata->path, *label = bdata->label; - - dv->priv->button_action_id = 0; - - switch (abs (bdata->action_num)) { - case MouseActLoadThumb: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_NONE); - } - break; - case MouseActLoadThumbRecursive: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR); - } - break; - case MouseActLoadThumbRecursiveInOneTab: - if (!strcmp (label, ".") || !strcmp (label, "..")) { - dirview_change_root (dv, path); - } else { - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_ONE_TAB); - } - break; - case MouseActChangeTop: - dirview_change_root (dv, path); - break; - default: - break; - } - - free_button_action_data (bdata); - - return FALSE; -} - - -static gboolean -dirview_button_action (DirView *dv, GdkEventButton *event, gint num) -{ - GimvThumbWin *tw; - GtkWidget *dirtree; - GtkCTreeNode *node; - DirNode *dirnode; - gchar *node_text; - gint row; - gboolean is_leaf, expanded, retval = FALSE; - - g_return_val_if_fail (dv, FALSE); - - dirtree = dv->dirtree; - tw = dv->tw; - - gtk_clist_get_selection_info(GTK_CLIST(dirtree), - event->x, event->y, &row, NULL); - node = gtk_ctree_node_nth(GTK_CTREE(dirtree), row); - if (!node) return FALSE; - - gtk_ctree_get_node_info (GTK_CTREE (dirtree), node, &node_text, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - - gtk_clist_freeze(GTK_CLIST(dirtree)); - gtk_ctree_select(GTK_CTREE(dirtree), node); - GTK_CLIST(dirtree)->focus_row = row; - gtk_clist_thaw(GTK_CLIST(dirtree)); - dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(dirtree), node); - - switch (abs(num)) { - case MouseActLoadThumb: - case MouseActLoadThumbRecursive: - case MouseActLoadThumbRecursiveInOneTab: - case MouseActChangeTop: - { - ButtonActionData *data = g_new0 (ButtonActionData, 1); - - data->dv = dv; - data->path = g_strdup (dirnode->path); - data->label = g_strdup (node_text); - data->action_num = num; - - dv->priv->button_action_id - = gtk_idle_add (idle_dirview_button_action, data); - - return FALSE; - break; - } - case MouseActPopupMenu: - dirview_popup_menu (dv, node, event); - if (num > 0) retval = TRUE; - break; - default: - break; - } - - return retval; -} - - - -/****************************************************************************** - * - * for drag motion related functions - * - ******************************************************************************/ -/* - * dirview_setup_drag_scroll: - * @ set timer for auto scroll. - * - * dv : Pointer to the DirView struct. - * x : X position of mouse cursor. - * y : Y positoon of mouse cursor. - * desirable : - * scroll : time out function for auto scroll. - */ -static void -dirview_setup_drag_scroll (DirView *dv, gint x, gint y, - desirable_fn desirable, scroll_fn scroll) -{ - dirview_cancel_drag_scroll (dv); - - dv->priv->drag_motion_x = x; - dv->priv->drag_motion_y = y; - - if ((* desirable) (dv, x, y)) - dv->priv->scroll_timer_id - = gtk_timeout_add (conf.dirview_auto_scroll_time, - scroll, dv); -} - - -/* - * dirview_cancel_drag_scroll: - * @ remove timer for auto scroll.. - * - * dv : Pointer to the DirView struct. - */ -static void -dirview_cancel_drag_scroll (DirView *dv) -{ - g_return_if_fail (dv); - - if (dv->priv->scroll_timer_id){ - gtk_timeout_remove (dv->priv->scroll_timer_id); - dv->priv->scroll_timer_id = 0; - } -} - - -/* - * dirview_scrolling_is_desirable: - * @ If the cursor is in a position close to either edge (top or bottom) - * @ and there is possible to scroll the window, this routine returns - * @ true. - * - * dv : Pointer to the DirView struct for scrolling. - * x : X position of mouse cursor. - * y : Y position of mouse cursor. - * Return : possiblilty of scrolling (TRUE or FALSE). - */ -static gboolean -dirview_scrolling_is_desirable (DirView *dv, gint x, gint y) -{ - GtkCTree *dirtree; - GtkAdjustment *vadj; - - dirtree = GTK_CTREE (dv->dirtree); - - vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (dv->scroll_win)); - - if (y < SCROLL_EDGE) { - if (vadj->value > vadj->lower) - return TRUE; - } else { - if (y > (vadj->page_size - SCROLL_EDGE)){ - if (vadj->value < vadj->upper - vadj->page_size) - return TRUE; - } - } - - return FALSE; -} - - -/* - * timeout_dirview_scroll: - * @ Timer callback to scroll the tree. - * - * data : Pointer to the DirView struct. - * Return : TRUE - */ -static gboolean -timeout_dirview_scroll (gpointer data) -{ - DirView *dv = data; - GtkAdjustment *vadj; - gfloat vpos; - - vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (dv->scroll_win)); - - if (dv->priv->drag_motion_y < SCROLL_EDGE) { - vpos = vadj->value - vadj->step_increment; - if (vpos < vadj->lower) - vpos = vadj->lower; - - gtk_adjustment_set_value (vadj, vpos); - } else { - vpos = vadj->value + vadj->step_increment; - if (vpos > vadj->upper - vadj->page_size) - vpos = vadj->upper - vadj->page_size; - - gtk_adjustment_set_value (vadj, vpos); - } - - return TRUE; -} - - -/* - * timeout_auto_expand_directory: - * @ This routine is invoked in a delayed fashion if the user - * @ keeps the drag cursor still over the widget. - * - * data : Pointer to the DirView struct. - * Retuan : FALSE - */ -static gint -timeout_auto_expand_directory (gpointer data) -{ - DirView *dv = data; - GtkCTreeNode *node; - - g_return_val_if_fail (dv, FALSE); - - node = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), - dv->priv->drag_tree_row); - if (!node) { - dv->priv->auto_expand_timeout_id = 0; - return FALSE; - } - - if (!GTK_CTREE_ROW (node)->expanded) { - gtk_ctree_expand (GTK_CTREE (dv->dirtree), node); - } - - return FALSE; -} - - - -/****************************************************************************** - * - * Callback functions - * - ******************************************************************************/ -static void -cb_dirtree_destroy (GtkWidget *widget, DirView *dv) -{ - g_return_if_fail (dv); - - dv->dirtree = NULL; -} - - -static void -cb_dirview_destroyed (GtkWidget *widget, DirView *dv) -{ - g_return_if_fail (dv); - - dirview_cancel_drag_scroll (dv); - - if (dv->priv->button_action_id) - gtk_idle_remove (dv->priv->button_action_id); - dv->priv->button_action_id = 0; - - if (dv->priv->swap_com_id) - gtk_idle_remove (dv->priv->swap_com_id); - dv->priv->swap_com_id = 0; - - if (dv->priv->change_root_id) - gtk_idle_remove (dv->priv->change_root_id); - dv->priv->change_root_id = 0; - - gtk_widget_destroy (dv->dirtree); - - g_free (dv->root_dir); - g_free (dv->priv); - g_free (dv); -} - - -static void -cb_node_destroy (gpointer data) -{ - DirNode *node = data; - g_free (node->path); - g_free (node); -} - - -static void -cb_expand (GtkWidget *dirtree, GtkCTreeNode *parent, DirView *dv) -{ - GtkCTreeNode *node; - DirNode *dirnode; - - g_return_if_fail (dv); - - if (!GTK_CTREE_ROW (parent)->children) return; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE (dirtree), parent); - - if (!(dirnode->flags & DirNodeScannedFlag)) { - gtk_clist_freeze (GTK_CLIST (dirtree)); - - node = gtk_ctree_find_by_row_data (GTK_CTREE (dirtree), parent, NULL); - gtk_ctree_remove_node (GTK_CTREE (dirtree), node); - - expand_dir (dv, parent); - - gtk_clist_thaw (GTK_CLIST (dirtree)); - } -} - - -static void -cb_collapse (GtkWidget *dirtree, GtkCTreeNode *parent, DirView *dv) -{ - g_return_if_fail (dv && parent); -} - - -static gboolean -cb_button_press (GtkWidget *widget, GdkEventButton *event, DirView *dv) -{ - gint num; - - g_return_val_if_fail (dv, TRUE); - g_return_val_if_fail (event, TRUE); - - num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); - if (event->type == GDK_2BUTTON_PRESS) { - dv->priv->button_2pressed_queue = num; - } else if (num > 0) { - return dirview_button_action (dv, event, num); - } - - return FALSE; -} - - -static gboolean -cb_button_release (GtkWidget *widget, GdkEventButton *event, DirView *dv) -{ - gint num; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (event, FALSE); - - if (dv->priv->button_2pressed_queue) { - num = dv->priv->button_2pressed_queue; - if (num > 0) - num = 0 - num; - dv->priv->button_2pressed_queue = 0; - } else { - num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); - } - if (num < 0) - return dirview_button_action (dv, event, num); - - return FALSE; -} - - -static gboolean -cb_key_press (GtkWidget *widget, GdkEventKey *event, DirView *dv) -{ - guint keyval, popup_key; - GdkModifierType modval, popup_mod; - GtkCTreeNode *node; - GList *sel_list; - DirNode *dirnode; - gchar *node_text; - gboolean expanded, is_leaf; - - g_return_val_if_fail (dv, FALSE); - - keyval = event->keyval; - modval = event->state; - - sel_list = GTK_CLIST (dv->dirtree)->selection; - if (!sel_list) return FALSE; - node = sel_list->data; - gtk_ctree_get_node_info (GTK_CTREE (widget), node, &node_text, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - - dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node); - if (!dirnode) return FALSE; - - if (akey.common_popup_menu || *akey.common_popup_menu) - gtk_accelerator_parse (akey.common_popup_menu, &popup_key, &popup_mod); - else - return FALSE; - - if (keyval == popup_key && (!popup_mod || (modval & popup_mod))) { - dirview_popup_menu (dv, NULL, NULL); - } else { - switch (keyval) { - case GDK_KP_Enter: - case GDK_Return: - case GDK_ISO_Enter: - if (!strcmp (node_text, ".") || !strcmp (node_text, "..")) { - dirview_change_root (dv, dirnode->path); - } else { - open_dir_images (dirnode->path, dv->tw, NULL, - LOAD_CACHE, conf.scan_dir_recursive); - } - break; - case GDK_space: - gtk_ctree_toggle_expansion (GTK_CTREE (widget), node); - break; - case GDK_Right: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root (dv, dirnode->path); - } else { - gtk_ctree_expand (GTK_CTREE (widget), node); - } - return TRUE; - break; - case GDK_Left: - if (modval & GDK_CONTROL_MASK) { - dirview_change_root_to_parent (dv); - } else { - gtk_ctree_collapse (GTK_CTREE (widget), node); - } - return TRUE; - break; - case GDK_Up: - if (modval & GDK_CONTROL_MASK) - dirview_change_root_to_parent (dv); - return TRUE; - break; - case GDK_Down: - if (modval & GDK_CONTROL_MASK) - dirview_change_root (dv, dirnode->path); - return TRUE; - } - } - - return FALSE; -} - - - -/****************************************************************************** - * - * Callback functions for popup menu - * - ******************************************************************************/ -static void -cb_open_thumbnail (DirView *dv, ScanSubDirType scan_subdir, GtkWidget *menuitem) -{ - gchar *path; - - path = dirview_get_selected_path (dv); - if (!path) return; - - open_dir_images (path, dv->tw, NULL, LOAD_CACHE, scan_subdir); - - g_free (path); -} - - -static void -cb_go_to_here (DirView *dv, guint action, GtkWidget *menuitem) -{ - gchar *path; - - path = dirview_get_selected_path (dv); - if (!path) return; - - dirview_change_root (dv, path); - - g_free (path); -} - - -static void -cb_refresh_dir_tree (DirView *dv, guint action, GtkWidget *menuitem) -{ - refresh_dir_tree (dv, NULL); -} - -static void -cb_file_property (DirView *dv, guint action, GtkWidget *menuitem) -{ - GimvImageInfo *info; - gchar *path, *tmpstr; - - g_return_if_fail (dv); - - tmpstr = dirview_get_selected_path (dv); - if (!tmpstr) return; - - path = remove_slash (tmpstr); - g_free(tmpstr); - - info = gimv_image_info_get (path); - if (!info) { - g_free (path); - return; - } - - dlg_prop_from_image_info (info, 0); - - gimv_image_info_unref (info); - g_free (path); -} - - -static void -cb_mkdir (DirView *dv, guint action, GtkWidget *menuitem) -{ - GtkCTreeNode *node; - DirNode *dirnode; - gboolean success; - - g_return_if_fail (dv); - node = GTK_CLIST (dv->dirtree)->selection->data; - if (!node) return; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE(dv->dirtree), node); - if (!dirnode) return; - - success = make_dir_dialog - (dirnode->path, GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - if (success) { - refresh_dir_tree (dv, node); - } -} - - -static void -cb_rename_dir (DirView *dv, guint action, GtkWidget *menuitem) -{ - GtkCTreeNode *node, *parent; - DirNode *dirnode; - gboolean success; - - g_return_if_fail (dv); - node = GTK_CLIST (dv->dirtree)->selection->data; - if (!node) return; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE(dv->dirtree), node); - if (!dirnode) return; - - success = rename_dir_dialog - (dirnode->path, GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - if (success) { - parent = (GTK_CTREE_ROW (node))->parent; - if (parent) - refresh_dir_tree (dv, parent); - } -} - - -static void -cb_delete_dir (DirView *dv, guint action, GtkWidget *menuitem) -{ - GtkCTreeNode *node, *parent; - DirNode *dirnode; - gchar *path; - - g_return_if_fail (dv); - node = GTK_CLIST (dv->dirtree)->selection->data; - if (!node) return; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE(dv->dirtree), node); - if (!dirnode) return; - - path = remove_slash (dirnode->path); - - delete_dir (path, GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - g_free (path); - - /* refresh dir tree */ - parent = (GTK_CTREE_ROW (node))->parent; - if (parent) - refresh_dir_tree (dv, parent); -} - - - -/****************************************************************************** - * - * Callback functions for toolbar buttons. - * - ******************************************************************************/ -static void -cb_home_button (GtkWidget *widget, DirView *dv) -{ - g_return_if_fail (dv); - - dirview_go_home (dv); -} - - -static void -cb_up_button (GtkWidget *widget, DirView *dv) -{ - dirview_change_root_to_parent (dv); -} - - -static void -cb_refresh_button (GtkWidget *widget, DirView *dv) -{ - GtkCTreeNode *parent; - - g_return_if_fail (dv); - - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - if (parent) - refresh_dir_tree (dv, parent); -} - - -static void -cb_dotfile_button (GtkWidget *widget, DirView *dv) -{ - GtkCTreeNode *parent; - - g_return_if_fail (widget && dv); - - dv->show_dotfile = !dv->show_dotfile; - - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - refresh_dir_tree (dv, parent); -} - - - -/****************************************************************************** - * - * Callback functions for DnD - * - ******************************************************************************/ -static void -cb_drag_motion (GtkWidget *dirtree, GdkDragContext *context, - gint x, gint y, gint time, gpointer data) -{ - DirView *dv = data; - GtkCTreeNode *node; - DirNode *node_data; - gint row, on_row; - - g_return_if_fail (dv); - - /* Set up auto-scrolling */ - if (conf.dirview_auto_scroll) - dirview_setup_drag_scroll (dv, x, y, - dirview_scrolling_is_desirable, - timeout_dirview_scroll); - - if (!GTK_CLIST (dirtree)->selection) return; - - on_row = gtk_clist_get_selection_info (GTK_CLIST (dirtree), x, y, &row, NULL); - - /* Remove the auto-expansion timeout if we are on the blank area of the - * tree or on a row different from the previous one. - */ - if ((!on_row || row != dv->priv->drag_tree_row) - && dv->priv->auto_expand_timeout_id != 0) - { - gtk_timeout_remove (dv->priv->auto_expand_timeout_id); - dv->priv->auto_expand_timeout_id = 0; - } - - if (on_row) { - node = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), row); - node_data = gtk_ctree_node_get_row_data (GTK_CTREE (dirtree), - gtk_ctree_node_nth (GTK_CTREE (dirtree), - row)); - - /* hilight row under cursor */ - if (node_data && dv->priv->hilit_dir != row) { - if (dv->priv->hilit_dir != -1) { - /* - gtk_clist_set_foreground (GTK_CLIST (dirtree), dv->hilit_dir, - &(dirtree->style->fg[GTK_STATE_NORMAL])); - */ - gtk_clist_set_background (GTK_CLIST (dirtree), dv->priv->hilit_dir, - &(dirtree->style->base[GTK_STATE_NORMAL])); - } - - dv->priv->hilit_dir = row; - - /* - gtk_clist_set_foreground (GTK_CLIST (dirtree), dv->hilit_dir, - &(dirtree->style->fg[GTK_STATE_PRELIGHT])); - */ - gtk_clist_set_background (GTK_CLIST (dirtree), dv->priv->hilit_dir, - &(dirtree->style->bg[GTK_STATE_PRELIGHT])); - } - - /* Install the timeout handler for auto-expansion */ - if (conf.dirview_auto_expand && row != dv->priv->drag_tree_row) { - dv->priv->auto_expand_timeout_id - = gtk_timeout_add (conf.dirview_auto_expand_time, - timeout_auto_expand_directory, - dv); - dv->priv->drag_tree_row = row; - } - } -} - - -static void -cb_drag_leave (GtkWidget *dirtree, GdkDragContext *context, guint time, - gpointer data) -{ - DirView *dv = data; - - dirview_cancel_drag_scroll (dv); - - /* - gtk_clist_set_foreground (GTK_CLIST (dirtree), dv->hilit_dir, - &(dirtree->style->fg[GTK_STATE_NORMAL])); - */ - gtk_clist_set_background (GTK_CLIST (dirtree), dv->priv->hilit_dir, - &(dirtree->style->base[GTK_STATE_NORMAL])); - dv->priv->hilit_dir = -1; - - /* remove auto expand handler */ - if (dv->priv->auto_expand_timeout_id != 0) { - gtk_timeout_remove (dv->priv->auto_expand_timeout_id); - dv->priv->auto_expand_timeout_id = 0; - } - - dv->priv->drag_tree_row = -1; -} - - -static void -cb_drag_data_get (GtkWidget *dirtree, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - DirView *dv = data; - GtkCTreeNode *node; - DirNode *dirnode; - gchar *uri, *tmpstr; - - g_return_if_fail (dv && dirtree); - - dirview_cancel_drag_scroll (dv); - - node = GTK_CLIST (dirtree)->selection->data; - if (!node) return; - - dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(dirtree), node); - g_return_if_fail (dirnode); - - tmpstr = remove_slash (dirnode->path); - - uri = g_strconcat ("file://", tmpstr, "\r\n", NULL); - - gtk_selection_data_set(seldata, seldata->target, - 8, uri, strlen(uri)); - g_free (tmpstr); - g_free (uri); -} - - -static void -cb_drag_data_received (GtkWidget *dirtree, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint32 time, - gpointer data) -{ - gint row; - DirNode *node; - DirView *dv = data; - GtkCTreeNode *parent; - - g_return_if_fail (dv); - - dirview_cancel_drag_scroll (dv); - - if (!GTK_CLIST (dirtree)->selection) return; - - gtk_clist_get_selection_info (GTK_CLIST (dirtree), x, y, &row, NULL); - parent = gtk_ctree_node_nth (GTK_CTREE (dirtree), row); - node = gtk_ctree_node_get_row_data (GTK_CTREE (dirtree), parent); - - if (node) { - if (iswritable (node->path)) { - dnd_file_operation (node->path, context, seldata, time, dv->tw); - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - refresh_dir_tree (dv, parent); - } else { - gchar error_message[BUF_SIZE], *dir_internal; - - dir_internal = charset_to_internal (node->path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - g_snprintf (error_message, BUF_SIZE, - _("Permission denied: %s"), - dir_internal); - gtkutil_message_dialog - (_("Error!!"), error_message, - GTK_WINDOW(gtk_widget_get_toplevel(dv->container))); - - g_free (dir_internal); - } - } -} - - -static void -cb_drag_end (GtkWidget *dirtree, GdkDragContext *context, gpointer data) -{ - DirView *dv = data; - GtkCTreeNode *parent; - - g_return_if_fail (dirtree && dv); - - dirview_cancel_drag_scroll (dv); - - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - - /* refresh_dir_tree (dv, parent); */ -} - - -static void -cb_toolbar_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data) -{ - GdkColormap *colormap; - GimvIcon *icon; - - icon = gimv_icon_stock_get_icon ("paper"); - colormap = gdk_colormap_get_system (); - gtk_drag_set_icon_pixmap (context, colormap, - icon->pixmap, icon->mask, - 0, 0); -} - - -static void -cb_toolbar_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - switch (info) { - case TARGET_GIMV_COMPONENT: - gtk_selection_data_set(seldata, seldata->target, - 8, "dummy", strlen("dummy")); - break; - } -} - - -typedef struct SwapCom_Tag -{ - GimvThumbWin *tw; - gint src; - gint dest; -} SwapCom; - - -static gint -idle_thumbwin_swap_component (gpointer data) -{ - SwapCom *swap = data; - gimv_thumb_win_swap_component (swap->tw, swap->src, swap->dest); - return FALSE; -} - - -static void -cb_com_swap_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, gint y, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - GimvThumbWin *tw = data; - GtkWidget *src_widget; - gpointer p; - gint src, dest; - - switch (info) { - case TARGET_GIMV_COMPONENT: - src_widget = gtk_drag_get_source_widget (context); - if (gdk_window_get_toplevel (src_widget->window) - != gdk_window_get_toplevel (widget->window)) - { - return; - } - - p = gtk_object_get_data (GTK_OBJECT (src_widget), "gimv-component"); - src = GPOINTER_TO_INT (p); - if (!src) return; - - p = gtk_object_get_data (GTK_OBJECT (widget), "gimv-component"); - dest = GPOINTER_TO_INT (p); - if (!dest) return; - - { - SwapCom *swap = g_new0 (SwapCom, 1); - swap->tw = tw; - swap->src = src; - swap->dest = dest; - /* to avoid gtk's bug, exec redraw after exit this callback function */ - gtk_idle_add_full (GTK_PRIORITY_REDRAW, - idle_thumbwin_swap_component, NULL, swap, - (GtkDestroyNotify) g_free); - } - - break; - - default: - break; - } -} - - - -/****************************************************************************** - * - * Public functions - * - ******************************************************************************/ -/* - * dirview_change_root: - * @ Change top directory. - * - * dirtree : GtkCtree widget. - * root_drir : path to change. - -*/ -void -dirview_change_root (DirView *dv, const gchar *root_dir) -{ - gchar *dest_dir; - GtkCTreeNode *root_node; - - g_return_if_fail (dv && root_dir); - - dest_dir = add_slash (root_dir); - - if (!isdir (dest_dir)) { - g_free (dest_dir); - return; - } - - g_free (dv->root_dir); - dv->root_dir = dest_dir; - - gtk_clist_clear (GTK_CLIST (dv->dirtree)); - - root_node = dirview_insert_node (dv, NULL, dv->root_dir); - if (!root_node) return; - - /* set opened mark */ - if (gimv_thumb_view_find_opened_dir (dv->root_dir)) { - dirview_set_opened_mark (dv, dv->root_dir); - } - - gtk_ctree_expand (GTK_CTREE (dv->dirtree), root_node); - - adjust_ctree (dv->dirtree, root_node); -} - - -void -dirview_change_root_to_parent (DirView *dv) -{ - gchar *end; - gchar *root; - - g_return_if_fail (dv); - - root = g_strdup (dv->root_dir); - end = strrchr (root, '/'); - if (end && end != root) *end = '\0'; - end = strrchr (root, '/'); - if (end) *(end + 1) = '\0'; - - dirview_change_dir (dv, root); - - g_free (root); -} - - -/* - * dirview_change_dir: - * @ Change selection to specified directory. - * - * dirtree : GtkCtree widget: - * str : path to change. - */ -void -dirview_change_dir (DirView *dv, const gchar *str) -{ - GtkWidget *dirtree; - GtkCTreeNode *node; - gchar *path, *row, *ptr; - gboolean is_leaf, expanded; - size_t length; - - g_return_if_fail (dv); - - dirtree = dv->dirtree; - - path = add_slash (str); - - if (!isdir (path)) { - g_free (path); - return; - } - - ptr = path; - - /* FIXME */ - /* if selected path in directory view is same as str, adjust to it */ - /* END FIXME */ - - /* get root node */ - node = gtk_ctree_node_nth (GTK_CTREE (dirtree), 0); - gtk_ctree_get_node_info (GTK_CTREE (dirtree), node, &row, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - - /* if root node is specified directory, adjust to root */ - if (!(strcmp (ptr, row))) { - g_free (path); - adjust_ctree (dirtree, node); - return; - } - - if (!is_leaf && !expanded) - gtk_ctree_expand (GTK_CTREE (dirtree), node); - - /* get first child */ - node = GTK_CTREE_ROW(node)->children; - if (!node) { - g_free (path); - dirview_change_root (dv, str); - return; - } - - /* - * if specified directory string is shorter than root node's one, - * change top direcotry. - */ - length = strlen (dv->root_dir); - if (strlen (ptr) >= length) { - ptr = ptr + length; - } else { - g_free (path); - dirview_change_root (dv, str); - return; - } - - /* search children */ - gtk_clist_freeze (GTK_CLIST (dirtree)); - while (TRUE) { - gtk_ctree_get_node_info (GTK_CTREE (dirtree), node, &row, NULL, - NULL, NULL, NULL, NULL, &is_leaf, &expanded); - if (!strncmp (row, ptr, strlen (row)) && *(ptr+strlen (row)) == '/' ) { - ptr = ptr + strlen (row) + 1; - while (*ptr == '/') - ptr++; - if (!is_leaf && GTK_CTREE_ROW (node)->children && !expanded) { - gtk_ctree_expand(GTK_CTREE (dirtree), node); - } - if (!(ptr && *ptr)) - break; - if (!(node = GTK_CTREE_ROW (node)->children)) - break; - } else if (!(node = GTK_CTREE_ROW (node)->sibling)) { - break; - } - } - gtk_clist_thaw (GTK_CLIST (dirtree)); - - g_free (path); - - if (node) { - adjust_ctree (dirtree, node); - } else { - dirview_change_root (dv, str); - } -} - - -/* - * dirview_go_home: - * @ Change top directory to home directory. - * - * dv : Pointer to the DirView struct. - */ -void -dirview_go_home (DirView *dv) -{ - const gchar *home = g_getenv ("HOME"); - - dirview_change_root (dv, home); - dirview_change_dir (dv, home); -} - - -void -dirview_refresh_list (DirView *dv) -{ - GtkCTreeNode *parent; - - g_return_if_fail (dv); - - parent = gtk_ctree_node_nth (GTK_CTREE (dv->dirtree), 0); - if (parent) - refresh_dir_tree (dv, parent); -} - - -gchar * -dirview_get_selected_path (DirView *dv) -{ - DirNode *dirnode; - GtkCTreeNode *node; - - g_return_val_if_fail (dv, NULL); - g_return_val_if_fail (dv->dirtree, NULL); - if (!GTK_CLIST(dv->dirtree)->selection) return NULL; - - node = GTK_CLIST (dv->dirtree)->selection->data; - if (!node) return NULL; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE (dv->dirtree), node); - if (!dirnode) return NULL; - - return g_strdup (dirnode->path); -} - - -void -dirview_expand_dir (DirView *dv, const gchar *dir, gboolean open_all) -{ - GtkCTreeNode *node; - - g_return_if_fail (dv); - g_return_if_fail (dir && *dir); - - node = dirview_find_directory (dv, dir); - if (!node) return; - - if (open_all) - gtk_ctree_expand_recursive (GTK_CTREE (dv->dirtree), node); - else - gtk_ctree_expand (GTK_CTREE (dv->dirtree), node); -} - - -gboolean -dirview_set_opened_mark (DirView *dv, const gchar *path) -{ - GtkCTreeNode *node; - DirNode *dirnode; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (path && path, FALSE); - - node = dirview_find_directory (dv, path); - - if (!node) return FALSE; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE (dv->dirtree), node); - dirnode->flags |= DirNodeOpenedFlag; - - gtk_ctree_node_set_foreground (GTK_CTREE (dv->dirtree), node, - &dv->dirtree->style->fg[GTK_STATE_ACTIVE]); - - return TRUE; -} - - -gboolean -dirview_unset_opened_mark (DirView *dv, const gchar *path) -{ - GtkCTreeNode *node; - DirNode *dirnode; - - g_return_val_if_fail (dv, FALSE); - g_return_val_if_fail (path && path, FALSE); - - node = dirview_find_directory (dv, path); - - if (!node) return FALSE; - - dirnode = gtk_ctree_node_get_row_data (GTK_CTREE (dv->dirtree), node); - dirnode->flags &= ~DirNodeOpenedFlag; - - gtk_ctree_node_set_foreground (GTK_CTREE (dv->dirtree), node, - &dv->dirtree->style->fg[GTK_STATE_NORMAL]); - - return TRUE; -} - - -/* - * dirview_show_toolbar: - * @ - * - * dv : Pointer to the DirView struct. - */ -void -dirview_show_toolbar (DirView *dv) -{ - g_return_if_fail (dv); - - dv->show_toolbar = TRUE; - gtk_widget_show (dv->toolbar_eventbox); -} - - -/* - * dirview_hide_toolbar: - * @ - * - * dv : Pointer to the DirView struct. - */ -void -dirview_hide_toolbar (DirView *dv) -{ - g_return_if_fail (dv); - - dv->show_toolbar = FALSE; - gtk_widget_hide (dv->toolbar_eventbox); -} - - -/* - * dirview_create_toolbar: - * @ - * - * dv : Pointer to the DirView struct. - */ -static GtkWidget * -dirview_create_toolbar (DirView *dv) -{ - GtkWidget *toolbar; - GtkWidget *button; - GtkWidget *iconw; - - g_return_val_if_fail (dv, NULL); - - toolbar = gtkutil_create_toolbar (); - - /* file open button */ - iconw = gimv_icon_stock_get_widget ("small_home"); - button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), - _("Home"), - _("Home"), - _("Home"), - iconw, - GTK_SIGNAL_FUNC (cb_home_button), - dv); - - /* preference button */ - iconw = gimv_icon_stock_get_widget ("small_up"); - button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), - _("Up"), - _("Up"), - _("Up"), - iconw, - GTK_SIGNAL_FUNC (cb_up_button), - dv); - - /* refresh button */ - iconw = gimv_icon_stock_get_widget ("small_refresh"); - button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), - _("Refresh"), - _("Refresh"), - _("Refresh"), - iconw, - GTK_SIGNAL_FUNC (cb_refresh_button), - dv); - - /* preference button */ - iconw = gimv_icon_stock_get_widget ("dotfile"); - button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), - _("Dotfile"), - _("Show/Hide dotfile"), - _("Show/Hide dotfile"), - iconw, - GTK_SIGNAL_FUNC (cb_dotfile_button), - dv); - - gtk_widget_show_all (toolbar); - gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); - - return toolbar; -} - - -static gint -idle_change_root (gpointer data) -{ - DirView *dv = data; - - g_return_val_if_fail (dv, FALSE); - - dv->priv->change_root_id = 0; - - dirview_change_root (dv, dv->root_dir); - dirview_change_dir (dv, dv->root_dir); - /* - if (dv) - dirview_go_home (dv); - */ - - return FALSE; -} - - -/****************************************************************************** - * - * dirview_create: - * @ create directory view widget. - * - * tw : - * Return : directory view packed container widget. - * - ******************************************************************************/ -DirView * -dirview_create (const gchar *root_dir, GtkWidget *parent_win, GimvThumbWin *tw) -{ - DirView *dv; - GtkWidget *eventbox; - const gchar *home = g_getenv ("HOME"); - - dv = g_new0 (DirView, 1); - dv->priv = g_new0 (DirViewPrivate, 1); - - if (root_dir) - dv->root_dir = g_strdup (root_dir); - else - dv->root_dir = g_strdup (home); - - dv->popup_menu = NULL; - dv->tw = tw; - dv->show_toolbar = conf.dirview_show_toolbar; - dv->show_dotfile = conf.dirview_show_dotfile; - dv->priv->hilit_dir = -1; - dv->priv->scroll_timer_id = 0; - dv->priv->button_action_id = 0; - dv->priv->swap_com_id = 0; - dv->priv->change_root_id = 0; - - /* main vbox */ - dv->container = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (dv->container, "DirView"); - gtk_widget_show (dv->container); - - dnd_dest_set (dv->container, dnd_types_component, dnd_types_component_num); - gtk_object_set_data (GTK_OBJECT (dv->container), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); - gtk_signal_connect (GTK_OBJECT (dv->container), "drag_data_received", - GTK_SIGNAL_FUNC (cb_com_swap_drag_data_received), dv->tw); - - /* toolbar */ - eventbox = dv->toolbar_eventbox = gtk_event_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (eventbox), 1); - gtk_box_pack_start (GTK_BOX (dv->container), eventbox, FALSE, FALSE, 0); - gtk_widget_show (eventbox); - - dv->toolbar = dirview_create_toolbar (dv); - gtk_container_add (GTK_CONTAINER (eventbox), dv->toolbar); - - if (!dv->show_toolbar) - gtk_widget_hide (dv->toolbar_eventbox); - - dnd_src_set (eventbox, dnd_types_component, dnd_types_component_num); - gtk_object_set_data (GTK_OBJECT (eventbox), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); - gtk_signal_connect (GTK_OBJECT (eventbox), "drag_begin", - GTK_SIGNAL_FUNC (cb_toolbar_drag_begin), tw); - gtk_signal_connect (GTK_OBJECT (eventbox), "drag_data_get", - GTK_SIGNAL_FUNC (cb_toolbar_drag_data_get), tw); - - /* scrolled window */ - dv->scroll_win = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (dv->scroll_win), 1); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dv->scroll_win), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start(GTK_BOX(dv->container), dv->scroll_win, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (dv->scroll_win), "destroy", - GTK_SIGNAL_FUNC (cb_dirview_destroyed), dv); - gtk_widget_show (dv->scroll_win); - - /* ctree */ - dirview_create_ctree (dv); - - dv->priv->change_root_id = gtk_idle_add (idle_change_root, dv); - /* dirview_go_home (dirtree); */ - - return dv; -} - -#endif /* ENABLE_TREEVIEW */ diff -Nru gimageview-0.2.27/src/dirview.h gimageview-0.3.0-0.20101117/src/dirview.h --- gimageview-0.2.27/src/dirview.h 2004-06-22 02:20:39.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dirview.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dirview.h,v 1.16 2004/06/21 15:45:37 makeinu Exp $ - */ - -#ifndef __DIRVIEW_H__ -#define __DIRVIEW_H__ - -#include "gimageview.h" - -typedef struct DirViewPrivate_Tag DirViewPrivate; - -typedef enum -{ - DIRVIEW_TREE, - DIRVIEW_LIST, - DIRVIEW_TREE_WITH_FILE, - DIRVIEW_LIST_WITH_FILE -} DirViewMode; - - -struct DirView_Tag -{ - GtkWidget *container; - GtkWidget *toolbar; - GtkWidget *toolbar_eventbox; - GtkWidget *scroll_win; - GtkWidget *dirtree; - GtkWidget *popup_menu; - - GimvThumbWin *tw; - - gchar *root_dir; - DirViewMode mode; - gboolean show_toolbar; - gboolean show_dotfile; - - DirViewPrivate *priv; -}; - - -void dirview_change_root (DirView *dv, - const gchar *root_dir); -void dirview_change_root_to_parent (DirView *dv); -void dirview_change_dir (DirView *dv, - const gchar *str); -void dirview_go_home (DirView *dv); -void dirview_refresh_list (DirView *dv); -gchar *dirview_get_selected_path (DirView *dv); -void dirview_expand_dir (DirView *dv, - const gchar *dir, - gboolean open_all); -gboolean dirview_set_opened_mark (DirView *dv, - const gchar *path); -gboolean dirview_unset_opened_mark (DirView *dv, - const gchar *path); -void dirview_show_toolbar (DirView *dv); -void dirview_hide_toolbar (DirView *dv); - -DirView *dirview_create (const gchar *root_dir, - GtkWidget *parent_win, - GimvThumbWin *tw); - -#endif /* __DIRVIEW_H__ */ diff -Nru gimageview-0.2.27/src/dirview_priv.h gimageview-0.3.0-0.20101117/src/dirview_priv.h --- gimageview-0.2.27/src/dirview_priv.h 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dirview_priv.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001-2003 Takuro Ashie - * - * 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: dirview_priv.h,v 1.2 2003/06/13 09:43:25 makeinu Exp $ - */ - -#ifndef __DIRVIEW_PRIV_H__ -#define __DIRVIEW_PRIV_H__ - -#include "dirview.h" - -struct DirViewPrivate_Tag { - /* for DnD */ - gint hilit_dir; - - guint scroll_timer_id; - gint drag_motion_x; - gint drag_motion_y; - - gint auto_expand_timeout_id; - - /* for mouse event */ - gint button_2pressed_queue; /* attach an action to - button release event */ - - guint button_action_id; - guint swap_com_id; - -#ifdef ENABLE_TREEVIEW - GtkTreePath *drag_tree_row; - guint adjust_tree_id; -#else /* ENABLE_TREEVIEW */ - gint drag_tree_row; - guint change_root_id; -#endif /* ENABLE_TREEVIEW */ -}; - -typedef enum { - MouseActNone, - MouseActLoadThumb, - MouseActLoadThumbRecursive, - MouseActPopupMenu, - MouseActChangeTop, - MouseActLoadThumbRecursiveInOneTab -} DirViewMouseAction; - -#endif /* __DIRVIEW_PRIV_H__ */ diff -Nru gimageview-0.2.27/src/dither.c gimageview-0.3.0-0.20101117/src/dither.c --- gimageview-0.2.27/src/dither.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dither.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dither.c,v 1.6 2004/09/21 08:44:31 makeinu Exp $ - */ - -#include - -#include "dither.h" - -static gint *evenerr = NULL,*odderr = NULL; -static guchar *dbuf = NULL; - - -guchar *ditherinit(gint w) -{ - ditherfinish(); - evenerr = g_malloc0 (3 * (w + 10) * sizeof(gint)); - if (!evenerr) goto ERROR0; - - odderr = g_malloc0 (3 * (w + 10) * sizeof(gint)); - if (!odderr) goto ERROR1; - - dbuf = g_malloc (w); - if (!dbuf) goto ERROR2; - - return dbuf; - -ERROR2: - g_free (odderr); - odderr = NULL; -ERROR1: - g_free (evenerr); - evenerr = NULL; -ERROR0: - return NULL; -} - - -void ditherfinish(void) -{ - if (evenerr) { - g_free (evenerr); - evenerr = NULL; - } - - if (odderr) { - g_free (odderr); - odderr = NULL; - } - - if (dbuf) { - g_free (dbuf); - dbuf = NULL; - } -} - -void ditherline(guchar *theline, gint linenum, gint width) -{ - gint x,y,lx; - gint c0, c1, c2, times2; - gint terr0, terr1, terr2, actual0, actual1, actual2; - gint start, addon, r, g, b; - gint *thiserr; - gint *nexterr; - - y = linenum; - if ((y & 1 ) == 0) { - start = 0; - addon = 1; - thiserr = evenerr + 3; - nexterr = odderr + width * 3; - } else { - start = width - 1; - addon = -1; - thiserr = odderr + 3; - nexterr = evenerr + width * 3; - } - nexterr[0] = nexterr[1] = nexterr[2] = 0; - - x = start; - for(lx = 0; lx < width; lx++) { - r = theline[x * 3]; - g = theline[x * 3 + 1]; - b = theline[x * 3 + 2]; - - terr0 = r + ((thiserr[0] + 8) >> 4); - terr1 = g + ((thiserr[1] + 8) >> 4); - terr2 = b + ((thiserr[2] + 8) >> 4); - - /* is this going to screw up on white? */ - actual0 = (terr0 >> 5) * 255/7; - actual1 = (terr1 >> 5) * 255/7; - actual2 = (terr2 >> 6) * 255/3; - - if (actual0 < 0) actual0 = 0; - if (actual0 > 255) actual0 = 255; - if (actual1 < 0) actual1 = 0; - if (actual1 > 255) actual1 = 255; - if( actual2 < 0) actual2 = 0; - if (actual2 > 255) actual2 = 255; - - c0 = terr0 - actual0; - c1 = terr1 - actual1; - c2 = terr2 - actual2; - - times2 = (c0 << 1); - nexterr[-3] = c0; c0 += times2; - nexterr[ 3] += c0; c0 += times2; - nexterr[ 0] += c0; c0 += times2; - thiserr[ 3] += c0; - - times2 = (c1 << 1); - nexterr[-2] = c1; c1 += times2; - nexterr[ 4] += c1; c1 += times2; - nexterr[ 1] += c1; c1 += times2; - thiserr[ 4] += c1; - - times2 = (c2 << 1); - nexterr[-1] = c2; c2 += times2; - nexterr[ 5] += c2; c2 += times2; - nexterr[ 2] += c2; c2 += times2; - thiserr[ 5] += c2; - - dbuf[x] = (actual0 >> 5) * 32 + (actual1 >> 5) * 4 + (actual2 >> 6); - - thiserr += 3; - nexterr -= 3; - x += addon; - } -} diff -Nru gimageview-0.2.27/src/dither.h gimageview-0.3.0-0.20101117/src/dither.h --- gimageview-0.2.27/src/dither.h 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dither.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dither.h,v 1.6 2004/09/21 08:44:31 makeinu Exp $ - */ - -#ifndef __DITHER_H__ -#define __DITHER_H__ - -guchar *ditherinit (gint w); -void ditherfinish (void); -void ditherline (guchar *theline, - gint linenum, - gint width); - -#endif /* __DITHER_H__ */ diff -Nru gimageview-0.2.27/src/dnd.c gimageview-0.3.0-0.20101117/src/dnd.c --- gimageview-0.2.27/src/dnd.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dnd.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,246 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dnd.c,v 1.19 2004/04/08 14:11:28 makeinu Exp $ - */ - -#include - -#include "gimageview.h" - -#include "dnd.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "gtkutils.h" -#include "gimv_thumb.h" -#include "gimv_thumb_view.h" -#include "gimv_thumb_win.h" -#include "menu.h" -#include "prefs.h" - - -GtkTargetEntry dnd_types_all[] = { - {"GIMV_TAB", 0, TARGET_GIMV_TAB}, - {"GIMV_COMPONENT", 0, TARGET_GIMV_COMPONENT}, - {"GIMV_ARCHIVE_MEMBER_LIST", 0, TARGET_GIMV_ARCHIVE_MEMBER_LIST}, - {"text/uri-list", 0, TARGET_URI_LIST}, - {"property/bgimage", 0, TARGET_URI_LIST}, -}; -const gint dnd_types_all_num = sizeof(dnd_types_all) / sizeof(GtkTargetEntry); - -GtkTargetEntry *dnd_types_uri = &dnd_types_all[3]; -const gint dnd_types_uri_num = 1; - -GtkTargetEntry *dnd_types_archive = &dnd_types_all[2]; -const gint dnd_types_archive_num = 2; - -GtkTargetEntry *dnd_types_tab_component = &dnd_types_all[0]; -const gint dnd_types_tab_component_num = 2; - -GtkTargetEntry *dnd_types_component = &dnd_types_all[1]; -const gint dnd_types_component_num = 1; - - -GtkItemFactoryEntry dnd_file_popup_items [] = -{ - {N_("/Open in new tab"), NULL, menu_modal_cb, GDK_ACTION_PRIVATE, NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/Move"), NULL, menu_modal_cb, GDK_ACTION_MOVE, NULL}, - {N_("/Copy"), NULL, menu_modal_cb, GDK_ACTION_COPY, NULL}, - {N_("/Symbolic Link"), NULL, menu_modal_cb, GDK_ACTION_LINK , NULL}, - {N_("/---"), NULL, NULL, 0, ""}, - {N_("/Cancel"), NULL, NULL, 0, NULL}, - {NULL, NULL, NULL, 0, NULL}, -}; - - -/* - * dnd_get_file_list: - * @ convert string URI list to GList format. - * - * string : file list (string format) - * Return : file list (GList format) - */ -GList * -dnd_get_file_list (const gchar *string, gint len) -{ - gchar *file; - gchar *ptr, *uri; - GList *list = NULL; - gint pos = 0; - - uri = ptr = g_memdup (string, len); - - while (*ptr && (pos < len)) { - if (!strncmp(ptr, "file:", 5)) { - ptr += 5; - pos += 5; - } - if (!strncmp(ptr, "//", 2)){ - ptr += 2; - pos += 2; - } - - file = ptr; - - while (*ptr != '\r' && *ptr != '\n' && *ptr != '\0') { - ptr++; - pos++; - } - *ptr++ = '\0'; - pos++; - - while (*ptr == '\r' || *ptr == '\n') { - ptr++; - pos++; - } - - if (file && file[0] != '\r' && file[0] != '\n' && file[0] != '\0') - list = g_list_append (list, g_strdup(file)); - } - - g_free (uri); - - return list; -} - - -/* - * dnd_src_set: - * @ - * - * widget : widget to set DnD (source side). - */ -void -dnd_src_set (GtkWidget *widget, const GtkTargetEntry *entry, gint num) -{ - /* FIXME */ - if (conf.dnd_enable_to_external) - dnd_types_all[3].flags = 0; - else - dnd_types_all[3].flags = GTK_TARGET_SAME_APP; - - gtk_drag_source_set(widget, - GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK, - entry, num, - GDK_ACTION_ASK | GDK_ACTION_COPY - | GDK_ACTION_MOVE | GDK_ACTION_LINK); -} - - -/* - * dnd_dest_set: - * @ - * - * widget : widget to set DnD (destination side). - */ -void -dnd_dest_set (GtkWidget *widget, const GtkTargetEntry *entry, gint num) -{ - if (conf.dnd_enable_from_external) - dnd_types_all[3].flags = 0; - else - dnd_types_all[3].flags = GTK_TARGET_SAME_APP; - - gtk_drag_dest_set(widget, - GTK_DEST_DEFAULT_ALL, - /* GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, */ - entry, num, - GDK_ACTION_ASK | GDK_ACTION_COPY - | GDK_ACTION_MOVE | GDK_ACTION_LINK); -} - - -/* - * dnd_file_operation: - * @ Open DnD context menu and do specified file operation when data - * received. This function will called by "drag_data_received" signal's - * callback function. - * - * dest_dir : destination directory to move/copy/link specified files. - * context : DnD context. - * seldata : URI list (string format). - * time : time when drag data received. - * tw : Pointer to parent ThumbWindow. - */ -void -dnd_file_operation (const gchar *dest_dir, GdkDragContext *context, - GtkSelectionData *seldata, guint time, GimvThumbWin *tw) -{ - GtkWidget *dnd_popup; - GList *list; - GimvThumbView *tv; - gboolean dnd_success = TRUE, dnd_delete = FALSE; - gint n_menu_items, action; - - g_return_if_fail (dest_dir && context && seldata); - - list = dnd_get_file_list (seldata->data, seldata->length); - - /* create popup menu */ - n_menu_items = sizeof (dnd_file_popup_items) - / sizeof (dnd_file_popup_items[0]) - 1; - dnd_popup = menu_create_items (NULL, dnd_file_popup_items, - n_menu_items, "", - NULL); - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (dnd_popup)); - gtk_object_sink (GTK_OBJECT (dnd_popup)); -#endif - - /* popup menu */ - action = menu_popup_modal (dnd_popup, NULL, NULL, NULL, NULL); - - gtk_widget_unref (dnd_popup); - - if (action == GDK_ACTION_PRIVATE) { - open_images_dirs (list, tw, LOAD_CACHE, FALSE); - } else { - GtkWindow *window = tw ? GTK_WINDOW (tw) : NULL; - switch (action) { - case GDK_ACTION_MOVE: - files2dir (list, dest_dir, FILE_MOVE, window); - dnd_delete = TRUE; - break; - case GDK_ACTION_COPY: - files2dir (list, dest_dir, FILE_COPY, window); - break; - case GDK_ACTION_LINK: - files2dir (list, dest_dir, FILE_LINK, window); - break; - default: - dnd_success = FALSE; - break; - } - } - - gtk_drag_finish(context, dnd_success, dnd_delete, time); - - /* update dest side file list */ - tv = gimv_thumb_view_find_opened_dir (dest_dir); - if (tv) { - gimv_thumb_view_refresh_list (tv); - gtk_idle_add (gimv_thumb_view_refresh_list_idle, tv); - } - - g_list_foreach (list, (GFunc) g_free, NULL); - g_list_free (list); -} diff -Nru gimageview-0.2.27/src/dnd.h gimageview-0.3.0-0.20101117/src/dnd.h --- gimageview-0.2.27/src/dnd.h 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/dnd.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: dnd.h,v 1.8 2003/06/15 16:14:53 makeinu Exp $ - */ - -#ifndef __DND_H__ -#define __DND_H__ - -#include "gimageview.h" - -typedef enum -{ - TARGET_URI_LIST, - TARGET_TEXT, - TARGET_GIMV_TAB, - TARGET_GIMV_COMPONENT, - TARGET_GIMV_ARCHIVE_MEMBER_LIST -} TargetType; - - -extern GtkTargetEntry dnd_types_all[]; -extern const gint dnd_types_all_num; - -extern GtkTargetEntry *dnd_types_uri; -extern const gint dnd_types_uri_num; - -extern GtkTargetEntry *dnd_types_archive; -extern const gint dnd_types_archive_num; - -extern GtkTargetEntry *dnd_types_tab_component; -extern const gint dnd_types_tab_component_num; - -extern GtkTargetEntry *dnd_types_component; -extern const gint dnd_types_component_num; - -/* - extern GtkTargetEntry dnd_com_types[]; - extern const gint dnd_com_types_num; -*/ - - -GList *dnd_get_file_list (const gchar *string, - gint len); -void dnd_src_set (GtkWidget *widget, - const GtkTargetEntry *entry, - gint num); -void dnd_dest_set (GtkWidget *widget, - const GtkTargetEntry *entry, - gint num); -void dnd_file_operation (const gchar *dest_dir, - GdkDragContext *context, - GtkSelectionData *seldata, - guint time, - GimvThumbWin *tw); - -#endif /* __DND_H__ */ diff -Nru gimageview-0.2.27/src/exif_view.c gimageview-0.3.0-0.20101117/src/exif_view.c --- gimageview-0.2.27/src/exif_view.c 2004-09-22 15:37:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/exif_view.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,362 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: exif_view.c,v 1.23 2004/09/22 15:37:11 makeinu Exp $ - */ - -#include "gimageview.h" - -#ifdef ENABLE_EXIF - -#include -#include - -#include "exif_view.h" -#include "gimv_image.h" -#include "gimv_io_mem.h" -#include "gtkutils.h" -#include "gimv_icon_stock.h" -#include "gimv_image_loader.h" - - -#ifdef ENABLE_TREEVIEW -typedef enum { - COLUMN_TERMINATOR = -1, - COLUMN_KEY, - COLUMN_VALUE, - N_COLUMN -} ListStoreColumn; -#endif /* ENABLE_TREEVIEW */ - - -/****************************************************************************** - * - * Callback Functions. - * - ******************************************************************************/ -static void -cb_exif_view_destroy (GtkWidget *widget, ExifView *ev) -{ - g_return_if_fail (ev); - - if (ev->exif_data) - exif_data_unref (ev->exif_data); - ev->exif_data = NULL; - - if (ev->jpeg_data) - jpeg_data_unref (ev->jpeg_data); - ev->jpeg_data = NULL; - - g_free (ev); -} - - -static void -cb_exif_window_close (GtkWidget *button, ExifView *ev) -{ - g_return_if_fail (ev); - - gtk_widget_destroy (ev->window); -} - - -/****************************************************************************** - * - * Other Private Functions. - * - ******************************************************************************/ -static void -exif_view_content_list_set_data (GtkWidget *clist, - ExifContent *content) -{ - const gchar *text[2]; - guint i; - - g_return_if_fail (clist); - g_return_if_fail (content); - -#ifdef ENABLE_TREEVIEW - { - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); - gtk_list_store_clear (GTK_LIST_STORE (model)); - } -#else /* ENABLE_TREEVIEW */ - gtk_clist_clear (GTK_CLIST (clist)); -#endif /* ENABLE_TREEVIEW */ - - for (i = 0; i < content->count; i++) { - text[0] = exif_tag_get_name (content->entries[i]->tag); - if (text[0] && *text[0]) text[0] = _(text[0]); - text[1] = exif_entry_get_value (content->entries[i]); - if (text[1] && *text[1]) text[1] = _(text[1]); -#ifdef ENABLE_TREEVIEW - { - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); - GtkTreeIter iter; - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_KEY, text[0], - COLUMN_VALUE, text[1], - COLUMN_TERMINATOR); - } -#else /* ENABLE_TREEVIEW */ - gtk_clist_append (GTK_CLIST (clist), (gchar **) text); -#endif /* ENABLE_TREEVIEW */ - } -} - - -/****************************************************************************** - * - * Public Functions. - * - ******************************************************************************/ -ExifView * -exif_view_create_window (const gchar *filename, GtkWindow *parent) -{ - ExifView *ev; - GtkWidget *button; - gchar buf[BUF_SIZE]; - - g_return_val_if_fail (filename && *filename, NULL); - - ev = exif_view_create (filename, parent); - if (!ev) return NULL; - - ev->window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (ev->window), parent); - g_snprintf (buf, BUF_SIZE, _("%s EXIF data"), filename); - gtk_window_set_title (GTK_WINDOW (ev->window), buf); - gtk_window_set_default_size (GTK_WINDOW (ev->window), 500, 400); - gtk_window_set_position (GTK_WINDOW (ev->window), GTK_WIN_POS_CENTER); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ev->window)->vbox), - ev->container, - TRUE, TRUE, 0); - - gtk_widget_show_all (ev->window); - - /* button */ - button = gtk_button_new_with_label (_("Close")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ev->window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_exif_window_close), ev); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - gtk_widget_grab_focus (button); - - gimv_icon_stock_set_window_icon (ev->window->window, "gimv_icon"); - - return ev; -} - - -static GtkWidget * -exif_view_get_thumbnail (ExifData *edata) -{ - GtkWidget *image; - GimvImageLoader *loader; - GimvIO *gio; - GimvImage *gimvimage; - GdkPixmap *pixmap = NULL; - GdkBitmap *bitmap = NULL; - - - g_return_val_if_fail (edata, NULL); - - if (!edata->data) return NULL; - if (edata->size <= 0) return NULL; - - loader = gimv_image_loader_new (); - if (!loader) return NULL; - - gio = gimv_io_mem_new (NULL, "rb", GimvIOMemModeWrap); - gimv_io_mem_wrap ((GimvIOMem *) gio, edata->data, edata->size, FALSE); - gimv_image_loader_set_gio (loader, gio); - - gimv_image_loader_load (loader); - - gimvimage = gimv_image_loader_get_image (loader); - if (!gimvimage) { - gimv_image_loader_unref (loader); - return NULL; - } - - gimv_image_scale_get_pixmap (gimvimage, - gimv_image_width (gimvimage), - gimv_image_height (gimvimage), - &pixmap, &bitmap); - - gimv_image_loader_unref (loader); - gimv_io_unref (gio); - -#ifdef USE_GTK2 - image = gtk_image_new_from_pixmap (pixmap, bitmap); -#else - image = gtk_pixmap_new (pixmap, bitmap); -#endif - - if (pixmap) - gdk_pixmap_unref (pixmap); - - return image; -} - - -ExifView * -exif_view_create (const gchar *filename, GtkWindow *parent) -{ - JPEGData *jdata; - ExifData *edata; - ExifView *ev = NULL; - ExifContent *contents[EXIF_IFD_COUNT]; - GtkWidget *notebook, *label; - GtkWidget *vbox, *pixmap; - gint i; - - gchar *titles[] = { - N_("Tag"), N_("Value"), - }; - - g_return_val_if_fail (filename && *filename, NULL); - - jdata = jpeg_data_new_from_file (filename); - if (!jdata) { - gtkutil_message_dialog (_("Error!!"), _("EXIF data not found."), - GTK_WINDOW (ev->window)); - return NULL; - } - - edata = jpeg_data_get_exif_data (jdata); - if (!edata) { - gtkutil_message_dialog (_("Error!!"), _("EXIF data not found."), - GTK_WINDOW (parent)); - goto ERROR; - } - - ev = g_new0 (ExifView, 1); - ev->exif_data = edata; - ev->jpeg_data = jdata; - -#if 0 - contents[0] = edata->ifd0; - contents[1] = edata->ifd1; - contents[2] = edata->ifd_exif; - contents[3] = edata->ifd_gps; - contents[4] = edata->ifd_interoperability; -#else - for (i = 0; i < EXIF_IFD_COUNT; i++) - contents[i] = edata->ifd[i]; -#endif - - ev->container = gtk_vbox_new (FALSE, 0); - gtk_signal_connect (GTK_OBJECT (ev->container), "destroy", - GTK_SIGNAL_FUNC (cb_exif_view_destroy), ev); - gtk_widget_show (ev->container); - - notebook = gtk_notebook_new (); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - gtk_box_pack_start(GTK_BOX(ev->container), notebook, TRUE, TRUE, 0); - gtk_widget_show (notebook); - - /* Tag Tables */ - for (i = 0; i < EXIF_IFD_COUNT; i++) { - GtkWidget *scrolledwin, *clist; - - /* scrolled window & clist */ - label = gtk_label_new (_(exif_ifd_get_name(i))); - scrolledwin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), - GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); -#ifdef USE_GTK2 - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), - GTK_SHADOW_IN); -#endif /* USE_GTK2 */ - gtk_container_set_border_width (GTK_CONTAINER (scrolledwin), 5); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), - scrolledwin, label); - gtk_widget_show (scrolledwin); - -#ifdef ENABLE_TREEVIEW - { - GtkListStore *store; - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - store = gtk_list_store_new (N_COLUMN, G_TYPE_STRING, G_TYPE_STRING); - clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); - - /* set column for key */ - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_title (col, _(titles[0])); - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_KEY); - gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); - - /* set column for value */ - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_title (col, _(titles[1])); - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_VALUE); - gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); - } -#else /* ENABLE_TREEVIEW */ - clist = gtk_clist_new_with_titles (2, titles); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); - gtk_clist_set_column_auto_resize (GTK_CLIST (clist), 0, TRUE); - gtk_clist_set_column_auto_resize (GTK_CLIST (clist), 1, TRUE); -#endif /* ENABLE_TREEVIEW */ - - gtk_container_add (GTK_CONTAINER (scrolledwin), clist); - gtk_widget_show (clist); - - exif_view_content_list_set_data (clist, contents[i]); - } - - /* Thumbnail page */ - label = gtk_label_new (_("Thumbnail")); - vbox = gtk_vbox_new (TRUE, 0); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), - vbox, label); - gtk_widget_show (vbox); - - pixmap = exif_view_get_thumbnail (edata); - - if (pixmap) - gtk_box_pack_start (GTK_BOX (vbox), pixmap, TRUE, TRUE, 0); - - return ev; - -ERROR: - jpeg_data_unref (jdata); - return NULL; -} - -#endif /* ENABLE_EXIF */ diff -Nru gimageview-0.2.27/src/exif_view.h gimageview-0.3.0-0.20101117/src/exif_view.h --- gimageview-0.2.27/src/exif_view.h 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/exif_view.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: exif_view.h,v 1.5 2003/06/13 09:43:25 makeinu Exp $ - */ - -#ifndef __EXIF_VIEW__ -#define __EXIF_VIEW__ - -#include "gimageview.h" - -#ifdef ENABLE_EXIF - -#include -#include /* FIXME!! */ - -typedef struct ExifView_Tag -{ - GtkWidget *window; /* if open in stand alone window, use this */ - GtkWidget *container; /* exif view */ - ExifData *exif_data; - JPEGData *jpeg_data; -} ExifView; - - -ExifView *exif_view_create_window (const gchar *filename, - GtkWindow *parent); -ExifView *exif_view_create (const gchar *filename, - GtkWindow *parent); - -#endif /* ENABLE_EXIF */ - -#endif /* __EXIF_VIEW__ */ diff -Nru gimageview-0.2.27/src/fileload.c gimageview-0.3.0-0.20101117/src/fileload.c --- gimageview-0.2.27/src/fileload.c 2004-06-17 03:49:42.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fileload.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fileload.c,v 1.50 2004/06/17 03:49:42 makeinu Exp $ + * $Id: fileload.c 1200 2009-01-07 09:12:12Z makeinu $ */ #include @@ -31,20 +31,20 @@ #include "gimageview.h" -#include "charset.h" #include "fr-command.h" #include "fr-archive.h" #include "gimv_image.h" -#include "gfileutil.h" -#include "gtkutils.h" #include "prefs.h" #include "fileload.h" -#include "fileutil.h" #include "gimv_icon_stock.h" #include "gimv_image_info.h" #include "gimv_image_win.h" #include "gimv_thumb_view.h" #include "gimv_thumb_win.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_gtk.h" /* for filebrowser call back functions */ @@ -129,7 +129,7 @@ } if (files->archive) - gtk_object_unref (GTK_OBJECT (files->archive)); + g_object_unref (G_OBJECT (files->archive)); loading_stop = FALSE; @@ -223,15 +223,15 @@ button = gtk_button_new_with_label (_("Skip")); gtk_container_border_width (GTK_CONTAINER (button), 5); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(cb_file_load_cancel), files); + g_signal_connect (G_OBJECT(button), "clicked", + G_CALLBACK(cb_file_load_cancel), files); /* stop button */ button = gtk_button_new_with_label (_("Stop")); gtk_container_border_width (GTK_CONTAINER (button), 5); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(cb_file_load_stop), files); + g_signal_connect (G_OBJECT(button), "clicked", + G_CALLBACK(cb_file_load_stop), files); files->window = window; @@ -620,7 +620,7 @@ gpointer data) { gchar *temp_dir; - temp_dir = gtk_object_get_data (GTK_OBJECT (archive), "temp-dir"); + temp_dir = g_object_get_data (G_OBJECT (archive), "temp-dir"); if (!temp_dir || !*temp_dir) return; @@ -678,24 +678,24 @@ timer = gtk_timeout_add (50, (GtkFunction)progress_timeout, tw->progressbar); } - gtk_signal_connect (GTK_OBJECT (archive), - "start", - GTK_SIGNAL_FUNC (cb_archive_action_started), - NULL); - gtk_signal_connect (GTK_OBJECT (archive), - "done", - GTK_SIGNAL_FUNC (cb_archive_action_performed), - tw); - gtk_signal_connect (GTK_OBJECT (archive), - "destroy", - GTK_SIGNAL_FUNC (cb_archive_destroy), - NULL); + g_signal_connect (G_OBJECT (archive), + "start", + G_CALLBACK (cb_archive_action_started), + NULL); + g_signal_connect (G_OBJECT (archive), + "done", + G_CALLBACK (cb_archive_action_performed), + tw); + g_signal_connect (G_OBJECT (archive), + "destroy", + G_CALLBACK (cb_archive_destroy), + NULL); temp_dir = g_strconcat (get_temp_dir_name (), FR_ARCHIVE (archive)->filename, NULL); - gtk_object_set_data_full (GTK_OBJECT (archive), "temp-dir", temp_dir, - (GtkDestroyNotify) g_free); + g_object_set_data_full (G_OBJECT (archive), "temp-dir", temp_dir, + (GtkDestroyNotify) g_free); files = files_loader_new (); files->thumb_load_type = type; @@ -713,7 +713,7 @@ success = fr_archive_load (archive, filename); if (!success) { GtkWindow *window = tw_tmp ? GTK_WINDOW (tw_tmp) : NULL; - gtk_object_unref (GTK_OBJECT (archive)); + g_object_unref (G_OBJECT (archive)); /* gtk_object_remove_data (GTK_OBJECT (archive), "progress-bar"); */ gtkutil_message_dialog (_("Error!!"), _("Cannot load this archive file.\n"), @@ -827,8 +827,6 @@ filebrowser_open_files (FileSel *filesel, ImgWinType type) { GtkFileSelection *fsel = GTK_FILE_SELECTION(filesel->filebrowser); - -#ifdef USE_GTK2 FilesLoader *files; gint i; gchar **path = gtk_file_selection_get_selections (fsel); @@ -857,52 +855,6 @@ files_loader_delete (files); g_strfreev (path); -#else - GList *sel_list = NULL, *node; - gchar *path, *path_tail, *file; - FilesLoader *files; - - /* get directory path */ - path = g_strdup(gtk_file_selection_get_filename(fsel)); - if(!path) return; - path_tail = (gchar *) strrchr(path, '/'); - if (path_tail) *(path_tail + 1) = '\0'; - - /* get selected files */ - node = GTK_CLIST(fsel->file_list)->selection; - if (node) { - files = files_loader_new (); - - while(node) { - gtk_clist_get_text(GTK_CLIST(fsel->file_list), - GPOINTER_TO_INT(node->data), 0, &file); - file = g_strconcat(path, file, NULL); - if (!(conf.detect_filetype_by_ext) - || gimv_image_detect_type_by_ext (file) - || fr_archive_utils_get_file_name_ext (file)) - { - files->filelist = g_list_append (files->filelist, file); - } - - node = g_list_next(node); - } - - files->filelist = g_list_first (files->filelist); - - if (type == THUMBNAIL_WINDOW) { - files->status = THUMB_LOADING; - open_image_files_in_thumbnail_view (files, filesel->tw, NULL); - } else { - files->status = IMAGE_LOADING; - open_image_files_in_image_view (files); - } - - files_loader_delete (files); - } - - g_free (path); - g_list_free(sel_list); -#endif } @@ -997,13 +949,13 @@ } -/* - * create_filebrowser: - * @ File open dialog (extend Gtk+'s original file open dialog widget) - * - * parent : Pointer to parent window. - * Return : Pointer to new filebrowser. - */ +static void +cb_cancel_button_clicked(GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy(GTK_WIDGET(data)); +} + + GtkWidget * create_filebrowser (gpointer parent) { @@ -1011,41 +963,34 @@ FileSel *filesel; filebrowser = gtk_file_selection_new(_("Load file(s)")); - gtk_signal_connect (GTK_OBJECT (filebrowser), "destroy", - GTK_SIGNAL_FUNC(cb_filebrowser_close), parent); + g_signal_connect (G_OBJECT (filebrowser), "destroy", + G_CALLBACK(cb_filebrowser_close), parent); filesel = g_new0 (FileSel, 1); filesel->filebrowser = filebrowser; filesel->tw = (GimvThumbWin *) parent; - gtk_object_set_data_full (GTK_OBJECT (filebrowser), "filesel", - filesel, (GtkDestroyNotify) g_free); + g_object_set_data_full (G_OBJECT (filebrowser), "filesel", + filesel, (GtkDestroyNotify) g_free); if (filesel->tw) gtk_window_set_transient_for (GTK_WINDOW (filebrowser), GTK_WINDOW (filesel->tw)); -#ifdef USE_GTK2 gtk_file_selection_set_select_multiple (GTK_FILE_SELECTION(filebrowser), TRUE); -#else - gtk_clist_set_selection_mode ( - GTK_CLIST(GTK_FILE_SELECTION(filebrowser)->file_list), - GTK_SELECTION_EXTENDED); -#endif /* - gtk_signal_connect( - GTK_OBJECT(GTK_FILE_SELECTION(filebrowser)->selection_entry), - "changed", GTK_SIGNAL_FUNC(filebrowser_changed), filebrowser); + g_signal_connect( + G_OBJECT(GTK_FILE_SELECTION(filebrowser)->selection_entry), + "changed", G_CALLBACK(filebrowser_changed), filebrowser); */ - gtk_signal_connect( - GTK_OBJECT(GTK_FILE_SELECTION(filebrowser)->ok_button), + g_signal_connect( + G_OBJECT(GTK_FILE_SELECTION(filebrowser)->ok_button), "clicked", - GTK_SIGNAL_FUNC(cb_filebrowser_ok_sel), + G_CALLBACK(cb_filebrowser_ok_sel), filesel); - gtk_signal_connect_object( - GTK_OBJECT(GTK_FILE_SELECTION(filebrowser)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), - GTK_OBJECT(filebrowser)); + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filebrowser)->cancel_button), + "clicked", G_CALLBACK(cb_cancel_button_clicked), + filebrowser); bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); @@ -1055,35 +1000,19 @@ add_selected = gtk_button_new_with_label(_("Open selected files")); gtk_box_pack_start(GTK_BOX(bbox), add_selected, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(add_selected), - "clicked", - GTK_SIGNAL_FUNC(cb_filebrowser_open_selected_files), - filesel); + g_signal_connect(G_OBJECT(add_selected), + "clicked", + G_CALLBACK(cb_filebrowser_open_selected_files), + filesel); add_all = gtk_button_new_with_label(_("Thumbnail for selected files")); gtk_box_pack_start(GTK_BOX(bbox), add_all, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(add_all), - "clicked", - GTK_SIGNAL_FUNC (cb_filebrowser_add_thumbnail), - filesel); + g_signal_connect(G_OBJECT(add_all), + "clicked", + G_CALLBACK (cb_filebrowser_add_thumbnail), + filesel); gtk_widget_show_all(bbox); -#if 0 - /* - * 2004-06-17 Takuro Ashie - * This code causes clash on latest Gtk+2. - */ - /* - * Change the Cancel buttons caption to Close. - */ - label = gtk_label_new(_("Close")); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); - gtk_container_remove(GTK_CONTAINER(GTK_FILE_SELECTION(filebrowser)->cancel_button), - gtk_container_children(GTK_CONTAINER(GTK_FILE_SELECTION(filebrowser)->cancel_button))->data); - gtk_container_add(GTK_CONTAINER(GTK_FILE_SELECTION(filebrowser)->cancel_button), label); - gtk_widget_show(label); -#endif - gtk_widget_show(filebrowser); gimv_icon_stock_set_window_icon (filebrowser->window, "nfolder"); diff -Nru gimageview-0.2.27/src/fileload.h gimageview-0.3.0-0.20101117/src/fileload.h --- gimageview-0.2.27/src/fileload.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fileload.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fileload.h,v 1.12 2004/04/11 14:03:36 makeinu Exp $ + * $Id: fileload.h 1021 2004-04-11 14:03:36Z makeinu $ */ #ifndef __FILE_H__ diff -Nru gimageview-0.2.27/src/fileutil.c gimageview-0.3.0-0.20101117/src/fileutil.c --- gimageview-0.2.27/src/fileutil.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fileutil.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,595 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: fileutil.c,v 1.19 2004/09/21 08:44:31 makeinu Exp $ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fileutil.h" - -#ifndef FALSE -# define FALSE (0) -#endif - -#ifndef TRUE -# define TRUE (!FALSE) -#endif - -#ifndef BUF_SIZE -# define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -# define MAX_PATH_LEN 1024 -#endif - - -/* - * file_exists: - * @ check whether path is exist. - * - * path : path to check. - * Return : return TRUE if exist, and return FALSE if not exist. - */ -int -file_exists (const char *path) -{ - struct stat st; - - if ((!path) || (!*path)) - return FALSE; - if (stat(path, &st) < 0) - return FALSE; - return TRUE; -} - - -/* - * isfile: - * @ check whether path is file. - * - * path : path to check. - * Return : return TRUE if path is file, and return FALSE if not. - */ -int -isfile (const char *path) -{ - struct stat st; - - if ((!path) || (!*path)) - return FALSE; - if (stat(path, &st) < 0) - return FALSE; - if (S_ISREG(st.st_mode)) - return TRUE; - return FALSE; -} - - -/* - * isdir: - * @ check whether path is directory. - * - * path : path to check. - * Return : return TRUE if path is directory, and return FALSE if not. - */ -int -isdir (const char *path) -{ - struct stat st; - - if ((!path) || (!*path)) - return FALSE; - if (stat(path, &st) < 0) - return FALSE; - if (S_ISDIR(st.st_mode)) - return TRUE; - return FALSE; -} - - -/* - * islink: - * @ check whether path is link. - * - * path : path to check. - * Return : return 1 if path is link, and return 0 if not. - */ -int -islink(const char *path) -{ - struct stat st; - - if (lstat(path, &st) < 0) - return FALSE; - if (S_ISLNK(st.st_mode)) - return TRUE; - return FALSE; -} - - -/* - * iswritable: - * @ check whether path is writable. - * - * path : path to check. - * Return : return TRUE if path is writable, and return FALSE if not. - */ -int -iswritable (const char *path) -{ - uid_t uid = getuid(); - gid_t gid = getgid(); - struct stat st; - - if (stat(path, &st)) - return FALSE; - - if (!S_ISDIR (st.st_mode)) - return FALSE; - - if(uid == st.st_uid && (st.st_mode & S_IWUSR)) - return TRUE; - else if (gid == st.st_gid && (st.st_mode & S_IWGRP)) - return TRUE; - else if (st.st_mode & S_IWOTH) - return TRUE; - - return FALSE; -} - - -int -isexecutable (const char *path) -{ - struct stat st; - - if (stat(path, &st)) - return FALSE; - - if (st.st_mode & S_IXUSR - || st.st_mode & S_IXGRP - || st.st_mode & S_IXOTH) - { - return TRUE; - } - - return FALSE; -} - - -/* - * Return: negative value if it is not directory. - * 0 if has no sub directory. - positive value if has sub directory. - */ -int -has_subdirs (const char *path) -{ - struct stat st; - - if ((!path) || (!*path)) - return -1; - if (stat(path, &st) < 0) - return -1; - if (!S_ISDIR(st.st_mode)) - return -1; - - return st.st_nlink - 2; -} - - -/* - * fileutil_makedir: - * @ make one directory. - * - * dir : directory to make. - * Return : return TURE if success, and return FALSE if fail. - */ -int -makedir (const char *dir) -{ - if ((!dir) || (!*dir)) - return FALSE; - if (!mkdir(dir, S_IRWXU)) - return TRUE; - return FALSE; -} - - -/* - * mkdirs: - * @ make directory recursively. similar to "mkdir -p" shell command. - * @ The path string until last "/" character will be intented as directory. - * - * path : src path. - * Return : return TRUE if success, and return FALSE if fail. - */ -int -mkdirs (const char *path) -{ - char ss[MAX_PATH_LEN]; - int i, ii; - - i = 0; - ii = 0; - while (path[i] && i < MAX_PATH_LEN) { - ss[ii++] = path[i]; - ss[ii] = '\0'; - if (i + 1 < MAX_PATH_LEN && path[i + 1] == '/') { - if (!file_exists(ss)) { - if (!makedir(ss)) - return FALSE; - } else if (!isdir(ss)) - return FALSE; - } - i++; - } - return TRUE; -} - - -int -ensure_dir_exists (const char *a_path) -{ - if (!a_path) return FALSE; - - if (!isdir (a_path)) { - char *path = g_strdup (a_path); - char *p = path; - - while (*p != '\0') { - p++; - if ((*p == '/') || (*p == '\0')) { - int end = TRUE; - - if (*p != '\0') { - *p = '\0'; - end = FALSE; - } - - if (!isdir (path)) { - if (mkdir (path, 0755) < 0) { - g_free (path); - return FALSE; - } - } - if (!end) *p = '/'; - } - } - g_free (path); - } - - return TRUE; -} - - -int -get_file_mtime (const char *path) -{ - struct stat st; - - if (! path || ! *path) return 0; - - if (stat(path, &st)) - return 0; - - return st.st_mtime; -} - - -/* - * fileutile_size2str: - * @ add comma. - * size : - * space : - * Return : - */ -char * -fileutil_size2str (size_t size, int space) -{ - unsigned int i = 0, j = 0, n_digit = 0; - char tmp[14]; - char comma[14]; - char buf[14]; - - i = size; - - /* detect digit num */ - while (i > 0) { - i = i/10; - n_digit++; - } - - sprintf (tmp, "%d", size); - - if (strlen (tmp) < 4) - return g_strdup (tmp); - - /* until first comma */ - if (n_digit % 3 != 0) { - for (i = 0; i < n_digit % 3; i++) - comma[j++] = tmp[i]; - if (i != strlen (tmp)) - comma[j++] = ','; - } - - /* until end of string */ - while (tmp[i] != '\0'){ - comma[j++] = tmp[i++]; - comma[j++] = tmp[i++]; - comma[j++] = tmp[i++]; - if(tmp[i] != '\0') - comma[j++] = ','; - } - - /* end of string */ - comma[j] = '\0'; - - if (space) { - g_snprintf (buf, 14, "%13s", comma); - return g_strdup (buf); - } else { - return g_strdup(comma); - } -} - - -/* - * fileutile_time2str: - * time : - * Return : - */ -char * -fileutil_time2str (time_t time) -{ - struct tm *jst = localtime (&time); - char *week[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - char timestamp[256]; - - g_snprintf (timestamp, 256, "%4d/%02d/%02d %s %02d:%02d", - jst->tm_year+1900, jst->tm_mon+1, jst->tm_mday, - week[jst->tm_wday], jst->tm_hour, jst->tm_min); - - return g_strdup (timestamp); -} - - -/* - * fileutile_uid2str: - * uid : - * Return : - */ -char * -fileutil_uid2str (uid_t uid) -{ - struct passwd *pw = getpwuid (uid); - char buf[16]; - - if (pw) { - return g_strdup (pw->pw_name); - } else { - g_snprintf (buf, 16, "%d", uid); - return g_strdup (buf); - } -} - - -/* - * fileutile_gid2str: - * gid : - * Return : - */ -char * -fileutil_gid2str (gid_t gid) -{ - struct group *gr = getgrgid (gid); - char buf[16]; - - if (gr) { - return g_strdup (gr->gr_name); - } else { - g_snprintf (buf, 16, "%d", gid); - return g_strdup (buf); - } -} - - -/* - * fileutile_mode2str: - * mode : - * Return : - */ -char * -fileutil_mode2str (mode_t mode) -{ - char permission[11] = {"----------"}; - - switch (mode & S_IFMT){ - case S_IFREG: - permission[0] = '-'; - break; - case S_IFLNK: - permission[0] = 'l'; - break; - case S_IFDIR: - permission[0] = 'd'; - break; - default: - permission[0] = '?'; - break; - } - - if (mode & S_IRUSR) - permission[1] = 'r'; - if (mode & S_IWUSR) - permission[2] = 'w'; - if (mode & S_IXUSR) - permission[3] = 'x'; - - if (mode & S_IRGRP) - permission[4] = 'r'; - if (mode & S_IWGRP) - permission[5] = 'w'; - if (mode & S_IXGRP) - permission[6] = 'x'; - - if (mode & S_IROTH) - permission[7] = 'r'; - if (mode & S_IWOTH) - permission[8] = 'w'; - if (mode & S_IXOTH) - permission[9] = 'x'; - - if (mode & S_ISUID) - permission[3] = 'S'; - if (mode & S_ISGID) - permission[6] = 'S'; - if (mode & S_ISVTX) - permission[9] = 'T'; - - permission[11] = 0; - - return g_strdup (permission); -} - - -/* - * fileutil_home2tilde: - * @ If path string include HOME DIR, convert it to "~/". - * @ The returned string should be freed when no longer needed. - * - * path : src path. - * Return : Short path. - * @ If HOME DIR is not included in path string , return src path. - */ -char * -fileutil_home2tilde (const char *path) -{ - char *home = NULL; - char buf[MAX_PATH_LEN]; - char *retval; - size_t len; - - home = getenv("HOME"); - - len = strlen (home); - if (strlen (path) > len - && !strncmp (path, home, len) - && (path[len] == '/' || path[len] == '\0')) - { - g_snprintf (buf, BUF_SIZE, "~/%s", path + len + 1); - retval = g_strdup (buf); - } else { - retval = g_strdup (path); - } - - return retval; -} - - -/* - * fileutil_dir_basename: - * @ Return directory name (strip parent direcory name). - * @ The returned string should be freed when no longer needed. - * - * path : src path. - * Return : Base directory name. - */ -char * -fileutil_dir_basename (const char *path) -{ - char *basename = NULL; - char *tmpstr = NULL, *endchr = NULL; - char *retval; - - if (!path) - return NULL; - - tmpstr = g_strdup (path); - endchr = strrchr(tmpstr, '/'); - - if (endchr && endchr + 1) { - basename = endchr + 1; - } else if (endchr) { - *endchr = '\0'; - endchr = strrchr(tmpstr, '/'); - if (endchr && endchr + 1) - basename = endchr + 1; - } else { - return NULL; - } - - retval = g_strdup (basename); - g_free (tmpstr); - - return retval; -} - - -char * -fileutil_get_extention (const char *filename) -{ - char *ext; - - if (!filename) - return NULL; - - ext = strrchr(filename, '.'); - if (ext) - ext = ext + 1; - else - return NULL; - - if (ext == "\0") - return NULL; - else - return ext; -} - - -int -fileutil_extension_is (const char *filename, const char *ext) -{ - int len1, len2; - - if (!filename) return FALSE; - if (!*filename) return FALSE; - if (!ext) return FALSE; - if (!*ext) return FALSE; - - len1 = strlen (filename); - len2 = strlen (ext); - - if (len1 < len2) return FALSE; - - return !g_strcasecmp (filename + len1 - len2, ext); -} diff -Nru gimageview-0.2.27/src/fileutil.h gimageview-0.3.0-0.20101117/src/fileutil.h --- gimageview-0.2.27/src/fileutil.h 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fileutil.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: fileutil.h,v 1.11 2004/09/21 08:44:31 makeinu Exp $ - */ - -#ifndef __FILEUTIL_H__ -#define __FILEUTIL_H__ - -#include -#include - -typedef enum -{ - SIZE_BYTE, - SIZE_KBYTE, - SIZE_MBYTE, - SIZE_GBYTE, - SIZE_BIT, - SIZE_KBIT, - SIZE_MBIT, - SIZE_GBIT -} SIZE_UNIT; - -int file_exists (const char *path); -int isfile (const char *path); -int isdir (const char *path); -int islink (const char *path); -int iswritable (const char *path); -int isexecutable (const char *path); - -int has_subdirs (const char *path); -int makedir (const char *dir); -int mkdirs (const char *path); - -int ensure_dir_exists (const char *a_path); -int get_file_mtime (const char *path); - -char *fileutil_size2str (size_t size, - int space); -char *fileutil_time2str (time_t time); -char *fileutil_uid2str (uid_t uid); -char *fileutil_gid2str (gid_t gid); -char *fileutil_mode2str (mode_t mode); - -char *fileutil_home2tilde (const char *path); -char *fileutil_dir_basename (const char *path); -char *fileutil_get_extention (const char *path); -int fileutil_extension_is (const char *filename, - const char *ext); - -#endif /* __FILEUTIL_H__ */ diff -Nru gimageview-0.2.27/src/fr-archive.c gimageview-0.3.0-0.20101117/src/fr-archive.c --- gimageview-0.2.27/src/fr-archive.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-archive.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-archive.c,v 1.19 2004/09/21 08:44:31 makeinu Exp $ + * $Id: fr-archive.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -27,11 +27,10 @@ #include #include #include "gimv_image_info.h" -#include "fileutil.h" #include "fr-archive.h" #include "fr-command.h" #include "fr-process.h" -#include "gtk2-compat.h" +#include "utils_file.h" #define MAX_CHUNK_LEN 16000 /* FIXME : what is the max length of a command @@ -49,12 +48,14 @@ static GList *archive_ext_list = NULL; -static GtkObjectClass *parent_class; static guint fr_archive_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (FRArchive, fr_archive, G_TYPE_OBJECT) + + static void -fr_archive_destroy (GtkObject *object) +fr_archive_dispose (GObject *object) { FRArchive *archive; @@ -64,9 +65,9 @@ archive = FR_ARCHIVE (object); if (archive->command != NULL) - gtk_object_unref (GTK_OBJECT (archive->command)); + g_object_unref (G_OBJECT (archive->command)); - gtk_object_unref (GTK_OBJECT (archive->process)); + g_object_unref (G_OBJECT (archive->process)); g_print (_("archive \"%s\" has been finalized.\n"), archive->filename); @@ -74,41 +75,40 @@ g_free (archive->filename); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (fr_archive_parent_class)->dispose) + G_OBJECT_CLASS (fr_archive_parent_class)->dispose (object); } static void fr_archive_class_init (FRArchiveClass *class) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) class; fr_archive_signals[START] = - gtk_signal_new ("start", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRArchiveClass, start), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); + g_signal_new ("start", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRArchiveClass, start), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); fr_archive_signals[DONE] = - gtk_signal_new ("done", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRArchiveClass, done), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, - GTK_TYPE_INT, - GTK_TYPE_INT); - gtk_object_class_add_signals (object_class, fr_archive_signals, - LAST_SIGNAL); + g_signal_new ("done", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRArchiveClass, done), + NULL, NULL, + gtk_marshal_NONE__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); - object_class->destroy = fr_archive_destroy; + gobject_class->dispose = fr_archive_dispose; class->start = NULL; class->done = NULL; } @@ -120,36 +120,6 @@ archive->filename = NULL; archive->command = NULL; archive->process = fr_process_new (); - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (archive)); - gtk_object_sink (GTK_OBJECT (archive)); -#endif -} - - -GtkType -fr_archive_get_type (void) -{ - static GtkType fr_archive_type = 0; - - if (! fr_archive_type) { - GtkTypeInfo fr_archive_info = { - "FRArchive", - sizeof (FRArchive), - sizeof (FRArchiveClass), - (GtkClassInitFunc) fr_archive_class_init, - (GtkObjectInitFunc) fr_archive_init, - NULL, /* reserved_1 */ - NULL, /* reserved_2 */ - (GtkClassInitFunc) NULL - }; - - fr_archive_type = gtk_type_unique (gtk_object_get_type (), - &fr_archive_info); - } - - return fr_archive_type; } @@ -157,33 +127,11 @@ fr_archive_new (void) { FRArchive *archive; - archive = FR_ARCHIVE (gtk_type_new (fr_archive_get_type ())); + archive = FR_ARCHIVE (g_object_new (FR_TYPE_ARCHIVE, NULL)); return archive; } -FRArchive * -fr_archive_ref (FRArchive *archive) -{ - g_return_val_if_fail (archive != NULL, NULL); - g_return_val_if_fail (FR_IS_ARCHIVE (archive), NULL); - - gtk_object_ref (GTK_OBJECT (archive)); - - return archive; -} - - -void -fr_archive_unref (FRArchive *archive) -{ - g_return_if_fail (archive != NULL); - g_return_if_fail (FR_IS_ARCHIVE (archive)); - - gtk_object_unref (GTK_OBJECT (archive)); -} - - ExtArchiverPlugin *found_archiver = NULL; static void @@ -223,9 +171,9 @@ FRAction action, FRArchive *archive) { - gtk_signal_emit (GTK_OBJECT (archive), - fr_archive_signals[START], - action); + g_signal_emit (G_OBJECT (archive), + fr_archive_signals[START], 0, + action); } @@ -255,10 +203,10 @@ g_print ("%s [DONE]\n", s_action); #endif - gtk_signal_emit (GTK_OBJECT (archive), - fr_archive_signals[DONE], - action, - error); + g_signal_emit (G_OBJECT (archive), + fr_archive_signals[DONE], 0, + action, + error); } @@ -280,14 +228,14 @@ if (! create_command_from_filename (archive, filename)) return; if (tmp_command != NULL) - gtk_object_unref (GTK_OBJECT (tmp_command)); + g_object_unref (G_OBJECT (tmp_command)); - gtk_signal_connect (GTK_OBJECT (archive->command), "start", - GTK_SIGNAL_FUNC (action_started), - archive); - gtk_signal_connect (GTK_OBJECT (archive->command), "done", - GTK_SIGNAL_FUNC (action_performed), - archive); + g_signal_connect (G_OBJECT (archive->command), "start", + G_CALLBACK (action_started), + archive); + g_signal_connect (G_OBJECT (archive->command), "done", + G_CALLBACK (action_performed), + archive); } @@ -317,15 +265,15 @@ if (!create_command_from_filename (archive, filename)) return FALSE; if (tmp_command != NULL) - gtk_object_unref (GTK_OBJECT (tmp_command)); + g_object_unref (G_OBJECT (tmp_command)); - gtk_signal_connect (GTK_OBJECT (archive->command), "start", - GTK_SIGNAL_FUNC (action_started), - archive); - - gtk_signal_connect (GTK_OBJECT (archive->command), "done", - GTK_SIGNAL_FUNC (action_performed), - archive); + g_signal_connect (G_OBJECT (archive->command), "start", + G_CALLBACK (action_started), + archive); + + g_signal_connect (G_OBJECT (archive->command), "done", + G_CALLBACK (action_performed), + archive); fr_command_list (archive->command); diff -Nru gimageview-0.2.27/src/fr-archive.h gimageview-0.3.0-0.20101117/src/fr-archive.h --- gimageview-0.2.27/src/fr-archive.h 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-archive.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-archive.h,v 1.13 2004/09/21 08:44:31 makeinu Exp $ + * $Id: fr-archive.h 1176 2007-10-21 13:47:18Z makeinu $ */ #ifndef ARCHIVE_H @@ -32,15 +32,16 @@ #include "fr-command.h" #define FR_TYPE_ARCHIVE (fr_archive_get_type ()) -#define FR_ARCHIVE(obj) (GTK_CHECK_CAST ((obj), FR_TYPE_ARCHIVE, FRArchive)) -#define FR_ARCHIVE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FR_TYPE_ARCHIVE, FRArchiveClass)) -#define FR_IS_ARCHIVE(obj) (GTK_CHECK_TYPE ((obj), FR_TYPE_ARCHIVE)) -#define FR_IS_ARCHIVE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FR_TYPE_ARCHIVE)) +#define FR_ARCHIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_ARCHIVE, FRArchive)) +#define FR_ARCHIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_ARCHIVE, FRArchiveClass)) +#define FR_IS_ARCHIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_ARCHIVE)) +#define FR_IS_ARCHIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_ARCHIVE)) +#define FR_ARCHIVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_ARCHIVE, FRArchiveClass)) typedef struct _FRArchiveClass FRArchiveClass; struct _FRArchive { - GtkObject __parent; + GObject __parent; char * filename; /* The archive filename. */ FRCommand * command; @@ -50,7 +51,7 @@ }; struct _FRArchiveClass { - GtkObjectClass __parent_class; + GObjectClass __parent_class; /* -- Signals -- */ void (*start) (FRArchive *archive, @@ -61,14 +62,12 @@ FRProcError error); }; - #define GIMV_ARCHIVER_IF_VERSION 1 typedef FRCommand *(*ExtArchiverNewFn) (FRProcess *process, const char *filename, FRArchive *archive); - typedef struct ExtArchiverPlugin_Tag { const guint32 if_version; /* plugin interface version */ @@ -77,14 +76,11 @@ gboolean is_compressed; } ExtArchiverPlugin; - -GtkType fr_archive_get_type (void); +GType fr_archive_get_type (void); FRArchive * fr_archive_new (void); void fr_archive_free (FRArchive *archive); void fr_archive_new_file (FRArchive *archive, char *filename); -FRArchive *fr_archive_ref (FRArchive *archive); -void fr_archive_unref (FRArchive *archive); gboolean fr_archive_load (FRArchive *archive, const char *filename); void fr_archive_reload (FRArchive *archive); diff -Nru gimageview-0.2.27/src/fr-command.c gimageview-0.3.0-0.20101117/src/fr-command.c --- gimageview-0.2.27/src/fr-command.c 2004-05-23 14:07:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-command.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,21 +19,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-command.c,v 1.15 2003/06/18 09:26:56 makeinu Exp $ + * $Id: fr-command.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include -#include "fileutil.h" #include "fr-process.h" #include "fr-command.h" #include "gimv_image_info.h" -#include "gtk2-compat.h" +#include "utils_file.h" -static void fr_command_class_init (FRCommandClass *class); -static void fr_command_init (FRCommand *afile); -static void fr_command_destroy (GtkObject *object); +static void fr_command_dispose (GObject *object); enum { @@ -43,7 +40,6 @@ }; -static GtkObjectClass *parent_class = NULL; static guint fr_command_signals[LAST_SIGNAL] = { 0 }; @@ -80,35 +76,37 @@ } +G_DEFINE_TYPE (FRCommand, fr_command, G_TYPE_OBJECT) + + static void fr_command_class_init (FRCommandClass *class) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - parent_class = gtk_type_class (GTK_TYPE_OBJECT); - object_class = (GtkObjectClass*) class; + gobject_class = (GObjectClass*) class; fr_command_signals[START] = - gtk_signal_new ("start", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRCommandClass, start), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); + g_signal_new ("start", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRCommandClass, start), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); fr_command_signals[DONE] = - gtk_signal_new ("done", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRCommandClass, done), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, - GTK_TYPE_INT, - GTK_TYPE_INT); - gtk_object_class_add_signals (object_class, fr_command_signals, - LAST_SIGNAL); - - object_class->destroy = fr_command_destroy; + g_signal_new ("done", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRCommandClass, done), + NULL, NULL, + gtk_marshal_NONE__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + + gobject_class->dispose = fr_command_dispose; class->list = base_fr_command_list; class->add = base_fr_command_add; @@ -125,8 +123,9 @@ gpointer data) { FRCommand *comm = FR_COMMAND (data); - gtk_signal_emit (GTK_OBJECT (comm), fr_command_signals[START], - comm->action); + g_signal_emit (G_OBJECT (comm), + fr_command_signals[START], 0, + comm->action); } @@ -137,9 +136,10 @@ { FRCommand *comm = FR_COMMAND (data); comm->file_list = g_list_reverse (comm->file_list); - gtk_signal_emit (GTK_OBJECT (comm), fr_command_signals[DONE], - comm->action, - error); + g_signal_emit (G_OBJECT (comm), + fr_command_signals[DONE], 0, + comm->action, + error); } @@ -148,21 +148,16 @@ { comm->filename = NULL; comm->file_list = NULL; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (comm)); - gtk_object_sink (GTK_OBJECT (comm)); -#endif } static void -fr_command_destroy (GtkObject *object) +fr_command_dispose (GObject *object) { FRCommand* comm; g_return_if_fail (object != NULL); - g_return_if_fail (IS_FR_COMMAND (object)); + g_return_if_fail (FR_IS_COMMAND (object)); comm = FR_COMMAND (object); if (comm->filename != NULL) @@ -175,36 +170,14 @@ g_list_free (comm->file_list); } - gtk_signal_disconnect_by_data (GTK_OBJECT (comm->process), comm); - gtk_object_unref (GTK_OBJECT (comm->process)); + g_signal_handlers_disconnect_matched (G_OBJECT (comm->process), + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, comm); + g_object_unref (G_OBJECT (comm->process)); /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GtkType -fr_command_get_type () -{ - static guint fr_command_type = 0; - - if (!fr_command_type) { - GtkTypeInfo fr_command_info = { - "FRCommand", - sizeof (FRCommand), - sizeof (FRCommandClass), - (GtkClassInitFunc) fr_command_class_init, - (GtkObjectInitFunc) fr_command_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - fr_command_type = gtk_type_unique (gtk_object_get_type(), - &fr_command_info); - } - - return fr_command_type; + if (G_OBJECT_CLASS (fr_command_parent_class)->dispose) + G_OBJECT_CLASS (fr_command_parent_class)->dispose (object); } @@ -215,14 +188,14 @@ { fr_command_set_filename (comm, fr_command_name); - gtk_object_ref (GTK_OBJECT (process)); + g_object_ref (G_OBJECT (process)); comm->process = process; - gtk_signal_connect (GTK_OBJECT (comm->process), "start", - GTK_SIGNAL_FUNC (fr_command_start), - comm); - gtk_signal_connect (GTK_OBJECT (comm->process), "done", - GTK_SIGNAL_FUNC (fr_command_done), - comm); + g_signal_connect (G_OBJECT (comm->process), "start", + G_CALLBACK (fr_command_start), + comm); + g_signal_connect (G_OBJECT (comm->process), "done", + G_CALLBACK (fr_command_done), + comm); } @@ -230,7 +203,7 @@ fr_command_set_filename (FRCommand *comm, const char *filename) { - g_return_if_fail (IS_FR_COMMAND (comm)); + g_return_if_fail (FR_IS_COMMAND (comm)); if (comm->filename != NULL) g_free (comm->filename); @@ -252,7 +225,7 @@ void fr_command_list (FRCommand *comm) { - g_return_if_fail (IS_FR_COMMAND (comm)); + g_return_if_fail (FR_IS_COMMAND (comm)); if (comm->file_list != NULL) { g_list_foreach (comm->file_list, (GFunc) gimv_image_info_unref, NULL); @@ -261,7 +234,7 @@ } comm->action = FR_ACTION_LIST; - FR_COMMAND_CLASS (GTK_OBJECT_GET_CLASS (comm))->list (comm); + FR_COMMAND_CLASS (G_OBJECT_GET_CLASS (comm))->list (comm); } @@ -272,10 +245,10 @@ gboolean update) { comm->action = FR_ACTION_ADD; - FR_COMMAND_CLASS (GTK_OBJECT_GET_CLASS (comm))->add (comm, - file_list, - base_dir, - update); + FR_COMMAND_CLASS (G_OBJECT_GET_CLASS (comm))->add (comm, + file_list, + base_dir, + update); } @@ -301,7 +274,7 @@ } - FR_COMMAND_CLASS (GTK_OBJECT_GET_CLASS (comm))->delete (comm, file_list); + FR_COMMAND_CLASS (G_OBJECT_GET_CLASS (comm))->delete (comm, file_list); if (free_file_list) { g_list_foreach (file_list, (GFunc) g_free, NULL); @@ -319,10 +292,10 @@ gboolean junk_paths) { comm->action = FR_ACTION_EXTRACT; - FR_COMMAND_CLASS (GTK_OBJECT_GET_CLASS (comm))->extract (comm, - file_list, - dest_dir, - overwrite, - skip_older, - junk_paths); + FR_COMMAND_CLASS (G_OBJECT_GET_CLASS (comm))->extract (comm, + file_list, + dest_dir, + overwrite, + skip_older, + junk_paths); } diff -Nru gimageview-0.2.27/src/fr-command.h gimageview-0.3.0-0.20101117/src/fr-command.h --- gimageview-0.2.27/src/fr-command.h 2004-05-23 14:07:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-command.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,27 +19,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-command.h,v 1.11 2003/06/13 09:43:27 makeinu Exp $ + * $Id: fr-command.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_COMMAND_H #define FR_COMMAND_H - #include #include "fr-process.h" - -#define FR_COMMAND_TYPE fr_command_get_type () -#define FR_COMMAND(o) GTK_CHECK_CAST (o, FR_COMMAND_TYPE, FRCommand) -#define FR_COMMAND_CLASS(k) GTK_CHECK_CLASS_CAST (k, FR_COMMAND_TYPE, FRCommandClass) -#define IS_FR_COMMAND(o) GTK_CHECK_TYPE (o, FR_COMMAND_TYPE) - +#define FR_TYPE_COMMAND (fr_command_get_type ()) +#define FR_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND, FRCommand)) +#define FR_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND, FRCommandClass)) +#define FR_IS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND)) +#define FR_IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND)) +#define FR_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND, FRCommandClass)) typedef struct _FRCommand FRCommand; typedef struct _FRCommandClass FRCommandClass; - typedef enum { FR_ACTION_LIST, FR_ACTION_ADD, @@ -47,10 +45,9 @@ FR_ACTION_EXTRACT, } FRAction; - struct _FRCommand { - GtkObject __parent; + GObject __parent; GList *file_list; /* FileData elements */ /**/ @@ -69,10 +66,9 @@ char *filename; }; - struct _FRCommandClass { - GtkObjectClass __parent_class; + GObjectClass __parent_class; /**/ @@ -103,8 +99,7 @@ FRProcError error); }; - -GtkType fr_command_get_type (void); +GType fr_command_get_type (void); void fr_command_construct (FRCommand *comm, FRProcess *process, const char *filename); @@ -124,5 +119,4 @@ gboolean skip_older, gboolean junk_paths); - #endif /* FR_COMMAND_H */ diff -Nru gimageview-0.2.27/src/fr-process.c gimageview-0.3.0-0.20101117/src/fr-process.c --- gimageview-0.2.27/src/fr-process.c 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-process.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-process.c,v 1.11 2003/06/13 09:43:27 makeinu Exp $ + * $Id: fr-process.c 1139 2007-10-17 09:08:44Z makeinu $ */ #include @@ -34,7 +34,6 @@ #include #include #include "fr-process.h" -#include "gtk2-compat.h" #define REFRESH_RATE 100 @@ -46,12 +45,14 @@ LAST_SIGNAL }; -static GtkObjectClass *parent_class; static guint fr_process_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (FRProcess, fr_process, G_TYPE_OBJECT) + + static void -fr_process_destroy (GtkObject *object) +fr_process_dispose (GObject *object) { FRProcess *fr_proc; @@ -72,38 +73,37 @@ } /* Chain up */ - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (fr_process_parent_class)->dispose) + G_OBJECT_CLASS (fr_process_parent_class)->dispose (object); } static void fr_process_class_init (FRProcessClass *class) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) class; fr_process_signals[START] = - gtk_signal_new ("start", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRProcessClass, start), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("start", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRProcessClass, start), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); fr_process_signals[DONE] = - gtk_signal_new ("done", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (FRProcessClass, done), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - gtk_object_class_add_signals (object_class, fr_process_signals, - LAST_SIGNAL); + g_signal_new ("done", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (FRProcessClass, done), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); - object_class->destroy = fr_process_destroy; + gobject_class->dispose = fr_process_dispose; class->done = NULL; } @@ -128,36 +128,6 @@ fr_proc->running = FALSE; fr_proc->use_standard_locale = TRUE; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (fr_proc)); - gtk_object_sink (GTK_OBJECT (fr_proc)); -#endif -} - - -GtkType -fr_process_get_type (void) -{ - static GtkType fr_process_type = 0; - - if (! fr_process_type) { - GtkTypeInfo fr_process_info = { - "FRProcess", - sizeof (FRProcess), - sizeof (FRProcessClass), - (GtkClassInitFunc) fr_process_class_init, - (GtkObjectInitFunc) fr_process_init, - NULL, /* reserved_1 */ - NULL, /* reserved_2 */ - (GtkClassInitFunc) NULL - }; - - fr_process_type = gtk_type_unique (gtk_object_get_type (), - &fr_process_info); - } - - return fr_process_type; } @@ -165,7 +135,7 @@ fr_process_new (void) { FRProcess *fr_proc; - fr_proc = FR_PROCESS (gtk_type_new (fr_process_get_type ())); + fr_proc = FR_PROCESS (g_object_new (FR_TYPE_PROCESS, NULL)); return fr_proc; } @@ -299,9 +269,9 @@ if (pipe (pipe_fd) < 0) { fr_proc->error = FR_PROC_ERROR_PIPE; - gtk_signal_emit (GTK_OBJECT (fr_proc), - fr_process_signals[DONE], - fr_proc->error); + g_signal_emit (G_OBJECT (fr_proc), + fr_process_signals[DONE], 0, + fr_proc->error); return; } @@ -312,9 +282,9 @@ close (pipe_fd[1]); fr_proc->error = FR_PROC_ERROR_FORK; - gtk_signal_emit (GTK_OBJECT (fr_proc), - fr_process_signals[DONE], - fr_proc->error); + g_signal_emit (G_OBJECT (fr_proc), + fr_process_signals[DONE], 0, + fr_proc->error); return; } @@ -436,9 +406,9 @@ fr_proc->running = FALSE; - gtk_signal_emit (GTK_OBJECT (fr_proc), - fr_process_signals[DONE], - fr_proc->error); + g_signal_emit (G_OBJECT (fr_proc), + fr_process_signals[DONE], 0, + fr_proc->error); return FALSE; } @@ -471,8 +441,8 @@ fr_proc->row_output = NULL; } - gtk_signal_emit (GTK_OBJECT (fr_proc), - fr_process_signals[START]); + g_signal_emit (G_OBJECT (fr_proc), + fr_process_signals[START], 0); fr_proc->current_command = 0; start_current_command (fr_proc); @@ -503,7 +473,7 @@ fr_proc->running = FALSE; fr_proc->error = FR_PROC_ERROR_STOPPED; - gtk_signal_emit (GTK_OBJECT (fr_proc), - fr_process_signals[DONE], - fr_proc->error); + g_signal_emit (G_OBJECT (fr_proc), + fr_process_signals[DONE], 0, + fr_proc->error); } diff -Nru gimageview-0.2.27/src/fr-process.h gimageview-0.3.0-0.20101117/src/fr-process.h --- gimageview-0.2.27/src/fr-process.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/fr-process.h 2010-11-17 06:10:11.000000000 +0000 @@ -19,21 +19,22 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * $Id: fr-process.h,v 1.8 2003/06/13 09:43:28 makeinu Exp $ + * $Id: fr-process.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef FR_PROCESS_H #define FR_PROCESS_H #include -#include +#include #include #define FR_TYPE_PROCESS (fr_process_get_type ()) -#define FR_PROCESS(obj) (GTK_CHECK_CAST ((obj), FR_TYPE_PROCESS, FRProcess)) -#define FR_PROCESS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FR_TYPE_PROCESS, FRProcessClass)) -#define FR_IS_PROCESS(obj) (GTK_CHECK_TYPE ((obj), FR_TYPE_PROCESS)) -#define FR_IS_PROCESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FR_TYPE_PROCESS)) +#define FR_PROCESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_PROCESS, FRProcess)) +#define FR_PROCESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_PROCESS, FRProcessClass)) +#define FR_IS_PROCESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_PROCESS)) +#define FR_IS_PROCESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_PROCESS)) +#define FR_PROCESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_PROCESS, FRProcessClass)) #define FR_PROCCESS_BUFFER_SIZE 4096 @@ -54,7 +55,7 @@ typedef struct _FRProcessClass FRProcessClass; struct _FRProcess { - GtkObject __parent; + GObject __parent; GPtrArray *comm; GPtrArray *dir; @@ -81,7 +82,7 @@ }; struct _FRProcessClass { - GtkObjectClass __parent_class; + GObjectClass __parent_class; /* -- Signals -- */ @@ -91,7 +92,7 @@ FRProcError error); }; -GtkType fr_process_get_type (void); +GType fr_process_get_type (void); FRProcess * fr_process_new (void); void fr_process_clear (FRProcess *fr_proc); void fr_process_begin_command (FRProcess *fr_proc, diff -Nru gimageview-0.2.27/src/gfileutil.c gimageview-0.3.0-0.20101117/src/gfileutil.c --- gimageview-0.2.27/src/gfileutil.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gfileutil.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1966 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gfileutil.c,v 1.43 2004/09/21 08:44:31 makeinu Exp $ - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "charset.h" -#include "fileutil.h" -#include "fr-archive.h" -#include "gfileutil.h" -#include "gimv_comment.h" -#include "gimv_image.h" -#include "gimv_thumb.h" -#include "gimv_thumb_cache.h" -#include "gtkutils.h" -#include "intl.h" -#include "prefs.h" - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -#ifndef MAX_PATH_LEN -#define MAX_PATH_LEN 1024 -#endif - - -gchar * -add_slash (const gchar *path) -{ - g_return_val_if_fail (path, NULL); - - if (!*path) return g_strdup ("/"); - - if (path [strlen (path) - 1] == '/') - return g_strdup (path); - else - return g_strconcat (path, "/", NULL); -} - - -gchar * -remove_slash (const gchar *path) -{ - g_return_val_if_fail (path, NULL); - g_return_val_if_fail (*path, g_strdup (path)); - - if (path[strlen (path) - 1] == '/') - return g_dirname (path); - else - return g_strdup (path); -} - - -gboolean getting_dir = FALSE; -gboolean stop_getting_dir = FALSE; -static gchar* tmpdir = NULL; - - -gchar * -get_temp_dir_name (void) -{ - if (tmpdir) return tmpdir; - - tmpdir = g_strdup_printf ("%s%s.%d", - g_get_tmp_dir (), - "/gimv", - getpid ()); - return tmpdir; -} - - -void -remove_dir (const gchar *dirname) -{ - GList *node, *list; - - if (!isdir(dirname)) return; - - list = get_dir_all (dirname); - - for (node = list; node; node = g_list_next (node)) - remove (node->data); - - if (list) { - remove (dirname); - g_list_foreach (list, (GFunc) g_free, NULL); - g_list_free (list); - } -} - - -void -remove_temp_dir (void) -{ - if (!tmpdir) return; - - remove_dir (tmpdir); - - g_free (tmpdir); - tmpdir = NULL; -} - - -/* - * get_dir: - * @ Get image files in specified directory. - * - * dirname : Directory to scan. - * files : Pointer to OpenFiles struct for store directory list. - */ -void -get_dir (const gchar *dirname, GetDirFlags flags, - GList **filelist_ret, GList **dirlist_ret) -{ - DIR *dp; - struct dirent *entry; - gchar buf[MAX_PATH_LEN], *path; - GList *filelist = NULL, *dirlist = NULL, *list; - - g_return_if_fail (dirname && *dirname); - - getting_dir = TRUE; - - if (flags & GETDIR_DISP_STDERR) - fprintf (stderr, _("scandir = %s\n"), dirname); - else if (flags & GETDIR_DISP_STDOUT) - fprintf (stdout, _("scandir = %s\n"), dirname); - - if ((dp = opendir (dirname))) { - while ((entry = readdir (dp))) { - if (flags & GETDIR_ENABLE_CANCEL) { - while (gtk_events_pending()) gtk_main_iteration(); - if (stop_getting_dir) break; - } - - /* ignore dot file */ - if (!(flags & GETDIR_READ_DOT) && entry->d_name[0] == '.') - continue; - - /* get full path */ - if (dirname [strlen (dirname) - 1] == '/') - g_snprintf (buf, MAX_PATH_LEN, "%s%s", dirname, entry->d_name); - else - g_snprintf (buf, MAX_PATH_LEN, "%s/%s", dirname, entry->d_name); - - /* if path is file */ - if (!isdir (buf) || (!(flags & GETDIR_FOLLOW_SYMLINK) && islink (buf))) { - if (!filelist_ret) continue; - - if (!(flags & GETDIR_DETECT_EXT) - || gimv_image_detect_type_by_ext (buf) - || ((flags & GETDIR_GET_ARCHIVE) - && fr_archive_utils_get_file_name_ext (buf))) - { - path = g_strdup (buf); - - if (flags & GETDIR_DISP_STDERR) - fprintf (stderr, _("filename = %s\n"), path); - else if (flags & GETDIR_DISP_STDOUT) - fprintf (stdout, _("filename = %s\n"), path); - - filelist = g_list_append (filelist, path); - } - - /* if path is dir */ - } else if (isdir(buf)) { - if (dirlist_ret && strcmp(entry->d_name, ".") - && strcmp(entry->d_name, "..")) - { - path = g_strdup (buf); - - if (flags & GETDIR_DISP_STDERR) - fprintf (stderr, _("dirname = %s\n"), path); - else if (flags & GETDIR_DISP_STDOUT) - fprintf (stdout, _("dirname = %s\n"), path); - - dirlist = g_list_append (dirlist, path); - } - } - } - closedir (dp); - if (filelist) - filelist = g_list_sort (filelist, gtkutil_comp_spel); - if (dirlist) - dirlist = g_list_sort (dirlist, gtkutil_comp_spel); - } else { - g_warning ("cannot open directory: %s", dirname); - } - - /* recursive get */ - if (flags & GETDIR_RECURSIVE) { - GList *tmplist = g_list_copy (dirlist); - gint tmp_flags = flags | GETDIR_RECURSIVE_IS_BRANCH; - - list = tmplist; - while (list) { - GList *tmp_filelist = NULL, *tmp_dirlist = NULL; - if (flags & GETDIR_ENABLE_CANCEL) { - while (gtk_events_pending()) gtk_main_iteration(); - if (stop_getting_dir) break; - } - get_dir ((const gchar *) list->data, tmp_flags, - &tmp_filelist, &tmp_dirlist); - filelist = g_list_concat (filelist, tmp_filelist); - dirlist = g_list_concat (dirlist, tmp_dirlist); - list = g_list_next (list); - } - g_list_free (tmplist); - } - - /* return value */ - if (filelist_ret) - *filelist_ret = filelist; - if (dirlist_ret) - *dirlist_ret = dirlist; - - if (!(flags & GETDIR_RECURSIVE_IS_BRANCH)) { - getting_dir = FALSE; - stop_getting_dir = FALSE; - } -} - - -void -get_dir_stop (void) -{ - if (getting_dir) - stop_getting_dir = TRUE; -} - - -/* - * get_dir_all: - * @ - * - * dirname : - * Return : - */ -GList * -get_dir_all (const gchar *dirname) -{ - GList *filelist, *dirlist, *sub_dirlist, *node; - gchar *sub_dirname; - - get_dir (dirname, GETDIR_READ_DOT, &filelist, &dirlist); - - if (dirlist) { - node = dirlist; - while (node) { - sub_dirname = node->data; - sub_dirlist = get_dir_all (sub_dirname); - if (sub_dirlist) - filelist = g_list_concat (sub_dirlist, filelist); - node = g_list_next (node); - } - filelist = g_list_concat (filelist, dirlist); - } - return filelist; -} - - -/* - * get_dir_all_file: - * @ - * - * dirname : - * Return : - */ -static GList * -get_dir_all_file (const gchar *dirname) -{ - GList *filelist, *dirlist, *sub_dirlist, *node; - gchar *sub_dirname; - - get_dir (dirname, GETDIR_READ_DOT, &filelist, &dirlist); - - if (dirlist) { - node = dirlist; - while (node) { - sub_dirname = node->data; - sub_dirlist = get_dir_all_file (sub_dirname); - if (sub_dirlist) - filelist = g_list_concat (sub_dirlist, filelist); - node = g_list_next (node); - } - } - return filelist; -} - - -/* - * merge from misc/misc.c in Text maid (Copyright(C) Kazuki Iwamoto). - */ -gchar * -relpath2abs (const gchar *path) -{ - gchar *dir, *dest; - gint i,j,len; - - g_return_val_if_fail (path && *path, NULL); - - if (path[0] != '/') { - dir = g_get_current_dir (); - dest = g_strjoin ("/", dir, path, NULL); - g_free (dir); - } else { - dest = g_strdup (path); - } - - len = strlen (dest) + 1; - i = 0; - while (i < len - 2) { - if (dest[i] == '/' && dest[i + 1] == '.' - && (dest[i + 2] == '/' || dest[i + 2] == '\0')) - { - len -= 2; - memmove (dest + i, dest + i + 2, len - i); - } - - i++; - } - - i = 0; - while (i < len - 3) { - if (dest[i] == '/' && dest[i + 1] == '.' && dest[i + 2] == '.' - && (dest[i + 3] == '/' || dest[i + 3] == '\0')) - { - len -= 3; - memmove (dest + i, dest + i + 3, len - i); - for (j = i - 1; j >= 0; j--) { - if (dest[j] == '/') - break; - } - if (j >= 0) { - memmove (dest + j, dest + i, len - i); - len -= i - j; - i = j; - } - } - - i++; - } - - return dest; -} - - -gchar * -link2abs (const gchar *path) -{ - gchar *retval = NULL, **dirs, buf[MAX_PATH_LEN], *tmpstr; - gint i, num; - - g_return_val_if_fail (path && *path, NULL); - g_return_val_if_fail (path[0] == '/', g_strdup (path)); - - if (!strcmp (path, "/")) return g_strdup (path); - - dirs = g_strsplit (path, "/", -1); - g_return_val_if_fail (dirs, g_strdup (path)); - - retval = g_strdup(""); - for (i = 0; dirs[i]; i++) { - gchar *endchr; - - if (!*dirs[i]) continue; - - tmpstr = g_strconcat (retval, "/", dirs[i], NULL); - g_free (retval); - retval = tmpstr; - - num = readlink (retval, buf, MAX_PATH_LEN); - if (num < 1) continue; - - buf[num] = '\0'; - if (buf[0] == '/') { - g_free (retval); - retval = g_strdup (buf); - } else { - endchr = strrchr (retval, '/'); - if (!endchr) { - g_free (retval); - retval = g_strdup (path); - break; - } - *endchr = '\0'; - /* FIXME: what about link to link? */ - tmpstr = g_strconcat (retval, "/", buf, NULL); - g_free (retval); - retval = tmpstr; - } - } - - g_strfreev (dirs); - - if (!retval) { - g_warning ("invalid link: %s\n", path); - } else { - tmpstr = relpath2abs (retval); - g_free (retval); - retval = tmpstr; - } - - return retval; -} - - -static gboolean -move_file_check_path (const gchar *from_path, - struct stat *from_st, - const gchar *dir, - gboolean show_error, - GtkWindow *window) -{ - gchar *from_dir, error_message[BUF_SIZE]; - gchar *from_path_internal, *dir_internal; - gboolean retval = FALSE; - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - dir_internal = charset_to_internal (dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /******************** - * check source file - ********************/ - if (lstat (from_path, from_st)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't find source file :\n%s"), - from_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - - /***************** - * check dest dir - *****************/ - if (!iswritable (dir)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't move file : %s\n" - "Permission denied: %s\n"), - from_path_internal, dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - - /******************* - * check source dir - *******************/ - from_dir = g_dirname (from_path); - if (!iswritable (from_dir)) { - if (show_error) { - gchar *from_dir_internal; - - from_dir_internal = charset_to_internal (from_dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - g_snprintf (error_message, BUF_SIZE, - _("Can't move file : %s\n" - "Permission denied: %s\n"), - from_path_internal, from_dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - - g_free (from_dir_internal); - } - g_free (from_dir); - goto ERROR; - } - g_free (from_dir); - - retval = TRUE; - -ERROR: - g_free (from_path_internal); - g_free (dir_internal); - return retval; -} - - -static gboolean -move_file_check_over_write (const gchar *from_path, - struct stat *from_st, - const gchar *to_path, - struct stat *to_st, - gchar *new_path, gint new_path_len, - ConfirmType *action, - gboolean show_error, - GtkWindow *window) -{ - gchar error_message[BUF_SIZE], *to_path_internal; - gint exist; - gboolean retval = FALSE; - - if (new_path) - new_path[0] = '\0'; - - to_path_internal = charset_to_internal (to_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - exist = !lstat(to_path, to_st); - if (exist && (!strcmp (from_path, to_path) - || from_st->st_ino == to_st->st_ino)) - { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Same file :\n%s"), to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - - } else if (exist && *action == CONFIRM_ASK) { - if (isdir (from_path)) { - g_snprintf (error_message, BUF_SIZE, - _("File exist : %s"), to_path_internal); - gtkutil_message_dialog (_("ERROR!!"), error_message, window); - - } else { - g_snprintf (error_message, BUF_SIZE, - _("The file exists : %s\n" - "Overwrite?"), - to_path_internal); - *action = gtkutil_overwrite_confirm_dialog (_("File exist!!"), error_message, - to_path, from_path, - new_path, MAX_PATH_LEN, - ConfirmDialogMultipleFlag, - window); - } - } - - if (new_path && *new_path) { - retval = TRUE; - } else { - switch (*action) { - case CONFIRM_YES: - case CONFIRM_YES_TO_ALL: - retval = TRUE; - break; - case CONFIRM_NO: - case CONFIRM_CANCEL: - retval = FALSE; - break; - case CONFIRM_NO_TO_ALL: - if (exist) - retval = FALSE; - else - retval = TRUE; - break; - default: - if (!exist) - retval = TRUE; - else - retval = FALSE; - break; - } - } - -ERROR: - g_free (to_path_internal); - return retval; -} - - -/* - * move_file: - * @ - * - * from_path : - * dir : - * action : - * show_error : - * Return : TRUE if success to move file. - */ -gboolean -move_file (const gchar *from_path, const gchar *dir, - ConfirmType *action, gboolean show_error, - GtkWindow *window) -{ - gchar *to_path, error_message[BUF_SIZE]; - struct stat from_st, to_st, todir_st; - struct utimbuf ut; - gboolean move_file = FALSE, move_faild = FALSE, copy_success = FALSE, retval; - gchar *from_path_internal, *to_path_internal, new_path[MAX_PATH_LEN]; - - new_path[0] = '\0'; - - g_return_val_if_fail (action, FALSE); - - retval = move_file_check_path (from_path, &from_st, dir, show_error, window); - if (!retval) return FALSE; - - /* set dest path */ - to_path = g_strconcat (dir, g_basename (from_path), NULL); - - move_file = move_file_check_over_write (from_path, &from_st, - to_path, &to_st, - new_path, MAX_PATH_LEN, - action, show_error, - window); - if (!move_file) { - retval = FALSE; - goto ERROR0; - } - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - if (*new_path) { - g_free (to_path); - to_path = g_strdup (new_path); - } - to_path_internal = charset_to_internal (to_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /************** - * move file!! - **************/ - stat (dir, &todir_st); - if (from_st.st_dev != todir_st.st_dev) { - copy_success = copy_file_to_file (from_path, to_path, action, show_error, - window); - if (copy_success) { - /* reset new file's time info */ - ut.actime = from_st.st_atime; - ut.modtime = from_st.st_mtime; - utime(to_path, &ut); - - /* remove old file */ - if (remove (from_path) < 0) { /* faild to remove file */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Faild to remove file :\n" - "%s"), - from_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR1; - } - } else { - move_faild = TRUE; - } - } else { - move_faild = rename (from_path, to_path); - } - - /************************ - * if faild to move file - ************************/ - if (move_faild) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Faild to move file :\n" - "From : %s\n" - "To : %s"), - from_path_internal, to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - } - -ERROR1: - g_free (from_path_internal); - g_free (to_path_internal); -ERROR0: - g_free (to_path); - return retval; -} - - -static gboolean -copy_dir_check_source (const gchar *from_dir, gboolean show_error, - GtkWindow *window) -{ - gchar error_message[BUF_SIZE], *from_dir_internal; - gboolean retval = TRUE; - - from_dir_internal = charset_to_internal (from_dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (islink (from_dir)) { /* check path is link or not */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("%s is link!!.\n"), - from_dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR; - } - - if (!file_exists (from_dir)) { /* check path exists or not */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't find source file :\n%s"), - from_dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR; - } - - if (!isdir (from_dir)) { /* check path is directory or not */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("%s is not directory!!.\n"), - from_dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR; - } - -ERROR: - g_free (from_dir_internal); - return TRUE; -} - - -static gboolean -copy_dir_check_dest (const gchar *from_path, const gchar *dirname, - const gchar *to_dir, gboolean show_error, - GtkWindow *window) -{ - gchar error_message[BUF_SIZE]; - gchar *from_path_internal, *dirname_internal, *to_dir_internal; - gboolean retval = TRUE; - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - dirname_internal = charset_to_internal (dirname, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - to_dir_internal = charset_to_internal (to_dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (!iswritable (dirname)) { /* check permission */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't copy directory : %s\n" - "Permission denied: %s\n"), - from_path_internal, - dirname_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR; - } - - if (file_exists (to_dir)) { /* check dest path */ - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("File exists!! : %s\n"), - to_dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - retval = FALSE; - goto ERROR; - } - -ERROR: - g_free (from_path_internal); - g_free (dirname_internal); - g_free (to_dir_internal); - - return retval; -} - - -/* - * copy_dir: - * @ - * - * from_path : - * dir : - * action : - * show_error : - * Return : TRUE if success to copy directory. - */ -static gboolean -copy_dir (const gchar *from_path, const gchar *dir, - ConfirmType *action, gboolean show_error, - GtkWindow *window) -{ - GtkWidget *progress_win; - gchar message[BUF_SIZE]; - GList *filelist, *node; - gchar *from_dir, *to_dir, *to_path, *dirname; - ConfirmType confirm; - gboolean result, cancel = FALSE; - gfloat progress; - gint pos, length; - - from_dir = g_strdup (from_path); - if (from_dir[strlen (from_dir) - 1] == '/') - from_dir[strlen (from_dir) - 1] = '\0'; - - dirname = g_strdup (dir); - if (dirname[strlen (dirname) - 1] == '/') - dirname[strlen (dirname) - 1] = '\0'; - - to_dir = g_strconcat (dirname, "/", g_basename (from_dir), NULL); - - /******************* - * check source dir - *******************/ - result = copy_dir_check_source (from_dir, show_error, window); - if (!result) goto ERROR; - - /***************** - * check dest dir - *****************/ - result = copy_dir_check_dest (from_path, dirname, to_dir, show_error, window); - g_free (dirname); - if (!result) goto ERROR; - - - /**************** - * do copy files - ****************/ - filelist = node = get_dir_all_file (from_path); - confirm = CONFIRM_YES_TO_ALL; - - progress_win = gtkutil_create_progress_window (_("Copy directory"), "...", - &cancel, 300, -1, window); - gtk_grab_add (progress_win); - length = g_list_length (filelist); - - while (node) { - guint len; - gchar *filename = node->data; - gchar *tmpstr; - - while (gtk_events_pending()) gtk_main_iteration(); - - pos = g_list_position (filelist, node); - progress = (gfloat) pos / (gfloat) length; - - { /********** convert charset **********/ - gchar *filename_internal; - - filename_internal = charset_to_internal (filename, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - g_snprintf (message, BUF_SIZE, _("Copying %s ..."), - filename_internal); - - g_free (filename_internal); - } - - gtkutil_progress_window_update (progress_win, _("Copying directory"), - message, NULL, progress); - - len = strlen (from_path); - - if (strlen (filename) > len) { - tmpstr = filename + len; - if (tmpstr[0] == '/') tmpstr++; - to_path = g_strconcat (to_dir, "/", tmpstr, NULL); - - /* realy do copy :-) */ - mkdirs (to_path); - copy_file_to_file (filename, to_path, &confirm, show_error, window); - - g_free (to_path); - } - - node = g_list_next (node); - } - - gtk_grab_remove (progress_win); - gtk_widget_destroy (progress_win); - - g_list_foreach (filelist, (GFunc) g_free, NULL); - g_list_free (filelist); - - g_free (from_dir); - g_free (to_dir); - - return TRUE; - -ERROR: - g_free (from_dir); - g_free (to_dir); - return FALSE; -} - - -/* - * copy_file_to_file: - * @ - * - * from_path : - * to_path : - * action : - * show_error : - * Return : TRUE if success to copy file. - */ -gboolean -copy_file_to_file (const gchar *from_path, const gchar *to_path, - ConfirmType *action, gboolean show_error, - GtkWindow *window) -{ - gint b; - gchar buf[BUFSIZ], *from_path_internal, *to_path_internal; - gchar error_message[BUF_SIZE]; - FILE *from, *to; - struct stat from_st, to_st; - gint exist; - gchar new_path[MAX_PATH_LEN]; - - new_path[0] = '\0'; - - g_return_val_if_fail (action, FALSE); - - /******************** - * check source file - ********************/ - if (isdir (from_path)) { - return copy_dir (from_path, to_path, action, show_error, window); - } - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - to_path_internal = charset_to_internal (to_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (lstat (from_path, &from_st)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't find source file :\n%s"), - from_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - - /****************** - * check dest file - ******************/ - exist = !lstat(to_path, &to_st); - if (exist && (!strcmp (from_path, to_path) - || from_st.st_ino == to_st.st_ino)) - { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Same file :\n%s"), - to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - - } else if (exist && *action == CONFIRM_ASK) { - g_snprintf (error_message, BUF_SIZE, - _("The file exists : %s\n" - "Overwrite?"), - to_path_internal); - *action = gtkutil_overwrite_confirm_dialog (_("File exist!!"), error_message, - to_path, from_path, - new_path, MAX_PATH_LEN, - ConfirmDialogMultipleFlag, - window); - } - - if (*new_path) { - g_free (to_path_internal); - to_path = new_path; - to_path_internal = charset_to_internal (to_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - } else { - switch (*action) { - case CONFIRM_YES: - case CONFIRM_YES_TO_ALL: - break; - case CONFIRM_NO: - case CONFIRM_CANCEL: - goto ERROR; - break; - case CONFIRM_NO_TO_ALL: - if (exist) - goto ERROR; - break; - default: - if (exist) - goto ERROR; - break; - } - } - - /********** - * do copy - **********/ - from = fopen (from_path, "rb"); - if (!from) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't open file for read :\n%s"), - to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - - to = fopen (to_path, "wb"); - if (!to) { - fclose (from); - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't open file for write :\n%s"), - to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - - while ((b = fread (buf, sizeof (char), BUFSIZ, from)) > 0) { - fwrite (buf, sizeof (char), b, to); - if (ferror (to)) { - fclose (from); - fclose (to); - - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("An error occured while copying file :\n%s"), - to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR; - } - } - - fclose (from); - fclose (to); - - g_free (to_path_internal); - g_free (from_path_internal); - return TRUE; - -ERROR: - g_free (to_path_internal); - g_free (from_path_internal); - return FALSE; -} - - -/* - * copy_file: - * @ - * - * from_path : - * dir : - * action : - * show_error : - * Return : TRUE if success to copy file. - */ -gboolean -copy_file (const gchar *from_path, const gchar *dir, - ConfirmType *action, gboolean show_error, - GtkWindow *window) -{ - gchar *to_path; - gboolean retval; - gchar error_message[BUF_SIZE]; - - g_return_val_if_fail (action, FALSE); - - /* check source file is directory or not */ - if (isdir (from_path)) { - return copy_dir (from_path, dir, action, show_error, window); - } - - /***************** - * check dest dir - *****************/ - if (!iswritable (dir)) { - if (show_error) { - gchar *from_path_internal, *dir_internal; - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - dir_internal = charset_to_internal (dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - g_snprintf (error_message, BUF_SIZE, - _("Can't copy file : %s\n" - "Permission denied: %s\n"), - from_path_internal, dir_internal); - - gtkutil_message_dialog (_("Error!!"), error_message, window); - - g_free (from_path_internal); - g_free (dir_internal); - } - return FALSE; - } - - to_path = g_strconcat (dir, g_basename (from_path), NULL); - retval = copy_file_to_file (from_path, to_path, action, show_error, window); - g_free (to_path); - - return retval; -} - - -/* - * link_file: - * @ - * - * from_path : - * dir : - * action : - * show_error : - * Return : TRUE if success to link file. - */ -gboolean -link_file (const gchar *from_path, const gchar *dir, - gboolean show_error, GtkWindow *window) -{ - gchar *to_path, *to_path_internal, *from_path_internal, *dir_internal; - struct stat from_st, to_st; - gboolean link_faild; - gchar error_message[BUF_SIZE]; - - from_path_internal = charset_to_internal (from_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - dir_internal = charset_to_internal (dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /******************** - * check source file - ********************/ - if (lstat (from_path, &from_st)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't find source file :\n%s"), - from_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR0; - } - - /***************** - * check dest dir - *****************/ - if (!iswritable (dir)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Can't create link : %s\n" - "Permission denied: %s\n"), - from_path_internal, dir_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR0; - } - - to_path = g_strconcat(dir_internal, g_basename(from_path), NULL); - to_path_internal = charset_to_internal (to_path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /****************** - * check dest path - ******************/ - if (!lstat (to_path, &to_st)) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("File exist : %s"), - to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR1; - } - - link_faild = symlink(from_path, to_path); - - if (link_faild) { - if (show_error) { - g_snprintf (error_message, BUF_SIZE, - _("Faild to create link :\n" - "From : %s\n" - "To : %s"), - from_path_internal, to_path_internal); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - goto ERROR1; - } - - g_free (to_path); - g_free (to_path_internal); - g_free (from_path_internal); - g_free (dir_internal); - return TRUE; - -ERROR1: - g_free (to_path); - g_free (to_path_internal); -ERROR0: - g_free (from_path_internal); - g_free (dir_internal); - return FALSE; -} - - - -static gchar * -get_dest_cache_dir (const gchar *src_file, - const gchar *dest_dir, - const gchar *cache_type) -{ - gchar *dest_file, *dest_cache_dir; - - if (!src_file || !dest_dir || !cache_type) return NULL; - - dest_file = g_strconcat (dest_dir, g_basename (src_file), NULL); - dest_cache_dir = gimv_thumb_cache_get_path (dest_file, cache_type); - - if (dest_cache_dir) { - gchar *endchr; - - endchr = strrchr (dest_cache_dir, '/'); - if (endchr) { - *(endchr + 1) = '\0'; - mkdirs (dest_cache_dir); - } else { - g_free (dest_cache_dir); - dest_cache_dir = NULL; - } - } - g_free (dest_file); - - return dest_cache_dir; -} - - -static gchar * -get_dest_comment_dir (const gchar *src_file, - const gchar *dest_dir) -{ - gchar *dest_file, *dest_comment_dir; - - if (!src_file || !dest_dir) return NULL; - - dest_file = g_strconcat (dest_dir, g_basename (src_file), NULL); - dest_comment_dir = gimv_comment_get_path (dest_file); - - if (dest_comment_dir) { - gchar *endchr; - - endchr = strrchr (dest_comment_dir, '/'); - if (endchr) { - *(endchr + 1) = '\0'; - mkdirs (dest_comment_dir); - } else { - g_free (dest_comment_dir); - dest_comment_dir = NULL; - } - } - g_free (dest_file); - - return dest_comment_dir; -} - - -static gboolean -do_file_operate (const gchar *src_file, - const gchar *dest_dir, - ConfirmType *over_write, - FileOperateType action, - GtkWidget *progress_win, - gfloat progress, - GtkWindow *window) -{ - gchar *src_cache, *dest_cache_dir; - gchar *src_comment, *dest_comment_dir; - gchar *cache_type; - gchar *src_file_internal; - struct stat src_st, dest_st; - ConfirmType cache_over_write = CONFIRM_YES_TO_ALL; - gboolean success = TRUE, delete_src = FALSE, result; - gchar message[BUF_SIZE]; - - /* FIXME!! */ /* get cache file & dir */ - src_cache = gimv_thumb_find_thumbcache (src_file, &cache_type); - dest_cache_dir = get_dest_cache_dir (src_file, dest_dir, cache_type); - src_comment = gimv_comment_find_file (src_file); - dest_comment_dir = get_dest_comment_dir (src_file, dest_dir); - - /* if move to different file system, change to copy */ - lstat (src_file, &src_st); - lstat (dest_dir, &dest_st); - if (src_st.st_dev != dest_st.st_dev && action == FILE_MOVE ) { - action = FILE_COPY; - delete_src = TRUE; - } - - src_file_internal = charset_to_internal (src_file, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - switch (action) { - case FILE_MOVE: - g_snprintf (message, BUF_SIZE, - _("Moving %s ..."), src_file_internal); - gtkutil_progress_window_update (progress_win, _("Moving files"), - message, NULL, progress); - result = move_file (src_file, dest_dir, over_write, TRUE, window); - - if (!result) - success = FALSE; - - /* FIXME!! */ /* move cache file */ - if (result && src_cache && dest_cache_dir) - move_file (src_cache, dest_cache_dir, &cache_over_write, FALSE, window); - if (result && src_comment && dest_comment_dir) - move_file (src_comment, dest_comment_dir, &cache_over_write, FALSE, window); - - break; - - case FILE_COPY: - { - gboolean delete_src_cache = FALSE, delete_src_comment = FALSE; - - g_snprintf (message, BUF_SIZE, - _("Copying %s ..."), src_file_internal); - gtkutil_progress_window_update (progress_win, _("Copying files"), - message, NULL, progress); - result = copy_file (src_file, dest_dir, over_write, TRUE, window); - - if (!result) - success = FALSE; - - /* FIXME!! */ /* copy cache file */ - if (result && src_cache && dest_cache_dir) { - if (copy_file (src_cache, dest_cache_dir, &cache_over_write, FALSE, window)) - delete_src_cache = TRUE; - } - if (result && src_comment && dest_comment_dir) { - if (copy_file (src_comment, dest_comment_dir, &cache_over_write, FALSE, window)) - delete_src_comment = TRUE; - } - - /* FIXME: delete src? */ - if (result && delete_src) { - GList *delete_file_list = NULL; - delete_file_list = g_list_append (delete_file_list, (gpointer) src_file); - if (delete_src_cache) - delete_file_list = g_list_append (delete_file_list, src_cache); - if (delete_src_comment) - delete_file_list = g_list_append (delete_file_list, src_comment); - if (delete_file_list) - delete_files (delete_file_list, CONFIRM_YES, window); - g_list_free (delete_file_list); - } - - break; - } - case FILE_LINK: - g_snprintf (message, BUF_SIZE, - _("Creating Link %s ..."), src_file_internal); - gtkutil_progress_window_update (progress_win, _("Creating Links"), - message, NULL, progress); - result = link_file (src_file, dest_dir, TRUE, window); - - if (!result) - success = FALSE; - - /* FIXME!! */ /* link cache file */ - if (result && src_cache && dest_cache_dir) - link_file (src_cache, dest_cache_dir, FALSE, window); - if (result && src_comment && dest_comment_dir) - link_file (src_comment, dest_comment_dir, FALSE, window); - - break; - - default: - success = FALSE; - break; - } - - g_free (src_file_internal); - - /* FIXME!! */ - g_free (src_cache); - g_free (dest_cache_dir); - g_free (src_comment); - g_free (dest_comment_dir); - - return success; -} - - -gboolean -files2dir (GList *filelist, const gchar *dir, FileOperateType action, GtkWindow *window) -{ - GtkWidget *progress_win; - GList *node; - ConfirmType over_write = CONFIRM_ASK; - gboolean success = TRUE, cancel = FALSE, result; - gchar message[BUF_SIZE], *src_file, *dest_dir, *dir_internal; - gint length, pos; - gfloat progress; - - g_return_val_if_fail (filelist, FALSE); - g_return_val_if_fail (dir, FALSE); - - dir_internal = charset_to_internal (dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /***************** - * check dest dir - *****************/ - if (!file_exists (dir)) { - g_snprintf (message, BUF_SIZE, - _("Directory doesn't exist!!: %s"), - dir_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - goto ERROR; - } - if (!iswritable (dir)) { - g_snprintf (message, BUF_SIZE, - _("Permission denied!!: %s"), - dir_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - goto ERROR; - } - - /* add "/" character */ - if (dir[strlen(dir) - 1] == '/') - dest_dir = g_strdup (dir); - else - dest_dir = g_strconcat (dir, "/", NULL); - - /* create progress window */ - progress_win = gtkutil_create_progress_window ("File Operation", "...", - &cancel, 300, -1, window); - gtk_grab_add (progress_win); - - /* do file operation */ - length = g_list_length (filelist); - for (node = filelist; node; node = g_list_next (node)) { - src_file = node->data; - - while (gtk_events_pending()) gtk_main_iteration(); - - pos = g_list_position (filelist, node); - progress = (gfloat) pos / (gfloat) length; - - result = do_file_operate (src_file, dest_dir, &over_write, action, - progress_win, progress, window); - if (!result) - success = FALSE; - - /* cancel */ - if (cancel || (over_write == CONFIRM_CANCEL)) break; - - /* reset to CONFIRM_ASK mode */ - if (over_write != CONFIRM_YES_TO_ALL && over_write != CONFIRM_NO_TO_ALL) { - over_write = CONFIRM_ASK; - } - } - - gtk_grab_remove (progress_win); - gtk_widget_destroy (progress_win); - - g_free (dest_dir); - g_free (dir_internal); - - return success; - -ERROR: - g_free (dir_internal); - return FALSE; -} - - -gboolean -files2dir_with_dialog (GList *filelist, gchar **default_dir, FileOperateType action, - GtkWindow *window) -{ - gchar *dir; - gboolean retval = FALSE; - gchar *title, *label, *tmpstr; - - g_return_val_if_fail (filelist, FALSE); - g_return_val_if_fail (default_dir, FALSE); - - if (!*default_dir) - *default_dir = g_strdup (g_getenv("HOME")); - - switch (action) { - case FILE_MOVE: - title = _("Move files to..."); - label = _("Move files to: "); - break; - case FILE_COPY: - title = _("Copy files to..."); - label = _("Copy files to: "); - break; - case FILE_LINK: - title = _("Link files to..."); - label = _("Link files to: "); - break; - default: - dir = *default_dir; - goto FUNC_END; - break; - } - - tmpstr = charset_to_internal (*default_dir, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - dir = gtkutil_modal_file_dialog (title, tmpstr, MODAL_FILE_DIALOG_DIR_ONLY, window); - g_free (tmpstr); - tmpstr = NULL; - - if (dir) { - if (dir[strlen(dir) - 1] != '/') { - tmpstr = dir; - dir = g_strconcat (dir, "/", NULL); - g_free (tmpstr); - } - - tmpstr = dir; - dir = charset_internal_to_locale (dir); - g_free (tmpstr); - - retval = files2dir (filelist, dir, action, window); - } - -FUNC_END: - if (*default_dir != dir) - g_free (*default_dir); - *default_dir = dir; - - return retval; -} - - -gboolean -delete_dir (const gchar *path, GtkWindow *window) -{ - gboolean exist, cancel, not_empty = FALSE; - struct stat st; - gchar message[BUF_SIZE], *path_internal; - GList *filelist, *listnode; - gint length, pos; - gfloat progress; - GtkWidget *progress_win; - ConfirmType action; - - g_return_val_if_fail (path && *path, FALSE); - - path_internal = charset_to_internal (path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - /* check direcotry exist or not */ - exist = !lstat (path, &st); - if (!exist) { - g_snprintf (message, BUF_SIZE, - _("Directory not exist : %s"), path_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - goto ERROR; - } - - /* check path is link or not */ - if (islink (path)) { - g_snprintf (message, BUF_SIZE, - _("%s is symbolic link.\n" - "Remove link ?"), path_internal); - action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), - message, 0, window); - if (action == CONFIRM_YES) { - remove (path); - } - goto SUCCESS; - } - - /* confirm */ - g_snprintf (message, BUF_SIZE, - _("Delete %s\n" - "OK?"), path_internal); - action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), - message, 0, window); - if (action != CONFIRM_YES) goto ERROR; - - /* remove sub directories recursively */ - filelist = get_dir_all (path); - if (filelist) { - g_snprintf (message, BUF_SIZE, - _("%s is not empty\n" - "Delete all files under %s ?"), - path_internal, path_internal); - action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), - message, 0, window); - if (action != CONFIRM_YES) goto ERROR; - - /* create progress bar */ - progress_win = gtkutil_create_progress_window ("Delete File", "Deleting Files", - &cancel, 300, -1, window); - gtk_grab_add (progress_win); - - length = g_list_length (filelist); - listnode = filelist; - - while (listnode) { - - /* update progress */ - pos = g_list_position (filelist, listnode); - if ((pos % 50) == 0) { - while (gtk_events_pending()) gtk_main_iteration(); - - pos = g_list_position (filelist, listnode); - progress = (gfloat) pos / (gfloat) length; - - { /********** convert charset **********/ - gchar *tmpstr; - tmpstr = charset_to_internal (listnode->data, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - g_snprintf (message, BUF_SIZE, - _("Deleting %s ..."), - tmpstr); - g_free (tmpstr); - } - - gtkutil_progress_window_update (progress_win, NULL, - message, NULL, progress); - } - - /* remove a file */ - if (remove ((gchar *) listnode->data) < 0) - not_empty = TRUE; - listnode = g_list_next (listnode); - - /* cancel */ - if (cancel) break; - } - gtk_grab_remove (progress_win); - gtk_widget_destroy (progress_win); - - g_list_foreach (filelist, (GFunc) g_free, NULL); - g_list_free (filelist); - } - - /* remove the directory */ - if (not_empty) { - g_snprintf (message, BUF_SIZE, - _("Faild to remove directory :\n" - "%s is not empty."), path_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - } else if (remove (path) < 0) { - g_snprintf (message, BUF_SIZE, - _("Faild to remove directory : %s"), path_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - } - -SUCCESS: - g_free (path_internal); - return TRUE; - -ERROR: - g_free (path_internal); - return FALSE; -} - - -gboolean -delete_files (GList *filelist, ConfirmType confirm, GtkWindow *window) -{ - GtkWidget *progress_win = NULL; - GList *node; - gboolean cancel = FALSE, dialog = FALSE; - gint pos, length; - gfloat progress; - gchar message[BUF_SIZE], *dirname; - - g_return_val_if_fail (filelist, FALSE); - - length = g_list_length (filelist); - - if (confirm == CONFIRM_ASK) - dialog = TRUE; - - if (dialog) { - g_snprintf (message, BUF_SIZE, - _("Delete these %d files.\n" - "OK?"), - length); - confirm = gtkutil_confirm_dialog (_("Confirm Deleting Files"), - message, 0, window); - } - - if (!(confirm == CONFIRM_YES || confirm == CONFIRM_YES_TO_ALL)) { - return FALSE; - } - - if (dialog) { - progress_win = gtkutil_create_progress_window (_("Delete File"), - _("Deleting Files"), - &cancel, 300, -1, window); - gtk_grab_add (progress_win); - } - - node = filelist; - while (node) { - gchar *filename = node->data, *filename_internal, *dirname_internal; - - node = g_list_next (node); - if (!filename || !*filename) continue; - - filename_internal = charset_to_internal (filename, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - while (gtk_events_pending()) gtk_main_iteration(); - - pos = g_list_position (filelist, node); - progress = (gfloat) pos / (gfloat) length; - - if (dialog && progress_win) { - g_snprintf (message, BUF_SIZE, _("Deleting %s ..."), - filename_internal); - gtkutil_progress_window_update (progress_win, NULL, - message, NULL, progress); - } - - dirname = g_dirname (filename); - dirname_internal = charset_to_internal (dirname, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (!iswritable (dirname)) { - g_snprintf (message, BUF_SIZE, - _("Permission denied : %s"), dirname_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - - } else { /* remove file!! */ - gboolean success; - gint ret; - - if (isdir (filename)) { - success = delete_dir (filename, window); - } else { - ret = remove (filename); - if (ret < 0) - success = FALSE; - else - success = TRUE; - } - - if (!success) { - g_snprintf (message, BUF_SIZE, - _("Faild to delete file :\n%s"), - filename_internal); - gtkutil_message_dialog (_("Error!!"), message, window); - } - } - - g_free (dirname); - g_free (dirname_internal); - g_free (filename_internal); - dirname = NULL; - dirname_internal = NULL; - filename_internal = NULL; - - /* cancel */ - if (cancel) break; - } - - if (dialog && progress_win) { - gtk_grab_remove (progress_win); - gtk_widget_destroy (progress_win); - } - - return TRUE; -} - -gboolean -make_dir_dialog (const gchar *parent_dir, GtkWindow *window) -{ - gchar *dirname, *path, *parent_path, *tmpstr; - gboolean success = FALSE, exist; - struct stat st; - gchar error_message[BUF_SIZE]; - - g_return_val_if_fail (parent_dir && *parent_dir, FALSE); - - parent_path = add_slash (parent_dir); - - if (!iswritable (parent_path)) { - g_snprintf (error_message, BUF_SIZE, - _("Permission denied : %s"), parent_path); - gtkutil_message_dialog (_("Error!!"), error_message, window); - goto ERROR0; - } - - dirname = gtkutil_popup_textentry (_("Make directory"), - _("New directory name: "), - NULL, NULL, -1, 0, window); - if (!dirname) goto ERROR0; - - tmpstr = charset_internal_to_locale (dirname); - g_free (dirname); - dirname = tmpstr; - path = g_strconcat (parent_path, dirname, NULL); - - exist = !lstat (path, &st); - if (exist) { - if (isdir (path)) - g_snprintf (error_message, BUF_SIZE, - _("Directory exist : %s"), path); - else - g_snprintf (error_message, BUF_SIZE, - _("File exist : %s"), path); - gtkutil_message_dialog (_("Error!!"), error_message, window); - g_free (path); - goto ERROR1; - } - - success = makedir (path); - if (!success) { - g_snprintf (error_message, BUF_SIZE, - _("Faild to create directory : %s"), path); - gtkutil_message_dialog (_("Error!!"), error_message, window); - } - - ERROR1: - g_free (path); - ERROR0: - g_free (parent_path); - - return success; -} - - -gboolean -rename_dir_dialog (const gchar *dir, GtkWindow *window) -{ - gboolean exist, success = FALSE; - struct stat st; - gchar message[BUF_SIZE]; - gchar *path, *parent_dir, *dirname, *src_path, *src_file_internal; - gchar *dest_path, *tmpstr; - - g_return_val_if_fail (dir && *dir, FALSE); - - path = add_slash (dir); - - /* check direcotry */ - exist = !lstat (path, &st); - if (!exist) { - g_snprintf (message, BUF_SIZE, - _("Directory not exist :%s"), path); - gtkutil_message_dialog (_("Error!!"), message, window); - goto ERROR0; - } - - src_path = remove_slash (path); - parent_dir = g_dirname (src_path); - - /* popup rename directory dialog */ - src_file_internal = charset_locale_to_internal (g_basename (src_path)); - dirname = gtkutil_popup_textentry (_("Rename directory"), - _("New directory name: "), - src_file_internal, - NULL, -1, 0, window); - g_free (src_file_internal); - if (!dirname) goto ERROR1; - - tmpstr = charset_internal_to_locale (dirname); - g_free (dirname); - dirname = tmpstr; - - dest_path = g_strconcat (parent_dir, "/", dirname, NULL); - - if (rename (src_path, dest_path) < 0) { - g_snprintf (message, BUF_SIZE, - _("Faild to rename directory : %s"), src_path); - gtkutil_message_dialog (_("Error!!"), message, window); - } else { - success = TRUE; - } - - g_free (dirname); - g_free (dest_path); - ERROR1: - g_free (src_path); - g_free (parent_dir); - ERROR0: - g_free (path); - - return success; -} diff -Nru gimageview-0.2.27/src/gfileutil.h gimageview-0.3.0-0.20101117/src/gfileutil.h --- gimageview-0.2.27/src/gfileutil.h 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gfileutil.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gfileutil.h,v 1.17 2003/06/13 09:43:28 makeinu Exp $ - */ - -#ifndef __GFILEUTIL_H__ -#define __GFILEUTIL_H__ - -#include - -#include "gtkutils.h" - - -typedef enum -{ - GETDIR_READ_DOT = 1 << 0, - GETDIR_FOLLOW_SYMLINK = 1 << 1, - GETDIR_DETECT_EXT = 1 << 2, - GETDIR_GET_ARCHIVE = 1 << 3, /* use with GETDIR_DETECT_EXT */ - GETDIR_DISP_STDOUT = 1 << 4, - GETDIR_DISP_STDERR = 1 << 5, - GETDIR_ENABLE_CANCEL = 1 << 6, - GETDIR_RECURSIVE = 1 << 7, - GETDIR_RECURSIVE_IS_BRANCH = 1 << 8 /* for internal use */ -} GetDirFlags; - - -typedef enum -{ - FILE_COPY, - FILE_MOVE, - FILE_LINK, - FILE_HLINK, - FILE_REMOVE, - FILE_RENAME -} FileOperateType; - - -gchar *add_slash (const gchar *path); -gchar *remove_slash (const gchar *path); - -gchar *get_temp_dir_name (void); -void remove_temp_dir (void); -void get_dir (const gchar *dirname, - GetDirFlags flags, - GList **filelist, - GList **dirlist); -void get_dir_stop (void); -GList *get_dir_all (const gchar *dirname); -gchar *relpath2abs (const gchar *path); -gchar *link2abs (const gchar *path); - - -void remove_dir (const char *dirname); -gboolean move_file (const gchar *from_path, - const gchar *dir, - ConfirmType *action, - gboolean show_error, - GtkWindow *window); -gboolean copy_file_to_file (const gchar *from_path, - const gchar *to_path, - ConfirmType *action, - gboolean show_error, - GtkWindow *window); -gboolean copy_file (const gchar *from_path, - const gchar *dir, - ConfirmType *action, - gboolean show_error, - GtkWindow *window); -gboolean link_file (const gchar *from_path, - const gchar *dir, - gboolean show_error, - GtkWindow *window); -gboolean files2dir (GList *filelist, - const gchar *dir, - FileOperateType type, - GtkWindow *window); -gboolean files2dir_with_dialog (GList *filelist, - gchar **dir, - FileOperateType action, - GtkWindow *window); -gboolean delete_dir (const gchar *path, - GtkWindow *window); -gboolean delete_files (GList *filelist, - ConfirmType confirm, - GtkWindow *window); - -gboolean make_dir_dialog (const gchar *parent_dir, - GtkWindow *window); -gboolean rename_dir_dialog (const gchar *dir, - GtkWindow *window); -#endif diff -Nru gimageview-0.2.27/src/gimageview.c gimageview-0.3.0-0.20101117/src/gimageview.c --- gimageview-0.2.27/src/gimageview.c 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimageview.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimageview.c,v 1.50 2004/02/24 18:04:19 makeinu Exp $ + * $Id: gimageview.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -30,11 +30,8 @@ #include "gimageview.h" #include "argparse.h" -#include "charset.h" -#include "dirview.h" #include "fileload.h" -#include "fileutil.h" -#include "gfileutil.h" +#include "gimv_dir_view.h" #include "gimv_image.h" #include "gimv_icon_stock.h" #include "gimv_image_win.h" @@ -43,6 +40,9 @@ #include "gimv_thumb_cache.h" #include "gimv_thumb_win.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #include "fr-archive.h" @@ -93,11 +93,9 @@ /* set locale */ setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); -#ifdef USE_GTK2 - bind_textdomain_codeset (PACKAGE, "UTF-8"); -#endif - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, GIMV_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); /* Gtk Initialize */ gtk_set_locale(); @@ -112,11 +110,7 @@ prefs_load_config (); g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s", g_getenv("HOME"), GIMV_RC_DIR, GIMV_KEYACCEL_RC); -#ifdef USE_GTK2 gtk_accel_map_load (buf); -#else /* USE_GTK2 */ - gtk_item_factory_parse_rc (buf); -#endif /* USE_GTK2 */ /* gimv_image_init (); */ @@ -159,11 +153,7 @@ prefs_save_config (); g_snprintf (buf, MAX_PATH_LEN, "%s/%s/%s", g_getenv("HOME"), GIMV_RC_DIR, GIMV_KEYACCEL_RC); -#ifdef USE_GTK2 gtk_accel_map_save (buf); -#else /* USE_GTK2 */ - gtk_item_factory_dump_rc (buf, NULL, TRUE); -#endif /* USE_GTK2 */ remove_temp_dir (); @@ -254,7 +244,7 @@ static gint idle_slideshow_startup (gpointer data) { - GimvSlideShow *slideshow = (GimvSlideShow *) data; + GimvSlideshow *slideshow = (GimvSlideshow *) data; /* reset config */ prefs_load_config (); @@ -268,7 +258,7 @@ static void startup_slideshow (FilesLoader *files) { - GimvSlideShow *slideshow; + GimvSlideshow *slideshow; GList *list, *filelist; /* get file list from directories */ @@ -310,7 +300,6 @@ /* init slideshow */ slideshow = gimv_slideshow_new_with_filelist (filelist, filelist); - gimv_slideshow_open_window (slideshow); gimv_slideshow_set_interval (slideshow, args_val.slideshow_interval * 1000); /* files->filelist = NULL; */ @@ -415,7 +404,7 @@ gchar *dirname = NULL; if (list) dirname = list->data; - if (dirname) dirview_change_root (tw->dv, dirname); + if (dirname) gimv_dir_view_chroot (tw->dv, dirname); } /* exec slide show if specified by argument */ diff -Nru gimageview-0.2.27/src/gimageview.h gimageview-0.3.0-0.20101117/src/gimageview.h --- gimageview-0.2.27/src/gimageview.h 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimageview.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimageview.h,v 1.18 2004/04/08 13:39:25 makeinu Exp $ + * $Id: gimageview.h 1168 2007-10-20 17:21:57Z makeinu $ */ #ifndef __GIMAGEVIEW_H__ @@ -28,11 +28,10 @@ # include "config.h" #endif +#include #include #include -#include "intl.h" - /* global constants */ #define GIMV_PROG_NAME "GImageView" #define GIMV_PROG_VERSION "GImageView Version "VERSION @@ -55,10 +54,9 @@ typedef struct GimvThumb_Tag GimvThumb; typedef struct GimvThumbView_Tag GimvThumbView; typedef struct GimvThumbWin_Tag GimvThumbWin; -typedef struct DirView_Tag DirView; +typedef struct GimvDirView_Tag GimvDirView; typedef struct GimvComment_Tag GimvComment; typedef struct GimvCommentView_Tag GimvCommentView; -typedef struct GimvSlideShow_Tag GimvSlideShow; /* will be replaced to GimvVFS */ typedef struct _FRArchive FRArchive; diff -Nru gimageview-0.2.27/src/gimv_anim.c gimageview-0.3.0-0.20101117/src/gimv_anim.c --- gimageview-0.2.27/src/gimv_anim.c 2004-06-17 06:37:26.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_anim.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,60 +18,28 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_anim.c,v 1.17 2004/06/17 06:37:26 makeinu Exp $ + * $Id: gimv_anim.c 1139 2007-10-17 09:08:44Z makeinu $ */ #include "gimv_anim.h" -#ifdef HAVE_GDK_PIXBUF -# include -#elif defined (HAVE_GDK_IMLIB) -# include -#endif +#include -static void gimv_anim_class_init (GimvAnimClass *klass); -static void gimv_anim_init (GimvAnim *anim); -static void gimv_anim_destroy (GtkObject *object); +G_DEFINE_TYPE (GimvAnim, gimv_anim, GIMV_TYPE_IMAGE) -static GimvImageClass *parent_class = NULL; - - -GtkType -gimv_anim_get_type (void) -{ - static GtkType gimv_anim_type = 0; - - if (!gimv_anim_type) { - static const GtkTypeInfo gimv_anim_info = { - "GimvAnim", - sizeof (GimvAnim), - sizeof (GimvAnimClass), - (GtkClassInitFunc) gimv_anim_class_init, - (GtkObjectInitFunc) gimv_anim_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_anim_type = gtk_type_unique (gimv_image_get_type (), - &gimv_anim_info); - } - - return gimv_anim_type; -} +static void gimv_anim_dispose (GObject *object); static void gimv_anim_class_init (GimvAnimClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gimv_image_get_type ()); + gobject_class = (GObjectClass *) klass; - object_class->destroy = gimv_anim_destroy; + gobject_class->dispose = gimv_anim_dispose; } @@ -85,7 +53,7 @@ static void -gimv_anim_destroy (GtkObject *object) +gimv_anim_dispose (GObject *object) { GimvAnim *anim; @@ -102,15 +70,15 @@ } anim->table = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_anim_parent_class)->dispose) + G_OBJECT_CLASS (gimv_anim_parent_class)->dispose (object); } GimvAnim * gimv_anim_new (void) { - GimvAnim *anim = GIMV_ANIM (gtk_type_new (GIMV_TYPE_ANIM)); + GimvAnim *anim = GIMV_ANIM (g_object_new (GIMV_TYPE_ANIM, NULL)); return anim; } @@ -163,13 +131,11 @@ } -#if HAVE_GDK_PIXBUF static void free_rgb_buffer (guchar *pixels, gpointer data) { g_free(pixels); } -#endif /* HAVE_GDK_PIXBUF */ gboolean gimv_anim_update_frame (GimvAnim *anim, @@ -182,7 +148,6 @@ g_return_val_if_fail (anim, FALSE); -#if HAVE_GDK_PIXBUF { gint bytes = 3; @@ -196,13 +161,6 @@ width, height, bytes * width, free_rgb_buffer, NULL); } -#elif defined (HAVE_GDK_IMLIB) - if (image->image) - gdk_imlib_kill_image (image->image); - - image->image = gdk_imlib_create_image_from_data (frame, NULL, width, height); - g_free (frame); -#endif /* HAVE_GDK_PIXBUF */ if (image->image) return TRUE; diff -Nru gimageview-0.2.27/src/gimv_anim.h gimageview-0.3.0-0.20101117/src/gimv_anim.h --- gimageview-0.2.27/src/gimv_anim.h 2004-05-23 14:07:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_anim.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_anim.h,v 1.8 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_anim.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef __GIMV_ANIM_H__ @@ -26,19 +26,17 @@ #include "gimv_image.h" - #define GIMV_TYPE_ANIM (gimv_anim_get_type ()) -#define GIMV_ANIM(obj) (GTK_CHECK_CAST (obj, gimv_anim_get_type (), GimvAnim)) -#define GIMV_ANIM_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_anim_get_type, GimvAnimClass)) -#define GIMV_IS_ANIM(obj) (GTK_CHECK_TYPE (obj, gimv_anim_get_type ())) -#define GIMV_IS_ANIM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ANIM)) - +#define GIMV_ANIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_ANIM, GimvAnim)) +#define GIMV_ANIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ANIM, GimvAnimClass)) +#define GIMV_IS_ANIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_ANIM)) +#define GIMV_IS_ANIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ANIM)) +#define GIMV_ANIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_ANIM, GimvAnimClass)) typedef struct GimvAnim_Tag GimvAnim; typedef struct GimvAnimClass_Tag GimvAnimClass; typedef struct GimvAnimFuncTable_Tag GimvAnimFuncTable; - struct GimvAnim_Tag { GimvImage parent; @@ -48,13 +46,11 @@ GimvAnimFuncTable *table; }; - struct GimvAnimClass_Tag { GimvImageClass parent_class; }; - struct GimvAnimFuncTable_Tag { gint (*get_length) (GimvAnim *anim); @@ -66,8 +62,7 @@ void (*delete) (GimvAnim *anim); }; - -GtkType gimv_anim_get_type (void); +GType gimv_anim_get_type (void); GimvAnim *gimv_anim_new (void); /* public */ diff -Nru gimageview-0.2.27/src/gimv_cell_pixmap.c gimageview-0.3.0-0.20101117/src/gimv_cell_pixmap.c --- gimageview-0.2.27/src/gimv_cell_pixmap.c 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_cell_pixmap.c 2010-11-17 06:10:11.000000000 +0000 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_cell_pixmap.c,v 1.1 2003/07/06 16:46:21 makeinu Exp $ + * $Id: gimv_cell_pixmap.c 1142 2007-10-17 13:02:27Z makeinu $ */ /* @@ -29,12 +29,14 @@ # define GTK_DISABLE_DEPRECATED #endif /* GTK_DISABLE_DEPRECATED */ -#include "gimv_cell_pixmap.h" +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ -#if (GTK_MAJOR_VERSION >= 2) +#include "gimv_cell_pixmap.h" #include -#include "intl.h" +#include static void gimv_cell_renderer_pixmap_get_property (GObject *object, guint param_id, @@ -44,8 +46,6 @@ guint param_id, const GValue *value, GParamSpec *pspec); -static void gimv_cell_renderer_pixmap_init (GimvCellRendererPixmap *celltext); -static void gimv_cell_renderer_pixmap_class_init (GimvCellRendererPixmapClass *class); static void gimv_cell_renderer_pixmap_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *rectangle, @@ -73,31 +73,7 @@ }; -GtkType -gimv_cell_renderer_pixmap_get_type (void) -{ - static GtkType cell_pixmap_type = 0; - - if (!cell_pixmap_type) { - static const GTypeInfo cell_pixmap_info = { - sizeof (GimvCellRendererPixmapClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_cell_renderer_pixmap_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvCellRendererPixmap), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_cell_renderer_pixmap_init, - }; - - cell_pixmap_type = g_type_register_static (GTK_TYPE_CELL_RENDERER, - "Gimvcellrendererpixmap", - &cell_pixmap_info, 0); - } - - return cell_pixmap_type; -} +G_DEFINE_TYPE (GimvCellRendererPixmap, gimv_cell_renderer_pixmap, GTK_TYPE_CELL_RENDERER) static void @@ -421,5 +397,3 @@ gdk_gc_set_clip_origin (gc, 0, 0); } } - -#endif /* (GTK_MAJOR_VERSION >= 2) */ diff -Nru gimageview-0.2.27/src/gimv_cell_pixmap.h gimageview-0.3.0-0.20101117/src/gimv_cell_pixmap.h --- gimageview-0.2.27/src/gimv_cell_pixmap.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_cell_pixmap.h 2010-11-17 06:10:11.000000000 +0000 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_cell_pixmap.h,v 1.1 2003/07/06 16:46:21 makeinu Exp $ + * $Id: gimv_cell_pixmap.h 1142 2007-10-17 13:02:27Z makeinu $ */ /* @@ -28,27 +28,16 @@ #ifndef __GIMV_CELL_RENDERER_PIXMAP_H__ #define __GIMV_CELL_RENDERER_PIXMAP_H__ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#if (GTK_MAJOR_VERSION >= 2) - #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS - -#define GIMV_TYPE_CELL_RENDERER_PIXMAP (gimv_cell_renderer_pixmap_get_type ()) -#define GIMV_CELL_RENDERER_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmap)) -#define GIMV_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmapClass)) -#define GIMV_IS_CELL_RENDERER_PIXMAP(obj) (GTK_CHECK_TYPE ((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP)) -#define GIMV_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_CELL_RENDERER_PIXMAP)) -#define GIMV_CELL_RENDERER_PIXMAP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmapClass)) +#define GIMV_TYPE_CELL_RENDERER_PIXMAP (gimv_cell_renderer_pixmap_get_type ()) +#define GIMV_CELL_RENDERER_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmap)) +#define GIMV_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmapClass)) +#define GIMV_IS_CELL_RENDERER_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP)) +#define GIMV_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_CELL_RENDERER_PIXMAP)) +#define GIMV_CELL_RENDERER_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_CELL_RENDERER_PIXMAP, GimvCellRendererPixmapClass)) typedef struct GimvCellRendererPixmap_Tag GimvCellRendererPixmap; typedef struct GimvCellRendererPixmapClass_Tag GimvCellRendererPixmapClass; @@ -76,13 +65,9 @@ void (*_gimv_reserved4) (void); }; -GtkType gimv_cell_renderer_pixmap_get_type (void); +GType gimv_cell_renderer_pixmap_get_type (void); GtkCellRenderer *gimv_cell_renderer_pixmap_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GIMV_CELL_RENDERER_PIXMAP_H__ */ - -#endif /* (GTK_MAJOR_VERSION >= 2) */ diff -Nru gimageview-0.2.27/src/gimv_comment.c gimageview-0.3.0-0.20101117/src/gimv_comment.c --- gimageview-0.2.27/src/gimv_comment.c 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_comment.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_comment.c,v 1.3 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_comment.c 1179 2007-10-23 02:18:13Z makeinu $ */ /* @@ -33,13 +33,12 @@ #include #include -#include "charset.h" -#include "fileutil.h" #include "gimv_image_info.h" #include "gimv_mime_types.h" -#include "gtk2-compat.h" -#include "gtkutils.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_gtk.h" #define GIMV_COMMENT_DIRECTORY ".gimv/comment" @@ -50,9 +49,7 @@ } GimvCommentSignalType; -static void gimv_comment_init (GimvComment *comment); -static void gimv_comment_class_init (GimvCommentClass *klass); -static void gimv_comment_destroy (GtkObject *object); +static void gimv_comment_dispose (GObject *object); static gchar *defval_time (GimvImageInfo *info, gpointer data); static gchar *defval_file_url (GimvImageInfo *info, gpointer data); @@ -66,7 +63,6 @@ #endif -static GtkObjectClass *parent_class = NULL; static gint gimv_comment_signals[LAST_SIGNAL] = {0}; @@ -97,57 +93,35 @@ * GimvComment class funcs * ******************************************************************************/ -GtkType -gimv_comment_get_type () -{ - static GtkType gimv_comment_type = 0; - - if (!gimv_comment_type) { - static const GtkTypeInfo gimv_comment_info = { - "GimvComment", - sizeof (GimvComment), - sizeof (GimvCommentClass), - (GtkClassInitFunc) gimv_comment_class_init, - (GtkObjectInitFunc) gimv_comment_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_comment_type = gtk_type_unique (gtk_object_get_type (), &gimv_comment_info); - } - - return gimv_comment_type; -} +G_DEFINE_TYPE (GimvComment, gimv_comment, G_TYPE_OBJECT) static void gimv_comment_class_init (GimvCommentClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; gimv_comment_signals[FILE_SAVED] - = gtk_signal_new ("file_saved", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvCommentClass, file_saved), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("file_saved", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvCommentClass, file_saved), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_comment_signals[FILE_DELETED] - = gtk_signal_new ("file_deleted", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvCommentClass, file_deleted), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, gimv_comment_signals, LAST_SIGNAL); + = g_signal_new ("file_deleted", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvCommentClass, file_deleted), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - object_class->destroy = gimv_comment_destroy; + gobject_class->dispose = gimv_comment_dispose; klass->file_saved = NULL; klass->file_deleted = NULL; @@ -163,16 +137,11 @@ comment->data_list = NULL; comment->note = NULL; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (comment)); - gtk_object_sink (GTK_OBJECT (comment)); -#endif } static void -gimv_comment_destroy (GtkObject *object) +gimv_comment_dispose (GObject *object) { GimvComment *comment = GIMV_COMMENT (object); GList *node; @@ -204,30 +173,8 @@ comment->note = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - -GimvComment * -gimv_comment_ref (GimvComment *comment) -{ - g_return_val_if_fail (comment, NULL); - g_return_val_if_fail (GIMV_IS_COMMENT (comment), NULL); - - gtk_object_ref (GTK_OBJECT (comment)); - - return comment; -} - - -void -gimv_comment_unref (GimvComment *comment) -{ - g_return_if_fail (comment); - g_return_if_fail (GIMV_IS_COMMENT (comment)); - - gtk_object_unref (GTK_OBJECT (comment)); + if (G_OBJECT_CLASS (gimv_comment_parent_class)->dispose) + G_OBJECT_CLASS (gimv_comment_parent_class)->dispose (object); } @@ -390,7 +337,7 @@ { GimvComment *comment; - comment = GIMV_COMMENT (gtk_type_new (gimv_comment_get_type ())); + comment = GIMV_COMMENT (g_object_new (GIMV_TYPE_COMMENT, NULL)); g_return_val_if_fail (comment, NULL); return comment; @@ -835,14 +782,14 @@ fclose (file); - gtk_signal_emit (GTK_OBJECT (comment), gimv_comment_signals[FILE_SAVED]); + g_signal_emit (G_OBJECT (comment), gimv_comment_signals[FILE_SAVED], 0); return TRUE; ERROR: fclose (file); - gtk_signal_emit (GTK_OBJECT (comment), gimv_comment_signals[FILE_SAVED]); + g_signal_emit (G_OBJECT (comment), gimv_comment_signals[FILE_SAVED], 0); return FALSE; } @@ -866,8 +813,10 @@ g_return_val_if_fail (info, NULL); comment = gimv_image_info_get_comment (info); - if (comment) - return gimv_comment_ref (comment); + if (comment) { + g_object_ref (G_OBJECT (comment)); + return comment; + } comment = gimv_comment_new (); comment->info = gimv_image_info_ref (info); diff -Nru gimageview-0.2.27/src/gimv_comment.h gimageview-0.3.0-0.20101117/src/gimv_comment.h --- gimageview-0.2.27/src/gimv_comment.h 2004-09-14 08:42:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_comment.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_comment.h,v 1.3 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_comment.h 1165 2007-10-20 15:13:06Z makeinu $ */ #ifndef __GIMV_COMMENT_H__ @@ -27,16 +27,17 @@ #include "gimageview.h" #define GIMV_TYPE_COMMENT (gimv_comment_get_type ()) -#define GIMV_COMMENT(obj) (GTK_CHECK_CAST ((obj), GIMV_TYPE_COMMENT, GimvComment)) -#define GIMV_COMMENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMMENT, GimvCommentClass)) -#define GIMV_IS_COMMENT(obj) (GTK_CHECK_TYPE ((obj), GIMV_TYPE_COMMENT)) -#define GIMV_IS_COMMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_COMMENT)) +#define GIMV_COMMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_COMMENT, GimvComment)) +#define GIMV_COMMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_COMMENT, GimvCommentClass)) +#define GIMV_IS_COMMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_COMMENT)) +#define GIMV_IS_COMMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_COMMENT)) +#define GIMV_COMMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_COMMENT, GimvCommentClass)) typedef struct GimvCommentClass_Tag GimvCommentClass; struct GimvComment_Tag { - GtkObject parent; + GObject parent; gchar *filename; GimvImageInfo *info; /* 1:1 relation */ @@ -46,7 +47,7 @@ }; struct GimvCommentClass_Tag { - GtkObjectClass parent_class; + GObjectClass parent_class; /* -- Signals -- */ void (*file_saved) (GimvComment *comment, @@ -55,10 +56,8 @@ GimvImageInfo *info); }; - typedef gchar *(*GimvCommentDataGetDefValFn) (GimvImageInfo *info, gpointer data); - typedef struct GimvCommentDataEntry_Tag { gchar *key; @@ -71,14 +70,10 @@ GimvCommentDataGetDefValFn def_val_fn; } GimvCommentDataEntry; - -GtkType gimv_comment_get_type (void); +GType gimv_comment_get_type (void); GimvComment *gimv_comment_get_from_image_info (GimvImageInfo *info); -GimvComment *gimv_comment_ref (GimvComment *comment); -void gimv_comment_unref (GimvComment *comment); - void gimv_comment_update_data_entry_list (void); GList *gimv_comment_get_data_entry_list (void); diff -Nru gimageview-0.2.27/src/gimv_comment_view.c gimageview-0.3.0-0.20101117/src/gimv_comment_view.c --- gimageview-0.2.27/src/gimv_comment_view.c 2004-09-22 15:37:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_comment_view.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_comment_view.c,v 1.6 2004/09/22 15:37:11 makeinu Exp $ + * $Id: gimv_comment_view.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "gimv_comment_view.h" @@ -27,16 +27,15 @@ #include "gimageview.h" -#include "charset.h" -#include "dnd.h" #include "gimv_comment.h" #include "gimv_icon_stock.h" #include "gimv_image_info.h" #include "gimv_image_view.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_dnd.h" -#ifdef ENABLE_TREEVIEW typedef enum { COLUMN_TERMINATOR = -1, COLUMN_KEY, @@ -44,7 +43,6 @@ COLUMN_RAW_ENTRY, N_COLUMN } ListStoreColumn; -#endif /* ENABLE_TREEVIEW */ static void gimv_comment_view_set_sensitive (GimvCommentView *cv); @@ -86,33 +84,24 @@ gimv_comment_view_delete_selected_data (GimvCommentView *cv) { GimvCommentDataEntry *entry; + GtkTreeView *treeview; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean found; g_return_if_fail (cv); -#ifdef ENABLE_TREEVIEW - { - GtkTreeView *treeview = GTK_TREE_VIEW (cv->comment_clist); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreeModel *model; - GtkTreeIter iter; - gboolean found; + treeview = GTK_TREE_VIEW (cv->comment_clist); + selection = gtk_tree_view_get_selection (treeview); - found = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!found) return; + found = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!found) return; - gtk_tree_model_get (model, &iter, - COLUMN_RAW_ENTRY, &entry, - COLUMN_TERMINATOR); - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); - } -#else /* ENABLE_TREEVIEW */ - if (cv->selected_row < 0) return; - g_return_if_fail (cv->selected_row < GTK_CLIST (cv->comment_clist)->rows); - - entry = gtk_clist_get_row_data (GTK_CLIST (cv->comment_clist), - cv->selected_row); - gtk_clist_remove (GTK_CLIST (cv->comment_clist), cv->selected_row); -#endif /* ENABLE_TREEVIEW */ + gtk_tree_model_get (model, &iter, + COLUMN_RAW_ENTRY, &entry, + COLUMN_TERMINATOR); + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); if (entry) gimv_comment_data_entry_remove (cv->comment, entry); @@ -128,30 +117,18 @@ cb_save_button_pressed (GtkButton *button, GimvCommentView *cv) { gchar *note; + GtkTextBuffer *buffer; + GtkTextIter start, end; g_return_if_fail (cv); g_return_if_fail (cv->comment); -#if USE_GTK2 - { - GtkTextBuffer *buffer; - GtkTextIter start, end; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); - gtk_text_buffer_get_iter_at_offset (buffer, &start, 0); - gtk_text_buffer_get_iter_at_offset (buffer, &end, -1); + gtk_text_buffer_get_iter_at_offset (buffer, &start, 0); + gtk_text_buffer_get_iter_at_offset (buffer, &end, -1); - note = gtk_text_buffer_get_text (buffer, &start, &end, TRUE); - } -#else /* USE_GTK2 */ - { - gint len; - - len = gtk_text_get_length (GTK_TEXT (cv->note_box)); - note = gtk_editable_get_chars (GTK_EDITABLE (cv->note_box), 0, len); - } -#endif /* USE_GTK2 */ + note = gtk_text_buffer_get_text (buffer, &start, &end, TRUE); if (note && *note) gimv_comment_update_note (cv->comment, note); @@ -178,7 +155,7 @@ g_return_if_fail (cv->comment); gimv_comment_delete_file (cv->comment); - gimv_comment_unref (cv->comment); + g_object_unref (G_OBJECT (cv->comment)); cv->comment = NULL; gimv_comment_view_clear (cv); } @@ -189,11 +166,11 @@ { g_return_if_fail (cv); - gtk_signal_disconnect_by_func (GTK_OBJECT (cv->notebook), - GTK_SIGNAL_FUNC (cb_switch_page), cv); + g_signal_handlers_disconnect_by_func (G_OBJECT (cv->notebook), + G_CALLBACK (cb_switch_page), cv); if (cv->comment) { - gimv_comment_unref (cv->comment); + g_object_unref (G_OBJECT (cv->comment)); cv->comment = NULL; } @@ -206,7 +183,6 @@ } -#ifdef ENABLE_TREEVIEW static void cb_tree_view_cursor_changed (GtkTreeView *treeview, GimvCommentView *cv) { @@ -243,87 +219,6 @@ gimv_comment_view_set_sensitive (cv); } -#else /* ENABLE_TREEVIEW */ - -static void -cb_clist_select_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, GimvCommentView *cv) -{ - gchar *text[2] = {NULL, NULL}; - gboolean success1, success2; - - g_return_if_fail (cv); - - cv->selected_row = row; - - success1 = gtk_clist_get_text (clist, row, 0, &text[0]); - success2 = gtk_clist_get_text (clist, row, 1, &text[1]); - - if (success1) { - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cv->key_combo)->entry), text[0]); - } else { - gtk_entry_set_text (GTK_ENTRY(cv->value_entry), "\0"); - } - - if (success2) { - gtk_entry_set_text (GTK_ENTRY(cv->value_entry), text[1]); - } else { - gtk_entry_set_text (GTK_ENTRY(cv->value_entry), "\0"); - } - - gimv_comment_view_set_sensitive (cv); -} - - -static void -cb_clist_unselect_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, GimvCommentView *cv) -{ - g_return_if_fail (cv); - - cv->selected_row = -1; - - gimv_comment_view_set_sensitive (cv); -} - - -static void -cb_clist_row_move (GtkCList *clist, - gint arg1, gint arg2, - GimvCommentView *cv) -{ - GimvCommentDataEntry *entry1, *entry2, *tmpentry; - GList *node1, *node2; - gint pos1, pos2, tmppos; - - g_return_if_fail (clist && GTK_IS_CLIST (clist)); - g_return_if_fail (cv); - g_return_if_fail (cv->comment); - - entry1 = gtk_clist_get_row_data (clist, arg1); - entry2 = gtk_clist_get_row_data (clist, arg2); - - g_return_if_fail (entry1 && entry2); - - node1 = g_list_find (cv->comment->data_list, entry1); - node2 = g_list_find (cv->comment->data_list, entry2); - g_return_if_fail (node1 && node2); - - pos1 = g_list_position (cv->comment->data_list, node1); - pos2 = g_list_position (cv->comment->data_list, node2); - - /* swap data position in the list */ - if (pos1 > pos2) { - tmppos = pos1; pos1 = pos2; pos2 = tmppos; - tmpentry = entry1; entry1 = entry2; entry2 = tmpentry; - } - cv->comment->data_list = g_list_remove (cv->comment->data_list, entry1); - cv->comment->data_list = g_list_remove (cv->comment->data_list, entry2); - cv->comment->data_list = g_list_insert (cv->comment->data_list, entry2, pos1); - cv->comment->data_list = g_list_insert (cv->comment->data_list, entry1, pos2); -} -#endif /* ENABLE_TREEVIEW */ - static gboolean cb_data_list_key_press (GtkWidget *widget, GdkEventKey *event, GimvCommentView *cv) @@ -335,8 +230,8 @@ case GDK_Return: if (cv->selected_item) { gtk_widget_grab_focus (cv->value_entry); - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), - "key_press_event"); + g_signal_stop_emission_by_name (G_OBJECT (widget), + "key_press_event"); return TRUE; } break; @@ -366,8 +261,8 @@ } else { gtk_widget_grab_focus (cv->save_button); } - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), - "key_press_event"); + g_signal_stop_emission_by_name (G_OBJECT (widget), + "key_press_event"); return TRUE; break; @@ -402,7 +297,11 @@ cb_combo_select (GtkWidget *label, GimvCommentView *cv) { GtkWidget *clist; - gchar *key = gtk_object_get_data (GTK_OBJECT (label), "key"); + gchar *key = g_object_get_data (G_OBJECT (label), "key"); + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean go_next; g_return_if_fail (label && GTK_IS_LIST_ITEM (label)); g_return_if_fail (cv); @@ -411,51 +310,28 @@ cv->selected_item = label; clist = cv->comment_clist; -#ifdef ENABLE_TREEVIEW - { - GtkTreeView *treeview = GTK_TREE_VIEW (clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean go_next; - - go_next = gtk_tree_model_get_iter_first (model, &iter); - - for (; go_next; go_next = gtk_tree_model_iter_next (model, &iter)) { - GimvCommentDataEntry *entry; - - gtk_tree_model_get (model, &iter, - COLUMN_RAW_ENTRY, &entry, - COLUMN_TERMINATOR); - if (!entry) continue; + treeview = GTK_TREE_VIEW (clist); + model = gtk_tree_view_get_model (treeview); - if (entry->key && !strcmp (key, entry->key)) { - GtkTreePath *treepath = gtk_tree_model_get_path (model, &iter); + go_next = gtk_tree_model_get_iter_first (model, &iter); - if (!treepath) continue; - gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); - gtk_tree_path_free (treepath); - break; - } - } - } -#else /* ENABLE_TREEVIEW */ - { - gint row; + for (; go_next; go_next = gtk_tree_model_iter_next (model, &iter)) { + GimvCommentDataEntry *entry; - for (row = 0; row < GTK_CLIST (clist)->rows; row++) { - GimvCommentDataEntry *entry; + gtk_tree_model_get (model, &iter, + COLUMN_RAW_ENTRY, &entry, + COLUMN_TERMINATOR); + if (!entry) continue; - entry = gtk_clist_get_row_data (GTK_CLIST (clist), row); - if (!entry) continue; + if (entry->key && !strcmp (key, entry->key)) { + GtkTreePath *treepath = gtk_tree_model_get_path (model, &iter); - if (entry->key && !strcmp (key, entry->key)) { - gtk_clist_select_row (GTK_CLIST (clist), row, 0); - /* gtk_clist_moveto (GTK_CLIST (clist), row, 0, 0.0, 0.0); */ - break; - } + if (!treepath) continue; + gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + gtk_tree_path_free (treepath); + break; } } -#endif /* ENABLE_TREEVIEW */ } static void @@ -529,6 +405,9 @@ GtkWidget *scrolledwin, *clist, *combo, *entry; GtkWidget *label; gchar *titles[] = {_("Key"), _("Value")}; + GtkListStore *store; + GtkTreeViewColumn *col; + GtkCellRenderer *render; label = gtk_label_new (_("Data")); gtk_widget_set_name (label, "TabLabel"); @@ -543,18 +422,10 @@ scrolledwin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0); -#ifdef ENABLE_TREEVIEW -{ - GtkListStore *store; - GtkTreeViewColumn *col; - GtkCellRenderer *render; - store = gtk_list_store_new (N_COLUMN, G_TYPE_STRING, G_TYPE_STRING, @@ -582,30 +453,12 @@ gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_VALUE); gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); - gtk_signal_connect (GTK_OBJECT (clist),"cursor-changed", - GTK_SIGNAL_FUNC (cb_tree_view_cursor_changed), cv); + g_signal_connect (G_OBJECT (clist),"cursor-changed", + G_CALLBACK (cb_tree_view_cursor_changed), cv); gtk_container_add (GTK_CONTAINER (scrolledwin), clist); -} -#else /* ENABLE_TREEVIEW */ - clist = cv->comment_clist = gtk_clist_new_with_titles (2, titles); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_BROWSE); - /* gtk_clist_set_column_width (GTK_CLIST(clist), 0, 80); */ - gtk_clist_set_column_auto_resize (GTK_CLIST(clist), 0, TRUE); - gtk_clist_set_column_auto_resize (GTK_CLIST(clist), 1, TRUE); - gtk_clist_set_reorderable(GTK_CLIST(clist), TRUE); - gtk_clist_set_use_drag_icons (GTK_CLIST(clist), FALSE); - gtk_container_add (GTK_CONTAINER (scrolledwin), clist); - - gtk_signal_connect (GTK_OBJECT (clist),"select_row", - GTK_SIGNAL_FUNC (cb_clist_select_row), cv); - gtk_signal_connect (GTK_OBJECT (clist),"unselect_row", - GTK_SIGNAL_FUNC (cb_clist_unselect_row), cv); - gtk_signal_connect (GTK_OBJECT (clist),"row-move", - GTK_SIGNAL_FUNC (cb_clist_row_move), cv); -#endif /* ENABLE_TREEVIEW */ - gtk_signal_connect (GTK_OBJECT (clist), "key_press_event", - GTK_SIGNAL_FUNC (cb_data_list_key_press), cv); + g_signal_connect (G_OBJECT (clist), "key_press_event", + G_CALLBACK (cb_data_list_key_press), cv); /* entry area */ hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); @@ -632,12 +485,12 @@ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); cv->value_entry = entry = gtk_entry_new (); gtk_box_pack_start (GTK_BOX (vbox1), entry, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (cb_entry_changed), cv); - gtk_signal_connect (GTK_OBJECT (entry), "activate", - GTK_SIGNAL_FUNC (cb_entry_enter), cv); - gtk_signal_connect (GTK_OBJECT (entry), "key_press_event", - GTK_SIGNAL_FUNC (cb_entry_key_press), cv); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (cb_entry_changed), cv); + g_signal_connect (G_OBJECT (entry), "activate", + G_CALLBACK (cb_entry_enter), cv); + g_signal_connect (G_OBJECT (entry), "key_press_event", + G_CALLBACK (cb_entry_key_press), cv); gtk_widget_show_all (cv->data_page); @@ -645,7 +498,6 @@ } -#ifdef USE_GTK2 static void cb_text_buffer_changed (GtkTextBuffer *buffer, GimvCommentView *cv) { @@ -653,15 +505,6 @@ cv->changed = TRUE; } } -#else /* USE_GTK2 */ -static void -cb_text_changed (GtkEditable *editable, GimvCommentView *cv) -{ - if (cv->comment) { - cv->changed = TRUE; - } -} -#endif /* USE_GTK2 */ static GtkWidget * @@ -669,6 +512,7 @@ { GtkWidget *scrolledwin; GtkWidget *label; + GtkTextBuffer *textbuf; /* "Note" page */ label = gtk_label_new (_("Note")); @@ -678,30 +522,14 @@ cv->note_page = scrolledwin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_widget_show (scrolledwin); -#ifdef USE_GTK2 - { - GtkTextBuffer *textbuf; - - cv->note_box = gtk_text_view_new (); - textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); - g_signal_connect (G_OBJECT (textbuf), "changed", - G_CALLBACK (cb_text_buffer_changed), cv); - } -#else /* USE_GTK2 */ - cv->note_box = gtk_text_new (gtk_scrolled_window_get_hadjustment - (GTK_SCROLLED_WINDOW (scrolledwin)), - gtk_scrolled_window_get_vadjustment - (GTK_SCROLLED_WINDOW (scrolledwin))); - gtk_text_set_editable (GTK_TEXT (cv->note_box), TRUE); - gtk_signal_connect (GTK_OBJECT (cv->note_box), "changed", - GTK_SIGNAL_FUNC (cb_text_changed), cv); -#endif /* USE_GTK2 */ + cv->note_box = gtk_text_view_new (); + textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); + g_signal_connect (G_OBJECT (textbuf), "changed", + G_CALLBACK (cb_text_buffer_changed), cv); gtk_container_add (GTK_CONTAINER (scrolledwin), cv->note_box); gtk_widget_show (cv->note_box); @@ -733,7 +561,6 @@ gimv_comment_view_set_sensitive (GimvCommentView *cv) { const gchar *key_str, *value_str; - gboolean selected = FALSE; g_return_if_fail (cv); @@ -746,19 +573,6 @@ } else { gimv_comment_view_set_sensitive_all (cv, TRUE); } - -#ifdef ENABLE_TREEVIEW - { - GtkTreeView *treeview = GTK_TREE_VIEW (cv->comment_clist); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreeModel *model; - GtkTreeIter iter; - - selected = gtk_tree_selection_get_selected (selection, &model, &iter); - } -#else /* ENABLE_TREEVIEW */ - if (cv->selected_row >= 0) selected = TRUE; -#endif /* ENABLE_TREEVIEW */ } @@ -810,17 +624,17 @@ label = gtk_list_item_new_with_label (_(data_entry->display_name)); - gtk_object_set_data_full (GTK_OBJECT (label), "key", - g_strdup (data_entry->key), - (GtkDestroyNotify) g_free); + g_object_set_data_full (G_OBJECT (label), "key", + g_strdup (data_entry->key), + (GtkDestroyNotify) g_free); gtk_container_add (GTK_CONTAINER (GTK_COMBO (cv->key_combo)->list), label); gtk_widget_show (label); - gtk_signal_connect (GTK_OBJECT(label), "select", - GTK_SIGNAL_FUNC (cb_combo_select), cv); - gtk_signal_connect (GTK_OBJECT(label), "deselect", - GTK_SIGNAL_FUNC (cb_combo_deselect), cv); + g_signal_connect (G_OBJECT(label), "select", + G_CALLBACK (cb_combo_select), cv); + g_signal_connect (G_OBJECT(label), "deselect", + G_CALLBACK (cb_combo_deselect), cv); if (!first_label) first_label = label; @@ -836,11 +650,16 @@ GimvCommentDataEntry *entry; const gchar *key, *dname, *value; gchar *text[16]; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean go_next; + GimvCommentDataEntry *src_entry; g_return_if_fail (cv); if (!cv->selected_item) return; - key = gtk_object_get_data (GTK_OBJECT (cv->selected_item), "key"); + key = g_object_get_data (G_OBJECT (cv->selected_item), "key"); g_return_if_fail (key); dname = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (cv->key_combo)->entry)); @@ -851,51 +670,28 @@ g_return_if_fail (entry); -#ifdef ENABLE_TREEVIEW - { - GtkTreeView *treeview = GTK_TREE_VIEW (cv->comment_clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean go_next; - GimvCommentDataEntry *src_entry; - - go_next = gtk_tree_model_get_iter_first (model, &iter); - for (; go_next; go_next = gtk_tree_model_iter_next (model, &iter)) { - gtk_tree_model_get (model, &iter, - COLUMN_RAW_ENTRY, &src_entry, - COLUMN_TERMINATOR); - if (src_entry == entry) break; - } - - text[0] = entry->display_name; - text[1] = entry->value; - if (!entry->userdef) text[0] = _(text[0]); + treeview = GTK_TREE_VIEW (cv->comment_clist); + model = gtk_tree_view_get_model (treeview); - if (!go_next) - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_KEY, text[0], - COLUMN_VALUE, text[1], - COLUMN_RAW_ENTRY, entry, + go_next = gtk_tree_model_get_iter_first (model, &iter); + for (; go_next; go_next = gtk_tree_model_iter_next (model, &iter)) { + gtk_tree_model_get (model, &iter, + COLUMN_RAW_ENTRY, &src_entry, COLUMN_TERMINATOR); + if (src_entry == entry) break; } -#else /* ENABLE_TREEVIEW */ - { - GtkCList *clist = GTK_CLIST (cv->comment_clist); - gint row = gtk_clist_find_row_from_data (clist, entry); - - text[0] = entry->display_name; - text[1] = entry->value; - if (!entry->userdef) text[0] = _(text[0]); - - if (row < 0) { - row = gtk_clist_append (clist, text); - gtk_clist_set_row_data (clist, row, entry); - } else { - gtk_clist_set_text (clist, row, 1, text[1]); - } - } -#endif /* ENABLE_TREEVIEW */ + + text[0] = entry->display_name; + text[1] = entry->value; + if (!entry->userdef) text[0] = _(text[0]); + + if (!go_next) + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_KEY, text[0], + COLUMN_VALUE, text[1], + COLUMN_RAW_ENTRY, entry, + COLUMN_TERMINATOR); cv->changed = TRUE; @@ -916,6 +712,8 @@ node = cv->comment->data_list; while (node) { GimvCommentDataEntry *entry = node->data; + GtkTreeModel *model; + GtkTreeIter iter; node = g_list_next (node); @@ -931,48 +729,20 @@ text[0] = _(entry->display_name); text[1] = entry->value; -#ifdef ENABLE_TREEVIEW - { - GtkTreeModel *model; - GtkTreeIter iter; - model = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->comment_clist)); - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COLUMN_KEY, text[0], - COLUMN_VALUE, text[1], - COLUMN_RAW_ENTRY, entry, - COLUMN_TERMINATOR); - } -#else /* ENABLE_TREEVIEW */ - { - gint row; - row = gtk_clist_append (GTK_CLIST (cv->comment_clist), text); - gtk_clist_set_row_data (GTK_CLIST (cv->comment_clist), - row, entry); - } -#endif /* ENABLE_TREEVIEW */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->comment_clist)); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_KEY, text[0], + COLUMN_VALUE, text[1], + COLUMN_RAW_ENTRY, entry, + COLUMN_TERMINATOR); } if (cv->comment->note && *cv->comment->note) { -#ifdef USE_GTK2 GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); gtk_text_buffer_set_text (buffer, cv->comment->note, -1); -#else /* USE_GTK2 */ - GdkFont *font; - - if (conf.textentry_font && *conf.textentry_font) - font = gdk_fontset_load (conf.textentry_font); - else - font = NULL; - - gtk_text_insert (GTK_TEXT (cv->note_box), font, NULL, NULL, - cv->comment->note, -1); - - if (font) - gdk_font_unref (font); -#endif /* USE_GTK2 */ } } @@ -990,40 +760,19 @@ void gimv_comment_view_clear (GimvCommentView *cv) { + GtkTextBuffer *buffer; + GtkTreeModel *model; + g_return_if_fail (cv); -#ifdef ENABLE_TREEVIEW - { - GtkTreeModel *model - = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->comment_clist)); - gtk_list_store_clear (GTK_LIST_STORE (model)); - } -#else /* ENABLE_TREEVIEW */ - { - gint i; - for (i = GTK_CLIST (cv->comment_clist)->rows - 1; i >= 0; i--) { - gtk_clist_remove (GTK_CLIST (cv->comment_clist), i); - } - } -#endif /* ENABLE_TREEVIEW */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->comment_clist)); + gtk_list_store_clear (GTK_LIST_STORE (model)); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cv->key_combo)->entry), "\0"); gtk_entry_set_text (GTK_ENTRY (cv->value_entry), "\0"); -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); - gtk_text_buffer_set_text (buffer, "\0", -1); - } -#else /* USE_GTK2 */ - { - GtkText *text; - text = GTK_TEXT (cv->note_box); - gtk_text_set_point (text, 0); - gtk_text_forward_delete (text, gtk_text_get_length(text)); - } -#endif /* USE_GTK2 */ + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cv->note_box)); + gtk_text_buffer_set_text (buffer, "\0", -1); cv->changed = FALSE; @@ -1039,13 +788,13 @@ gimv_comment_view_clear (cv); if (cv->comment) { - gimv_comment_unref (cv->comment); + g_object_unref (G_OBJECT (cv->comment)); cv->comment = NULL; } cv->comment = gimv_comment_get_from_image_info (info); - gtk_signal_connect (GTK_OBJECT (cv->comment), "file_saved", - GTK_SIGNAL_FUNC (cb_file_saved), cv); + g_signal_connect (G_OBJECT (cv->comment), "file_saved", + G_CALLBACK (cb_file_saved), cv); gimv_comment_view_reset_data (cv); gimv_comment_view_set_combo_list (cv); @@ -1072,8 +821,8 @@ cv->main_vbox = gtk_vbox_new (FALSE, 0); gtk_widget_set_name (cv->main_vbox, "GimvCommentView"); - gtk_signal_connect (GTK_OBJECT (cv->main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_destroyed), cv); + g_signal_connect (G_OBJECT (cv->main_vbox), "destroy", + G_CALLBACK (cb_destroyed), cv); cv->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (cv->notebook), 1); @@ -1081,8 +830,8 @@ gtk_box_pack_start(GTK_BOX(cv->main_vbox), cv->notebook, TRUE, TRUE, 0); gtk_widget_show (cv->notebook); - gtk_signal_connect (GTK_OBJECT(cv->notebook), "switch-page", - GTK_SIGNAL_FUNC(cb_switch_page), cv); + g_signal_connect (G_OBJECT(cv->notebook), "switch-page", + G_CALLBACK(cb_switch_page), cv); create_data_page (cv); create_note_page (cv); @@ -1094,9 +843,7 @@ hbox1 = cv->inner_button_area = gtk_hbox_new (TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox), hbox1, FALSE, TRUE, 0); -#ifdef USE_GTK2 gtk_box_set_homogeneous (GTK_BOX(hbox1), FALSE); -#endif /* USE_GTK2 */ button = gtk_button_new_with_label (_("_Save")); cv->save_button = button; @@ -1104,8 +851,8 @@ _("_Save")); gtk_widget_add_accelerator(button, "clicked", cv->accel_group, key, GDK_MOD1_MASK, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_save_button_pressed), cv); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_save_button_pressed), cv); gtk_box_pack_start (GTK_BOX (hbox1), button, FALSE, TRUE, 2); /* GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); */ @@ -1115,8 +862,8 @@ _("_Reset")); gtk_widget_add_accelerator(button, "clicked", cv->accel_group, key, GDK_MOD1_MASK, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_reset_button_pressed), cv); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_reset_button_pressed), cv); gtk_box_pack_start (GTK_BOX (hbox1), button, FALSE, TRUE, 2); /* GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); */ @@ -1126,8 +873,8 @@ _("_Delete")); gtk_widget_add_accelerator(button, "clicked", cv->accel_group, key, GDK_MOD1_MASK, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_del_button_pressed), cv); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_del_button_pressed), cv); gtk_box_pack_start (GTK_BOX (hbox1), button, FALSE, TRUE, 2); /* GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); */ @@ -1216,8 +963,8 @@ _("_Prev")); gtk_widget_add_accelerator(button, "clicked", cv->accel_group, key, GDK_MOD1_MASK, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_prev_button_pressed), cv); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_prev_button_pressed), cv); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 2); @@ -1227,8 +974,8 @@ _("_Next")); gtk_widget_add_accelerator(button, "clicked", cv->accel_group, key, GDK_MOD1_MASK, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_next_button_pressed), cv); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_next_button_pressed), cv); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 2); } diff -Nru gimageview-0.2.27/src/gimv_comment_view.h gimageview-0.3.0-0.20101117/src/gimv_comment_view.h --- gimageview-0.2.27/src/gimv_comment_view.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_comment_view.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_comment_view.h,v 1.1 2003/07/06 16:46:21 makeinu Exp $ + * $Id: gimv_comment_view.h 944 2003-07-06 16:46:21Z makeinu $ */ #ifndef __GIMV_COMMENT_VIEW_H__ diff -Nru gimageview-0.2.27/src/gimv_dir_view.c gimageview-0.3.0-0.20101117/src/gimv_dir_view.c --- gimageview-0.2.27/src/gimv_dir_view.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dir_view.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,2111 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2002 Takuro Ashie + * + * 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: gimv_dir_view.c 1213 2009-01-14 09:24:51Z makeinu $ + */ + +#include "gimv_dir_view.h" + +#include + +#include "gimv_file_prop_win.h" +#include "gimv_icon_stock.h" +#include "gimv_thumb_win.h" +#include "prefs.h" +#include "utils_char_code.h" +#include "utils_dnd.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_menu.h" + +G_DEFINE_TYPE (GimvDirView, gimv_dir_view, GTK_TYPE_VBOX) + +#define GIMV_DIR_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GIMV_TYPE_DIR_VIEW, GimvDirViewPrivate)) + +typedef struct GimvDirViewPrivate_Tag { + /* for DnD */ + gint hilit_dir; + + guint scroll_timer_id; + gint drag_motion_x; + gint drag_motion_y; + + gint auto_expand_timeout_id; + + /* for mouse event */ + gint button_2pressed_queue; /* attach an action to + button release event */ + + guint button_action_id; + guint swap_com_id; + + GtkTreePath *drag_tree_row; + guint adjust_tree_id; +} GimvDirViewPrivate; + +typedef enum { + MouseActNone, + MouseActLoadThumb, + MouseActLoadThumbRecursive, + MouseActPopupMenu, + MouseActChangeTop, + MouseActLoadThumbRecursiveInOneTab +} GimvDirViewMouseAction; + +typedef enum { + COLUMN_TERMINATOR = -1, + COLUMN_LABEL, + COLUMN_FULLPATH, + COLUMN_ICON_OPEN, + COLUMN_ICON_CLOSE, + COLUMN_IS_DUMMY, + N_COLUMN +} TreeStoreColumn; + +/* callback functions */ +static gboolean cb_button_press (GtkWidget *widget, + GdkEventButton *event, + GimvDirView *dv); +static gboolean cb_button_release (GtkWidget *widget, + GdkEventButton *event, + GimvDirView *dv); +static gboolean cb_scroll (GtkWidget *widget, + GdkEventScroll *se, + GimvDirView *dv); +static gboolean cb_key_press (GtkWidget *widget, + GdkEventKey *event, + GimvDirView *dv); +static void cb_tree_expand (GtkTreeView *treeview, + GtkTreeIter *parent_iter, + GtkTreePath *treepath, + gpointer data); + +/* callback functions for popup menu */ +static void cb_open_thumbnail (GimvDirView *dv, + ScanSubDirType scan_subdir, + GtkWidget *menuitem); +static void cb_go_to_here (GimvDirView *dv, + guint action, + GtkWidget *menuitem); +static void cb_refresh_dir_tree (GimvDirView *dv, + guint action, + GtkWidget *menuitem); +static void cb_file_property (GimvDirView *tv, + guint action, + GtkWidget *menuitem); +static void cb_mkdir (GimvDirView *dv, + guint action, + GtkWidget *menuitem); +static void cb_rename_dir (GimvDirView *dv, + guint action, + GtkWidget *menuitem); +static void cb_delete_dir (GimvDirView *dv, + guint action, + GtkWidget *menuitem); + +/* Callback functions for toolbar buttons */ +static void cb_home_button (GtkWidget *widget, + GimvDirView *dv); +static void cb_up_button (GtkWidget *widget, + GimvDirView *dv); +static void cb_refresh_button (GtkWidget *widget, + GimvDirView *dv); +static void cb_dotfile_button (GtkWidget *widget, + GimvDirView *dv); + +/* Callback functions for DnD */ +static void cb_drag_data_get (GtkWidget *dirtree, + GdkDragContext *context, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data); +static void cb_drag_data_received (GtkWidget *dirtree, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *seldata, + guint info, + guint32 time, + gpointer data); +static void cb_drag_end (GtkWidget *dirtree, + GdkDragContext *context, + gpointer data); +static void cb_toolbar_drag_begin (GtkWidget *widget, + GdkDragContext *context, + gpointer data); +static gboolean cb_drag_motion (GtkWidget *widget, + GdkDragContext *drag_context, + gint x, + gint y, + guint time, + gpointer data); +static void cb_toolbar_drag_data_get (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data); +static void cb_com_swap_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data); + +/* other private functions */ +static void get_icon_pixbufs (void); +static void set_columns_type (GtkTreeView *tree_view); +static void dirview_create_treeview (GimvDirView *dv, + const gchar *root); +static GtkWidget *dirview_create_toolbar (GimvDirView *dv); +static void insert_dummy_row (GtkTreeStore *store, + GtkTreeIter *parent_iter); +static void insert_row (GtkTreeStore *store, + GtkTreeIter *iter, + GtkTreeIter *parent_iter, + const gchar *label, + const gchar *fullpath); +static gboolean get_iter_from_path (GimvDirView *dv, + const gchar *str, + GtkTreeIter *iter); +static void adjust_tree (GtkTreeView *treeview, + GtkTreeIter *iter); +static void adjust_tree_idle (GimvDirView *dv, + GtkTreeIter *iter); +static void get_expanded_dirs (GtkTreeView *treeview, + GtkTreePath *treepath, + gpointer data); +static void refresh_dir_tree (GimvDirView *dv, + GtkTreeIter *parent_iter); +static void dirview_popup_menu (GimvDirView *dv, + GdkEventButton *event); +static gboolean dirview_button_action (GimvDirView *dv, + GdkEventButton *event, + gint num); + +static GtkItemFactoryEntry dirview_popup_items [] = +{ + {N_("/_Load Thumbnail"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_NONE, NULL}, + {N_("/Load Thumbnail re_cursively"), NULL, cb_open_thumbnail, SCAN_SUB_DIR, NULL}, + {N_("/Load Thumbnail recursively in _one tab"), NULL, cb_open_thumbnail, SCAN_SUB_DIR_ONE_TAB, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Go to here"), NULL, cb_go_to_here, 0, NULL}, + {N_("/_Refresh Tree"), NULL, cb_refresh_dir_tree, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Property..."), NULL, cb_file_property, 0, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/_Make Directory..."), NULL, cb_mkdir, 0, NULL}, + {N_("/Re_name Directory..."), NULL, cb_rename_dir, 0, NULL}, + {N_("/_Delete Directory..."), NULL, cb_delete_dir, 0, NULL}, + {NULL, NULL, NULL, 0, NULL}, +}; + +static GdkPixbuf *folder = NULL; +static GdkPixbuf *ofolder = NULL; +static GdkPixbuf *lfolder = NULL; +static GdkPixbuf *lofolder = NULL; +static GdkPixbuf *go_folder = NULL; +static GdkPixbuf *up_folder = NULL; +static GdkPixbuf *lock_folder = NULL; + + + +/****************************************************************************** + * + * Callback functions + * + ******************************************************************************/ +static void +gimv_dir_view_dispose (GObject *object) +{ + GimvDirView *dv = GIMV_DIR_VIEW (object); + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + + if (dv->root_dir) + g_free (dv->root_dir); + dv->root_dir = NULL; + + if (priv->button_action_id) + gtk_idle_remove (priv->button_action_id); + priv->button_action_id = 0; + + if (priv->swap_com_id) + gtk_idle_remove (priv->swap_com_id); + priv->swap_com_id = 0; + + if (priv->adjust_tree_id) + gtk_idle_remove (priv->adjust_tree_id); + priv->adjust_tree_id = 0; +} + + +static gboolean +cb_button_press (GtkWidget *widget, GdkEventButton *event, GimvDirView *dv) +{ + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + gint num; + + num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); + if (event->type == GDK_2BUTTON_PRESS) { + priv->button_2pressed_queue = num; + } else if (num > 0) { + return dirview_button_action (dv, event, num); + } + + return FALSE; +} + + +static gboolean +cb_button_release (GtkWidget *widget, GdkEventButton *event, GimvDirView *dv) +{ + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + gint num; + + if (priv->button_2pressed_queue) { + num = priv->button_2pressed_queue; + if (num > 0) + num = 0 - num; + priv->button_2pressed_queue = 0; + } else { + num = prefs_mouse_get_num_from_event (event, conf.dirview_mouse_button); + } + if (num < 0) + return dirview_button_action (dv, event, num); + + return FALSE; +} + + +static gboolean +cb_scroll (GtkWidget *widget, GdkEventScroll *se, GimvDirView *dv) +{ + GdkEventButton be; + gboolean retval = FALSE; + gint num; + + g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); + + be.type = GDK_BUTTON_PRESS; + be.window = se->window; + be.send_event = se->send_event; + be.time = se->time; + be.x = se->x; + be.y = se->y; + be.axes = NULL; + be.state = se->state; + be.device = se->device; + be.x_root = se->x_root; + be.y_root = se->y_root; + switch ((se)->direction) { + case GDK_SCROLL_UP: + be.button = 4; + break; + case GDK_SCROLL_DOWN: + be.button = 5; + break; + case GDK_SCROLL_LEFT: + be.button = 6; + break; + case GDK_SCROLL_RIGHT: + be.button = 7; + break; + default: + g_warning ("invalid scroll direction!"); + be.button = 0; + break; + } + + num = prefs_mouse_get_num_from_event (&be, conf.dirview_mouse_button); + if (num > 0) + retval = dirview_button_action (dv, &be, num); + + be.type = GDK_BUTTON_RELEASE; + if (num < 0) + retval = dirview_button_action (dv, &be, num); + + return retval; +} + + +static gboolean +cb_key_press (GtkWidget *widget, GdkEventKey *event, GimvDirView *dv) +{ + guint keyval, popup_key; + GdkModifierType modval, popup_mod; + gboolean success; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreePath *treepath; + gboolean retval = FALSE; + gchar *label, *path; + + g_return_val_if_fail (dv, FALSE); + g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE); + + keyval = event->keyval; + modval = event->state; + + if (akey.common_popup_menu || *akey.common_popup_menu) + gtk_accelerator_parse (akey.common_popup_menu, &popup_key, &popup_mod); + else + return FALSE; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); + g_return_val_if_fail (selection, FALSE); + + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return FALSE; + treepath = gtk_tree_model_get_path (model, &iter); + if (!treepath) return FALSE; + + gtk_tree_model_get (model, &iter, + COLUMN_LABEL, &label, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + if (keyval == popup_key && (!popup_mod || (modval & popup_mod))) { + dirview_popup_menu (dv, NULL); + } else { + switch (keyval) { + case GDK_KP_Enter: + case GDK_Return: + case GDK_ISO_Enter: + { + if (!strcmp (label, ".") || !strcmp (label, "..")) { + gimv_dir_view_chroot (dv, path); + } else { + open_dir_images (path, dv->tw, NULL, + LOAD_CACHE, conf.scan_dir_recursive); + } + retval = TRUE; + break; + } + case GDK_space: + if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), treepath)) + gtk_tree_view_collapse_row (GTK_TREE_VIEW (widget), treepath); + else + gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), treepath, FALSE); + retval = TRUE; + break; + case GDK_Right: + if (modval & GDK_CONTROL_MASK) { + gimv_dir_view_chroot (dv, path); + } else { + gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), treepath, FALSE); + } + retval = TRUE; + break; + case GDK_Left: + if (modval & GDK_CONTROL_MASK) { + gimv_dir_view_chroot_to_parent (dv); + } else { + gtk_tree_view_collapse_row (GTK_TREE_VIEW (widget), treepath); + } + retval = TRUE; + break; + case GDK_Up: + if (modval & GDK_CONTROL_MASK) { + gimv_dir_view_chroot_to_parent (dv); + retval = TRUE; + } + break; + case GDK_Down: + if (modval & GDK_CONTROL_MASK) { + gimv_dir_view_chroot (dv, path); + retval = TRUE; + } + break; + } + } + + g_free (label); + g_free (path); + gtk_tree_path_free(treepath); + + return retval; +} + + +static void +cb_tree_expand (GtkTreeView *treeview, + GtkTreeIter *parent_iter, + GtkTreePath *treepath, + gpointer data) +{ + GimvDirView *dv = data; + GtkTreeStore *store; + GtkTreeIter child_iter, iter; + gchar *parent_dir; + gboolean dummy; + GList *subdir_list = NULL, *node; + GetDirFlags flags; + + g_return_if_fail (dv); + + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + + gtk_tree_model_iter_children (GTK_TREE_MODEL (store), + &child_iter, parent_iter); + gtk_tree_model_get (GTK_TREE_MODEL (store), &child_iter, + COLUMN_IS_DUMMY, &dummy, + COLUMN_TERMINATOR); + if (!dummy) return; + + gtk_tree_model_get (GTK_TREE_MODEL (store), parent_iter, + COLUMN_FULLPATH, &parent_dir, + COLUMN_TERMINATOR); + + flags = GETDIR_FOLLOW_SYMLINK | GETDIR_READ_DOT; + get_dir (parent_dir, flags, NULL, &subdir_list); + + if (dv->show_dotfile || conf.dirview_show_current_dir) { + insert_row (store, &iter, parent_iter, ".", parent_dir); + } + + if (dv->show_dotfile || conf.dirview_show_parent_dir) { + gchar *end, *grandparent = remove_slash(parent_dir); + + end = strrchr (grandparent, '/'); + if (end) *(end + 1) = '\0'; + + insert_row (store, &iter, parent_iter, "..", grandparent); + + g_free (grandparent); + } + + for (node = subdir_list; node; node = g_list_next (node)) { + gchar *path = node->data; + gboolean dot_file_check; + + dot_file_check = g_basename(path)[0] != '.' + || (dv->show_dotfile && g_basename(path)[0] == '.') + || (conf.dirview_show_current_dir && !strcmp (g_basename(path), ".")) + || (conf.dirview_show_parent_dir && !strcmp (g_basename(path), "..")); + + if (isdir (path) && dot_file_check) { + insert_row (store, &iter, parent_iter, g_basename (path), path); + } + } + g_list_foreach (subdir_list, (GFunc) g_free, NULL); + g_list_free (subdir_list); + + gtk_tree_store_remove (store, &child_iter); + + g_free (parent_dir); +} + + + +/****************************************************************************** + * + * Callback functions for popup menu + * + ******************************************************************************/ +static void +cb_open_thumbnail (GimvDirView *dv, ScanSubDirType scan_subdir, GtkWidget *menuitem) +{ + gchar *path; + + path = gimv_dir_view_get_selected_path (dv); + if (!path) return; + + open_dir_images (path, dv->tw, NULL, LOAD_CACHE, scan_subdir); + + g_free (path); +} + + +static void +cb_go_to_here (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + gchar *path; + + path = gimv_dir_view_get_selected_path (dv); + if (!path) return; + + gimv_dir_view_chroot (dv, path); + + g_free (path); +} + + +static void +cb_refresh_dir_tree (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + gboolean success; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; + + refresh_dir_tree (dv, &iter); +} + + +static void +cb_file_property (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + GimvImageInfo *info; + gchar *path, *tmpstr; + + g_return_if_fail (dv); + + tmpstr = gimv_dir_view_get_selected_path (dv); + if (!tmpstr) return; + + path = remove_slash (tmpstr); + g_free(tmpstr); + + info = gimv_image_info_get (path); + if (!info) { + g_free (path); + return; + } + + gimv_file_prop_win_run (info, 0); + + gimv_image_info_unref (info); + g_free (path); +} + + +static void +cb_mkdir (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + gchar *parent_path; + gboolean success; + GtkTreeIter iter; + + g_return_if_fail (dv); + + parent_path = gimv_dir_view_get_selected_path (dv); + if (!parent_path) return; + + success = make_dir_dialog ( + parent_path, + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (dv)))); + + if (success) { + if (get_iter_from_path (dv, parent_path, &iter)) + refresh_dir_tree (dv, &iter); + else + refresh_dir_tree (dv, NULL); + } + + g_free (parent_path); +} + + +static void +cb_rename_dir (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + gboolean success; + gchar *path; + + g_return_if_fail (dv); + + path = gimv_dir_view_get_selected_path (dv); + if (!path) return; + + success = rename_dir_dialog + (path, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (dv)))); + + if (success) { + gchar *tmp_path, *parent_dir; + GtkTreeIter iter; + + tmp_path = remove_slash (path); + parent_dir = g_dirname (tmp_path); + + if (get_iter_from_path (dv, parent_dir, &iter)) + refresh_dir_tree (dv, &iter); + else + refresh_dir_tree (dv, NULL); + + g_free (tmp_path); + g_free (parent_dir); + } +} + + +static void +cb_delete_dir (GimvDirView *dv, guint action, GtkWidget *menuitem) +{ + gchar *path, *parent_dir; + GtkTreeIter iter; + + g_return_if_fail (dv); + + path = gimv_dir_view_get_selected_path (dv); + if (!path) return; + + if (path [strlen (path) - 1] == '/') + path [strlen (path) - 1] = '\0'; + + delete_dir (path, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (dv)))); + g_free (path); + + parent_dir = g_dirname (path); + + /* refresh dir tree */ + if (get_iter_from_path (dv, parent_dir, &iter)) + refresh_dir_tree (dv, &iter); + else + refresh_dir_tree (dv, NULL); + + g_free (parent_dir); +} + + + +/****************************************************************************** + * + * Callback functions for toolbar buttons. + * + ******************************************************************************/ +static void +cb_home_button (GtkWidget *widget, GimvDirView *dv) +{ + g_return_if_fail (dv); + + gimv_dir_view_go_home (dv); +} + + +static void +cb_up_button (GtkWidget *widget, GimvDirView *dv) +{ + gimv_dir_view_chroot_to_parent (dv); +} + + +static void +cb_refresh_button (GtkWidget *widget, GimvDirView *dv) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; + + g_return_if_fail (widget && dv); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + success = gtk_tree_model_get_iter_first (model, &iter); + if (!success) return; + + refresh_dir_tree (dv, &iter); +} + + +static void +cb_dotfile_button (GtkWidget *widget, GimvDirView *dv) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; + + g_return_if_fail (widget && dv); + + dv->show_dotfile = !dv->show_dotfile; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + success = gtk_tree_model_get_iter_first (model, &iter); + if (!success) return; + + refresh_dir_tree (dv, &iter); +} + + +/****************************************************************************** + * + * Callback functions for DnD + * + ******************************************************************************/ +static void +cb_drag_data_get (GtkWidget *dirtree, + GdkDragContext *context, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data) +{ + GimvDirView *dv = data; + gchar *path, *urilist; + + g_return_if_fail (dv); + + path = gimv_dir_view_get_selected_path(dv); + if (!path) return; + if (!*path) { + g_free (path); + return; + } + + if (path [strlen (path) - 1] == '/') + path [strlen (path) - 1] = '\0'; + urilist = g_strconcat ("file://", path, "\r\n", NULL); + + gtk_selection_data_set(seldata, seldata->target, + 8, urilist, strlen(urilist)); + + g_free (path); + g_free (urilist); +} + + +static gboolean +cb_drag_motion (GtkWidget *widget, + GdkDragContext *drag_context, + gint x, gint y, guint time, + gpointer data) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreePath *dest_path = NULL; + GtkTreeViewDropPosition pos; + gboolean success, retval = FALSE; + /* GimvDirView *dv = data; */ + + g_return_val_if_fail(GTK_IS_TREE_VIEW(widget), FALSE); + g_return_val_if_fail(data, FALSE); + + success = gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), + x, y, + &dest_path, &pos); + if (!success) return FALSE; + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); + gtk_tree_model_get_iter(model, &iter, dest_path); + /* + gtk_tree_model_get(model, &iter, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + */ + + if (pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE || + pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) + { + gdk_drag_status(drag_context, GDK_ACTION_MOVE, time); + } + else if (pos == GTK_TREE_VIEW_DROP_BEFORE || + pos == GTK_TREE_VIEW_DROP_AFTER) + { + gdk_drag_status(drag_context, 0, time); + retval = TRUE; + } + + if (dest_path) + gtk_tree_path_free(dest_path); + + return retval; +} + + +static void +cb_drag_data_received (GtkWidget *dirtree, + GdkDragContext *context, + gint x, gint y, + GtkSelectionData *seldata, + guint info, + guint32 time, + gpointer data) +{ + GimvDirView *dv = data; + GtkTreePath *treepath; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; + gchar *path; + + g_return_if_fail (dv); + + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dirtree), + x, y, + &treepath, NULL, + NULL, NULL); + if (!success) return; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dirtree)); + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + if (path && *path) { + if (iswritable (path)) { + dnd_file_operation (path, context, seldata, time, dv->tw); + success = gtk_tree_model_get_iter_first (model, &iter); + if (success) + refresh_dir_tree (dv, &iter); + else + refresh_dir_tree (dv, NULL); + } else { + gchar error_message[BUF_SIZE], *dir_internal; + + dir_internal = charset_to_internal (path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + g_snprintf (error_message, BUF_SIZE, + _("Permission denied: %s"), + dir_internal); + gtkutil_message_dialog ( + _("Error!!"), error_message, + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (dv)))); + + g_free (dir_internal); + } + } + + gtk_tree_path_free (treepath); + g_free (path); +} + + +static void +cb_drag_end (GtkWidget *dirtree, GdkDragContext *context, gpointer data) +{ + GimvDirView *dv = data; + GtkTreeModel *model; + GtkTreeIter iter; + + g_return_if_fail (dirtree && dv); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dirtree)); + if (gtk_tree_model_get_iter_first (model, &iter)) + refresh_dir_tree (dv, &iter); + else + refresh_dir_tree (dv, NULL); +} + + +static void +cb_toolbar_drag_begin (GtkWidget *widget, + GdkDragContext *context, + gpointer data) +{ + GdkColormap *colormap; + GimvIcon *icon; + + icon = gimv_icon_stock_get_icon ("paper"); + colormap = gdk_colormap_get_system (); + gtk_drag_set_icon_pixmap (context, colormap, + icon->pixmap, icon->mask, + 0, 0); +} + + +static void +cb_toolbar_drag_data_get (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data) +{ + switch (info) { + case TARGET_GIMV_COMPONENT: + gtk_selection_data_set(seldata, seldata->target, + 8, "dummy", strlen("dummy")); + break; + } +} + + +typedef struct SwapCom_Tag +{ + GimvThumbWin *tw; + gint src; + gint dest; +} SwapCom; + + +static gint +idle_thumbwin_swap_component (gpointer data) +{ + SwapCom *swap = data; + gimv_thumb_win_swap_component (swap->tw, swap->src, swap->dest); + return FALSE; +} + + +static void +cb_com_swap_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, gint y, + GtkSelectionData *seldata, + guint info, + guint time, + gpointer data) +{ + GimvThumbWin *tw = GIMV_DIR_VIEW (widget)->tw; + GtkWidget *src_widget; + gpointer p; + gint src, dest; + + switch (info) { + case TARGET_GIMV_COMPONENT: + case TARGET_GIMV_TAB: + src_widget = gtk_drag_get_source_widget (context); + if (!src_widget) return; + if (gdk_window_get_toplevel (src_widget->window) + != gdk_window_get_toplevel (widget->window)) + { + return; + } + + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); + src = GPOINTER_TO_INT (p); + if (!src) return; + + p = g_object_get_data (G_OBJECT (widget), "gimv-component"); + dest = GPOINTER_TO_INT (p); + if (!dest) return; + + { + SwapCom *swap = g_new0 (SwapCom, 1); + swap->tw = tw; + swap->src = src; + swap->dest = dest; + gtk_idle_add_full (/* GTK_PRIORITY_REDRAW */G_PRIORITY_LOW, + idle_thumbwin_swap_component, NULL, swap, + (GtkDestroyNotify) g_free); + } + + break; + + default: + break; + } +} + + + +/****************************************************************************** + * + * Other private functions + * + ******************************************************************************/ +static void +get_icon_pixbufs (void) +{ + if (!folder) { + folder = gimv_icon_stock_get_pixbuf ("folder"); + if (folder) g_object_ref (folder); + } + + if (!ofolder) { + ofolder = gimv_icon_stock_get_pixbuf ("folder-open"); + if (ofolder) g_object_ref (ofolder); + } + + if (!lfolder) { + lfolder = gimv_icon_stock_get_pixbuf ("folder-link"); + if (lfolder) g_object_ref (lfolder); + } + + if (!lofolder) { + lofolder = gimv_icon_stock_get_pixbuf ("folder-link-open"); + if (lofolder) g_object_ref (lofolder); + } + + if (!go_folder) { + go_folder = gimv_icon_stock_get_pixbuf ("folder-go"); + if (go_folder) g_object_ref (go_folder); + } + + if (!up_folder) { + up_folder = gimv_icon_stock_get_pixbuf ("folder-up"); + if (up_folder) g_object_ref (up_folder); + } + + if (!lock_folder) { + lock_folder = gimv_icon_stock_get_pixbuf ("folder-lock"); + if (lock_folder) g_object_ref (lock_folder); + } +} + + +static void +set_columns_type (GtkTreeView *tree_view) +{ + GtkTreeViewColumn *col; + GtkCellRenderer *render; + + gtk_tree_view_set_rules_hint (tree_view, FALSE); + gtk_tree_view_set_rules_hint (tree_view, TRUE); + + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title (col, "Directory Name"); + + render = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (col, render, FALSE); + gtk_tree_view_column_add_attribute (col, render, + "pixbuf", COLUMN_ICON_CLOSE); + gtk_tree_view_column_add_attribute (col, render, + "pixbuf-expander-open", + COLUMN_ICON_OPEN); + gtk_tree_view_column_add_attribute (col, render, + "pixbuf-expander-closed", + COLUMN_ICON_CLOSE); + + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_LABEL); + + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), col); + gtk_tree_view_set_expander_column (tree_view, col); +} + + +static void +dirview_create_treeview (GimvDirView *dv, const gchar *root) +{ + GtkTreeStore *store; + GtkTreeIter root_iter; + GtkTreePath *treepath; + + get_icon_pixbufs(); + + store = gtk_tree_store_new (N_COLUMN, + G_TYPE_STRING, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + GDK_TYPE_PIXBUF, + G_TYPE_BOOLEAN); + + dv->dirtree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + + insert_row (store, &root_iter, NULL, root, root); + + g_object_unref (G_OBJECT (store)); + + g_signal_connect (G_OBJECT (dv->dirtree), "row-expanded", + G_CALLBACK (cb_tree_expand), dv); + g_signal_connect (G_OBJECT (dv->dirtree),"button_press_event", + G_CALLBACK (cb_button_press), dv); + g_signal_connect (G_OBJECT (dv->dirtree),"button_release_event", + G_CALLBACK (cb_button_release), dv); + g_signal_connect (G_OBJECT(dv->dirtree), "scroll-event", + G_CALLBACK(cb_scroll), dv); + g_signal_connect (G_OBJECT (dv->dirtree), "key_press_event", + G_CALLBACK (cb_key_press), dv); + + /* for DnD */ + gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (dv->dirtree), + GDK_BUTTON1_MASK + | GDK_BUTTON2_MASK + | GDK_BUTTON3_MASK, + dnd_types_uri, + dnd_types_uri_num, + GDK_ACTION_ASK | GDK_ACTION_COPY + | GDK_ACTION_MOVE | GDK_ACTION_LINK); + gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (dv->dirtree), + dnd_types_uri, + dnd_types_uri_num, + GDK_ACTION_ASK | GDK_ACTION_COPY + | GDK_ACTION_MOVE | GDK_ACTION_LINK); + g_signal_connect (G_OBJECT (dv->dirtree), "drag_data_get", + G_CALLBACK (cb_drag_data_get), dv); + g_signal_connect (G_OBJECT (dv->dirtree), "drag_motion", + G_CALLBACK (cb_drag_motion), dv); + g_signal_connect (G_OBJECT (dv->dirtree), "drag_data_received", + G_CALLBACK (cb_drag_data_received), dv); + g_signal_connect (G_OBJECT (dv->dirtree), "drag_end", + G_CALLBACK (cb_drag_end), dv); + + set_columns_type (GTK_TREE_VIEW (dv->dirtree)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dv->dirtree), FALSE); + + gtk_container_add (GTK_CONTAINER (dv->scroll_win), dv->dirtree); + gtk_widget_show (dv->dirtree); + + treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); + gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, FALSE); + + gtk_tree_path_free (treepath); + + adjust_tree_idle (dv, NULL); +} + + +static GtkWidget * +dirview_create_toolbar (GimvDirView *dv) +{ + GtkWidget *toolbar; + GtkWidget *button; + GtkWidget *iconw; + + g_return_val_if_fail (dv, NULL); + + toolbar = gtkutil_create_toolbar (); + + /* file open button */ + iconw = gimv_icon_stock_get_widget ("small_home"); + button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), + _("Home"), + _("Home"), + _("Home"), + iconw, + G_CALLBACK (cb_home_button), + dv); + + /* preference button */ + iconw = gimv_icon_stock_get_widget ("small_up"); + button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), + _("Up"), + _("Up"), + _("Up"), + iconw, + G_CALLBACK (cb_up_button), + dv); + + /* refresh button */ + iconw = gimv_icon_stock_get_widget ("small_refresh"); + button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), + _("Refresh"), + _("Refresh"), + _("Refresh"), + iconw, + G_CALLBACK (cb_refresh_button), + dv); + + /* preference button */ + iconw = gimv_icon_stock_get_widget ("dotfile"); + button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), + _("Dotfile"), + _("Show/Hide dotfile"), + _("Show/Hide dotfile"), + iconw, + G_CALLBACK (cb_dotfile_button), + dv); + + gtk_widget_show_all (toolbar); + gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + + return toolbar; +} + + +/* + * remove all children, and insert dummy row. + */ +static void +insert_dummy_row (GtkTreeStore *store, GtkTreeIter *parent_iter) +{ + GtkTreeIter iter; + gboolean success; + + g_return_if_fail (store); + + gtk_tree_store_prepend (store, &iter, parent_iter); + gtk_tree_store_set (store, &iter, + COLUMN_IS_DUMMY, TRUE, + COLUMN_TERMINATOR); + + success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), + &iter, + parent_iter, + 1); + if (!success) return; + + while (gtk_tree_store_is_ancestor (store, parent_iter, &iter)) { + gtk_tree_store_remove (store, &iter); + } +} + + +/* + * fullpath shouldn't be terminated with "/" character. + */ +static void +insert_row (GtkTreeStore *store, + GtkTreeIter *iter, GtkTreeIter *parent_iter, + const gchar *label, const gchar *fullpath) +{ + GdkPixbuf *icon, *oicon; + gchar *path, *tmpstr; + gchar *label_internal; + + g_return_if_fail (store); + g_return_if_fail (iter); + g_return_if_fail (label && *label); + g_return_if_fail (fullpath && *fullpath); + + path = remove_slash (fullpath); + + if (!strcmp (label, ".")) { + icon = go_folder; + oicon = go_folder; + } else if (!strcmp (label, "..")) { + icon = up_folder; + oicon = up_folder; + } else if (access(path, R_OK)) { + icon = lock_folder; + oicon = lock_folder; + } else if (islink(path)) { + icon = lfolder; + oicon = lofolder; + } else if (isdir(path)) { + icon = folder; + oicon = ofolder; + } else { + return; + } + + tmpstr = add_slash (path); + g_free(path); + path = tmpstr; + + /* convert charset */ + label_internal = charset_to_internal (label, conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + gtk_tree_store_append (store, iter, parent_iter); + gtk_tree_store_set (store, iter, + COLUMN_LABEL, label_internal, + COLUMN_FULLPATH, path, + COLUMN_ICON_OPEN, oicon, + COLUMN_ICON_CLOSE, icon, + COLUMN_IS_DUMMY, FALSE, + COLUMN_TERMINATOR); + + if (strcmp (label, ".") && strcmp (label, "..") && !access(path, R_OK)) + insert_dummy_row (store, iter); + + g_free (label_internal); + g_free (path); +} + + +static gboolean +is_in_view (GtkTreeView *treeview, GtkTreePath *treepath) +{ + GdkRectangle widget_area, cell_area; + + if (!GTK_WIDGET_REALIZED (treeview)) + return FALSE; + + /* widget area */ + gtkutil_get_widget_area (GTK_WIDGET (treeview), &widget_area); + + gtk_tree_view_get_cell_area(treeview, treepath, NULL, &cell_area); + + if (cell_area.y >= 0 && cell_area.y < widget_area.height) + return TRUE; + else + return FALSE; +} + + +static void +adjust_tree (GtkTreeView *treeview, GtkTreeIter *iter) +{ + GtkTreeModel *model; + GtkTreePath *treepath; + GtkTreeSelection *selection; + GtkTreeIter tmp_iter; + gboolean success; + + model = gtk_tree_view_get_model (treeview); + selection = gtk_tree_view_get_selection (treeview); + + if (iter) { + treepath = gtk_tree_model_get_path (model, iter); + tmp_iter = *iter; + } else { + treepath = gtk_tree_path_new_from_string ("0"); + success = gtk_tree_model_get_iter (model, &tmp_iter, treepath); + if (!success) goto FUNC_END; + } + + gtk_tree_selection_select_path (selection, treepath); + if (!is_in_view(treeview, treepath)) + gtk_tree_view_scroll_to_cell (treeview, treepath, NULL, + TRUE, 0.0, 0.0); + + FUNC_END: + gtk_tree_path_free (treepath); + treepath = NULL; +} + + +static gboolean +get_iter_from_path (GimvDirView *dv, const gchar *str, GtkTreeIter *iter) +{ + GtkTreeModel *model; + GtkTreeIter parent_iter, child_iter; + GtkTreePath *treepath; + GtkTreeSelection *selection; + gchar *destpath; + gint len_src, len_dest; + gboolean go_next, retval = FALSE; + + g_return_val_if_fail (dv, FALSE); + g_return_val_if_fail (iter, FALSE); + + destpath = add_slash (str); + if (!destpath) return FALSE; + + len_src = strlen (dv->root_dir); + len_dest = strlen (destpath); + + if (len_dest < len_src || strncmp (dv->root_dir, destpath, len_src)) { + goto ERROR; + } + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); + + go_next = gtk_tree_model_get_iter_from_string (model, &parent_iter, "0"); + if (!go_next) goto ERROR; + treepath = gtk_tree_model_get_path (model, &parent_iter); + + if (!strcmp (destpath, dv->root_dir)) { + gtk_tree_path_free (treepath); + g_free (destpath); + return gtk_tree_model_get_iter_first (model, iter); + } + + gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, FALSE); + gtk_tree_path_free (treepath); + treepath = NULL; + + go_next = gtk_tree_model_get_iter_from_string (model, &parent_iter, "0:0"); + + while (go_next) { + gint len; + gchar *path, *label; + + gtk_tree_model_get (model, &parent_iter, + COLUMN_LABEL, &label, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + len = strlen (path); /* path will be terminated by "/" */ + + /* It is just the directory! */ + if (!strcmp (label, ".") || !strcmp (label, "..")) { + go_next = gtk_tree_model_iter_next (model, &parent_iter); + } else if (!strcmp (destpath, path)) { + *iter = parent_iter; + go_next = FALSE; + retval = TRUE; + + /* It is the parent directory of the destpath */ + } else if (!strncmp (destpath, path, len)) { + treepath = gtk_tree_model_get_path (model, &parent_iter); + go_next = gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, + FALSE); + go_next = gtk_tree_model_iter_children (model, + &child_iter, + &parent_iter); + parent_iter = child_iter; + + gtk_tree_path_free (treepath); + treepath = NULL; + + /* No match. Search the next... */ + } else { + go_next = gtk_tree_model_iter_next (model, &parent_iter); + } + + g_free (path); + g_free (label); + } + + + g_free (destpath); + return retval; + + ERROR: + g_free (destpath); + return FALSE; +} + + +struct AdjustTreeIdle { + GimvDirView *dv; + GtkTreeView *treeview; + gboolean has_iter; + GtkTreeIter iter; +}; + + +static gint +idle_adjust_tree (gpointer data) +{ + struct AdjustTreeIdle *idle = data; + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (idle->dv); + + priv->adjust_tree_id = 0; + if (idle->has_iter) + adjust_tree (idle->treeview, &idle->iter); + else + adjust_tree (idle->treeview, NULL); + + return FALSE; +} + + +static void +adjust_tree_idle (GimvDirView *dv, GtkTreeIter *iter) +{ + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + GtkTreeView *treeview = GTK_TREE_VIEW (dv->dirtree); + struct AdjustTreeIdle *idle; + + g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); + + idle = g_new0(struct AdjustTreeIdle, 1); + + idle->dv = dv; + idle->treeview = treeview; + if (iter) { + idle->iter = *iter; + idle->has_iter = TRUE; + } else { + idle->has_iter = FALSE; + } + + priv->adjust_tree_id = + gtk_idle_add_full (G_PRIORITY_DEFAULT, + idle_adjust_tree, NULL, idle, + (GtkDestroyNotify) g_free); +} + + +static void +get_expanded_dirs (GtkTreeView *treeview, GtkTreePath *treepath, gpointer data) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GList **list; + gchar *path; + + g_return_if_fail (data); + list = data; + + model = gtk_tree_view_get_model (treeview); + + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + g_return_if_fail (path && *path); + + *list = g_list_append (*list, path); +} + + +static void +refresh_dir_tree (GimvDirView *dv, GtkTreeIter *parent_iter) +{ + GtkTreeView *treeview; + GtkTreeStore *store; + GtkTreeIter root_iter, iter; + GtkTreePath *treepath; + gchar *root_dir, *selected_path; + GList *expand_list = NULL, *node; + gboolean selected; + + g_return_if_fail (dv); + + selected_path = gimv_dir_view_get_selected_path (dv); + if (!selected_path) selected_path = g_strdup (dv->root_dir); + + /* get expanded directory list */ + gtk_tree_view_map_expanded_rows (GTK_TREE_VIEW (dv->dirtree), + get_expanded_dirs, + &expand_list); + + /* replace root node */ + root_dir = g_strdup (dv->root_dir); +#if 1 /* almost same with gimv_dir_view_chroot () */ + g_free (dv->root_dir); + dv->root_dir = add_slash (root_dir); + + treeview = GTK_TREE_VIEW (dv->dirtree); + + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); + insert_row (store, &root_iter, NULL, dv->root_dir, dv->root_dir); + + treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); + + gtk_tree_path_free (treepath); +#endif + g_free (root_dir); + + /* restore expanded directory */ + for (node = expand_list; node; node = g_list_next (node)) { + gimv_dir_view_expand_dir (dv, node->data, FALSE); + } + + g_list_foreach (expand_list, (GFunc) g_free, NULL); + g_list_free (expand_list); + + /* adjust tree pos */ + selected = get_iter_from_path (dv, selected_path, &iter); + if (selected) + adjust_tree_idle (dv, &iter); + + g_free (selected_path); +} + + +static void +dirview_popup_menu (GimvDirView *dv, GdkEventButton *event) +{ + GtkTreeModel *model; + GtkTreePath *treepath; + GtkTreeIter iter; + gboolean success; + gchar *path, *parent, *tmpstr, *label; + + GtkItemFactory *ifactory; + GtkWidget *dirview_popup, *menuitem; + gint n_menu_items; + guint button; + guint32 time; + GtkMenuPositionFunc pos_fn = NULL; + + g_return_if_fail (dv); + + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dv->dirtree), + event->x, event->y, + &treepath, NULL, NULL, NULL); + if (!success) return; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_LABEL, &label, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + tmpstr = remove_slash (path); + parent = g_dirname (tmpstr); + g_free (tmpstr); + + if (event) { + button = event->button; + time = event->time; + } else { + button = 0; + time = GDK_CURRENT_TIME; + pos_fn = menu_calc_popup_position; + } + + if (dv->popup_menu) { + gtk_widget_unref (dv->popup_menu); + dv->popup_menu = NULL; + } + + n_menu_items = sizeof(dirview_popup_items) + / sizeof(dirview_popup_items[0]) - 1; + dirview_popup = menu_create_items(NULL, dirview_popup_items, + n_menu_items, "", dv); + + + /* set sensitive */ + ifactory = gtk_item_factory_from_widget (dirview_popup); + + if (!strcmp (label, ".") || !strcmp (label, "..")) + { + menuitem = gtk_item_factory_get_item (ifactory, "/Refresh Tree"); + gtk_widget_set_sensitive (menuitem, FALSE); + menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); + gtk_widget_set_sensitive (menuitem, FALSE); + } + + if (!iswritable (path)) { + menuitem = gtk_item_factory_get_item (ifactory, "/Make Directory..."); + gtk_widget_set_sensitive (menuitem, FALSE); + } + + if (!parent || !strcmp (parent, ".") || !iswritable (parent) + || !strcmp (label, ".") || !strcmp (label, "..")) + { + menuitem = gtk_item_factory_get_item (ifactory, "/Rename Directory..."); + gtk_widget_set_sensitive (menuitem, FALSE); + menuitem = gtk_item_factory_get_item (ifactory, "/Delete Directory..."); + gtk_widget_set_sensitive (menuitem, FALSE); + } + + gtk_tree_path_free (treepath); + g_free (label); + g_free (path); + g_free (parent); + + /* popup menu */ + gtk_menu_popup(GTK_MENU (dirview_popup), NULL, NULL, + pos_fn, dv->dirtree->window, button, time); + + dv->popup_menu = dirview_popup; + + g_object_ref (G_OBJECT (dv->popup_menu)); + gtk_object_sink (GTK_OBJECT (dv->popup_menu)); +} + + +typedef struct ButtonActionData_Tag +{ + GimvDirView *dv; + gchar *path, *label; + gint action_num; +} ButtonActionData; + + +static void +free_button_action_data (ButtonActionData *data) +{ + g_free (data->path); + g_free (data->label); + g_free (data); +} + + +static gboolean +idle_dirview_button_action (gpointer data) +{ + ButtonActionData *bdata = data; + GimvDirView *dv = bdata->dv; + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + gchar *path = bdata->path, *label = bdata->label; + + priv->button_action_id = 0; + + switch (abs (bdata->action_num)) { + case MouseActLoadThumb: + if (!strcmp (label, ".") || !strcmp (label, "..")) { + gimv_dir_view_chroot (dv, path); + } else { + open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_NONE); + } + break; + case MouseActLoadThumbRecursive: + if (!strcmp (label, ".") || !strcmp (label, "..")) { + gimv_dir_view_chroot (dv, path); + } else { + open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR); + } + break; + case MouseActLoadThumbRecursiveInOneTab: + if (!strcmp (label, ".") || !strcmp (label, "..")) { + gimv_dir_view_chroot (dv, path); + } else { + open_dir_images (path, dv->tw, NULL, LOAD_CACHE, SCAN_SUB_DIR_ONE_TAB); + } + break; + case MouseActChangeTop: + gimv_dir_view_chroot (dv, path); + break; + default: + break; + } + + free_button_action_data (bdata); + + return FALSE; +} + + +static gboolean +dirview_button_action (GimvDirView *dv, GdkEventButton *event, gint num) +{ + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + gchar *path = NULL, *label; + GtkTreeSelection *selection; + GtkTreeModel *model; + gboolean success, retval = FALSE; + GtkTreePath *treepath; + GtkTreeViewColumn *treecolumn; + gint cell_x, cell_y; + GtkTreeIter iter; + + success = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dv->dirtree), + event->x, event->y, + &treepath, &treecolumn, + &cell_x, &cell_y); + if (!success) return FALSE; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); + gtk_tree_selection_select_path (selection, treepath); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + gtk_tree_model_get_iter (model, &iter, treepath); + gtk_tree_model_get (model, &iter, + COLUMN_LABEL, &label, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + switch (abs(num)) { + case MouseActLoadThumb: + case MouseActLoadThumbRecursive: + case MouseActLoadThumbRecursiveInOneTab: + case MouseActChangeTop: + { + ButtonActionData *data = g_new0 (ButtonActionData, 1); + + data->dv = dv; + data->path = path; + data->label = label; + data->action_num = num; + + priv->button_action_id + = gtk_idle_add (idle_dirview_button_action, data); + + gtk_tree_path_free (treepath); + + return FALSE; + break; + } + case MouseActPopupMenu: + dirview_popup_menu (dv, event); + if (num > 0) retval = TRUE; + break; + default: + break; + } + + g_free (path); + g_free (label); + gtk_tree_path_free (treepath); + + return retval; +} + + + +/****************************************************************************** + * + * Public functions + * + ******************************************************************************/ +void +gimv_dir_view_chroot (GimvDirView *dv, const gchar *root_dir) +{ + GtkTreeView *treeview; + GtkTreeStore *store; + GtkTreeIter root_iter; + GtkTreePath *treepath; + gchar *dest_dir; + + g_return_if_fail (dv); + g_return_if_fail (root_dir && *root_dir); + + dest_dir = add_slash (root_dir); + + if (!isdir (dest_dir)) { + g_free (dest_dir); + return; + } + + g_free (dv->root_dir); + dv->root_dir = dest_dir; + + treeview = GTK_TREE_VIEW (dv->dirtree); + + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); + insert_row (store, &root_iter, NULL, dv->root_dir, dv->root_dir); + + treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &root_iter); + gtk_tree_view_expand_row (treeview, treepath, FALSE); + + gtk_tree_path_free (treepath); + + adjust_tree_idle (dv, NULL); +} + + +void +gimv_dir_view_chroot_to_parent (GimvDirView *dv) +{ + gchar *end; + gchar *root; + + g_return_if_fail (dv); + + root = g_strdup (dv->root_dir); + end = strrchr (root, '/'); + if (end && end != root) *end = '\0'; + end = strrchr (root, '/'); + if (end) *(end + 1) = '\0'; + + gimv_dir_view_change_dir (dv, root); + g_free (root); +} + + +void +gimv_dir_view_change_dir (GimvDirView *dv, const gchar *str) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gchar *destpath; + gboolean success; + + g_return_if_fail (dv); + + destpath = add_slash (str); + if (!destpath) return; + + if (!isdir (destpath)) { + g_free (destpath); + return; + } + + /* FIXME */ + /* if selected path in directory view is same as str, adjust to it */ + /* END FIXME */ + + success = get_iter_from_path (dv, destpath, &iter); + + if (success) { + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + adjust_tree_idle (dv, &iter); + } else { + gimv_dir_view_chroot (dv, str); + } + + g_free (destpath); +} + + +void +gimv_dir_view_go_home (GimvDirView *dv) +{ + const gchar *home = g_getenv ("HOME"); + + gimv_dir_view_chroot (dv, home); + gimv_dir_view_change_dir (dv, home); +} + + +void +gimv_dir_view_refresh_list (GimvDirView *dv) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + success = gtk_tree_model_get_iter_first (model, &iter); + if (!success) return; + + refresh_dir_tree (dv, &iter); +} + + +gchar * +gimv_dir_view_get_selected_path (GimvDirView *dv) +{ + gboolean success; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + gchar *path; + + g_return_val_if_fail (dv, NULL); + g_return_val_if_fail (dv->dirtree, NULL); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dv->dirtree)); + g_return_val_if_fail (selection, NULL); + + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return NULL; + + gtk_tree_model_get (model, &iter, + COLUMN_FULLPATH, &path, + COLUMN_TERMINATOR); + + return path; +} + + +void +gimv_dir_view_expand_dir (GimvDirView *dv, const gchar *dir, gboolean open_all) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreePath *treepath; + gboolean success; + + success = get_iter_from_path (dv, dir, &iter); + if (!success) return; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv->dirtree)); + treepath = gtk_tree_model_get_path (model, &iter); + + gtk_tree_view_expand_row (GTK_TREE_VIEW (dv->dirtree), treepath, open_all); + + gtk_tree_path_free (treepath); +} + + +gboolean +gimv_dir_view_set_opened_mark (GimvDirView *dv, const gchar *path) +{ + /* note implemented yet */ + return TRUE; +} + + +gboolean +gimv_dir_view_unset_opened_mark (GimvDirView *dv, const gchar *path) +{ + /* note implemented yet */ + return TRUE; +} + + +void +gimv_dir_view_show_toolbar (GimvDirView *dv) +{ + g_return_if_fail (dv); + + dv->show_toolbar = TRUE; + gtk_widget_show (dv->toolbar_eventbox); +} + + +void +gimv_dir_view_hide_toolbar (GimvDirView *dv) +{ + g_return_if_fail (dv); + + dv->show_toolbar = FALSE; + gtk_widget_hide (dv->toolbar_eventbox); +} + + +static void +gimv_dir_view_class_init (GimvDirViewClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = (GObjectClass *) klass; + + gobject_class->dispose = gimv_dir_view_dispose; + + g_type_class_add_private (gobject_class, sizeof (GimvDirViewPrivate)); +} + + +static void +gimv_dir_view_init (GimvDirView *dv) +{ + GimvDirViewPrivate *priv = GIMV_DIR_VIEW_GET_PRIVATE (dv); + GtkWidget *eventbox; + const gchar *home = g_getenv ("HOME"); + + dv->root_dir = add_slash (home); + dv->dirtree = NULL; + dv->popup_menu = NULL; + dv->tw = NULL; + dv->show_toolbar = conf.dirview_show_toolbar; + dv->show_dotfile = conf.dirview_show_dotfile; + + priv->hilit_dir = -1; + priv->scroll_timer_id = 0; + priv->drag_tree_row = NULL; + priv->button_action_id = 0; + priv->swap_com_id = 0; + priv->adjust_tree_id = 0; + + /* main vbox */ + gtk_widget_set_name (GTK_WIDGET (dv), "GimvDirView"); + gtk_widget_show (GTK_WIDGET (dv)); + + dnd_dest_set (GTK_WIDGET (dv), + dnd_types_tab_component, dnd_types_tab_component_num); + g_object_set_data (G_OBJECT (dv), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); + g_signal_connect (G_OBJECT (dv), "drag_data_received", + G_CALLBACK (cb_com_swap_drag_data_received), NULL); + + /* toolbar */ + eventbox = dv->toolbar_eventbox = gtk_event_box_new (); + gtk_container_set_border_width (GTK_CONTAINER (eventbox), 1); + gtk_box_pack_start (GTK_BOX (dv), eventbox, FALSE, FALSE, 0); + gtk_widget_show (eventbox); + + dv->toolbar = dirview_create_toolbar (dv); + gtk_container_add (GTK_CONTAINER (eventbox), dv->toolbar); + + if (!dv->show_toolbar) + gtk_widget_hide (dv->toolbar_eventbox); + + dnd_src_set (dv->toolbar, dnd_types_component, dnd_types_component_num); + g_object_set_data (G_OBJECT (dv->toolbar), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); + g_signal_connect (G_OBJECT (dv->toolbar), "drag_begin", + G_CALLBACK (cb_toolbar_drag_begin), dv); + g_signal_connect (G_OBJECT (dv->toolbar), "drag_data_get", + G_CALLBACK (cb_toolbar_drag_data_get), dv); + + dnd_src_set (eventbox, dnd_types_component, dnd_types_component_num); + g_object_set_data (G_OBJECT (eventbox), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_DIR_VIEW)); + g_signal_connect (G_OBJECT (eventbox), "drag_begin", + G_CALLBACK (cb_toolbar_drag_begin), dv); + g_signal_connect (G_OBJECT (eventbox), "drag_data_get", + G_CALLBACK (cb_toolbar_drag_data_get), dv); + + /* scrolled window */ + dv->scroll_win = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (dv->scroll_win), 1); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dv->scroll_win), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(dv->scroll_win), + GTK_SHADOW_IN); + gtk_box_pack_start(GTK_BOX(dv), dv->scroll_win, TRUE, TRUE, 0); + gtk_widget_show (dv->scroll_win); + + /* ctree */ + dirview_create_treeview (dv, dv->root_dir); +} + + +GtkWidget * +gimv_dir_view_new (const gchar *root_dir, GimvThumbWin *tw) +{ + GimvDirView *dv = GIMV_DIR_VIEW (g_object_new (GIMV_TYPE_DIR_VIEW, NULL)); + dv->tw = tw; + if (root_dir) + gimv_dir_view_chroot(dv, root_dir); + return GTK_WIDGET (dv); +} diff -Nru gimageview-0.2.27/src/gimv_dir_view.h gimageview-0.3.0-0.20101117/src/gimv_dir_view.h --- gimageview-0.2.27/src/gimv_dir_view.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dir_view.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,90 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_dir_view.h 1177 2007-10-21 15:46:38Z makeinu $ + */ + +#ifndef __GIMV_DIR_VIEW_H__ +#define __GIMV_DIR_VIEW_H__ + +#include "gimageview.h" + +#define GIMV_TYPE_DIR_VIEW (gimv_dir_view_get_type ()) +#define GIMV_DIR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_DIR_VIEW, GimvDirView)) +#define GIMV_DIR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_DIR_VIEW, GimvDirViewClass)) +#define GIMV_IS_DIR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_DIR_VIEW)) +#define GIMV_IS_DIR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DIR_VIEW)) +#define GIMV_DIR_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_DIR_VIEW, GimvDirViewClass)) + +typedef struct GimvDirViewClass_Tag GimvDirViewClass; + +typedef enum +{ + GIMV_DIR_VIEWTREE, + GIMV_DIR_VIEWLIST, + GIMV_DIR_VIEWTREE_WITH_FILE, + GIMV_DIR_VIEWLIST_WITH_FILE +} GimvDirViewMode; + +struct GimvDirView_Tag +{ + GtkVBox parent; + + GtkWidget *toolbar; + GtkWidget *toolbar_eventbox; + GtkWidget *scroll_win; + GtkWidget *dirtree; + GtkWidget *popup_menu; + + GimvThumbWin *tw; + + gchar *root_dir; + GimvDirViewMode mode; + gboolean show_toolbar; + gboolean show_dotfile; +}; + +struct GimvDirViewClass_Tag +{ + GtkVBoxClass parent_class; +}; + +GType gimv_dir_view_get_type (void); +GtkWidget *gimv_dir_view_new (const gchar *root_dir, + GimvThumbWin *tw); +void gimv_dir_view_chroot (GimvDirView *dv, + const gchar *root_dir); +void gimv_dir_view_chroot_to_parent (GimvDirView *dv); +void gimv_dir_view_change_dir (GimvDirView *dv, + const gchar *str); +void gimv_dir_view_go_home (GimvDirView *dv); +void gimv_dir_view_refresh_list (GimvDirView *dv); +gchar *gimv_dir_view_get_selected_path (GimvDirView *dv); +void gimv_dir_view_expand_dir (GimvDirView *dv, + const gchar *dir, + gboolean open_all); +gboolean gimv_dir_view_set_opened_mark (GimvDirView *dv, + const gchar *path); +gboolean gimv_dir_view_unset_opened_mark (GimvDirView *dv, + const gchar *path); +void gimv_dir_view_show_toolbar (GimvDirView *dv); +void gimv_dir_view_hide_toolbar (GimvDirView *dv); + +#endif /* __GIMV_DIR_VIEW_H__ */ diff -Nru gimageview-0.2.27/src/gimv_dlist.c gimageview-0.3.0-0.20101117/src/gimv_dlist.c --- gimageview-0.2.27/src/gimv_dlist.c 2004-09-22 15:37:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dlist.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,16 +18,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_dlist.c,v 1.6 2004/09/22 15:37:11 makeinu Exp $ + * $Id: gimv_dlist.c 1142 2007-10-17 13:02:27Z makeinu $ */ +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + #include "gimv_dlist.h" #include #include - -#include "gtk2-compat.h" -#include "intl.h" /* FIXME */ +#include enum { @@ -36,23 +38,12 @@ }; -#if (GTK_MAJOR_VERSION >= 2) #define list_widget_get_row_num(widget) \ gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (widget)), NULL); -#else -#define list_widget_get_row_num(widget) GTK_CLIST (widget)->rows; -#endif /* (GTK_MAJOR_VERSION >= 2) */ - -static void gimv_dlist_init (GimvDList *dslist); -static void gimv_dlist_class_init (GimvDListClass *klass); /* object class functions */ -#if (GTK_MAJOR_VERSION >= 2) static void gimv_dlist_finalize (GObject *object); -#else /* (GTK_MAJOR_VERSION >= 2) */ -static void gimv_dlist_finalize (GtkObject *object); -#endif /* (GTK_MAJOR_VERSION >= 2) */ /* private functions */ static void gimv_dlist_enabled_list_updated (GimvDList *dslist); @@ -61,54 +52,10 @@ gboolean reorderble); -static GtkHBoxClass *parent_class = NULL; static gint gimv_dlist_signals[LAST_SIGNAL] = {0}; -GtkType -gimv_dlist_get_type (void) -{ - static GtkType gimv_dlist_type = 0; - -#if (GTK_MAJOR_VERSION >= 2) - if (!gimv_dlist_type) { - static const GTypeInfo gimv_dlist_info = { - sizeof (GimvDListClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_dlist_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvDList), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_dlist_init, - }; - - gimv_dlist_type = g_type_register_static (GTK_TYPE_HBOX, - "GimvDList", - &gimv_dlist_info, - 0); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - if (!gimv_dlist_type) { - static const GtkTypeInfo gimv_dlist_info = { - "GimvDList", - sizeof (GimvDList), - sizeof (GimvDListClass), - (GtkClassInitFunc) gimv_dlist_class_init, - (GtkObjectInitFunc) gimv_dlist_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_dlist_type = gtk_type_unique (gtk_hbox_get_type (), - &gimv_dlist_info); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ - - return gimv_dlist_type; -} +G_DEFINE_TYPE (GimvDList, gimv_dlist, GTK_TYPE_HBOX) static void @@ -134,22 +81,20 @@ static void gimv_dlist_class_init (GimvDListClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_hbox_get_type ()); + gobject_class = (GObjectClass *) klass; gimv_dlist_signals[ENABLED_LIST_UPDATED_SIGNAL] - = gtk_signal_new ("enabled-list-updated", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvDListClass, enabled_list_updated), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, gimv_dlist_signals, LAST_SIGNAL); + = g_signal_new ("enabled-list-updated", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvDListClass, enabled_list_updated), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - OBJECT_CLASS_SET_FINALIZE_FUNC (klass, gimv_dlist_finalize); + G_OBJECT_CLASS(klass)->finalize = gimv_dlist_finalize; } @@ -160,11 +105,7 @@ * *******************************************************************************/ static void -#ifdef USE_GTK2 gimv_dlist_finalize (GObject *object) -#else -gimv_dlist_finalize (GtkObject *object) -#endif { GimvDList *dslist = GIMV_DLIST (object); @@ -172,7 +113,8 @@ g_list_free (dslist->available_list); dslist->available_list = NULL; - OBJECT_CLASS_FINALIZE_SUPER (parent_class, object); + if (G_OBJECT_CLASS(gimv_dlist_parent_class)->finalize) + G_OBJECT_CLASS(gimv_dlist_parent_class)->finalize (object); } @@ -183,8 +125,6 @@ * *******************************************************************************/ -#if (GTK_MAJOR_VERSION >= 2) - static void cb_gimv_dlist_cursor_changed (GtkTreeView *treeview, gpointer data) { @@ -249,121 +189,28 @@ dslist->clist2_dest_row = -1; } -#else /* (GTK_MAJOR_VERSION >= 2) */ - -static void -cb_gimv_dlist_select_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, gpointer data) -{ - GimvDList *dslist = data; - - g_return_if_fail (clist); - g_return_if_fail (data); - - if (GTK_WIDGET (clist) == dslist->clist1) - dslist->clist1_selected = row; - else if (GTK_WIDGET (clist) == dslist->clist2) - dslist->clist2_selected = row; - - gimv_dlist_set_sensitive (dslist); -} - - -static void -cb_gimv_dlist_unselect_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, gpointer data) -{ - GimvDList *dslist = data; - - g_return_if_fail (clist); - g_return_if_fail (data); - - if (GTK_WIDGET (clist) == dslist->clist1) - dslist->clist1_selected = -1; - else if (GTK_WIDGET (clist) == dslist->clist2) - dslist->clist2_selected = -1; - - gimv_dlist_set_sensitive (dslist); -} - - -static gint -idle_gimv_dlist_row_move (gpointer data) -{ - GimvDList *dslist = data; - - gimv_dlist_enabled_list_updated (dslist); - gimv_dlist_set_sensitive (dslist); - - return FALSE; -} - - -static void -cb_gimv_dlist_row_move (GtkCList *clist, gint arg1, gint arg2, gpointer data) -{ - GimvDList *dslist = data; - gint src, dest = dslist->clist2_dest_row; - gint selected = dslist->clist2_selected; - - if (dslist->clist2_dest_row >= 0) { - dest = dslist->clist2_dest_row; - src = arg1 == dest ? arg2 : arg1; - } else { - src = arg1; - dest = arg2; - } - - if (selected >= 0) { - if (selected == src) { - dslist->clist2_selected = dest; - } else if (selected >= MIN (src, dest) && selected <= MAX (src, dest)) { - if (src < dest) - dslist->clist2_selected--; - else - dslist->clist2_selected++; - } - } - - dslist->clist2_dest_row = -1; - - gtk_idle_add (idle_gimv_dlist_row_move, dslist); -} -#endif /* (GTK_MAJOR_VERSION >= 2) */ - static void cb_gimv_dlist_add_button_pressed (GtkButton *button, gpointer data) { GimvDList *dslist = data; gint idx; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + gboolean success; if (dslist->clist1_selected < 0) return; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (dslist->clist1); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection; - GtkTreeIter iter; - gboolean success; - - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; + treeview = GTK_TREE_VIEW (dslist->clist1); + model = gtk_tree_view_get_model (treeview); - gtk_tree_model_get (model, &iter, 2, &idx, -1); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gpointer rowdata; - rowdata = gtk_clist_get_row_data (GTK_CLIST (dslist->clist1), - dslist->clist1_selected); + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; - if (!rowdata) return; - idx = g_list_index (dslist->available_list, rowdata); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + gtk_tree_model_get (model, &iter, 2, &idx, -1); gimv_dlist_column_add (dslist, idx); @@ -377,33 +224,22 @@ { GimvDList *dslist = data; gint idx; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + gboolean success; if (dslist->clist2_selected < 0) return; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection; - GtkTreeIter iter; - gboolean success; - - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; + treeview = GTK_TREE_VIEW (dslist->clist2); + model = gtk_tree_view_get_model (treeview); - gtk_tree_model_get (model, &iter, 2, &idx, -1); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gpointer rowdata; - rowdata = gtk_clist_get_row_data (GTK_CLIST (dslist->clist2), - dslist->clist2_selected); - if (!rowdata) return; + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; - idx = g_list_index (dslist->available_list, rowdata); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + gtk_tree_model_get (model, &iter, 2, &idx, -1); gimv_dlist_column_del (dslist, idx); @@ -418,6 +254,14 @@ GimvDList *dslist = data; gint selected = dslist->clist2_selected; gint rows = dslist->clist2_rows; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreePath *treepath; + GtkTreeIter iter, prev_iter, dest_iter; + gboolean success; + GValue *values; + gint i, colnum; g_return_if_fail (button && dslist); @@ -425,65 +269,52 @@ dslist->clist2_dest_row = dslist->clist2_selected - 1; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreePath *treepath; - GtkTreeIter iter, prev_iter, dest_iter; - gboolean success; - - GValue *values; - gint i, colnum = gtk_tree_model_get_n_columns (model); - - /* get src row */ - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; - treepath = gtk_tree_model_get_path (model, &iter); - - /* get prev row */ - success = gtk_tree_path_prev (treepath); - if (!success) { - gtk_tree_path_free (treepath); - return; - } - gtk_tree_model_get_iter (model, &prev_iter, treepath); - - /* get src data */ - values = g_new0 (GValue, colnum); - for (i = 0; i < colnum; i++) { - gtk_tree_model_get_value (model, &iter, i, &values[i]); - } + treeview = GTK_TREE_VIEW (dslist->clist2); + model = gtk_tree_view_get_model (treeview); + selection = gtk_tree_view_get_selection (treeview); - /* insert dest row before prev */ - gtk_list_store_insert_before (GTK_LIST_STORE (model), - &dest_iter, &prev_iter); - for (i = 0; i < colnum; i++) { - gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, - i, &values[i]); - g_value_unset (&values[i]); - } - g_free (values); + colnum = gtk_tree_model_get_n_columns (model); - /* delete src */ - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + /* get src row */ + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; + treepath = gtk_tree_model_get_path (model, &iter); - /* select dest */ + /* get prev row */ + success = gtk_tree_path_prev (treepath); + if (!success) { gtk_tree_path_free (treepath); - treepath = gtk_tree_model_get_path (model, &dest_iter); - gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + return; + } + gtk_tree_model_get_iter (model, &prev_iter, treepath); - /* clean */ - gtk_tree_path_free (treepath); + /* get src data */ + values = g_new0 (GValue, colnum); + for (i = 0; i < colnum; i++) { + gtk_tree_model_get_value (model, &iter, i, &values[i]); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gtk_clist_swap_rows (GTK_CLIST (dslist->clist2), selected, selected - 1); - gtk_clist_moveto (GTK_CLIST (dslist->clist2), selected - 1, 0, 0, 0); + + /* insert dest row before prev */ + gtk_list_store_insert_before (GTK_LIST_STORE (model), + &dest_iter, &prev_iter); + for (i = 0; i < colnum; i++) { + gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, + i, &values[i]); + g_value_unset (&values[i]); } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + g_free (values); + + /* delete src */ + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + /* select dest */ + gtk_tree_path_free (treepath); + treepath = gtk_tree_model_get_path (model, &dest_iter); + gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + + /* clean */ + gtk_tree_path_free (treepath); } @@ -493,6 +324,14 @@ GimvDList *dslist = data; gint selected = dslist->clist2_selected; gint rows = dslist->clist2_rows; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter, next_iter, dest_iter; + GtkTreePath *treepath; + gboolean success; + GValue *values; + gint i, colnum; g_return_if_fail (button && dslist); @@ -500,60 +339,47 @@ dslist->clist2_dest_row = dslist->clist2_selected + 1; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreeIter iter, next_iter, dest_iter; - GtkTreePath *treepath; - gboolean success; + treeview = GTK_TREE_VIEW (dslist->clist2); + model = gtk_tree_view_get_model (treeview); + selection = gtk_tree_view_get_selection (treeview); - GValue *values; - gint i, colnum = gtk_tree_model_get_n_columns (model); - - /* get src row */ - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; - - /* get prev row */ - next_iter = iter; - success = gtk_tree_model_iter_next (model, &next_iter); - if (!success) return; - - /* get src data */ - values = g_new0 (GValue, colnum); - for (i = 0; i < colnum; i++) { - gtk_tree_model_get_value (model, &iter, i, &values[i]); - } - - /* insert dest row before prev */ - gtk_list_store_insert_after (GTK_LIST_STORE (model), - &dest_iter, &next_iter); - for (i = 0; i < colnum; i++) { - gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, - i, &values[i]); - g_value_unset (&values[i]); - } - g_free (values); + colnum = gtk_tree_model_get_n_columns (model); - /* delete src */ - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + /* get src row */ + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; - /* select dest */ - treepath = gtk_tree_model_get_path (model, &dest_iter); - gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + /* get prev row */ + next_iter = iter; + success = gtk_tree_model_iter_next (model, &next_iter); + if (!success) return; + + /* get src data */ + values = g_new0 (GValue, colnum); + for (i = 0; i < colnum; i++) { + gtk_tree_model_get_value (model, &iter, i, &values[i]); + } + + /* insert dest row before prev */ + gtk_list_store_insert_after (GTK_LIST_STORE (model), + &dest_iter, &next_iter); + for (i = 0; i < colnum; i++) { + gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, + i, &values[i]); + g_value_unset (&values[i]); + } + g_free (values); + + /* delete src */ + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + /* select dest */ + treepath = gtk_tree_model_get_path (model, &dest_iter); + gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); - /* clean */ - gtk_tree_path_free (treepath); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gtk_clist_swap_rows (GTK_CLIST (dslist->clist2), selected, selected + 1); - gtk_clist_moveto (GTK_CLIST (dslist->clist2), selected + 1, 0, 0, 0); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + /* clean */ + gtk_tree_path_free (treepath); } @@ -568,8 +394,8 @@ { g_return_if_fail (GIMV_IS_DLIST (dslist)); - gtk_signal_emit (GTK_OBJECT (dslist), - gimv_dlist_signals[ENABLED_LIST_UPDATED_SIGNAL]); + g_signal_emit (G_OBJECT (dslist), + gimv_dlist_signals[ENABLED_LIST_UPDATED_SIGNAL], 0); } @@ -618,8 +444,6 @@ { GtkWidget *clist; -#if (GTK_MAJOR_VERSION >= 2) - GtkListStore *store; GtkTreeViewColumn *col; GtkCellRenderer *render; @@ -653,29 +477,6 @@ gtk_tree_view_column_add_attribute (col, render, "text", 0); gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); -#else /* (GTK_MAJOR_VERSION >= 2) */ - - clist = dslist->clist2 = gtk_clist_new (1); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); - gtk_clist_set_column_auto_resize (GTK_CLIST (clist), 0, TRUE); - - gtk_signal_connect (GTK_OBJECT (clist),"select_row", - GTK_SIGNAL_FUNC (cb_gimv_dlist_select_row), - dslist); - gtk_signal_connect (GTK_OBJECT (clist),"unselect_row", - GTK_SIGNAL_FUNC (cb_gimv_dlist_unselect_row), - dslist); - - if (reorderble) { - gtk_clist_set_reorderable (GTK_CLIST (clist), TRUE); - gtk_clist_set_use_drag_icons (GTK_CLIST (clist), FALSE); - gtk_signal_connect (GTK_OBJECT (clist),"row_move", - GTK_SIGNAL_FUNC (cb_gimv_dlist_row_move), - dslist); - } - -#endif /* (GTK_MAJOR_VERSION >= 2) */ - return clist; } @@ -690,11 +491,7 @@ gimv_dlist_new (const gchar *clist1_title, const gchar *clist2_title) { -#if (GTK_MAJOR_VERSION >= 2) GimvDList *dslist = g_object_new (gimv_dlist_get_type (), NULL); -#else /* (GTK_MAJOR_VERSION >= 2) */ - GimvDList *dslist = gtk_type_new (gimv_dlist_get_type ()); -#endif /* (GTK_MAJOR_VERSION >= 2) */ GtkWidget *hbox = GTK_WIDGET (dslist); GtkWidget *vbox, *vbox1, *vbox2, *vbox3, *hseparator; @@ -712,10 +509,8 @@ scrollwin1 = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin1), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_container_set_border_width(GTK_CONTAINER(scrollwin1), 5); gtk_box_pack_start (GTK_BOX (vbox1), scrollwin1, TRUE, TRUE, 0); gtk_widget_show (scrollwin1); @@ -801,10 +596,8 @@ scrollwin2 = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin2), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_container_set_border_width(GTK_CONTAINER(scrollwin2), 5); gtk_box_pack_start (GTK_BOX (vbox2), scrollwin2, TRUE, TRUE, 0); gtk_widget_show (scrollwin2); @@ -814,9 +607,6 @@ dslist->clist2_rows = list_widget_get_row_num (clist); gtk_widget_show (clist); - -#if (GTK_MAJOR_VERSION >= 2) - gtk_widget_set_size_request (scrollwin1, -1, 200); gtk_widget_set_size_request (scrollwin2, -1, 200); @@ -840,33 +630,6 @@ G_CALLBACK (cb_gimv_dlist_down_button_pressed), dslist); -#else /* (GTK_MAJOR_VERSION >= 2) */ - - gtk_widget_set_usize (scrollwin1, -1, 200); - gtk_widget_set_usize (scrollwin2, -1, 200); - -#ifdef USE_ARROW - gtk_widget_set_usize (dslist->add_button, 20, 20); - gtk_widget_set_usize (dslist->del_button, 20, 20); - gtk_widget_set_usize (dslist->up_button, 20, 20); - gtk_widget_set_usize (dslist->down_button, 20, 20); -#endif /* USE_ARROW */ - - gtk_signal_connect (GTK_OBJECT (dslist->add_button), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_dlist_add_button_pressed), - dslist); - gtk_signal_connect (GTK_OBJECT (dslist->del_button), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_dlist_del_button_pressed), - dslist); - gtk_signal_connect (GTK_OBJECT (dslist->up_button), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_dlist_up_button_pressed), - dslist); - gtk_signal_connect (GTK_OBJECT (dslist->down_button), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_dlist_down_button_pressed), - dslist); - -#endif /* (GTK_MAJOR_VERSION >= 2) */ - return hbox; } @@ -878,30 +641,21 @@ gchar *text = g_strdup (item); gchar *i18n_text = _(text); gint idx; + GtkTreeModel *model; + GtkListStore *store; + GtkTreeIter iter; g_return_val_if_fail (GIMV_IS_DLIST (dslist), -1); dslist->available_list = g_list_append (dslist->available_list, text); idx = g_list_index (dslist->available_list, text); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); - GtkListStore *store = GTK_LIST_STORE (model); - GtkTreeIter iter; - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - 0, i18n_text, 1, text, 2, idx, -1); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gint row; + model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); + store = GTK_LIST_STORE (model); - row = gtk_clist_append (GTK_CLIST (clist), &i18n_text); - gtk_clist_set_row_data (GTK_CLIST (clist), row, text); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, i18n_text, 1, text, 2, idx, -1); dslist->clist1_rows = list_widget_get_row_num (dslist->clist1); gimv_dlist_set_sensitive (dslist); @@ -915,6 +669,13 @@ { gchar *text, *i18n_text; GList *list; + GtkTreeView *treeview1; + GtkTreeView *treeview2; + GtkTreeModel *model1; + GtkTreeModel *model2; + GtkTreeIter iter1, iter2, next; + gboolean go_next; + gchar *str = NULL; list = g_list_nth (dslist->available_list, idx); g_return_if_fail (list); @@ -922,71 +683,50 @@ i18n_text = _(text); g_return_if_fail (text); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview1 = GTK_TREE_VIEW (dslist->clist1); - GtkTreeView *treeview2 = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model1 = gtk_tree_view_get_model (treeview1); - GtkTreeModel *model2 = gtk_tree_view_get_model (treeview2); - GtkTreeIter iter1, iter2, next; - gboolean go_next; - gchar *str = NULL; - - /* find row from clist1 */ - go_next = gtk_tree_model_get_iter_first (model1, &iter1); - for (; go_next; go_next = gtk_tree_model_iter_next (model1, &iter1)) { - gtk_tree_model_get (model1, &iter1, 1, &str, -1); - if (str && !strcmp (text, str)) break; - g_free (str); - str = NULL; - } - if (!str) return; - - /* append to clist2 */ - gtk_list_store_append (GTK_LIST_STORE (model2), &iter2); - gtk_list_store_set (GTK_LIST_STORE (model2), &iter2, - 0, i18n_text, 1, text, 2, idx, -1); - - /* set cursor of clist1 */ - next = iter1; - if (gtk_tree_model_iter_next (model1, &next)) { - GtkTreePath *path = gtk_tree_model_get_path (model1, &next); - gtk_tree_view_set_cursor (treeview1, path, NULL, FALSE); - gtk_tree_path_free (path); - } else { - GtkTreePath *path = gtk_tree_model_get_path (model1, &iter1); - if (gtk_tree_path_prev (path)) - gtk_tree_view_set_cursor (treeview1, path, NULL, FALSE); - gtk_tree_path_free (path); - } + treeview1 = GTK_TREE_VIEW (dslist->clist1); + treeview2 = GTK_TREE_VIEW (dslist->clist2); + model1 = gtk_tree_view_get_model (treeview1); + model2 = gtk_tree_view_get_model (treeview2); + + /* find row from clist1 */ + go_next = gtk_tree_model_get_iter_first (model1, &iter1); + for (; go_next; go_next = gtk_tree_model_iter_next (model1, &iter1)) { + gtk_tree_model_get (model1, &iter1, 1, &str, -1); + if (str && !strcmp (text, str)) break; + g_free (str); + str = NULL; + } + if (!str) return; - /* remove from clist1 */ - gtk_list_store_remove (GTK_LIST_STORE (model1), &iter1); + /* append to clist2 */ + gtk_list_store_append (GTK_LIST_STORE (model2), &iter2); + gtk_list_store_set (GTK_LIST_STORE (model2), &iter2, + 0, i18n_text, 1, text, 2, idx, -1); + + /* set cursor of clist1 */ + next = iter1; + if (gtk_tree_model_iter_next (model1, &next)) { + GtkTreePath *path = gtk_tree_model_get_path (model1, &next); + gtk_tree_view_set_cursor (treeview1, path, NULL, FALSE); + gtk_tree_path_free (path); + } else { + GtkTreePath *path = gtk_tree_model_get_path (model1, &iter1); + if (gtk_tree_path_prev (path)) + gtk_tree_view_set_cursor (treeview1, path, NULL, FALSE); + gtk_tree_path_free (path); + } - /* clean :-) */ - g_free (str); + /* remove from clist1 */ + gtk_list_store_remove (GTK_LIST_STORE (model1), &iter1); - /* reset */ - dslist->clist1_rows = gtk_tree_model_iter_n_children (model1, NULL); - dslist->clist2_rows = gtk_tree_model_iter_n_children (model2, NULL); + /* clean :-) */ + g_free (str); - g_signal_emit_by_name (G_OBJECT (treeview1), "cursor-changed"); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gint row1, row2; - - row1 = gtk_clist_find_row_from_data (GTK_CLIST (dslist->clist1), text); - if (row1 < 0) return; - - row2 = gtk_clist_append (GTK_CLIST (dslist->clist2), &i18n_text); - gtk_clist_set_row_data (GTK_CLIST (dslist->clist2), row2, text); - gtk_clist_remove (GTK_CLIST (dslist->clist1), row1); + /* reset */ + dslist->clist1_rows = gtk_tree_model_iter_n_children (model1, NULL); + dslist->clist2_rows = gtk_tree_model_iter_n_children (model2, NULL); - dslist->clist1_rows = GTK_CLIST (dslist->clist1)->rows; - dslist->clist2_rows = GTK_CLIST (dslist->clist2)->rows; - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + g_signal_emit_by_name (G_OBJECT (treeview1), "cursor-changed"); } @@ -995,6 +735,13 @@ { gchar *text, *i18n_text; GList *list; + GtkTreeView *treeview1; + GtkTreeView *treeview2; + GtkTreeModel *model1; + GtkTreeModel *model2; + GtkTreeIter iter, iter1, iter2, next; + gboolean go_next; + gchar *str = NULL; list = g_list_nth (dslist->available_list, idx); g_return_if_fail (list); @@ -1002,103 +749,59 @@ i18n_text = _(text); g_return_if_fail (text); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview1 = GTK_TREE_VIEW (dslist->clist1); - GtkTreeView *treeview2 = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model1 = gtk_tree_view_get_model (treeview1); - GtkTreeModel *model2 = gtk_tree_view_get_model (treeview2); - GtkTreeIter iter, iter1, iter2, next; - gboolean go_next; - gchar *str = NULL; - - /* find row from clist2 */ - go_next = gtk_tree_model_get_iter_first (model2, &iter2); - for (; go_next; go_next = gtk_tree_model_iter_next (model2, &iter2)) { - gtk_tree_model_get (model2, &iter2, 1, &str, -1); - if (str && !strcmp (text, str)) break; - g_free (str); - str = NULL; - } - if (!str) return; - - /* append to clist1 */ - go_next = gtk_tree_model_get_iter_first (model1, &iter1); - for (; go_next; go_next = gtk_tree_model_iter_next (model1, &iter1)) { - gint idx1; - gtk_tree_model_get (model1, &iter1, 2, &idx1, -1); - if (idx < idx1) break; - } - - if (go_next) - gtk_list_store_insert_before (GTK_LIST_STORE (model1), &iter, &iter1); - else - gtk_list_store_append (GTK_LIST_STORE (model1), &iter); - gtk_list_store_set (GTK_LIST_STORE (model1), &iter, - 0, i18n_text, 1, text, 2, idx, -1); - - /* set cursor of clist2 */ - next = iter2; - if (gtk_tree_model_iter_next (model2, &next)) { - GtkTreePath *path = gtk_tree_model_get_path (model2, &next); - gtk_tree_view_set_cursor (treeview2, path, NULL, FALSE); - gtk_tree_path_free (path); - } else { - GtkTreePath *path = gtk_tree_model_get_path (model2, &iter2); - if (gtk_tree_path_prev (path)) - gtk_tree_view_set_cursor (treeview2, path, NULL, FALSE); - gtk_tree_path_free (path); - } - - /* remove from clist2 */ - gtk_list_store_remove (GTK_LIST_STORE (model2), &iter2); - - /* clean :-) */ + treeview1 = GTK_TREE_VIEW (dslist->clist1); + treeview2 = GTK_TREE_VIEW (dslist->clist2); + model1 = gtk_tree_view_get_model (treeview1); + model2 = gtk_tree_view_get_model (treeview2); + + /* find row from clist2 */ + go_next = gtk_tree_model_get_iter_first (model2, &iter2); + for (; go_next; go_next = gtk_tree_model_iter_next (model2, &iter2)) { + gtk_tree_model_get (model2, &iter2, 1, &str, -1); + if (str && !strcmp (text, str)) break; g_free (str); + str = NULL; + } + if (!str) return; - dslist->clist1_rows = gtk_tree_model_iter_n_children (model1, NULL); - dslist->clist2_rows = gtk_tree_model_iter_n_children (model2, NULL); - - g_signal_emit_by_name (G_OBJECT (treeview2), "cursor-changed"); + /* append to clist1 */ + go_next = gtk_tree_model_get_iter_first (model1, &iter1); + for (; go_next; go_next = gtk_tree_model_iter_next (model1, &iter1)) { + gint idx1; + gtk_tree_model_get (model1, &iter1, 2, &idx1, -1); + if (idx < idx1) break; + } + + if (go_next) + gtk_list_store_insert_before (GTK_LIST_STORE (model1), &iter, &iter1); + else + gtk_list_store_append (GTK_LIST_STORE (model1), &iter); + gtk_list_store_set (GTK_LIST_STORE (model1), &iter, + 0, i18n_text, 1, text, 2, idx, -1); + + /* set cursor of clist2 */ + next = iter2; + if (gtk_tree_model_iter_next (model2, &next)) { + GtkTreePath *path = gtk_tree_model_get_path (model2, &next); + gtk_tree_view_set_cursor (treeview2, path, NULL, FALSE); + gtk_tree_path_free (path); + } else { + GtkTreePath *path = gtk_tree_model_get_path (model2, &iter2); + if (gtk_tree_path_prev (path)) + gtk_tree_view_set_cursor (treeview2, path, NULL, FALSE); + gtk_tree_path_free (path); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gint row1, row2; - gpointer rowdata; - - row2 = gtk_clist_find_row_from_data (GTK_CLIST (dslist->clist2), text); - if (row2 < 0) return; - - /* remove item from right side */ - gtk_clist_freeze (GTK_CLIST (dslist->clist1)); - - row1 = gtk_clist_append (GTK_CLIST (dslist->clist1), &i18n_text); - gtk_clist_set_row_data (GTK_CLIST (dslist->clist1), row1, text); - - while (row1 > 0) { - gint idx_prev; - - rowdata = gtk_clist_get_row_data (GTK_CLIST (dslist->clist1), row1 - 1); - if (!rowdata) break; - - idx_prev = g_list_index (dslist->available_list, rowdata); - - if (idx < idx_prev) { - gtk_clist_swap_rows (GTK_CLIST (dslist->clist1), row1, row1 - 1); - row1--; - } else { - break; - } - } - gtk_clist_thaw (GTK_CLIST (dslist->clist1)); + /* remove from clist2 */ + gtk_list_store_remove (GTK_LIST_STORE (model2), &iter2); - gtk_clist_remove (GTK_CLIST (dslist->clist2), row2); + /* clean :-) */ + g_free (str); - dslist->clist1_rows = GTK_CLIST (dslist->clist1)->rows; - dslist->clist2_rows = GTK_CLIST (dslist->clist2)->rows; - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + dslist->clist1_rows = gtk_tree_model_iter_n_children (model1, NULL); + dslist->clist2_rows = gtk_tree_model_iter_n_children (model2, NULL); + + g_signal_emit_by_name (G_OBJECT (treeview2), "cursor-changed"); } @@ -1144,30 +847,23 @@ gchar * gimv_dlist_get_enabled_row_text (GimvDList *dslist, gint row) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; gchar *text; g_return_val_if_fail (GIMV_IS_DLIST (dslist), NULL); g_return_val_if_fail (row >= 0 && row < dslist->clist2_rows, NULL); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (dslist->clist2); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean success; + treeview = GTK_TREE_VIEW (dslist->clist2); + model = gtk_tree_view_get_model (treeview); - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - if (!success) return NULL; + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + if (!success) return NULL; - gtk_tree_model_get (model, &iter, 1, &text, -1); - if (!text) return NULL; - - return text; - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - text = gtk_clist_get_row_data (GTK_CLIST (dslist->clist2), row); + gtk_tree_model_get (model, &iter, 1, &text, -1); if (!text) return NULL; - return g_strdup (text); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + return text; } diff -Nru gimageview-0.2.27/src/gimv_dlist.h gimageview-0.3.0-0.20101117/src/gimv_dlist.h --- gimageview-0.2.27/src/gimv_dlist.h 2004-05-23 14:07:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dlist.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,27 +18,24 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_dlist.h,v 1.3 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_dlist.h 1142 2007-10-17 13:02:27Z makeinu $ */ #ifndef __GIMV_DLIST_H__ #define __GIMV_DLIST_H__ -#ifdef HAVE_CONFIG_H -# include -#endif /* HAVE_CONFIG_H */ - #include -#define GIMV_DLIST(obj) GTK_CHECK_CAST (obj, gimv_dlist_get_type (), GimvDList) -#define GIMV_DLIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gimv_dlist_get_type, GimvDListClass) -#define GIMV_IS_DLIST(obj) GTK_CHECK_TYPE (obj, gimv_dlist_get_type ()) - +#define GIMV_TYPE_DLIST (gimv_dlist_get_type ()) +#define GIMV_DLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_DLIST, GimvDList)) +#define GIMV_DLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_DLIST, GimvDListClass)) +#define GIMV_IS_DLIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_DLIST)) +#define GIMV_IS_DLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DLIST)) +#define GIMV_DLIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_DLIST, GimvDListClass)) typedef struct GimvDList_Tag GimvDList; typedef struct GimvDListClass_Tag GimvDListClass; - struct GimvDList_Tag { GtkHBox parent; @@ -60,7 +57,6 @@ GList *available_list; }; - struct GimvDListClass_Tag { GtkHBoxClass parent_class; @@ -70,13 +66,12 @@ gboolean (*enabled_list_updated) (GimvDList *dslist); }; - /* * "available" or "clist1" means left side CList (or TreeView). * "enabled" or "clist2" means right side CList (or TreeView). */ -GtkType gimv_dlist_get_type (void); +GType gimv_dlist_get_type (void); GtkWidget *gimv_dlist_new (const gchar *clist1_title, const gchar *clist2_title); @@ -98,7 +93,6 @@ gchar *gimv_dlist_get_enabled_row_text (GimvDList *dslist, gint row); - #if 0 /* API draft */ void gimv_dlist_up (GimvDList *dslist, diff -Nru gimageview-0.2.27/src/gimv_dupl_finder.c gimageview-0.3.0-0.20101117/src/gimv_dupl_finder.c --- gimageview-0.2.27/src/gimv_dupl_finder.c 2004-10-20 11:36:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dupl_finder.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_dupl_finder.c,v 1.5 2004/10/16 12:11:23 makeinu Exp $ + * $Id: gimv_dupl_finder.c 1139 2007-10-17 09:08:44Z makeinu $ */ #include "gimv_dupl_finder.h" @@ -26,7 +26,6 @@ #include #include "gimv_thumb.h" -#include "gtk2-compat.h" #include "prefs.h" #include "gimv_dupl_win.h" @@ -40,15 +39,12 @@ } GimvDuplFinderSignalType; -static void gimv_dupl_finder_class_init (GimvDuplFinderClass *klass); -static void gimv_dupl_finder_init (GimvDuplFinder *finder); -static void gimv_dupl_finder_destroy (GtkObject *object); +static void gimv_dupl_finder_dispose (GObject *object); gboolean idle_duplicates_find (gpointer user_data); gboolean timeout_duplicates_find (gpointer data); -static GtkObjectClass *parent_class = NULL; static gint gimv_dupl_finder_signals[LAST_SIGNAL] = {0}; @@ -87,76 +83,54 @@ } -GtkType -gimv_dupl_finder_get_type (void) -{ - static GtkType gimv_dupl_finder_type = 0; - - if (!gimv_dupl_finder_type) { - static const GtkTypeInfo gimv_dupl_finder_info = { - "GimvDuplFinder", - sizeof (GimvDuplFinder), - sizeof (GimvDuplFinderClass), - (GtkClassInitFunc) gimv_dupl_finder_class_init, - (GtkObjectInitFunc) gimv_dupl_finder_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_dupl_finder_type = gtk_type_unique (gtk_object_get_type (), - &gimv_dupl_finder_info); - } - - return gimv_dupl_finder_type; -} +G_DEFINE_TYPE (GimvDuplFinder, gimv_dupl_finder, G_TYPE_OBJECT) static void gimv_dupl_finder_class_init (GimvDuplFinderClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; gimv_dupl_finder_signals[START_SIGNAL] - = gtk_signal_new ("start", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvDuplFinderClass, start), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("start", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvDuplFinderClass, start), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_dupl_finder_signals[STOP_SIGNAL] - = gtk_signal_new ("stop", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvDuplFinderClass, stop), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("stop", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvDuplFinderClass, stop), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_dupl_finder_signals[PROGRESS_UPDATE_SIGNAL] - = gtk_signal_new ("progress_update", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvDuplFinderClass, - progress_update), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("progress_update", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvDuplFinderClass, + progress_update), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_dupl_finder_signals[FOUND_SIGNAL] - = gtk_signal_new ("found", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvDuplFinderClass, found), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + = g_signal_new ("found", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvDuplFinderClass, found), + NULL, NULL, + gtk_marshal_NONE__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); - gtk_object_class_add_signals (object_class, - gimv_dupl_finder_signals, LAST_SIGNAL); - - object_class->destroy = gimv_dupl_finder_destroy; + gobject_class->dispose = gimv_dupl_finder_dispose; klass->start = NULL; klass->stop = NULL; @@ -182,11 +156,6 @@ finder->timer_rate = 10; finder->timer_id = 0; finder->idle_id = 0; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (finder)); - gtk_object_sink (GTK_OBJECT (finder)); -#endif } @@ -195,7 +164,7 @@ { GimvDuplFinder *finder; - finder = GIMV_DUPL_FINDER (gtk_type_new (gimv_dupl_finder_get_type ())); + finder = GIMV_DUPL_FINDER (g_object_new (GIMV_TYPE_DUPL_FINDER, NULL)); gimv_dupl_finder_set_algol_type (finder, type); return finder; @@ -203,21 +172,21 @@ static void -gimv_dupl_finder_destroy (GtkObject *object) +gimv_dupl_finder_dispose (GObject *object) { GimvDuplFinder *finder = GIMV_DUPL_FINDER (object); gimv_dupl_finder_stop (finder); - g_list_foreach (finder->src_list, (GFunc) gtk_object_unref, NULL); - g_list_foreach (finder->dest_list, (GFunc) gtk_object_unref, NULL); + g_list_foreach (finder->src_list, (GFunc) g_object_unref, NULL); + g_list_foreach (finder->dest_list, (GFunc) g_object_unref, NULL); g_list_free (finder->src_list); g_list_free (finder->dest_list); finder->src_list = NULL; finder->dest_list = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_dupl_finder_parent_class)->dispose) + G_OBJECT_CLASS (gimv_dupl_finder_parent_class)->dispose (object); } @@ -256,7 +225,7 @@ g_return_if_fail (GIMV_DUPL_FINDER (finder)); g_return_if_fail (GIMV_IS_THUMB (thumb)); - gtk_object_ref(GTK_OBJECT(thumb)); + g_object_ref(G_OBJECT(thumb)); finder->src_list = g_list_append (finder->src_list, thumb); } @@ -268,7 +237,7 @@ g_return_if_fail (GIMV_DUPL_FINDER (finder)); g_return_if_fail (GIMV_IS_THUMB (thumb)); - gtk_object_ref(GTK_OBJECT(thumb)); + g_object_ref(G_OBJECT(thumb)); finder->dest_list = g_list_append (finder->dest_list, thumb); } @@ -339,9 +308,9 @@ finder->pairs_found++; - gtk_signal_emit (GTK_OBJECT (finder), - gimv_dupl_finder_signals[FOUND_SIGNAL], - &pair); + g_signal_emit (G_OBJECT (finder), + gimv_dupl_finder_signals[FOUND_SIGNAL], 0, + &pair); } finder->pos++; @@ -355,8 +324,8 @@ if (!finder->cur1 || !finder->cur2) goto STOP; } - gtk_signal_emit (GTK_OBJECT (finder), - gimv_dupl_finder_signals[PROGRESS_UPDATE_SIGNAL]); + g_signal_emit (G_OBJECT (finder), + gimv_dupl_finder_signals[PROGRESS_UPDATE_SIGNAL], 0); finder->timer_id = gtk_timeout_add (finder->timer_rate, idle_duplicates_find, finder); @@ -378,7 +347,7 @@ g_return_if_fail (GIMV_IS_DUPL_FINDER (finder)); - gtk_signal_emit (GTK_OBJECT (finder), gimv_dupl_finder_signals[START_SIGNAL]); + g_signal_emit (G_OBJECT (finder), gimv_dupl_finder_signals[START_SIGNAL], 0); if (!finder->table) finder->table = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -417,8 +386,8 @@ finder->table = NULL; } - gtk_signal_emit (GTK_OBJECT (finder), - gimv_dupl_finder_signals[STOP_SIGNAL]); + g_signal_emit (G_OBJECT (finder), + gimv_dupl_finder_signals[STOP_SIGNAL], 0); } diff -Nru gimageview-0.2.27/src/gimv_dupl_finder.h gimageview-0.3.0-0.20101117/src/gimv_dupl_finder.h --- gimageview-0.2.27/src/gimv_dupl_finder.h 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dupl_finder.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_dupl_finder.h,v 1.3 2004/09/21 08:44:31 makeinu Exp $ + * $Id: gimv_dupl_finder.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef __GIMV_DUPL_FINDER_H__ @@ -29,11 +29,11 @@ #include #define GIMV_TYPE_DUPL_FINDER (gimv_dupl_finder_get_type ()) -#define GIMV_DUPL_FINDER(obj) (GTK_CHECK_CAST (obj, gimv_dupl_finder_get_type (), GimvDuplFinder)) -#define GIMV_DUPL_FINDER_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_dupl_finder_get_type, GimvDuplFinderClass)) -#define GIMV_IS_DUPL_FINDER(obj) (GTK_CHECK_TYPE (obj, gimv_dupl_finder_get_type ())) -#define GIMV_IS_DUPL_FINDER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DUPL_FINDER)) - +#define GIMV_DUPL_FINDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_DUPL_FINDER, GimvDuplFinder)) +#define GIMV_DUPL_FINDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_DUPL_FINDER, GimvDuplFinderClass)) +#define GIMV_IS_DUPL_FINDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_DUPL_FINDER)) +#define GIMV_IS_DUPL_FINDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DUPL_FINDER)) +#define GIMV_DUPL_FINDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_DUPL_FINDER, GimvDuplFinderClass)) typedef struct GimvDuplFinder_Tag GimvDuplFinder; typedef struct GimvDuplFinderPriv_Tag GimvDuplFinderPriv; @@ -41,10 +41,9 @@ typedef struct GimvDuplPair_Tag GimvDuplPair; typedef struct GimvDuplCompFuncTable_Tag GimvDuplCompFuncTable; - struct GimvDuplFinder_Tag { - GtkObject parent; + GObject parent; GList *src_list, *dest_list; GList *cur1, *cur2; @@ -65,10 +64,9 @@ guint idle_id; }; - struct GimvDuplFinderClass_Tag { - GtkObjectClass parent_class; + GObjectClass parent_class; void (*start) (GimvDuplFinder *finder); void (*stop) (GimvDuplFinder *finder); @@ -77,7 +75,6 @@ GimvDuplPair *pair); }; - struct GimvDuplPair_Tag { GimvThumb *thumb1; @@ -85,7 +82,6 @@ gfloat similarity; }; - struct GimvDuplCompFuncTable_Tag { const gchar * const label; @@ -97,8 +93,7 @@ void (*data_delete) (gpointer data); }; - -GtkType gimv_dupl_finder_get_type (void); +GType gimv_dupl_finder_get_type (void); const gchar **gimv_dupl_finder_get_algol_types (void); diff -Nru gimageview-0.2.27/src/gimv_dupl_win.c gimageview-0.3.0-0.20101117/src/gimv_dupl_win.c --- gimageview-0.2.27/src/gimv_dupl_win.c 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dupl_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,18 +18,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_dupl_win.c,v 1.5 2004/04/08 13:39:25 makeinu Exp $ + * $Id: gimv_dupl_win.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "gimv_dupl_win.h" -#include "charset.h" -#include "fileutil.h" #include "gimv_cell_pixmap.h" #include "gimv_icon_stock.h" #include "gimv_image_info.h" #include "gimv_thumb.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_file.h" struct GimvDuplWinPriv_Tag { @@ -37,16 +37,11 @@ GList *thumb_list; -#ifdef USE_GTK2 GtkTreeViewColumn *pixmap_col; GtkCellRenderer *pixmap_renderer; -#endif /* USE_GTK2 */ }; -static void gimv_dupl_win_init (GimvDuplWin *sw); -static void gimv_dupl_win_class_init (GimvDuplWinClass *klass); -static void gimv_dupl_win_destroy (GtkObject *object); - +static void gimv_dupl_win_dispose (GObject *object); static void cb_select_all_button (GtkButton *button, GimvDuplWin *sw); @@ -64,8 +59,6 @@ static void cb_select_thumb (GimvThumb *thumb, GimvDuplWin *sw); -#ifdef ENABLE_TREEVIEW - typedef enum { COLUMN_TERMINATOR = -1, COLUMN_THUMBNAIL, @@ -96,27 +89,6 @@ GimvThumb *thumb, gfloat similar); -#else /* ENABLE_TREEVIEW */ - -static void set_pixtext (GtkCTree *ctree, - GtkCTreeNode *node, - gpointer data); -static void cb_change_to_thumbnail_button (GtkButton *button, - GimvDuplWin *sw); -static void cb_change_to_icon_button (GtkButton *button, - GimvDuplWin *sw); -static void cb_ctree_select_row (GtkCTree *ctree, - GList *node, - gint column, - GimvDuplWin *sw); -static GtkCTreeNode *insert_node (GimvDuplWin *sw, - GtkCTreeNode *parent, - GimvThumb *thumb, - gfloat similar); - -#endif /* ENABLE_TREEVIEW */ - - gchar *simwin_titles[4] = { N_("Name"), N_("Accuracy"), @@ -125,32 +97,8 @@ }; gint simwin_column_num = sizeof (simwin_titles) / sizeof (gchar *); -static GtkDialogClass *parent_class = NULL; - - -GtkType -gimv_dupl_win_get_type (void) -{ - static GtkType gimv_dupl_win_type = 0; - - if (!gimv_dupl_win_type) { - static const GtkTypeInfo gimv_dupl_win_info = { - "GimvDuplWin", - sizeof (GimvDuplWin), - sizeof (GimvDuplWinClass), - (GtkClassInitFunc) gimv_dupl_win_class_init, - (GtkObjectInitFunc) gimv_dupl_win_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - gimv_dupl_win_type = gtk_type_unique (gtk_dialog_get_type (), - &gimv_dupl_win_info); - } - - return gimv_dupl_win_type; -} +G_DEFINE_TYPE (GimvDuplWin, gimv_dupl_win, GTK_TYPE_DIALOG) static void @@ -159,6 +107,9 @@ GtkWidget *hbox; GtkWidget *scrolledwin, *radio, *button; gint i; + GtkTreeStore *store; + GtkTreeViewColumn *col; + GtkCellRenderer *render; sw->ctree = NULL; sw->radio_thumb = NULL; @@ -172,10 +123,8 @@ sw->priv = g_new0 (GimvDuplWinPriv, 1); sw->priv->thumbnail_size = 96; sw->priv->thumb_list = NULL; -#ifdef ENABLE_TREEVIEW sw->priv->pixmap_col = NULL; sw->priv->pixmap_renderer = NULL; -#endif /* ENABLE_TREEVIEW */ /* window */ gtk_window_set_title (GTK_WINDOW (sw), _("Find Duplicates - result")); @@ -191,86 +140,56 @@ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (sw)->vbox), scrolledwin, TRUE, TRUE, 0); -#ifdef ENABLE_TREEVIEW - { - GtkTreeStore *store; - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - store = gtk_tree_store_new (N_COLUMN, - GDK_TYPE_PIXMAP, - GDK_TYPE_PIXMAP, - GDK_TYPE_PIXMAP, - GDK_TYPE_PIXMAP, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_POINTER); - sw->ctree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - gtk_container_add (GTK_CONTAINER (scrolledwin), sw->ctree); + store = gtk_tree_store_new (N_COLUMN, + GDK_TYPE_PIXMAP, + GDK_TYPE_PIXMAP, + GDK_TYPE_PIXMAP, + GDK_TYPE_PIXMAP, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_POINTER); + sw->ctree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_container_add (GTK_CONTAINER (scrolledwin), sw->ctree); + + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (sw->ctree), TRUE); + + /* name column */ + col = gtk_tree_view_column_new(); + sw->priv->pixmap_col = col; + gtk_tree_view_column_set_title (col, _(simwin_titles[0])); + + render = gimv_cell_renderer_pixmap_new (); + sw->priv->pixmap_renderer = render; + gtk_tree_view_column_pack_start (col, render, FALSE); + gtk_tree_view_column_add_attribute (col, render, + "pixmap", COLUMN_ICON); + gtk_tree_view_column_add_attribute (col, render, + "mask", COLUMN_ICON_MASK); + + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_NAME); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (sw->ctree), TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (sw->ctree), col); + gtk_tree_view_set_expander_column (GTK_TREE_VIEW (sw->ctree), col); - /* name column */ + /* other column */ + for (i = 1; i < simwin_column_num; i++) { col = gtk_tree_view_column_new(); - sw->priv->pixmap_col = col; - gtk_tree_view_column_set_title (col, _(simwin_titles[0])); - - render = gimv_cell_renderer_pixmap_new (); - sw->priv->pixmap_renderer = render; - gtk_tree_view_column_pack_start (col, render, FALSE); - gtk_tree_view_column_add_attribute (col, render, - "pixmap", COLUMN_ICON); - gtk_tree_view_column_add_attribute (col, render, - "mask", COLUMN_ICON_MASK); + gtk_tree_view_column_set_title (col, _(simwin_titles[i])); render = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_NAME); + gtk_tree_view_column_add_attribute (col, render, "text", + COLUMN_NAME + i); gtk_tree_view_append_column (GTK_TREE_VIEW (sw->ctree), col); - gtk_tree_view_set_expander_column (GTK_TREE_VIEW (sw->ctree), col); - - /* other column */ - for (i = 1; i < simwin_column_num; i++) { - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title (col, _(simwin_titles[i])); - - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", - COLUMN_NAME + i); - - gtk_tree_view_append_column (GTK_TREE_VIEW (sw->ctree), col); - } - - g_signal_connect (G_OBJECT (sw->ctree), "cursor_changed", - G_CALLBACK (cb_tree_cursor_changed), sw); } -#else /* ENABLE_TREEVIEW */ - { - for (i = 0; i < simwin_column_num; i++) - simwin_titles[i] = _(simwin_titles[i]); - sw->ctree = gtk_ctree_new_with_titles (simwin_column_num, 0, simwin_titles); - gtk_clist_set_column_width (GTK_CLIST (sw->ctree), 0, 250); - gtk_clist_set_column_width (GTK_CLIST (sw->ctree), 1, 50); - gtk_clist_set_column_width (GTK_CLIST (sw->ctree), 2, 50); - gtk_clist_set_column_width (GTK_CLIST (sw->ctree), 3, 150); - /* - for (i = 0; i < simwin_column_num; i++) - gtk_clist_set_column_auto_resize (GTK_CLIST (sw->ctree), i, TRUE); - */ - gtk_clist_set_column_justification(GTK_CLIST (sw->ctree), 1, - GTK_JUSTIFY_CENTER); - gtk_clist_set_column_justification(GTK_CLIST (sw->ctree), 2, - GTK_JUSTIFY_RIGHT); - gtk_container_add (GTK_CONTAINER (scrolledwin), sw->ctree); - gtk_signal_connect (GTK_OBJECT (sw->ctree), "tree_select_row", - GTK_SIGNAL_FUNC (cb_ctree_select_row), sw); - } -#endif /* ENABLE_TREEVIEW */ + g_signal_connect (G_OBJECT (sw->ctree), "cursor_changed", + G_CALLBACK (cb_tree_cursor_changed), sw); /* button */ hbox = gtk_hbox_new (FALSE, 0); @@ -280,15 +199,15 @@ /* radio button */ radio = gtk_radio_button_new_with_label (NULL, _("Thumbnail")); sw->radio_thumb = radio; - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_change_to_thumbnail_button), sw); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_change_to_thumbnail_button), sw); gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0); radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), _("Icon")); sw->radio_icon = radio; - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_change_to_icon_button), sw); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_change_to_icon_button), sw); gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); @@ -297,8 +216,8 @@ button = gtk_button_new_with_label (_("Select All")); sw->select_button = button; gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_select_all_button), sw); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_select_all_button), sw); GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); gtk_widget_show (button); @@ -306,8 +225,8 @@ button = gtk_button_new_with_label (_("Stop")); sw->stop_button = button; gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_finder_stop_button), sw); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_finder_stop_button), sw); GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); gtk_widget_show (button); @@ -318,38 +237,37 @@ gtk_box_pack_end (GTK_BOX (hbox), sw->progressbar, FALSE, FALSE, 0); /* finder */ - gtk_signal_connect (GTK_OBJECT (sw->finder), "start", - GTK_SIGNAL_FUNC (cb_finder_start), sw); - gtk_signal_connect (GTK_OBJECT (sw->finder), "stop", - GTK_SIGNAL_FUNC (cb_finder_stop), sw); - gtk_signal_connect (GTK_OBJECT (sw->finder), "progress_update", - GTK_SIGNAL_FUNC (cb_finder_progress_update), sw); - gtk_signal_connect (GTK_OBJECT (sw->finder), "found", - GTK_SIGNAL_FUNC (cb_finder_found), sw); + g_signal_connect (G_OBJECT (sw->finder), "start", + G_CALLBACK (cb_finder_start), sw); + g_signal_connect (G_OBJECT (sw->finder), "stop", + G_CALLBACK (cb_finder_stop), sw); + g_signal_connect (G_OBJECT (sw->finder), "progress_update", + G_CALLBACK (cb_finder_progress_update), sw); + g_signal_connect (G_OBJECT (sw->finder), "found", + G_CALLBACK (cb_finder_found), sw); } static void gimv_dupl_win_class_init (GimvDuplWinClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_dialog_get_type ()); + gobject_class = (GObjectClass *) klass; - object_class->destroy = gimv_dupl_win_destroy; + gobject_class->dispose = gimv_dupl_win_dispose; } static void -gimv_dupl_win_destroy (GtkObject *object) +gimv_dupl_win_dispose (GObject *object) { GimvDuplWin *sw = GIMV_DUPL_WIN (object); g_return_if_fail (sw); if (sw->priv) { - g_list_foreach (sw->priv->thumb_list, (GFunc) gtk_object_unref, NULL); + g_list_foreach (sw->priv->thumb_list, (GFunc) g_object_unref, NULL); g_list_free (sw->priv->thumb_list); sw->priv->thumb_list = NULL; g_free (sw->priv); @@ -357,12 +275,12 @@ } if (sw->finder) { - gtk_object_unref (GTK_OBJECT (sw->finder)); + g_object_unref (G_OBJECT (sw->finder)); sw->finder = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_dupl_win_parent_class)->dispose) + G_OBJECT_CLASS (gimv_dupl_win_parent_class)->dispose (object); } @@ -475,8 +393,6 @@ } -#ifdef ENABLE_TREEVIEW - static void cb_tree_cursor_changed (GtkTreeView *treeview, GimvDuplWin *sw) { @@ -606,7 +522,7 @@ text[3] = charset_locale_to_internal (tmpstr); g_free (tmpstr); - gtk_object_ref (GTK_OBJECT(thumb)); + g_object_ref (G_OBJECT(thumb)); sw->priv->thumb_list = g_list_append (sw->priv->thumb_list, thumb); model = gtk_tree_view_get_model (GTK_TREE_VIEW (sw->ctree)); @@ -630,139 +546,6 @@ return TRUE; } -#else /* ENABLE_TREEVIEW */ - -static void -set_pixtext (GtkCTree *ctree, GtkCTreeNode *node, gpointer data) -{ - gboolean thumbnail = GPOINTER_TO_INT (data); - GimvThumb *thumb; - GdkPixmap *pixmap; - GdkBitmap *mask; - guint8 spacing; - gboolean is_leaf, expanded; - gchar *text; - - g_return_if_fail (ctree); - g_return_if_fail (node); - - thumb = gtk_ctree_node_get_row_data (ctree, node); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - if (thumbnail) - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - else - gimv_thumb_get_icon (thumb, &pixmap, &mask); - - gtk_ctree_get_node_info (ctree, node, &text, &spacing, - NULL, NULL, NULL, NULL, - &is_leaf, &expanded); - gtk_ctree_set_node_info (ctree, node, - text, spacing, - pixmap, mask, pixmap, mask, - is_leaf, expanded); -} - - -static void -cb_change_to_thumbnail_button (GtkButton *button, GimvDuplWin *sw) -{ - g_return_if_fail (sw); - - gtk_clist_set_row_height (GTK_CLIST (sw->ctree), sw->priv->thumbnail_size); - gtk_ctree_post_recursive (GTK_CTREE (sw->ctree), NULL, - (GtkCTreeFunc) set_pixtext, - GINT_TO_POINTER (TRUE)); -} - - -static void -cb_change_to_icon_button (GtkButton *button, GimvDuplWin *sw) -{ - g_return_if_fail (sw); - - gtk_clist_set_row_height (GTK_CLIST (sw->ctree), ICON_SIZE); - gtk_ctree_post_recursive (GTK_CTREE (sw->ctree), NULL, - (GtkCTreeFunc) set_pixtext, - GINT_TO_POINTER (FALSE)); -} - - -static void -cb_ctree_select_row (GtkCTree *ctree, GList *node, gint column, GimvDuplWin *sw) -{ - GimvThumb *thumb; - - g_return_if_fail (ctree); - g_return_if_fail (node); - g_return_if_fail (sw); - - if (!sw->tv) return; - - thumb = gtk_ctree_node_get_row_data (ctree, GTK_CTREE_NODE (node)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - cb_select_thumb (thumb, sw); -} - - -static GtkCTreeNode * -insert_node (GimvDuplWin *sw, - GtkCTreeNode *parent, - GimvThumb *thumb, - gfloat similar) -{ - GtkCTreeNode *node; - GdkPixmap *pixmap; - GdkBitmap *mask; - gchar *text[32], accuracy[32], *tmpstr; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - if (GTK_TOGGLE_BUTTON (sw->radio_thumb)->active) - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - else - gimv_thumb_get_icon (thumb, &pixmap, &mask); - - text[0] = (gchar *) gimv_image_info_get_path (thumb->info); - text[0] = charset_to_internal (text[0], - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - - if (similar > 0) { - g_snprintf (accuracy, 32, "%2.1f%%", similar * 100); - text[1] = accuracy; - } else { - text[1] = NULL; - } - - tmpstr = fileutil_size2str (thumb->info->st.st_size, FALSE); - text[2] = charset_locale_to_internal (tmpstr); - g_free (tmpstr); - - tmpstr = fileutil_time2str (thumb->info->st.st_mtime); - text[3] = charset_locale_to_internal (tmpstr); - g_free (tmpstr); - - node = gtk_ctree_insert_node (GTK_CTREE (sw->ctree), - parent, NULL, text, 4, - pixmap, mask, - pixmap, mask, - FALSE, FALSE); - gtk_object_ref (GTK_OBJECT(thumb)); - sw->priv->thumb_list = g_list_append (sw->priv->thumb_list, thumb); - gtk_ctree_node_set_row_data (GTK_CTREE (sw->ctree), node, thumb); - - g_free (text[0]); - g_free (text[2]); - g_free (text[3]); - - return node; -} - -#endif /* ENABLE_TREEVIEW */ - /****************************************************************************** @@ -775,7 +558,7 @@ { GimvDuplWin *sw; - sw = GIMV_DUPL_WIN (gtk_type_new (gimv_dupl_win_get_type ())); + sw = GIMV_DUPL_WIN (g_object_new (GIMV_TYPE_DUPL_WIN, NULL)); /* FIXME */ sw->priv->thumbnail_size = thumbnail_size; @@ -816,15 +599,13 @@ GimvThumb*thumb2, gfloat similar) { + GtkTreeIter parent_iter, iter; + gboolean success; + g_return_if_fail (sw); g_return_if_fail (GIMV_IS_THUMB (thumb1)); g_return_if_fail (GIMV_IS_THUMB (thumb2)); -#ifdef ENABLE_TREEVIEW -{ - GtkTreeIter parent_iter, iter; - gboolean success; - success = find_row (sw, thumb1, &parent_iter, NULL); if (!success) { GtkTreeView *treeview = GTK_TREE_VIEW (sw->ctree); @@ -858,18 +639,3 @@ gtk_tree_path_free (treepath); } } -#else /* ENABLE_TREEVIEW */ -{ - GtkCTreeNode *parent, *node; - - node = gtk_ctree_find_by_row_data (GTK_CTREE (sw->ctree), NULL, thumb1); - if (node) - parent = node; - else - parent = insert_node (sw, node, thumb1, -1); - - node = insert_node (sw, parent, thumb2, similar); - gtk_ctree_expand (GTK_CTREE (sw->ctree), parent); -} -#endif /* ENABLE_TREEVIEW */ -} diff -Nru gimageview-0.2.27/src/gimv_dupl_win.h gimageview-0.3.0-0.20101117/src/gimv_dupl_win.h --- gimageview-0.2.27/src/gimv_dupl_win.h 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_dupl_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_dupl_win.h,v 1.5 2004/04/10 05:20:14 makeinu Exp $ + * $Id: gimv_dupl_win.h 1142 2007-10-17 13:02:27Z makeinu $ */ @@ -33,10 +33,11 @@ #include "gimv_thumb_view.h" #define GIMV_TYPE_DUPL_WIN (gimv_dupl_win_get_type ()) -#define GIMV_DUPL_WIN(obj) (GTK_CHECK_CAST (obj, gimv_dupl_win_get_type (), GimvDuplWin)) -#define GIMV_DUPL_WIN_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_dupl_win_get_type, GimvDuplWinClass)) -#define GIMV_IS_DUPL_WIN(obj) (GTK_CHECK_TYPE (obj, gimv_dupl_win_get_type ())) -#define GIMV_IS_DUPL_WIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DUPL_WIN)) +#define GIMV_DUPL_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_DUPL_WIN, GimvDuplWin)) +#define GIMV_DUPL_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_DUPL_WIN, GimvDuplWinClass)) +#define GIMV_IS_DUPL_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_DUPL_WIN)) +#define GIMV_IS_DUPL_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_DUPL_WIN)) +#define GIMV_DUPL_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_DUPL_WIN, GimvDuplWinClass)) typedef struct GimvDuplWin_Tag GimvDuplWin; typedef struct GimvDuplWinClass_Tag GimvDuplWinClass; @@ -68,7 +69,7 @@ /* result window */ -GtkType gimv_dupl_win_get_type (void); +GType gimv_dupl_win_get_type (void); GimvDuplWin *gimv_dupl_win_new (gint thumbnail_size); void gimv_dupl_win_set_relation (GimvDuplWin *sw, GimvThumbView *tv); diff -Nru gimageview-0.2.27/src/gimv_elist.c gimageview-0.3.0-0.20101117/src/gimv_elist.c --- gimageview-0.2.27/src/gimv_elist.c 2004-09-22 15:37:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_elist.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,15 +18,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_elist.c,v 1.6 2004/09/22 15:37:11 makeinu Exp $ + * $Id: gimv_elist.c 1145 2007-10-17 14:38:26Z makeinu $ */ #include "gimv_elist.h" #include #include +#include -#include "intl.h" #include "gimv_marshal.h" @@ -38,8 +38,6 @@ }; -#if (GTK_MAJOR_VERSION >= 2) - #include #define list_widget_get_row_num(widget) \ @@ -49,20 +47,8 @@ #define ROWDESTROY(columns) columns + 1 #define ALL_COLUMNS(columns) columns + 2 -#else /* (GTK_MAJOR_VERSION >= 2) */ - -#define list_widget_get_row_num(widget) GTK_CLIST (widget)->rows; - -#endif /* (GTK_MAJOR_VERSION >= 2) */ - -static void gimv_elist_init (GimvEList *editlist); -static void gimv_elist_class_init (GimvEListClass *klass); -#ifdef USE_GTK2 static void gimv_elist_finalize (GObject *object); -#else -static void gimv_elist_finalize (GtkObject *object); -#endif /* private */ static void gimv_elist_set_move_button_sensitive (GimvEList *editlist); @@ -74,54 +60,10 @@ static void gimv_elist_edit_area_reset (GimvEList *editlist); -static GtkVBoxClass *parent_class = NULL; static gint gimv_elist_signals[LAST_SIGNAL] = {0}; -GtkType -gimv_elist_get_type (void) -{ - static GtkType gimv_elist_type = 0; - -#if (GTK_MAJOR_VERSION >= 2) - if (!gimv_elist_type) { - static const GTypeInfo gimv_elist_info = { - sizeof (GimvEListClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_elist_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvEList), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_elist_init, - }; - - gimv_elist_type = g_type_register_static (GTK_TYPE_VBOX, - "GimvEList", - &gimv_elist_info, - 0); - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - if (!gimv_elist_type) { - static const GtkTypeInfo gimv_elist_info = { - "GimvEList", - sizeof (GimvEList), - sizeof (GimvEListClass), - (GtkClassInitFunc) gimv_elist_class_init, - (GtkObjectInitFunc) gimv_elist_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_elist_type = gtk_type_unique (gtk_vbox_get_type (), - &gimv_elist_info); - } -#endif /* (GTK_MAJOR_VERSION >= 2) */ - - return gimv_elist_type; -} +G_DEFINE_TYPE (GimvEList, gimv_elist, GTK_TYPE_VBOX) static void @@ -148,50 +90,48 @@ editlist->column_func_tables = NULL; editlist->get_rowdata_fn = NULL; -#if (GTK_MAJOR_VERSION >= 2) editlist->rowdata_table = g_hash_table_new (g_direct_hash, g_direct_equal); editlist->rowdata_destroy_fn_table = g_hash_table_new (g_direct_hash, g_direct_equal); -#endif /* (GTK_MAJOR_VERSION >= 2) */ } static void gimv_elist_class_init (GimvEListClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_vbox_get_type ()); + gobject_class = (GObjectClass *) klass; gimv_elist_signals[LIST_UPDATED_SIGNAL] - = gtk_signal_new ("list-updated", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvEListClass, list_updated), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("list-updated", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvEListClass, list_updated), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_elist_signals[EDIT_AREA_SET_DATA_SIGNAL] - = gtk_signal_new ("edit-area-set-data", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvEListClass, edit_area_set_data), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("edit-area-set-data", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvEListClass, edit_area_set_data), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_elist_signals[ACTION_CONFIRM_SIGNAL] - = gtk_signal_new ("action-confirm", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvEListClass, action_confirm), - gtk_marshal_NONE__INT_INT_POINTER, - GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, gimv_elist_signals, LAST_SIGNAL); + = g_signal_new ("action-confirm", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GimvEListClass, action_confirm), + NULL, NULL, + gtk_marshal_NONE__INT_INT_POINTER, + G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER); - OBJECT_CLASS_SET_FINALIZE_FUNC (klass, gimv_elist_finalize); + gobject_class->finalize = gimv_elist_finalize; } @@ -200,8 +140,8 @@ { g_return_if_fail (GIMV_IS_ELIST (editlist)); - gtk_signal_emit (GTK_OBJECT (editlist), - gimv_elist_signals[LIST_UPDATED_SIGNAL]); + g_signal_emit (G_OBJECT (editlist), + gimv_elist_signals[LIST_UPDATED_SIGNAL], 0); } @@ -211,7 +151,6 @@ * Object class functions. * *******************************************************************************/ -#if (GTK_MAJOR_VERSION >= 2) static void free_rowdata (gpointer key, gpointer value, gpointer data) { @@ -222,15 +161,10 @@ if (destroy) destroy (value); } -#endif /* (GTK_MAJOR_VERSION >= 2) */ static void -#ifdef USE_GTK2 gimv_elist_finalize (GObject *object) -#else -gimv_elist_finalize (GtkObject *object) -#endif { GimvEList *editlist = GIMV_ELIST (object); gint i; @@ -246,13 +180,12 @@ g_free (editlist->column_func_tables); editlist->column_func_tables = NULL; -#if (GTK_MAJOR_VERSION >= 2) g_hash_table_foreach (editlist->rowdata_table, free_rowdata, editlist); g_hash_table_destroy (editlist->rowdata_table); g_hash_table_destroy (editlist->rowdata_destroy_fn_table); -#endif /* (GTK_MAJOR_VERSION >= 2) */ - OBJECT_CLASS_FINALIZE_SUPER (parent_class, object); + if (G_OBJECT_CLASS(gimv_elist_parent_class)->finalize) + G_OBJECT_CLASS(gimv_elist_parent_class)->finalize (object); } @@ -262,8 +195,6 @@ * Callback functions for child widget. * *******************************************************************************/ -#if (GTK_MAJOR_VERSION >= 2) - static void cb_editlist_cursor_changed (GtkTreeView *treeview, gpointer data) { @@ -331,86 +262,19 @@ gimv_elist_set_sensitive (editlist); } -#else /* (GTK_MAJOR_VERSION >=2) */ - -static void -cb_editlist_select_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, gpointer data) -{ - GimvEList *editlist = data; - - editlist->selected = row; - - gimv_elist_edit_area_set_data (editlist, row); - - gimv_elist_set_sensitive (editlist); -} - - -static void -cb_editlist_unselect_row (GtkCList *clist, gint row, gint col, - GdkEventButton *event, gpointer data) -{ - GimvEList *editlist = data; - - editlist->selected = -1; - - gimv_elist_edit_area_set_data (editlist, -1); - - gimv_elist_set_sensitive (editlist); -} - - -static gint -idle_editlist_row_move (gpointer data) -{ - GimvEList *editlist = data; - - gimv_elist_updated (editlist); - gimv_elist_set_sensitive (editlist); - - return FALSE; -} - - -static void -cb_editlist_row_move (GtkCList *clist, gint arg1, gint arg2, gpointer data) -{ - GimvEList *editlist = data; - gint src, dest = editlist->dest_row; - gint selected = editlist->selected; - - if (editlist->dest_row >= 0) { - dest = editlist->dest_row; - src = arg1 == dest ? arg2 : arg1; - } else { - src = arg1; - dest = arg2; - } - - if (selected >= 0) { - if (selected == src) { - editlist->selected = dest; - } else if (selected >= MIN (src, dest) && selected <= MAX (src, dest)) { - if (src < dest) - editlist->selected--; - else - editlist->selected++; - } - } - - editlist->dest_row = -1; - - gtk_idle_add (idle_editlist_row_move, editlist); -} - -#endif /* (GTK_MAJOR_VERSION >=2) */ - static void cb_editlist_up_button (GtkButton *button, gpointer data) { GimvEList *editlist = data; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreePath *treepath; + GtkTreeIter iter, prev_iter, dest_iter; + gboolean success; + GValue *values; + gint i, colnum; gint selected = editlist->selected; gint rows = editlist->rows; @@ -421,65 +285,51 @@ editlist->dest_row = editlist->selected - 1; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreePath *treepath; - GtkTreeIter iter, prev_iter, dest_iter; - gboolean success; - - GValue *values; - gint i, colnum = gtk_tree_model_get_n_columns (model); - - /* get src row */ - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; - treepath = gtk_tree_model_get_path (model, &iter); - - /* get prev row */ - success = gtk_tree_path_prev (treepath); - if (!success) { - gtk_tree_path_free (treepath); - return; - } - gtk_tree_model_get_iter (model, &prev_iter, treepath); - - /* get src data */ - values = g_new0 (GValue, colnum); - for (i = 0; i < colnum; i++) { - gtk_tree_model_get_value (model, &iter, i, &values[i]); - } - - /* insert dest row before prev */ - gtk_list_store_insert_before (GTK_LIST_STORE (model), - &dest_iter, &prev_iter); - for (i = 0; i < colnum; i++) { - gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, - i, &values[i]); - g_value_unset (&values[i]); - } - g_free (values); - - /* delete src */ - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + selection = gtk_tree_view_get_selection (treeview); + colnum = gtk_tree_model_get_n_columns (model); - /* select dest */ - gtk_tree_path_free (treepath); - treepath = gtk_tree_model_get_path (model, &dest_iter); - gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + /* get src row */ + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; + treepath = gtk_tree_model_get_path (model, &iter); - /* clean */ + /* get prev row */ + success = gtk_tree_path_prev (treepath); + if (!success) { gtk_tree_path_free (treepath); + return; } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gtk_clist_swap_rows (GTK_CLIST (editlist->clist), selected, selected - 1); - gtk_clist_moveto (GTK_CLIST (editlist->clist), selected - 1, 0, 0, 0); + gtk_tree_model_get_iter (model, &prev_iter, treepath); + + /* get src data */ + values = g_new0 (GValue, colnum); + for (i = 0; i < colnum; i++) { + gtk_tree_model_get_value (model, &iter, i, &values[i]); } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + + /* insert dest row before prev */ + gtk_list_store_insert_before (GTK_LIST_STORE (model), + &dest_iter, &prev_iter); + for (i = 0; i < colnum; i++) { + gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, + i, &values[i]); + g_value_unset (&values[i]); + } + g_free (values); + + /* delete src */ + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + /* select dest */ + gtk_tree_path_free (treepath); + treepath = gtk_tree_model_get_path (model, &dest_iter); + gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + + /* clean */ + gtk_tree_path_free (treepath); } @@ -489,6 +339,14 @@ GimvEList *editlist = data; gint selected = editlist->selected; gint rows = editlist->rows; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter, next_iter, dest_iter; + GtkTreePath *treepath; + gboolean success; + GValue *values; + gint i, colnum; g_return_if_fail (button && editlist); @@ -496,60 +354,46 @@ editlist->dest_row = editlist->selected + 1; -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - GtkTreeIter iter, next_iter, dest_iter; - GtkTreePath *treepath; - gboolean success; - - GValue *values; - gint i, colnum = gtk_tree_model_get_n_columns (model); - - /* get src row */ - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) return; - - /* get prev row */ - next_iter = iter; - success = gtk_tree_model_iter_next (model, &next_iter); - if (!success) return; - - /* get src data */ - values = g_new0 (GValue, colnum); - for (i = 0; i < colnum; i++) { - gtk_tree_model_get_value (model, &iter, i, &values[i]); - } - - /* insert dest row before prev */ - gtk_list_store_insert_after (GTK_LIST_STORE (model), - &dest_iter, &next_iter); - for (i = 0; i < colnum; i++) { - gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, - i, &values[i]); - g_value_unset (&values[i]); - } - g_free (values); + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + selection = gtk_tree_view_get_selection (treeview); + colnum = gtk_tree_model_get_n_columns (model); - /* delete src */ - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + /* get src row */ + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; - /* select dest */ - treepath = gtk_tree_model_get_path (model, &dest_iter); - gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + /* get prev row */ + next_iter = iter; + success = gtk_tree_model_iter_next (model, &next_iter); + if (!success) return; - /* clean */ - gtk_tree_path_free (treepath); + /* get src data */ + values = g_new0 (GValue, colnum); + for (i = 0; i < colnum; i++) { + gtk_tree_model_get_value (model, &iter, i, &values[i]); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - { - gtk_clist_swap_rows (GTK_CLIST (editlist->clist), selected, selected + 1); - gtk_clist_moveto (GTK_CLIST (editlist->clist), selected + 1, 0, 0, 0); + + /* insert dest row before prev */ + gtk_list_store_insert_after (GTK_LIST_STORE (model), + &dest_iter, &next_iter); + for (i = 0; i < colnum; i++) { + gtk_list_store_set_value (GTK_LIST_STORE (model), &dest_iter, + i, &values[i]); + g_value_unset (&values[i]); } -#endif /* (GTK_MAJOR_VERSION >= 2) */ + g_free (values); + + /* delete src */ + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + /* select dest */ + treepath = gtk_tree_model_get_path (model, &dest_iter); + gtk_tree_view_set_cursor (treeview, treepath, NULL, FALSE); + + /* clean */ + gtk_tree_path_free (treepath); } @@ -615,6 +459,11 @@ gpointer rowdata = NULL; GtkDestroyNotify destroy_fn = NULL; gboolean set_rowdata = FALSE; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreeIter iter; + gboolean success; g_return_if_fail (GIMV_IS_ELIST (editlist)); @@ -627,34 +476,18 @@ GIMV_ELIST_ACTION_CHANGE); g_return_if_fail (text); -#ifdef ENABLE_TREEVIEW - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - gboolean success; - - selection = gtk_tree_view_get_selection (treeview); - success = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!success) { - g_strfreev (text); - return; - } + treeview = GTK_TREE_VIEW (editlist->clist); - for (i = 0; i < editlist->columns; i++) { - gtk_list_store_set (GTK_LIST_STORE (model), &iter, i, text[i], -1); - } + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) { + g_strfreev (text); + return; } -#else /* ENABLE_TREEVIEW */ - { - GtkCList *clist = GTK_CLIST (editlist->clist); - for (i = 0; i < editlist->columns; i++) { - gtk_clist_set_text (clist, editlist->selected, i, text[i]); - } + for (i = 0; i < editlist->columns; i++) { + gtk_list_store_set (GTK_LIST_STORE (model), &iter, i, text[i], -1); } -#endif /* ENABLE_TREEVIEW */ g_strfreev (text); @@ -739,8 +572,6 @@ gimv_elist_create_list_widget (GimvEList *editlist, gint colnum) { GtkWidget *clist; - -#if (GTK_MAJOR_VERSION >= 2) GtkListStore *store; GtkTreeViewColumn *col; GtkCellRenderer *render; @@ -785,19 +616,6 @@ gtk_tree_view_column_add_attribute (col, render, "text", i); gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - clist = editlist->clist = gtk_clist_new (colnum); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); - gtk_clist_set_reorderable (GTK_CLIST (clist), TRUE); - gtk_clist_set_use_drag_icons (GTK_CLIST (clist), FALSE); - - gtk_signal_connect (GTK_OBJECT (clist),"row_move", - GTK_SIGNAL_FUNC (cb_editlist_row_move), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->clist), "select_row", - GTK_SIGNAL_FUNC (cb_editlist_select_row), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->clist), "unselect_row", - GTK_SIGNAL_FUNC (cb_editlist_unselect_row), editlist); -#endif /* (GTK_MAJOR_VERSION >= 2) */ editlist->columns = colnum; @@ -828,8 +646,8 @@ g_return_if_fail (row < editlist->rows); - gtk_signal_emit (GTK_OBJECT (editlist), - gimv_elist_signals[EDIT_AREA_SET_DATA_SIGNAL]); + g_signal_emit (G_OBJECT (editlist), + gimv_elist_signals[EDIT_AREA_SET_DATA_SIGNAL], 0); for (i = 0; i < editlist->columns; i++) { GimvEListColumnFuncTable *table = editlist->column_func_tables[i]; @@ -839,7 +657,6 @@ if (!table->set_data_fn) continue; if (row >= 0) { -#if (GTK_MAJOR_VERSION >= 2) GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); GtkTreeModel *model = gtk_tree_view_get_model (treeview); GtkTreeIter iter; @@ -849,10 +666,6 @@ if (success) { gtk_tree_model_get (model, &iter, i, &text, -1); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_clist_get_text (GTK_CLIST (editlist->clist), row, i, &text); - if (text) text = g_strdup (text); -#endif /* (GTK_MAJOR_VERSION >= 2) */ } table->set_data_fn (editlist, table->widget, row, i, @@ -939,11 +752,7 @@ g_return_val_if_fail (colnum > 0, NULL); -#if (GTK_MAJOR_VERSION >= 2) editlist = g_object_new (gimv_elist_get_type (), NULL); -#else /* (GTK_MAJOR_VERSION >= 2) */ - editlist = gtk_type_new (gimv_elist_get_type ()); -#endif /* (GTK_MAJOR_VERSION >= 2) */ main_vbox = GTK_WIDGET (editlist); /* clist */ @@ -955,13 +764,11 @@ scrollwin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_container_set_border_width(GTK_CONTAINER (scrollwin), 5); gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0); - gtk_widget_set_usize (scrollwin, -1, 120); + gtk_widget_set_size_request (scrollwin, -1, 120); gtk_widget_show (scrollwin); clist = gimv_elist_create_list_widget (editlist, colnum); @@ -1038,8 +845,6 @@ gtk_widget_show (button); -#if (GTK_MAJOR_VERSION >= 2) - #ifdef USE_ARROW gtk_widget_set_size_request (editlist->up_button, 20, 20); gtk_widget_set_size_request (editlist->down_button, 20, 20); @@ -1059,29 +864,6 @@ g_signal_connect (G_OBJECT (editlist->del_button), "clicked", G_CALLBACK (cb_editlist_delete_button), editlist); -#else /* (GTK_MAJOR_VERSION >= 2) */ - -#ifdef USE_ARROW - gtk_widget_set_usize (editlist->up_button, 20, 20); - gtk_widget_set_usize (editlist->down_button, 20, 20); -#endif /* USE_ARROW */ - gtk_widget_set_usize (editlist->new_button, 70, -1); - - gtk_signal_connect (GTK_OBJECT (editlist->up_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_up_button), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->down_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_down_button), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->new_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_new_button), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->add_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_add_button), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->change_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_change_button), editlist); - gtk_signal_connect (GTK_OBJECT (editlist->del_button), "clicked", - GTK_SIGNAL_FUNC (cb_editlist_delete_button), editlist); - -#endif /* (GTK_MAJOR_VERSION >= 2) */ - /* initialize column func tables */ editlist->column_func_tables = g_new0 (GimvEListColumnFuncTable *, editlist->columns); @@ -1101,28 +883,16 @@ { GimvEList *editlist; gint i; + GList *list, *node; editlist = GIMV_ELIST (gimv_elist_new (colnum)); -#if (GTK_MAJOR_VERSION >= 2) - { - GList *list, *node; - list = gtk_tree_view_get_columns (GTK_TREE_VIEW (editlist->clist)); - for (node = list, i = 0; node; node = g_list_next (node), i++) { - GtkTreeViewColumn *col = node->data; - gtk_tree_view_column_set_title (col, titles[i]); - } + list = gtk_tree_view_get_columns (GTK_TREE_VIEW (editlist->clist)); + for (node = list, i = 0; node; node = g_list_next (node), i++) { + GtkTreeViewColumn *col = node->data; + gtk_tree_view_column_set_title (col, titles[i]); } gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (editlist->clist), TRUE); -#else /* (GTK_MAJOR_VERSION >= 2) */ - for (i = 0; i < colnum; i++) { - gtk_clist_set_column_title (GTK_CLIST (editlist->clist), - i, titles[i]); - gtk_clist_set_column_auto_resize (GTK_CLIST (editlist->clist), - i, TRUE); - } - gtk_clist_column_titles_show (GTK_CLIST (editlist->clist)); -#endif /* (GTK_MAJOR_VERSION >= 2) */ return GTK_WIDGET (editlist); } @@ -1133,14 +903,7 @@ { g_return_if_fail (GIMV_IS_ELIST (editlist)); -#if (GTK_MAJOR_VERSION >= 2) gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (editlist->clist), visible); -#else /* (GTK_MAJOR_VERSION >= 2) */ - if (visible) - gtk_clist_column_titles_show (GTK_CLIST (editlist->clist)); - else - gtk_clist_column_titles_hide (GTK_CLIST (editlist->clist)); -#endif /* (GTK_MAJOR_VERSION >= 2) */ } @@ -1149,11 +912,7 @@ { g_return_if_fail (GIMV_IS_ELIST (editlist)); -#if (GTK_MAJOR_VERSION >= 2) gtk_tree_view_set_reorderable (GTK_TREE_VIEW (editlist->clist), reorderble); -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_clist_set_reorderable (GTK_CLIST (editlist->clist), reorderble); -#endif /* (GTK_MAJOR_VERSION >= 2) */ if (reorderble) gtk_widget_show (editlist->move_button_area); @@ -1165,38 +924,28 @@ void gimv_elist_set_auto_sort (GimvEList *editlist, gint column) { + GList *list, *node; + g_return_if_fail (GIMV_IS_ELIST (editlist)); g_return_if_fail (column < editlist->columns); -#if (GTK_MAJOR_VERSION >= 2) - { - GList *list, *node; - list = gtk_tree_view_get_columns (GTK_TREE_VIEW (editlist->clist)); - - for (node = list; node; node = g_list_next (node)) { - GtkTreeViewColumn *treecolumn = node->data; - gtk_tree_view_column_set_reorderable (treecolumn, FALSE); - } + list = gtk_tree_view_get_columns (GTK_TREE_VIEW (editlist->clist)); - if (column >= 0) { - GtkTreeViewColumn *treecolumn; - node = g_list_nth (list, column); - treecolumn = node->data; - gtk_tree_view_column_set_reorderable (treecolumn, TRUE); - gtk_tree_view_column_set_sort_column_id (treecolumn, column); - gtk_tree_view_column_set_sort_order (treecolumn, GTK_SORT_ASCENDING); - } + for (node = list; node; node = g_list_next (node)) { + GtkTreeViewColumn *treecolumn = node->data; + gtk_tree_view_column_set_reorderable (treecolumn, FALSE); + } - g_list_free (list); + if (column >= 0) { + GtkTreeViewColumn *treecolumn; + node = g_list_nth (list, column); + treecolumn = node->data; + gtk_tree_view_column_set_reorderable (treecolumn, TRUE); + gtk_tree_view_column_set_sort_column_id (treecolumn, column); + gtk_tree_view_column_set_sort_order (treecolumn, GTK_SORT_ASCENDING); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - if (column < 0) - gtk_clist_set_auto_sort (GTK_CLIST (editlist->clist), FALSE); - else - gtk_clist_set_auto_sort (GTK_CLIST (editlist->clist), TRUE); - gtk_clist_set_sort_column (GTK_CLIST (editlist->clist), column); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + g_list_free (list); } @@ -1205,48 +954,36 @@ { g_return_val_if_fail (GIMV_IS_ELIST (editlist), FALSE); -#if (GTK_MAJOR_VERSION >= 2) return gtk_tree_view_get_reorderable (GTK_TREE_VIEW (editlist->clist)); -#else /* (GTK_MAJOR_VERSION >= 2) */ - return GTK_CLIST_REORDERABLE (GTK_CLIST (editlist->clist)); -#endif /* (GTK_MAJOR_VERSION >= 2) */ } gint gimv_elist_append_row (GimvEList *editlist, gchar *data[]) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkListStore *store; + GtkTreeIter iter; + gint i; gint retval; g_return_val_if_fail (GIMV_IS_ELIST (editlist), -1); g_return_val_if_fail (editlist->max_row < 0 || editlist->rows <= editlist->max_row, -1); -#if (GTK_MAJOR_VERSION >= 2) + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + store = GTK_LIST_STORE (model); + + gtk_list_store_append (store, &iter); - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkListStore *store = GTK_LIST_STORE (model); - GtkTreeIter iter; - gint i; - - gtk_list_store_append (store, &iter); - - for (i = 0; i < editlist->columns; i++) { - gtk_list_store_set (store, &iter, i, data[i], -1); - } + for (i = 0; i < editlist->columns; i++) { + gtk_list_store_set (store, &iter, i, data[i], -1); } editlist->rows = list_widget_get_row_num(editlist->clist); retval = editlist->rows - 1; -#else /* (GTK_MAJOR_VERSION >= 2) */ - - retval = gtk_clist_append (GTK_CLIST (editlist->clist), data); - editlist->rows = list_widget_get_row_num(editlist->clist); - -#endif /* (GTK_MAJOR_VERSION >= 2) */ - gimv_elist_set_sensitive (editlist); return retval; @@ -1256,28 +993,26 @@ void gimv_elist_remove_row (GimvEList *editlist, gint row) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkListStore *store; + GtkTreeIter iter; + gboolean success; + g_return_if_fail (GIMV_IS_ELIST (editlist)); g_return_if_fail (row >= 0 && row < editlist->rows); gimv_elist_set_row_data (editlist, row, NULL); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkListStore *store = GTK_LIST_STORE (model); - GtkTreeIter iter; - gboolean success; - - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - if (success) { - gtk_list_store_remove (store, &iter); - editlist->selected = -1; - } + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + store = GTK_LIST_STORE (model); + + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + if (success) { + gtk_list_store_remove (store, &iter); + editlist->selected = -1; } -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_clist_remove (GTK_CLIST (editlist->clist), row); -#endif /* (GTK_MAJOR_VERSION >= 2) */ editlist->rows = list_widget_get_row_num(editlist->clist); @@ -1307,6 +1042,10 @@ gchar ** gimv_elist_get_row_text (GimvEList *editlist, gint row) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; gchar **text; gint i; @@ -1316,38 +1055,19 @@ text = g_new0 (gchar *, editlist->columns + 1); -#if (GTK_MAJOR_VERSION >= 2) - - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean success; - - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - g_return_val_if_fail (success, NULL); - - for (i = 0; i < editlist->columns; i++) { - text[i] = NULL; - gtk_tree_model_get (model, &iter, i, &text[i], -1); - if (!text[i]) - text[i] = g_strdup (""); - } - } + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); -#else /* (GTK_MAJOR_VERSION >= 2) */ + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + g_return_val_if_fail (success, NULL); for (i = 0; i < editlist->columns; i++) { text[i] = NULL; - gtk_clist_get_text (GTK_CLIST (editlist->clist), row, i, &text[i]); - if (text[i]) - text[i] = g_strdup (text[i]); - else + gtk_tree_model_get (model, &iter, i, &text[i], -1); + if (!text[i]) text[i] = g_strdup (""); } -#endif /* (GTK_MAJOR_VERSION >= 2) */ - text[editlist->columns] = NULL; return text; @@ -1357,6 +1077,10 @@ gchar * gimv_elist_get_cell_text (GimvEList *editlist, gint row, gint col) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; gchar *text = NULL; g_return_val_if_fail (GIMV_IS_ELIST (editlist), NULL); @@ -1364,31 +1088,13 @@ g_return_val_if_fail (editlist->columns > 0, NULL); g_return_val_if_fail (col < editlist->columns, NULL); -#if (GTK_MAJOR_VERSION >= 2) - - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean success; + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - g_return_val_if_fail (success, NULL); - - gtk_tree_model_get (model, &iter, col, &text, -1); - } - -#else /* (GTK_MAJOR_VERSION >= 2) */ - - { - gboolean success; - success = gtk_clist_get_text (GTK_CLIST (editlist->clist), - row, col, &text); - if (!success) return NULL; - text = g_strdup (text); - } + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + g_return_val_if_fail (success, NULL); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + gtk_tree_model_get (model, &iter, col, &text, -1); return text; } @@ -1412,48 +1118,45 @@ gpointer data, GtkDestroyNotify destroy_fn) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + GtkDestroyNotify destroy; + gboolean success; + gpointer rowdata; + g_return_if_fail (GIMV_IS_ELIST (editlist)); g_return_if_fail (row >= 0 && row < editlist->rows); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - GtkDestroyNotify destroy; - gboolean success; - gpointer rowdata = gimv_elist_get_row_data (editlist, row); - - if (rowdata) { - destroy = g_hash_table_lookup (editlist->rowdata_destroy_fn_table, - rowdata); - if (destroy) { - destroy (rowdata); - g_hash_table_remove (editlist->rowdata_destroy_fn_table, rowdata); - } - - g_hash_table_remove (editlist->rowdata_table, rowdata); + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + rowdata = gimv_elist_get_row_data (editlist, row); + + if (rowdata) { + destroy = g_hash_table_lookup (editlist->rowdata_destroy_fn_table, + rowdata); + if (destroy) { + destroy (rowdata); + g_hash_table_remove (editlist->rowdata_destroy_fn_table, rowdata); } - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - g_return_if_fail (success); + g_hash_table_remove (editlist->rowdata_table, rowdata); + } - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - ROWDATA(editlist->columns), data, - ROWDESTROY(editlist->columns), destroy_fn, - -1); - - if (data) { - g_hash_table_insert (editlist->rowdata_table, - data, data); - g_hash_table_insert (editlist->rowdata_destroy_fn_table, - data, destroy_fn); - } + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + g_return_if_fail (success); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + ROWDATA(editlist->columns), data, + ROWDESTROY(editlist->columns), destroy_fn, + -1); + + if (data) { + g_hash_table_insert (editlist->rowdata_table, + data, data); + g_hash_table_insert (editlist->rowdata_destroy_fn_table, + data, destroy_fn); } -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_clist_set_row_data_full (GTK_CLIST (editlist->clist), row, - data, destroy_fn); -#endif /* (GTK_MAJOR_VERSION >= 2) */ gimv_elist_updated (editlist); } @@ -1463,47 +1166,41 @@ gimv_elist_get_row_data (GimvEList *editlist, gint row) { + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean success; + gpointer data; + g_return_val_if_fail (GIMV_IS_ELIST (editlist), NULL); g_return_val_if_fail (row >= 0 && row < editlist->rows, NULL); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean success; - gpointer data; - - success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); - if (!success) return NULL; - - gtk_tree_model_get (model, &iter, - ROWDATA (editlist->columns), &data, -1); - - return data; - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - return gtk_clist_get_row_data (GTK_CLIST (editlist->clist), row); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + treeview = GTK_TREE_VIEW (editlist->clist); + model = gtk_tree_view_get_model (treeview); + + success = gtk_tree_model_iter_nth_child (model, &iter, NULL, row); + if (!success) return NULL; + + gtk_tree_model_get (model, &iter, + ROWDATA (editlist->columns), &data, -1); + + return data; } void gimv_elist_unselect_all (GimvEList *editlist) { + GtkTreeView *treeview; + GtkTreeSelection *selection; + g_return_if_fail (GIMV_IS_ELIST (editlist)); -#if (GTK_MAJOR_VERSION >= 2) - { - GtkTreeView *treeview = GTK_TREE_VIEW (editlist->clist); - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); + treeview = GTK_TREE_VIEW (editlist->clist); + selection = gtk_tree_view_get_selection (treeview); - gtk_tree_selection_unselect_all (selection); - editlist->selected = -1; - } -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_clist_unselect_all (GTK_CLIST (editlist->clist)); -#endif /* (GTK_MAJOR_VERSION >= 2) */ + gtk_tree_selection_unselect_all (selection); + editlist->selected = -1; gimv_elist_set_sensitive (editlist); } @@ -1589,11 +1286,11 @@ retval |= GIMV_ELIST_CONFIRM_CANNOT_DELETE; } - gtk_signal_emit (GTK_OBJECT (editlist), - gimv_elist_signals[ACTION_CONFIRM_SIGNAL], - type, - editlist->selected, - &retval); + g_signal_emit (G_OBJECT (editlist), + gimv_elist_signals[ACTION_CONFIRM_SIGNAL], 0, + type, + editlist->selected, + &retval); return retval; } @@ -1767,21 +1464,12 @@ entry_data, editlist_entry_destroy); -#if (GTK_MAJOR_VERSION >= 2) g_signal_connect (G_OBJECT (editlist), "action_confirm", G_CALLBACK (cb_editlist_entry_confirm), entry_data); g_signal_connect (G_OBJECT (entry),"changed", G_CALLBACK (cb_editlist_entry_changed), entry_data); -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_signal_connect (GTK_OBJECT (editlist), "action_confirm", - GTK_SIGNAL_FUNC (cb_editlist_entry_confirm), - entry_data); - gtk_signal_connect (GTK_OBJECT (entry),"changed", - GTK_SIGNAL_FUNC (cb_editlist_entry_changed), - entry_data); -#endif /* (GTK_MAJOR_VERSION >= 2) */ gimv_elist_set_sensitive (editlist); @@ -1914,15 +1602,9 @@ button_data, editlist_check_button_destroy); -#if (GTK_MAJOR_VERSION >= 2) g_signal_connect (G_OBJECT (check_button),"toggled", G_CALLBACK (cb_editlist_check_button_toggled), button_data); -#else /* (GTK_MAJOR_VERSION >= 2) */ - gtk_signal_connect (GTK_OBJECT (check_button),"toggled", - GTK_SIGNAL_FUNC (cb_editlist_check_button_toggled), - button_data); -#endif /* (GTK_MAJOR_VERSION >= 2) */ gimv_elist_set_sensitive (editlist); diff -Nru gimageview-0.2.27/src/gimv_elist.h gimageview-0.3.0-0.20101117/src/gimv_elist.h --- gimageview-0.2.27/src/gimv_elist.h 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_elist.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_elist.h,v 1.4 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_elist.h 1146 2007-10-17 14:40:27Z makeinu $ */ @@ -30,11 +30,13 @@ #endif /* HAVE_CONFIG_H */ #include -#include "gtk2-compat.h" -#define GIMV_ELIST(obj) GTK_CHECK_CAST (obj, gimv_elist_get_type (), GimvEList) -#define GIMV_ELIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gimv_elist_get_type, GimvEListClass) -#define GIMV_IS_ELIST(obj) GTK_CHECK_TYPE (obj, gimv_elist_get_type ()) +#define GIMV_TYPE_ELIST (gimv_elist_get_type ()) +#define GIMV_ELIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_ELIST, GimvEList)) +#define GIMV_ELIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ELIST, GimvEListClass)) +#define GIMV_IS_ELIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_ELIST)) +#define GIMV_IS_ELIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ELIST)) +#define GIMV_ELIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_ELIST, GimvEListClass)) typedef struct GimvEList_Tag GimvEList; @@ -113,10 +115,8 @@ GimvEListColumnFuncTable **column_func_tables; GimvEListGetRowDataFn get_rowdata_fn; -#if (GTK_MAJOR_VERSION >= 2) GHashTable *rowdata_table; GHashTable *rowdata_destroy_fn_table; -#endif /* (GTK_MAJOR_VERSION >= 2) */ }; @@ -146,7 +146,7 @@ }; -GtkType gimv_elist_get_type (void); +GType gimv_elist_get_type (void); GtkWidget *gimv_elist_new (gint colnum); GtkWidget *gimv_elist_new_with_titles (gint colnum, gchar *titles[]); diff -Nru gimageview-0.2.27/src/gimv_exif_view.c gimageview-0.3.0-0.20101117/src/gimv_exif_view.c --- gimageview-0.2.27/src/gimv_exif_view.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_exif_view.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,335 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_exif_view.c 1208 2009-01-13 05:19:15Z makeinu $ + */ + +#include "gimageview.h" + +#include "jpeg-data.h" +#include + +#include "gimv_exif_view.h" +#include "gimv_image.h" +#include "gimv_io_mem.h" +#include "gimv_icon_stock.h" +#include "gimv_image_loader.h" +#include "utils_gtk.h" + + +typedef enum { + COLUMN_TERMINATOR = -1, + COLUMN_KEY, + COLUMN_VALUE, + N_COLUMN +} ListStoreColumn; + + +/****************************************************************************** + * + * Callback Functions. + * + ******************************************************************************/ +static void +cb_exif_view_destroy (GtkWidget *widget, GimvExifView *ev) +{ + g_return_if_fail (ev); + + if (ev->exif_data) + exif_data_unref (ev->exif_data); + ev->exif_data = NULL; + + if (ev->jpeg_data) + jpeg_data_unref (ev->jpeg_data); + ev->jpeg_data = NULL; + + g_free (ev); +} + + +static void +cb_exif_window_close (GtkWidget *button, GimvExifView *ev) +{ + g_return_if_fail (ev); + + gtk_widget_destroy (ev->window); +} + + +/****************************************************************************** + * + * Other Private Functions. + * + ******************************************************************************/ +static void +gimv_exif_view_content_list_set_data (GtkWidget *clist, + ExifContent *content) +{ + const gchar *text[2]; + guint i; + GtkTreeModel *model; + + g_return_if_fail (clist); + g_return_if_fail (content); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); + gtk_list_store_clear (GTK_LIST_STORE (model)); + + for (i = 0; i < content->count; i++) { + GtkTreeModel *model; + GtkTreeIter iter; + gchar value[256]; + + text[0] = exif_tag_get_name (content->entries[i]->tag); + if (text[0] && *text[0]) text[0] = _(text[0]); + value[0] = 0; + exif_entry_get_value (content->entries[i], + value, sizeof(value)); + text[1] = value; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (clist)); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COLUMN_KEY, text[0], + COLUMN_VALUE, text[1], + COLUMN_TERMINATOR); + } +} + + +/****************************************************************************** + * + * Public Functions. + * + ******************************************************************************/ +GimvExifView * +gimv_exif_view_create_window (const gchar *filename, GtkWindow *parent) +{ + GimvExifView *ev; + GtkWidget *button; + gchar buf[BUF_SIZE]; + + g_return_val_if_fail (filename && *filename, NULL); + + ev = gimv_exif_view_create (filename, parent); + if (!ev) return NULL; + + ev->window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (ev->window), parent); + g_snprintf (buf, BUF_SIZE, _("%s EXIF data"), filename); + gtk_window_set_title (GTK_WINDOW (ev->window), buf); + gtk_window_set_default_size (GTK_WINDOW (ev->window), 500, 400); + gtk_window_set_position (GTK_WINDOW (ev->window), GTK_WIN_POS_CENTER); + + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ev->window)->vbox), + ev->container, + TRUE, TRUE, 0); + + gtk_widget_show_all (ev->window); + + /* button */ + button = gtk_button_new_with_label (_("Close")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ev->window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_exif_window_close), ev); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + gtk_widget_grab_focus (button); + + gimv_icon_stock_set_window_icon (ev->window->window, "gimv_icon"); + + return ev; +} + + +static GtkWidget * +gimv_exif_view_get_thumbnail (ExifData *edata) +{ + GtkWidget *image; + GimvImageLoader *loader; + GimvIO *gio; + GimvImage *gimvimage; + GdkPixmap *pixmap = NULL; + GdkBitmap *bitmap = NULL; + + + g_return_val_if_fail (edata, NULL); + + if (!edata->data) return NULL; + if (edata->size <= 0) return NULL; + + loader = gimv_image_loader_new (); + if (!loader) return NULL; + + gio = gimv_io_mem_new (NULL, "rb", GimvIOMemModeWrap); + gimv_io_mem_wrap ((GimvIOMem *) gio, edata->data, edata->size, FALSE); + gimv_image_loader_set_gio (loader, gio); + + gimv_image_loader_load (loader); + + gimvimage = gimv_image_loader_get_image (loader); + if (!gimvimage) { + g_object_unref (G_OBJECT(loader)); + return NULL; + } + + gimv_image_scale_get_pixmap (gimvimage, + gimv_image_width (gimvimage), + gimv_image_height (gimvimage), + &pixmap, &bitmap); + + g_object_unref (G_OBJECT (loader)); + gimv_io_unref (gio); + + image = gtk_image_new_from_pixmap (pixmap, bitmap); + + if (pixmap) + gdk_pixmap_unref (pixmap); + + return image; +} + + +GimvExifView * +gimv_exif_view_create (const gchar *filename, GtkWindow *parent) +{ + JPEGData *jdata; + ExifData *edata; + GimvExifView *ev = NULL; + ExifContent *contents[EXIF_IFD_COUNT]; + GtkWidget *notebook, *label; + GtkWidget *vbox, *pixmap; + gint i; + + gchar *titles[] = { + N_("Tag"), N_("Value"), + }; + + g_return_val_if_fail (filename && *filename, NULL); + + jdata = jpeg_data_new_from_file (filename); + if (!jdata) { + gtkutil_message_dialog (_("Error!!"), _("EXIF data not found."), + GTK_WINDOW (ev->window)); + return NULL; + } + + edata = jpeg_data_get_exif_data (jdata); + if (!edata) { + gtkutil_message_dialog (_("Error!!"), _("EXIF data not found."), + GTK_WINDOW (parent)); + goto ERROR; + } + + ev = g_new0 (GimvExifView, 1); + ev->exif_data = edata; + ev->jpeg_data = jdata; + +#if 0 + contents[0] = edata->ifd0; + contents[1] = edata->ifd1; + contents[2] = edata->ifd_exif; + contents[3] = edata->ifd_gps; + contents[4] = edata->ifd_interoperability; +#else + for (i = 0; i < EXIF_IFD_COUNT; i++) + contents[i] = edata->ifd[i]; +#endif + + ev->container = gtk_vbox_new (FALSE, 0); + g_signal_connect (G_OBJECT (ev->container), "destroy", + G_CALLBACK (cb_exif_view_destroy), ev); + gtk_widget_show (ev->container); + + notebook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); + gtk_box_pack_start(GTK_BOX(ev->container), notebook, TRUE, TRUE, 0); + gtk_widget_show (notebook); + + /* Tag Tables */ + for (i = 0; i < EXIF_IFD_COUNT; i++) { + GtkWidget *scrolledwin, *clist; + GtkListStore *store; + GtkTreeViewColumn *col; + GtkCellRenderer *render; + + /* scrolled window & clist */ + label = gtk_label_new (_(exif_ifd_get_name(i))); + scrolledwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), + GTK_SHADOW_IN); + gtk_container_set_border_width (GTK_CONTAINER (scrolledwin), 5); + gtk_notebook_append_page (GTK_NOTEBOOK(notebook), + scrolledwin, label); + gtk_widget_show (scrolledwin); + + store = gtk_list_store_new (N_COLUMN, G_TYPE_STRING, G_TYPE_STRING); + clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); + + /* set column for key */ + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_resizable (col, TRUE); + gtk_tree_view_column_set_title (col, _(titles[0])); + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_KEY); + gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); + + /* set column for value */ + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_resizable (col, TRUE); + gtk_tree_view_column_set_title (col, _(titles[1])); + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", COLUMN_VALUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); + + gtk_container_add (GTK_CONTAINER (scrolledwin), clist); + gtk_widget_show (clist); + + gimv_exif_view_content_list_set_data (clist, contents[i]); + } + + /* Thumbnail page */ + label = gtk_label_new (_("Thumbnail")); + vbox = gtk_vbox_new (TRUE, 0); + gtk_notebook_append_page (GTK_NOTEBOOK(notebook), + vbox, label); + gtk_widget_show (vbox); + + pixmap = gimv_exif_view_get_thumbnail (edata); + + if (pixmap) + gtk_box_pack_start (GTK_BOX (vbox), pixmap, TRUE, TRUE, 0); + + return ev; + +ERROR: + jpeg_data_unref (jdata); + return NULL; +} diff -Nru gimageview-0.2.27/src/gimv_exif_view.h gimageview-0.3.0-0.20101117/src/gimv_exif_view.h --- gimageview-0.2.27/src/gimv_exif_view.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_exif_view.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,46 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_exif_view.h 1208 2009-01-13 05:19:15Z makeinu $ + */ + +#ifndef __GIMV_EXIF_VIEW_H__ +#define __GIMV_EXIF_VIEW_H__ + +#include "gimageview.h" + +#include +#include "jpeg-data.h" /* FIXME!! */ + +typedef struct GimvExifView_Tag +{ + GtkWidget *window; /* if open in stand alone window, use this */ + GtkWidget *container; /* exif view */ + ExifData *exif_data; + JPEGData *jpeg_data; +} GimvExifView; + + +GimvExifView *gimv_exif_view_create_window (const gchar *filename, + GtkWindow *parent); +GimvExifView *gimv_exif_view_create (const gchar *filename, + GtkWindow *parent); + +#endif /* __GIMV_EXIF_VIEW_H__ */ diff -Nru gimageview-0.2.27/src/gimv_file_prop_win.c gimageview-0.3.0-0.20101117/src/gimv_file_prop_win.c --- gimageview-0.2.27/src/gimv_file_prop_win.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_file_prop_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,568 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * gtk_prop.c + * + * Copyright (C) 1999 Rasca, Berlin + * EMail: thron@gmx.de + * + * Olivier Fourdan (fourdan@xfce.org) + * Heavily modified as part of the Xfce project (http://www.xfce.org) + * + * 2001/11/13 + * Takuro Ashie (ashie@homa.ne.jp) + * Modified as part of GImageView project + * (http://gtkmmviewer.sourceforge.net) + * + * 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. + * + * $Id: gimv_file_prop_win.c 1185 2007-10-23 14:57:59Z makeinu $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "gimv_file_prop_win.h" + +#ifdef DMALLOC +# include "dmalloc.h" +#endif + +/* FIXME? */ +#include "prefs.h" +#include "utils_char_code.h" +/* END FIXME? */ + + +#define box_pack_start(box,w) \ + gtk_box_pack_start(GTK_BOX(box),w,TRUE,FALSE,0) +#define box_pack_end(box,w) \ + gtk_box_pack_end(GTK_BOX(box),w,TRUE,FALSE,0) + +#define X_PAD 8 +#define Y_PAD 1 +#define TBL_XOPT GTK_EXPAND + +typedef struct +{ + GtkWidget *top; + GtkWidget *user; + GtkWidget *group; + GimvFileProp *prop; + int result; + int type; +} dlg; + +static dlg dl; + + +/* + */ +static GtkWidget * +label_new (const char *text, GtkJustification j_type) +{ + GtkWidget *label; + label = gtk_label_new (text); + gtk_label_set_justify (GTK_LABEL (label), j_type); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + /* j_type == GTK_JUSTIFY_RIGHT? 1.0 : 0.0, 0.5); */ + return (label); +} + + +/* + */ +static void +on_cancel (GtkWidget * btn, gpointer * data) +{ + if ((int) ((long) data) != DLG_RC_DESTROY) { + dl.result = (int) ((long) data); + gtk_widget_destroy (dl.top); + } + gtk_main_quit (); +} + + +/* + */ +static void +on_ok (GtkWidget * ok, gpointer * data) +{ + const char *val; + struct passwd *pw; + struct group *gr; + + val = gtk_entry_get_text (GTK_ENTRY (dl.user)); + if (val) { + pw = getpwnam (val); + if (pw) { + dl.prop->uid = pw->pw_uid; + } + } + val = gtk_entry_get_text (GTK_ENTRY (dl.group)); + if (val) { + gr = getgrnam (val); + if (gr) { + dl.prop->gid = gr->gr_gid; + } + } + gtk_widget_destroy (dl.top); + + dl.result = (int) ((long) data); + gtk_main_quit (); +} + + +/* + */ +static void +cb_perm (GtkWidget * toggle, void *data) +{ + int bit = (int) ((long) data); + if (GTK_TOGGLE_BUTTON (toggle)->active) + dl.prop->mode |= (mode_t) bit; + else + dl.prop->mode &= (mode_t) ~ bit; +} + + +/* + */ +static gint +on_key_press (GtkWidget * w, GdkEventKey * event, void *data) +{ + if (event->keyval == GDK_Escape) { + on_cancel ((GtkWidget *) data, (gpointer) ((long) DLG_RC_CANCEL)); + return (TRUE); + } + return (FALSE); +} + + +/* + * create a modal dialog for properties and handle it + */ +static gint +dlg_prop (const gchar *path, GimvFileProp * prop, gint flags) +{ + GtkWidget *ok = NULL, *cancel = NULL, *label, *skip, *all, *notebook, *table; + GtkWidget *owner[4], *perm[15], *info[12]; + struct tm *t; + struct passwd *pw; + struct group *gr; + char buf[PATH_MAX + 1]; + GList *g_user = NULL; + GList *g_group = NULL, *g_tmp; + int n, len; +#ifndef LINE_MAX +#define LINE_MAX 1024 +#endif + char line[LINE_MAX + 1]; + + + dl.result = 0; + dl.prop = prop; + dl.top = gtk_dialog_new (); + gtk_window_set_title (GTK_WINDOW (dl.top), _("Properties")); + g_signal_connect (G_OBJECT (dl.top), "destroy", + G_CALLBACK (on_cancel), + (gpointer) ((long) DLG_RC_DESTROY)); + gtk_window_set_modal (GTK_WINDOW (dl.top), TRUE); + gtk_window_set_position (GTK_WINDOW (dl.top), GTK_WIN_POS_MOUSE); + + notebook = gtk_notebook_new (); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->vbox), notebook, + TRUE, TRUE, 0); + + /* ok and cancel buttons */ + ok = gtk_button_new_with_label (_("Ok")); + cancel = gtk_button_new_with_label (_("Cancel")); + + GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT); + GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); + + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), ok, + TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), + cancel, TRUE, FALSE, 0); + + g_signal_connect (G_OBJECT (ok), "clicked", + G_CALLBACK (on_ok), + (gpointer) ((long) DLG_RC_OK)); + g_signal_connect (G_OBJECT (cancel), "clicked", + G_CALLBACK (on_cancel), + (gpointer) ((long) DLG_RC_CANCEL)); + gtk_widget_grab_default (ok); + + if (flags & GTK_PROP_MULTI) { + skip = gtk_button_new_with_label (_("Skip")); + all = gtk_button_new_with_label (_("All")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), skip, + TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), all, + TRUE, FALSE, 0); + g_signal_connect (G_OBJECT (skip), "clicked", + G_CALLBACK (on_cancel), + (gpointer) ((long) DLG_RC_SKIP)); + g_signal_connect (G_OBJECT (all), "clicked", + G_CALLBACK (on_ok), + (gpointer) ((long) DLG_RC_ALL)); + GTK_WIDGET_SET_FLAGS (skip, GTK_CAN_DEFAULT); + GTK_WIDGET_SET_FLAGS (all, GTK_CAN_DEFAULT); + } + + + /* date and size page */ + label = gtk_label_new (_("Info")); + table = gtk_table_new (6, 2, FALSE); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); + + n = 0; + info[n] = label_new (_("Name :"), GTK_JUSTIFY_RIGHT); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, TBL_XOPT, 0, X_PAD, Y_PAD); + { + gchar *path_internal; + path_internal = charset_to_internal (path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + info[n + 1] = label_new (path_internal, GTK_JUSTIFY_LEFT); + g_free (path_internal); + } + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, TBL_XOPT, 0, 0, 0); + n += 2; + + if (!(flags & GTK_PROP_NOT_DETECT_TYPE)) { + pid_t pid; + int out_fd[2]; + + if (pipe (out_fd) == 0) { + pid = fork (); + if (pid > 0) { + char *p; + + close (out_fd[1]); + len = read (out_fd[0], line, LINE_MAX); + if (n > 0) { + line[len] = '\0'; + len = strlen(line); + if (line[len - 1] == '\n') + line[len - 1] = '\0'; + } + waitpid (pid, NULL, WUNTRACED); + close (out_fd[0]); + + if ((p = strstr (line, ": ")) != NULL) { + p += 2; + info[n + 1] = label_new (p, GTK_JUSTIFY_LEFT); + info[n] = label_new (_("Type :"), GTK_JUSTIFY_RIGHT); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, + TBL_XOPT, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, + TBL_XOPT, 0, 0, 0); + n += 2; + } + } else if (pid == 0) { + gchar **argv = g_new0 (gchar *, 1); + + argv[0] = g_strdup ("file"); + argv[1] = g_strdup (path); + argv[2] = NULL; + + close (out_fd[0]); + dup2 (out_fd[1], STDOUT_FILENO); + + execvp (argv[0], argv); + } + } + } + + sprintf (buf, _("%ld Bytes"), (unsigned long) prop->size); + info[n + 1] = label_new (buf, GTK_JUSTIFY_LEFT); + info[n] = label_new (_("Size :"), GTK_JUSTIFY_RIGHT); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, + TBL_XOPT, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, + TBL_XOPT, 0, 0, 0); + n += 2; + + t = localtime (&prop->atime); + sprintf (buf, "%04d/%02d/%02d %02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min); + info[n + 1] = gtk_label_new (buf); + info[n] = gtk_label_new (_("Access Time :")); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, + TBL_XOPT, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, + TBL_XOPT, 0, 0, 0); + n += 2; + + t = localtime (&prop->mtime); + sprintf (buf, "%02d/%02d/%02d %02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min); + info[n + 1] = gtk_label_new (buf); + info[n] = gtk_label_new (_("Modification Time :")); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, + TBL_XOPT, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, + TBL_XOPT, 0, 0, 0); + n += 2; + + t = localtime (&prop->ctime); + sprintf (buf, "%04d/%02d/%02d %02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min); + info[n + 1] = gtk_label_new (buf); + info[n] = gtk_label_new (_("Change Time :")); + gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, + TBL_XOPT, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, + TBL_XOPT, 0, 0, 0); + n += 2; + + /* permissions page */ + if (!(flags & GTK_PROP_STALE_LINK)) { + label = gtk_label_new (_("Permissions")); + table = gtk_table_new (3, 5, FALSE); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); + + perm[0] = gtk_label_new (_("Owner :")); + perm[1] = gtk_check_button_new_with_label (_("Read")); + if (prop->mode & S_IRUSR) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[1]), 1); + g_signal_connect (G_OBJECT (perm[1]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IRUSR)); + perm[2] = gtk_check_button_new_with_label (_("Write")); + if (prop->mode & S_IWUSR) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[2]), 1); + g_signal_connect (G_OBJECT (perm[2]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IWUSR)); + perm[3] = gtk_check_button_new_with_label (_("Execute")); + if (prop->mode & S_IXUSR) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[3]), 1); + g_signal_connect (G_OBJECT (perm[3]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IXUSR)); + perm[4] = gtk_check_button_new_with_label (_("Set UID")); + if (prop->mode & S_ISUID) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[4]), 1); + g_signal_connect (G_OBJECT (perm[4]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_ISUID)); + + gtk_table_attach (GTK_TABLE (table), perm[0], 0, 1, 0, 1, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[1], 1, 2, 0, 1, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[2], 2, 3, 0, 1, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[3], 3, 4, 0, 1, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[4], 4, 5, 0, 1, 0, 0, X_PAD, 0); + + perm[5] = gtk_label_new (_("Group :")); + perm[6] = gtk_check_button_new_with_label (_("Read")); + if (prop->mode & S_IRGRP) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[6]), 1); + g_signal_connect (G_OBJECT (perm[6]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IRGRP)); + perm[7] = gtk_check_button_new_with_label (_("Write")); + if (prop->mode & S_IWGRP) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[7]), 1); + g_signal_connect (G_OBJECT (perm[7]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IWGRP)); + perm[8] = gtk_check_button_new_with_label (_("Execute")); + if (prop->mode & S_IXGRP) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[8]), 1); + g_signal_connect (G_OBJECT (perm[8]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IXGRP)); + perm[9] = gtk_check_button_new_with_label (_("Set GID")); + if (prop->mode & S_ISGID) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[9]), 1); + g_signal_connect (G_OBJECT (perm[9]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_ISGID)); + gtk_table_attach (GTK_TABLE (table), perm[5], 0, 1, 1, 2, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[6], 1, 2, 1, 2, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[7], 2, 3, 1, 2, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[8], 3, 4, 1, 2, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[9], 4, 5, 1, 2, 0, 0, X_PAD, 0); + + perm[10] = gtk_label_new (_("Other :")); + perm[11] = gtk_check_button_new_with_label (_("Read")); + if (prop->mode & S_IROTH) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[11]), 1); + g_signal_connect (G_OBJECT (perm[11]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IROTH)); + perm[12] = gtk_check_button_new_with_label (_("Write")); + if (prop->mode & S_IWOTH) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[12]), 1); + g_signal_connect (G_OBJECT (perm[12]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IWOTH)); + perm[13] = gtk_check_button_new_with_label (_("Execute")); + if (prop->mode & S_IXOTH) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[13]), 1); + g_signal_connect (G_OBJECT (perm[13]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_IXOTH)); + perm[14] = gtk_check_button_new_with_label (_("Sticky")); + if (prop->mode & S_ISVTX) + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[14]), 1); + g_signal_connect (G_OBJECT (perm[14]), "clicked", + G_CALLBACK (cb_perm), + (gpointer) ((long) S_ISVTX)); + gtk_table_attach (GTK_TABLE (table), perm[10], 0, 1, 2, 3, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[11], 1, 2, 2, 3, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[12], 2, 3, 2, 3, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[13], 3, 4, 2, 3, 0, 0, X_PAD, 0); + gtk_table_attach (GTK_TABLE (table), perm[14], 4, 5, 2, 3, 0, 0, X_PAD, 0); + } + + if (flags & GTK_PROP_EDITABLE) { + gint i, n_perms; + n_perms = sizeof (perm) / sizeof (GtkWidget *); + for (i = 0; i < n_perms; i++) { + gtk_widget_set_sensitive (perm[i], FALSE); + } + } + + /* owner/group page */ + while ((pw = getpwent ()) != NULL) { + g_user = g_list_append (g_user, g_strdup (pw->pw_name)); + } + g_user = g_list_sort (g_user, (GCompareFunc) strcmp); + endpwent (); + + while ((gr = getgrent ()) != NULL) { + g_group = g_list_append (g_group, g_strdup (gr->gr_name)); + } + endgrent (); + g_group = g_list_sort (g_group, (GCompareFunc) strcmp); + + label = gtk_label_new (_("Owner")); + table = gtk_table_new (2, 2, FALSE); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); + + pw = getpwuid (prop->uid); + sprintf (buf, "%s", pw ? pw->pw_name : _("unknown")); + owner[1] = gtk_combo_new (); + dl.user = GTK_WIDGET (GTK_COMBO (owner[1])->entry); + if (g_user) + gtk_combo_set_popdown_strings (GTK_COMBO (owner[1]), g_user); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (owner[1])->entry), buf); + owner[0] = label_new (_("Owner :"), GTK_JUSTIFY_RIGHT); + gtk_table_attach (GTK_TABLE (table), owner[0], 0, 1, 0, 1, 0, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), owner[1], 1, 2, 0, 1, 0, 0, X_PAD, 0); + + gr = getgrgid (prop->gid); + sprintf (buf, "%s", gr ? gr->gr_name : _("unknown")); + owner[3] = gtk_combo_new (); + dl.group = GTK_WIDGET (GTK_COMBO (owner[3])->entry); + if (g_group) + gtk_combo_set_popdown_strings (GTK_COMBO (owner[3]), g_group); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (owner[3])->entry), buf); + owner[2] = label_new (_("Group :"), GTK_JUSTIFY_RIGHT); + gtk_table_attach (GTK_TABLE (table), owner[2], 0, 1, 1, 2, 0, 0, X_PAD, Y_PAD); + gtk_table_attach (GTK_TABLE (table), owner[3], 1, 2, 1, 2, 0, 0, X_PAD, 0); + + if (flags & GTK_PROP_EDITABLE) { + gint i, n_owners; + n_owners = sizeof (owner) / sizeof (GtkWidget *); + for (i = 0; i < n_owners; i++) { + gtk_widget_set_sensitive (owner[i], FALSE); + } + } + + g_signal_connect (G_OBJECT (dl.top), "key_press_event", + G_CALLBACK (on_key_press), + (gpointer) cancel); + gtk_widget_show_all (dl.top); + + gtk_main (); + + /* free the lists */ + g_tmp = g_user; + while (g_tmp) { + g_free (g_tmp->data); + g_tmp = g_tmp->next; + } + g_list_free (g_user); + g_tmp = g_group; + while (g_tmp) { + g_free (g_tmp->data); + g_tmp = g_tmp->next; + } + g_list_free (g_group); + return (dl.result); +} + + +gboolean +gimv_file_prop_win_run (GimvImageInfo *info, gint flags) +{ + GimvFileProp prop; + gint rc = DLG_RC_CANCEL; + const gchar *path; + gboolean retval = FALSE; + + g_return_val_if_fail (info, FALSE); + + path = gimv_image_info_get_path (info); + + prop.mode = info->st.st_mode; + prop.uid = info->st.st_uid; + prop.gid = info->st.st_gid; + prop.ctime = info->st.st_ctime; + prop.mtime = info->st.st_mtime; + prop.atime = info->st.st_atime; + prop.size = info->st.st_size; + + rc = dlg_prop (path, &prop, 0); + + switch (rc) { + case DLG_RC_OK: + case DLG_RC_ALL: + if (prop.mode != info->st.st_mode) { + chmod (path, prop.mode); + retval = TRUE; + } + if ((prop.uid != info->st.st_uid) || (prop.gid != info->st.st_gid)) { + chown (path, prop.uid, prop.gid); + retval = TRUE; + } + default: + break; + } + + return retval; +} diff -Nru gimageview-0.2.27/src/gimv_file_prop_win.h gimageview-0.3.0-0.20101117/src/gimv_file_prop_win.h --- gimageview-0.2.27/src/gimv_file_prop_win.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_file_prop_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,89 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * gtk_prop.h + * + * Copyright (C) 1999 Rasca, Berlin + * EMail: thron@gmx.de + * + * Olivier Fourdan (fourdan@xfce.org) + * Heavily modified as part of the Xfce project (http://www.xfce.org) + * + * 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. + * + * $Id: gimv_file_prop_win.h 1185 2007-10-23 14:57:59Z makeinu $ + */ + +#ifndef __GIMV_FILE_PROP_WIN_H__ +#define __GIMV_FILE_PROP_WIN_H__ + +#include +#include + +#include "gimv_image_info.h" + +/* + * flags + */ +enum { + GTK_PROP_MULTI = 1 << 0, + GTK_PROP_STALE_LINK = 1 << 1, + GTK_PROP_EDITABLE = 1 << 2, + GTK_PROP_NOT_DETECT_TYPE = 1 << 3 +}; + +#define DLG_OK (1<<0) +#define DLG_CANCEL (1<<1) +#define DLG_YES (1<<2) +#define DLG_NO (1<<3) +#define DLG_CONTINUE (1<<4) +#define DLG_CLOSE (1<<5) +#define DLG_ALL (1<<6) +#define DLG_SKIP (1<<7) +/* */ +#define DLG_OK_CANCEL (DLG_OK|DLG_CANCEL) +#define DLG_YES_NO (DLG_YES|DLG_NO) +/* */ +#define DLG_ENTRY_VIEW (1<<8) +#define DLG_ENTRY_EDIT (1<<9) +#define DLG_COMBO (1<<10) +/* */ +#define DLG_INFO (1<<11) +#define DLG_WARN (1<<12) +#define DLG_ERROR (1<<13) +#define DLG_QUESTION (1<<14) + +#define DLG_RC_CANCEL 0 +#define DLG_RC_OK 1 +#define DLG_RC_ALL 2 +#define DLG_RC_CONTINUE 3 +#define DLG_RC_SKIP 4 +#define DLG_RC_DESTROY 5 + +typedef struct +{ + mode_t mode; + uid_t uid; + gid_t gid; + time_t ctime; + time_t mtime; + time_t atime; + off_t size; +} GimvFileProp; + +gboolean gimv_file_prop_win_run (GimvImageInfo *info, + gint flags); + +#endif /* __GIMV_FILE_PROP_WIN_H__ */ diff -Nru gimageview-0.2.27/src/gimv_hpaned.c gimageview-0.3.0-0.20101117/src/gimv_hpaned.c --- gimageview-0.2.27/src/gimv_hpaned.c 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_hpaned.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,412 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_hpaned.c,v 1.3 2004/03/07 11:53:30 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef USE_NORMAL_PANED - -#include "gimv_hpaned.h" -#include -#include - -static void gimv_hpaned_class_init (GimvHPanedClass *klass); -static void gimv_hpaned_init (GimvHPaned *hpaned); -static void gimv_hpaned_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gimv_hpaned_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gimv_hpaned_draw (GtkWidget *widget, - GdkRectangle *area); -static void gimv_hpaned_xor_line (GimvPaned *paned); -static gint gimv_hpaned_button_press (GtkWidget *widget, - GdkEventButton *event); -static gint gimv_hpaned_button_release (GtkWidget *widget, - GdkEventButton *event); - - -GtkType -gimv_hpaned_get_type (void) -{ - static GtkType hpaned_type = 0; - - if (!hpaned_type) { - static const GtkTypeInfo hpaned_info = { - "GimvHPaned", - sizeof (GimvHPaned), - sizeof (GimvHPanedClass), - (GtkClassInitFunc) gimv_hpaned_class_init, - (GtkObjectInitFunc) gimv_hpaned_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - hpaned_type = gtk_type_unique (gimv_paned_get_type (), - &hpaned_info); - } - return hpaned_type; -} - - -static void -gimv_hpaned_class_init (GimvHPanedClass *class) -{ - GtkWidgetClass *widget_class; - GimvPanedClass *paned_class; - - widget_class = (GtkWidgetClass*) class; - paned_class = (GimvPanedClass*) class; - - widget_class->size_request = gimv_hpaned_size_request; - widget_class->size_allocate = gimv_hpaned_size_allocate; -#ifndef USE_GTK2 - widget_class->draw = gimv_hpaned_draw; -#endif - widget_class->button_press_event = gimv_hpaned_button_press; - widget_class->button_release_event = gimv_hpaned_button_release; - - paned_class->xor_line = gimv_hpaned_xor_line; -} - - -static void -gimv_hpaned_init (GimvHPaned *hpaned) -{ - GIMV_PANED (hpaned)->horizontal = TRUE; -} - - -GtkWidget* -gimv_hpaned_new (void) -{ - GimvHPaned *hpaned; - - hpaned = gtk_type_new (gimv_hpaned_get_type ()); - - return GTK_WIDGET (hpaned); -} - - -static void -gimv_hpaned_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GimvPaned *paned; - GtkRequisition child_requisition; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_HPANED (widget)); - g_return_if_fail (requisition != NULL); - - paned = GIMV_PANED (widget); - requisition->width = 0; - requisition->height = 0; - - if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) { - gtk_widget_size_request (paned->child1, &child_requisition); - - requisition->height = child_requisition.height; - requisition->width = child_requisition.width; - } - - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) { - gtk_widget_size_request (paned->child2, &child_requisition); - - requisition->height = MAX (requisition->height, - child_requisition.height); - requisition->width += child_requisition.width; - } - - requisition->width += (GTK_CONTAINER (paned)->border_width * 2 - + paned->gutter_size); - requisition->height += GTK_CONTAINER (paned)->border_width * 2; -} - - -static void -gimv_hpaned_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GimvPaned *paned; - GtkRequisition child1_requisition; - GtkRequisition child2_requisition; - GtkAllocation child1_allocation; - GtkAllocation child2_allocation; - gint border_width, gutter_size; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_HPANED (widget)); - g_return_if_fail (allocation != NULL); - - widget->allocation = *allocation; - paned = GIMV_PANED (widget); - border_width = GTK_CONTAINER (paned)->border_width; - gutter_size = paned->gutter_size; - - if (paned->child1) - gtk_widget_get_child_requisition (paned->child1, - &child1_requisition); - else - child1_requisition.width = 0; - - if (paned->child2) - gtk_widget_get_child_requisition (paned->child2, - &child2_requisition); - else - child2_requisition.width = 0; - - gimv_paned_compute_position (paned, - MAX (1, (gint) widget->allocation.width - - gutter_size - - 2 * border_width), - child1_requisition.width, - child2_requisition.width); - - if (paned->child_hidden != 0) { - gutter_size = 0; - if ((paned->child_hidden == 1) && paned->child1) { - /* hide child1 and show child2 if it exists. */ - gtk_widget_hide (paned->child1); - if (paned->child2 && !GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_show (paned->child2); - } - if ((paned->child_hidden == 2) && paned->child2) { - /* hide child2 and show child1 if it exists. */ - gtk_widget_hide (paned->child2); - if (paned->child1 && !GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_show (paned->child1); - } - } else { - /* Show both children. */ - if (paned->child1 && !GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_show (paned->child1); - if (paned->child2 && !GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_show (paned->child2); - } - - /* Move the handle before the children so we don't get extra expose - * events */ - - paned->handle_ypos = border_width; - paned->handle_xpos = paned->child1_size + border_width; - - if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, - allocation->width, allocation->height); - - if (paned->child_hidden == 0) { - gdk_window_move_resize (paned->handle, - paned->handle_xpos, - paned->handle_ypos, - paned->gutter_size, - allocation->height); - gdk_window_show (paned->handle); - } else - gdk_window_hide (paned->handle); - } - - child1_allocation.height = child2_allocation.height - = MAX (1, (gint) allocation->height - border_width * 2); - child1_allocation.width = paned->child1_size; - child1_allocation.y = child2_allocation.y = border_width; - child1_allocation.x = border_width; - - child2_allocation.x - = child1_allocation.x + child1_allocation.width + gutter_size; - child2_allocation.width - = MAX (1, (gint) allocation->width - child2_allocation.x - border_width); - - /* Now allocate the childen, making sure, when resizing not to - * overlap the windows */ - if (GTK_WIDGET_MAPPED(widget) && - paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) && - paned->child1->allocation.width < child1_allocation.width) - { - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_size_allocate (paned->child2, &child2_allocation); - gtk_widget_size_allocate (paned->child1, &child1_allocation); - } else { - if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_size_allocate (paned->child1, &child1_allocation); - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_size_allocate (paned->child2, &child2_allocation); - } -} - - -static void -gimv_hpaned_draw (GtkWidget *widget, - GdkRectangle *area) -{ - GimvPaned *paned; - GdkRectangle handle_area, child_area; - guint16 border_width; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) { - gint width, height; - - paned = GIMV_PANED (widget); - border_width = GTK_CONTAINER (paned)->border_width; - - gdk_window_clear_area (widget->window, - area->x, area->y, - area->width, area->height); - - gdk_window_get_size (paned->handle, &width, &height); - - handle_area.x = paned->handle_xpos; - handle_area.y = paned->handle_ypos; - handle_area.width = width; - handle_area.height = height; - - if (gdk_rectangle_intersect (&handle_area, area, &child_area)){ - child_area.x -= handle_area.x; - child_area.y -= handle_area.y; - - gtk_paint_flat_box (widget->style, paned->handle, - GTK_WIDGET_STATE (widget), - GTK_SHADOW_NONE, - &child_area, widget, "paned", - 0, 0, - width, height); - } - - /* Redraw the children - */ - if (paned->child1 && - gtk_widget_intersect (paned->child1, area, &child_area)) - gtk_widget_draw (paned->child1, &child_area); - if (paned->child2 && - gtk_widget_intersect (paned->child2, area, &child_area)) - gtk_widget_draw (paned->child2, &child_area); - - } -} - - -static void -gimv_hpaned_xor_line (GimvPaned *paned) -{ - GtkWidget *widget; - GdkGCValues values; - guint16 xpos; - - widget = GTK_WIDGET(paned); - - if (!paned->xor_gc) { - GdkBitmap *stipple; - - stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, - gray50_width, - gray50_height); - - values.function = GDK_INVERT; - values.subwindow_mode = GDK_INCLUDE_INFERIORS; - values.fill = GDK_STIPPLED; - values.stipple = stipple; - paned->xor_gc = gdk_gc_new_with_values (widget->window, - &values, - GDK_GC_FUNCTION | - GDK_GC_SUBWINDOW | - GDK_GC_FILL | - GDK_GC_STIPPLE); - gdk_bitmap_unref (stipple); - } - - xpos = paned->child1_size + GTK_CONTAINER (paned)->border_width; - - gdk_draw_rectangle (widget->window, paned->xor_gc, - TRUE, - xpos, - 0, - paned->gutter_size, - widget->allocation.height - 1); -} - - -static gint -gimv_hpaned_button_press (GtkWidget *widget, GdkEventButton *event) -{ - GimvPaned *paned; - - g_return_val_if_fail (widget != NULL,FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget),FALSE); - - paned = GIMV_PANED (widget); - - if (!paned->in_drag && - (event->window == paned->handle) && (event->button == 1)) - { - paned->in_drag = TRUE; - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - gdk_pointer_grab (paned->handle, FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK, - NULL, NULL, event->time); - paned->child1_size += event->x - paned->gutter_size / 2; - paned->child1_size = CLAMP (paned->child1_size, 0, - widget->allocation.width - - paned->gutter_size - - 2 * GTK_CONTAINER (paned)->border_width); - gimv_hpaned_xor_line (paned); - } - - return TRUE; -} - - -static gint -gimv_hpaned_button_release (GtkWidget *widget, GdkEventButton *event) -{ - GimvPaned *paned; - - g_return_val_if_fail (widget != NULL,FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget),FALSE); - - paned = GIMV_PANED (widget); - - if (paned->in_drag && (event->button == 1)) { - gimv_hpaned_xor_line (paned); - paned->in_drag = FALSE; - paned->position_set = TRUE; - gdk_pointer_ungrab (event->time); - gtk_widget_queue_resize (GTK_WIDGET (paned)); - } - - return TRUE; -} - -#endif /* USE_NORMAL_PANED */ diff -Nru gimageview-0.2.27/src/gimv_hpaned.h gimageview-0.3.0-0.20101117/src/gimv_hpaned.h --- gimageview-0.2.27/src/gimv_hpaned.h 2004-05-23 14:07:59.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_hpaned.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_hpaned.h,v 1.3 2004/03/07 11:53:30 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifndef __GIMV_HPANED_H__ -#define __GIMV_HPANED_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include "gimv_paned.h" - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#ifndef USE_NORMAL_PANED - -#define GIMV_HPANED(obj) GTK_CHECK_CAST (obj, gimv_hpaned_get_type (), GimvHPaned) -#define GIMV_HPANED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gimv_hpaned_get_type (), GimvHPanedClass) -#define GIMV_IS_HPANED(obj) GTK_CHECK_TYPE (obj, gimv_hpaned_get_type ()) - - -typedef struct _GimvHPaned GimvHPaned; -typedef struct _GimvHPanedClass GimvHPanedClass; - -struct _GimvHPaned -{ - GimvPaned paned; -}; - -struct _GimvHPanedClass -{ - GimvPanedClass parent_class; -}; - - -GtkType gimv_hpaned_get_type (void); -GtkWidget* gimv_hpaned_new (void); - -#else /* USE_NORMAL_PANED */ - -#include - -#define GimvHPaned GtkHPaned -#define gimv_hpaned_new() gtk_hpaned_new() - -#endif /* USE_NORMAL_PANED */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GIMV_HPANED_H__ */ diff -Nru gimageview-0.2.27/src/gimv_icon_stock.c gimageview-0.3.0-0.20101117/src/gimv_icon_stock.c --- gimageview-0.2.27/src/gimv_icon_stock.c 2004-05-23 14:07:58.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_icon_stock.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_icon_stock.c,v 1.2 2003/06/13 09:43:30 makeinu Exp $ + * $Id: gimv_icon_stock.c 1179 2007-10-23 02:18:13Z makeinu $ */ #ifdef HAVE_CONFIG_H @@ -28,8 +28,8 @@ #include #include -#include "fileutil.h" #include "gimv_icon_stock.h" +#include "utils_file.h" #ifndef EXCLUDE_ICONS /* common icons */ @@ -98,6 +98,13 @@ #include "pixmaps/dotfile.xpm" #endif /* EXCLUDE_ICONS */ +/* cursors */ +#include "pixmaps/hand-open-data.xbm" +#include "pixmaps/hand-open-mask.xbm" +#include "pixmaps/hand-closed-data.xbm" +#include "pixmaps/hand-closed-mask.xbm" +#include "pixmaps/void-data.xbm" +#include "pixmaps/void-mask.xbm" #ifndef EXCLUDE_ICONS static GimvIconStockEntry default_icons [] = { @@ -166,13 +173,34 @@ = sizeof (default_icons) / sizeof (default_icons[0]); #endif /* EXCLUDE_ICONS */ +static struct { + char *data; + char *mask; + int data_width; + int data_height; + int mask_width; + int mask_height; + int hot_x, hot_y; +} cursors[] = { + { hand_open_data_bits, hand_open_mask_bits, + hand_open_data_width, hand_open_data_height, + hand_open_mask_width, hand_open_mask_height, + hand_open_data_width / 2, hand_open_data_height / 2 }, + { hand_closed_data_bits, hand_closed_mask_bits, + hand_closed_data_width, hand_closed_data_height, + hand_closed_mask_width, hand_closed_mask_height, + hand_closed_data_width / 2, hand_closed_data_height / 2 }, + { void_data_bits, void_mask_bits, + void_data_width, void_data_height, + void_mask_width, void_mask_height, void_data_width / 2, void_data_height / 2 }, + { NULL, NULL, 0, 0, 0, 0 } +}; static gchar *icondir = NULL, *default_icondir = NULL; static GdkColormap *sys_colormap = NULL; static GHashTable *icons = NULL; - gboolean gimv_icon_stock_init (const gchar *iconset) { @@ -201,7 +229,6 @@ return TRUE; } - GimvIcon * gimv_icon_stock_get_icon (const gchar *icon_name) { @@ -219,9 +246,7 @@ icon = g_new0 (GimvIcon, 1); icon->pixmap = NULL; icon->mask = NULL; -#ifdef USE_GTK2 icon->pixbuf = NULL; -#endif /* USE_GTK2 */ if (icondir) { path = g_strconcat (icondir, "/", icon_name, ".xpm", NULL); @@ -265,7 +290,6 @@ return icon; } - GtkWidget * gimv_icon_stock_get_widget (const gchar *icon_name) { @@ -277,16 +301,11 @@ icon = gimv_icon_stock_get_icon (icon_name); if (icon) -#ifdef USE_GTK2 widget = gtk_image_new_from_pixmap (icon->pixmap, icon->mask); -#else - widget = gtk_pixmap_new (icon->pixmap, icon->mask); -#endif return widget; } - void gimv_icon_stock_change_widget_icon (GtkWidget *widget, const gchar *icon_name) { @@ -295,23 +314,14 @@ g_return_if_fail (widget); g_return_if_fail (icon_name && *icon_name); -#ifdef USE_GTK2 - g_return_if_fail (GTK_IS_IMAGE (widget)); -#else - g_return_if_fail (GTK_IS_PIXMAP (widget)); -#endif + g_return_if_fail (GTK_IS_IMAGE (widget)); icon = gimv_icon_stock_get_icon (icon_name); if (!icon) return; -#ifdef USE_GTK2 gtk_image_set_from_pixmap (GTK_IMAGE (widget), icon->pixmap, icon->mask); -#else - gtk_pixmap_set (GTK_PIXMAP (widget), icon->pixmap, icon->mask); -#endif } - void gimv_icon_stock_set_window_icon (GdkWindow *window, gchar *name) { @@ -323,7 +333,6 @@ icon->pixmap, icon->mask); } - void gimv_icon_stock_free_icon (const gchar *icon_name) { @@ -336,15 +345,11 @@ g_hash_table_remove (icons, icon_name); gdk_pixmap_unref (icon->pixmap); -#ifdef USE_GTK2 if (icon->pixbuf) g_object_unref (icon->pixbuf); -#endif /* USE_GTK2 */ g_free (icon); } - -#ifdef USE_GTK2 GdkPixbuf * gimv_icon_stock_get_pixbuf (const gchar *icon_name) { @@ -388,7 +393,6 @@ return icon->pixbuf; } - void gimv_icon_stock_free_pixbuf (const gchar *icon_name) { @@ -402,4 +406,41 @@ g_object_unref (icon->pixbuf); icon->pixbuf = NULL; } -#endif /* USE_GTK2 */ + +GdkCursor * +gimv_icon_stock_get_cursor (GdkWindow *window, CursorType type) +{ + GdkBitmap *data; + GdkBitmap *mask; + GdkColor black, white; + GdkCursor *cursor; + + g_return_val_if_fail (window != NULL, NULL); + g_return_val_if_fail (type >= 0 && type < CURSOR_NUM_CURSORS, NULL); + + g_assert (cursors[type].data_width == cursors[type].mask_width); + g_assert (cursors[type].data_height == cursors[type].mask_height); + + data = gdk_bitmap_create_from_data (window, + cursors[type].data, + cursors[type].data_width, + cursors[type].data_height); + mask = gdk_bitmap_create_from_data (window, + cursors[type].mask, + cursors[type].mask_width, + cursors[type].mask_height); + + g_assert (data != NULL && mask != NULL); + + gdk_color_black (gdk_window_get_colormap (window), &black); + gdk_color_white (gdk_window_get_colormap (window), &white); + + cursor = gdk_cursor_new_from_pixmap (data, mask, &white, &black, + cursors[type].hot_x, cursors[type].hot_y); + g_assert (cursor != NULL); + + gdk_bitmap_unref (data); + gdk_bitmap_unref (mask); + + return cursor; +} diff -Nru gimageview-0.2.27/src/gimv_icon_stock.h gimageview-0.3.0-0.20101117/src/gimv_icon_stock.h --- gimageview-0.2.27/src/gimv_icon_stock.h 2004-05-23 14:07:58.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_icon_stock.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,41 +18,35 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_icon_stock.h,v 1.2 2003/06/13 09:43:30 makeinu Exp $ + * $Id: gimv_icon_stock.h 1173 2007-10-21 11:58:09Z makeinu $ */ #ifndef __GIMV_ICON_STOCK_H__ #define __GIMV_ICON_STOCK_H__ #include - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef USE_GTK2 -# include -#endif /* USE_GTK2 */ - +#include #define DEFAULT_ICONSET "default" - typedef struct GimvIconStockEntry_Tag { gchar *name; char **xpm_data; } GimvIconStockEntry; - typedef struct GimvIcon_Tag { GdkPixmap *pixmap; GdkBitmap *mask; -#ifdef USE_GTK2 GdkPixbuf *pixbuf; -#endif /* USE_GTK2 */ } GimvIcon; +typedef enum { + CURSOR_HAND_OPEN, + CURSOR_HAND_CLOSED, + CURSOR_VOID, + CURSOR_NUM_CURSORS +} CursorType; gboolean gimv_icon_stock_init (const gchar *iconset); GimvIcon *gimv_icon_stock_get_icon (const gchar *icon_name); @@ -63,9 +57,10 @@ void gimv_icon_stock_set_window_icon (GdkWindow *window, gchar *name); -#ifdef USE_GTK2 GdkPixbuf *gimv_icon_stock_get_pixbuf (const gchar *icon_name); void gimv_icon_stock_free_pixbuf (const gchar *icon_name); -#endif /* USE_GTK2 */ + +GdkCursor *gimv_icon_stock_get_cursor (GdkWindow *window, + CursorType type); #endif /* __GIMV_ICON_STOCK_H__ */ diff -Nru gimageview-0.2.27/src/gimv_image.c gimageview-0.3.0-0.20101117/src/gimv_image.c --- gimageview-0.2.27/src/gimv_image.c 2004-09-21 08:44:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image.c,v 1.68 2004/09/21 08:44:31 makeinu Exp $ + * $Id: gimv_image.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "gimageview.h" @@ -31,65 +31,35 @@ #include "gimv_image_loader.h" #include "gimv_mime_types.h" #include "prefs.h" -#include "fileutil.h" #include "gimv_io.h" #include "gimv_image_saver.h" +#include "utils_file.h" -#if defined (HAVE_GDK_PIXBUF) -# include -# include "pixbuf_utils.h" +#include typedef GdkPixbuf GimvRawImage; -#elif defined (HAVE_GDK_IMLIB) -# include -typedef GdkImlibImage GimvRawImage; -#endif /* HAVE_GDK_PIXBUF */ -static void gimv_image_class_init (GimvImageClass *klass); -static void gimv_image_init (GimvImage *image); -static void gimv_image_destroy (GtkObject *object); -static void gimv_image_backend_init (void); +G_DEFINE_TYPE (GimvImage, gimv_image, G_TYPE_OBJECT) +static void gimv_image_dispose (GObject *object); +static void gimv_image_backend_init (void); -static GtkObjectClass *parent_class = NULL; - - -GtkType -gimv_image_get_type (void) -{ - static GtkType gimv_image_type = 0; - - if (!gimv_image_type) { - static const GtkTypeInfo gimv_image_info = { - "GimvImage", - sizeof (GimvImage), - sizeof (GimvImageClass), - (GtkClassInitFunc) gimv_image_class_init, - (GtkObjectInitFunc) gimv_image_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_image_type = gtk_type_unique (gtk_object_get_type (), - &gimv_image_info); - } - - return gimv_image_type; -} - +static GdkPixbuf *pixbuf_copy_rotate_90 (GdkPixbuf *src, + gboolean counter_clockwise); +static GdkPixbuf *pixbuf_copy_mirror (GdkPixbuf *src, + gboolean mirror, + gboolean flip); static void gimv_image_class_init (GimvImageClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; gimv_image_backend_init (); - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; - object_class->destroy = gimv_image_destroy; + gobject_class->dispose = gimv_image_dispose; } @@ -102,16 +72,11 @@ /* image->ref_count = 1; */ image->comments = NULL; image->additional_data = NULL; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (image)); - gtk_object_sink (GTK_OBJECT (image)); -#endif } static void -gimv_image_destroy (GtkObject *object) +gimv_image_dispose (GObject *object) { GimvImage *image = GIMV_IMAGE (object); GimvRawImage *rawimage; @@ -120,25 +85,21 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) if (rawimage) gdk_pixbuf_unref (rawimage); -#elif defined (HAVE_GDK_IMLIB) - gdk_imlib_kill_image (rawimage); -#endif /* HAVE_GDK_PIXBUF */ image->image = NULL; gimv_image_free_comments (image); - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_image_parent_class)->dispose) + G_OBJECT_CLASS (gimv_image_parent_class)->dispose (object); } GimvImage * gimv_image_new (void) { - GimvImage *image = GIMV_IMAGE (gtk_type_new (GIMV_TYPE_IMAGE)); + GimvImage *image = GIMV_IMAGE (g_object_new (GIMV_TYPE_IMAGE, NULL)); return image; } @@ -151,23 +112,6 @@ void gimv_image_backend_init (void) { -#if defined (HAVE_GDK_PIXBUF) -#elif defined (HAVE_GDK_IMLIB) - /* - GdkImlibInitParams *imlib_param; - - imlib_param = g_new0 (GdkImlibInitParams, 1); - - imlib_param->flags = PARAMS_REMAP | PARAMS_FASTRENDER; - imlib_param->remap = 0; - imlib_param->fastrender = 0; - gdk_imlib_init_params(imlib_param); - g_free (imlib_param); - */ - gdk_imlib_init (); - gtk_widget_push_visual (gdk_imlib_get_visual()); - gtk_widget_push_colormap (gdk_imlib_get_colormap()); -#endif /* HAVE_GDK_PIXBUF */ } @@ -184,8 +128,8 @@ gimv_image_loader_load (loader); image = gimv_image_loader_get_image (loader); if (image) - gimv_image_ref (image); - gimv_image_loader_unref (loader); + g_object_ref (G_OBJECT (image)); + g_object_unref (G_OBJECT (loader)); return image; } @@ -202,19 +146,17 @@ saver = gimv_image_saver_new_with_attr (image, filename, format); /* gimv_image_saver_set_param (data, use_specific_data) */ retval = gimv_image_saver_save (saver); - gimv_image_saver_unref (saver); + g_object_unref (G_OBJECT (saver)); return retval; } -#if defined (HAVE_GDK_PIXBUF) static void free_rgb_buffer (guchar *pixels, gpointer data) { g_free(pixels); } -#endif /* HAVE_GDK_PIXBUF */ GimvImage * @@ -224,7 +166,6 @@ image = gimv_image_new (); -#if defined (HAVE_GDK_PIXBUF) { gint bytes = 3; @@ -236,13 +177,9 @@ width, height, bytes * width, free_rgb_buffer, NULL); } -#elif defined (HAVE_GDK_IMLIB) - image->image = gdk_imlib_create_image_from_data (data, NULL, width, height); - g_free (data); -#endif /* HAVE_GDK_PIXBUF */ if (!image->image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = NULL; } @@ -258,21 +195,15 @@ image = gimv_image_new (); -#if defined (HAVE_GDK_PIXBUF) { GdkColormap *cmap = gdk_colormap_get_system (); image->image = gdk_pixbuf_get_from_drawable (NULL, drawable, cmap, x , y, 0, 0, width, height); } -#elif defined (HAVE_GDK_IMLIB) - image->image = gdk_imlib_create_image_from_drawable (drawable, NULL, - x, y, - width, height); -#endif /* HAVE_GDK_PIXBUF */ if (!image->image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = NULL; } @@ -319,19 +250,8 @@ src_rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) dest_rawimage = pixbuf_copy_rotate_90 (src_rawimage, counter_clockwise); gdk_pixbuf_unref (src_rawimage); -#elif defined (HAVE_GDK_IMLIB) - if (counter_clockwise) { - gdk_imlib_flip_image_horizontal (src_rawimage); - gdk_imlib_rotate_image (src_rawimage, 1); - } else { - gdk_imlib_flip_image_vertical (src_rawimage); - gdk_imlib_rotate_image (src_rawimage, 1); - } - dest_rawimage = src_rawimage; -#endif /* HAVE_GDK_PIXBUF */ image->image = dest_rawimage; @@ -359,14 +279,8 @@ src_rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) dest_rawimage = pixbuf_copy_mirror (src_rawimage, TRUE, TRUE); gdk_pixbuf_unref (src_rawimage); -#elif defined (HAVE_GDK_IMLIB) - gdk_imlib_flip_image_vertical (src_rawimage); - gdk_imlib_flip_image_horizontal (src_rawimage); - dest_rawimage = src_rawimage; -#endif /* HAVE_GDK_PIXBUF */ image->image = dest_rawimage; @@ -439,20 +353,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) gdk_pixbuf_render_pixmap_and_mask (rawimage, pixmap_return, mask_return, 64); -#elif defined (HAVE_GDK_IMLIB) - *pixmap_return = gdk_imlib_move_image (rawimage); - *mask_return = gdk_imlib_move_mask (rawimage); - - /* FIXME */ - if (!*pixmap_return) { - gdk_imlib_render (image->image, - gimv_image_width (image), gimv_image_height (image)); - *pixmap_return = gdk_imlib_move_image (rawimage); - *mask_return = gdk_imlib_move_mask (rawimage); - } -#endif /* HAVE_GDK_PIXBUF */ } @@ -460,13 +361,8 @@ gimv_image_free_pixmap_and_mask (GdkPixmap *pixmap, GdkBitmap *mask) { -#if defined (HAVE_GDK_PIXBUF) if (pixmap) gdk_pixmap_unref (pixmap); if (mask) gdk_bitmap_unref (mask); -#elif defined (HAVE_GDK_IMLIB) - gdk_imlib_free_pixmap (pixmap); - gdk_imlib_free_bitmap (mask); -#endif /* HAVE_GDK_PIXBUF */ } @@ -505,12 +401,8 @@ } */ -#if defined (HAVE_GDK_PIXBUF) dest_rawimage = gdk_pixbuf_scale_simple (src_rawimage, width, height, conf.interpolation); -#elif defined (HAVE_GDK_IMLIB) - dest_rawimage = gdk_imlib_clone_scaled_image (src_rawimage, width, height); -#endif /* HAVE_GDK_PIXBUF */ dest_image = gimv_image_new (); dest_image->image = dest_rawimage; @@ -664,17 +556,12 @@ g_return_if_fail (pixmap_return); g_return_if_fail (mask_return); -#if defined (HAVE_GDK_PIXBUF) { GimvImage *dest_image; dest_image = gimv_image_scale (image, width, height); gimv_image_get_pixmap_and_mask (dest_image, pixmap_return, mask_return); - gimv_image_unref (dest_image); + g_object_unref (G_OBJECT (dest_image)); } -#elif defined (HAVE_GDK_IMLIB) - gdk_imlib_render (image->image, width, height); - gimv_image_get_pixmap_and_mask (image, pixmap_return, mask_return); -#endif } @@ -691,13 +578,8 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) *width = gdk_pixbuf_get_width (rawimage); *height = gdk_pixbuf_get_height (rawimage); -#elif defined (HAVE_GDK_IMLIB) - *width = rawimage->rgb_width; - *height = rawimage->rgb_height; -#endif /* HAVE_GDK_PIXBUF */ } @@ -711,11 +593,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_width (rawimage); -#elif defined (HAVE_GDK_IMLIB) - return rawimage->rgb_width; -#endif /* HAVE_GDK_PIXBUF */ } @@ -729,11 +607,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_height (rawimage); -#elif defined (HAVE_GDK_IMLIB) - return rawimage->rgb_height; -#endif /* HAVE_GDK_PIXBUF */ } @@ -747,11 +621,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_bits_per_sample (rawimage); -#elif defined (HAVE_GDK_IMLIB) - return 8; -#endif /* HAVE_GDK_PIXBUF */ } @@ -765,22 +635,14 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_has_alpha (rawimage); -#elif defined (HAVE_GDK_IMLIB) - return FALSE; -#endif /* HAVE_GDK_PIXBUF */ } gboolean gimv_image_can_alpha (GimvImage *image) { -#if defined (HAVE_GDK_PIXBUF) return TRUE; -#elif defined (HAVE_GDK_IMLIB) - return FALSE; -#endif /* HAVE_GDK_PIXBUF */ } @@ -794,14 +656,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_rowstride (rawimage); -#elif defined (HAVE_GDK_IMLIB) - if (!rawimage) - return 0; - else - return rawimage->rgb_width * 3; -#endif /* HAVE_GDK_PIXBUF */ } @@ -815,14 +670,7 @@ rawimage = (GimvRawImage *) image->image; -#if defined (HAVE_GDK_PIXBUF) return gdk_pixbuf_get_pixels (rawimage); -#elif defined (HAVE_GDK_IMLIB) - if (!rawimage) - return NULL; - else - return rawimage->rgb_data; -#endif /* HAVE_GDK_PIXBUF */ } @@ -837,21 +685,6 @@ } -GimvImage * -gimv_image_ref (GimvImage *image) -{ - gtk_object_ref (GTK_OBJECT (image)); - return image; -} - - -void -gimv_image_unref (GimvImage *image) -{ - gtk_object_unref (GTK_OBJECT (image)); -} - - static void free_comment (gpointer key, gpointer value, gpointer data) { @@ -1422,10 +1255,6 @@ if (bg_blue >= 0 && bg_blue < 256) bgcolor_blue = bg_blue; -#ifdef HAVE_GDK_IMLIB - goto ERROR; -#endif /* HAVE_GDK_IMLIB */ - if (!gimv_image_has_alpha (image)) goto ERROR; width = gimv_image_width (image); @@ -1462,3 +1291,118 @@ return dest_image; } + + +/* + * Returns a copy of pixbuf src rotated 90 degrees clockwise or 90 + * counterclockwise. + */ +static GdkPixbuf * +pixbuf_copy_rotate_90 (GdkPixbuf *src, + gboolean counter_clockwise) +{ + GdkPixbuf *dest; + gint has_alpha; + gint src_w, src_h, src_rs; + gint dest_w, dest_h, dest_rs; + guchar *src_pix, *src_p; + guchar *dest_pix, *dest_p; + gint i, j; + gint a; + + if (!src) return NULL; + + src_w = gdk_pixbuf_get_width (src); + src_h = gdk_pixbuf_get_height (src); + has_alpha = gdk_pixbuf_get_has_alpha (src); + src_rs = gdk_pixbuf_get_rowstride (src); + src_pix = gdk_pixbuf_get_pixels (src); + + dest_w = src_h; + dest_h = src_w; + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, dest_w, dest_h); + dest_rs = gdk_pixbuf_get_rowstride (dest); + dest_pix = gdk_pixbuf_get_pixels (dest); + + a = (has_alpha ? 4 : 3); + + for (i = 0; i < src_h; i++) { + src_p = src_pix + (i * src_rs); + for (j = 0; j < src_w; j++) { + if (counter_clockwise) + dest_p = dest_pix + ((dest_h - j - 1) * dest_rs) + (i * a); + else + dest_p = dest_pix + (j * dest_rs) + ((dest_w - i - 1) * a); + + *(dest_p++) = *(src_p++); /* r */ + *(dest_p++) = *(src_p++); /* g */ + *(dest_p++) = *(src_p++); /* b */ + if (has_alpha) *(dest_p) = *(src_p++); /* a */ + } + } + + return dest; +} + + +/* + * Returns a copy of pixbuf mirrored and or flipped. + * TO do a 180 degree rotations set both mirror and flipped TRUE + * if mirror and flip are FALSE, result is a simple copy. + */ +static GdkPixbuf * +pixbuf_copy_mirror (GdkPixbuf *src, + gboolean mirror, + gboolean flip) +{ + GdkPixbuf *dest; + gint has_alpha; + gint w, h; + gint src_rs, dest_rs; + guchar *src_pix, *dest_pix; + guchar *src_p, *dest_p; + gint i, j; + gint a; + + if (!src) return NULL; + + w = gdk_pixbuf_get_width (src); + h = gdk_pixbuf_get_height (src); + has_alpha = gdk_pixbuf_get_has_alpha (src); + src_rs = gdk_pixbuf_get_rowstride (src); + src_pix = gdk_pixbuf_get_pixels (src); + + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, w, h); + dest_rs = gdk_pixbuf_get_rowstride (dest); + dest_pix = gdk_pixbuf_get_pixels (dest); + + a = has_alpha ? 4 : 3; + + for (i = 0; i < h; i++) { + src_p = src_pix + (i * src_rs); + if (flip) + dest_p = dest_pix + ((h - i - 1) * dest_rs); + else + dest_p = dest_pix + (i * dest_rs); + + if (mirror) { + dest_p += (w - 1) * a; + for (j = 0; j < w; j++) { + *(dest_p++) = *(src_p++); /* r */ + *(dest_p++) = *(src_p++); /* g */ + *(dest_p++) = *(src_p++); /* b */ + if (has_alpha) *(dest_p) = *(src_p++); /* a */ + dest_p -= (a + 3); + } + } else { + for (j = 0; j < w; j++) { + *(dest_p++) = *(src_p++); /* r */ + *(dest_p++) = *(src_p++); /* g */ + *(dest_p++) = *(src_p++); /* b */ + if (has_alpha) *(dest_p++) = *(src_p++); /* a */ + } + } + } + + return dest; +} diff -Nru gimageview-0.2.27/src/gimv_image.h gimageview-0.3.0-0.20101117/src/gimv_image.h --- gimageview-0.2.27/src/gimv_image.h 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image.h,v 1.37 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_image.h 1164 2007-10-20 15:04:59Z makeinu $ */ #ifndef __GIMV_IMAGE_H__ @@ -26,19 +26,17 @@ #include "gimageview.h" - #define GIMV_TYPE_IMAGE (gimv_image_get_type ()) -#define GIMV_IMAGE(obj) (GTK_CHECK_CAST (obj, gimv_image_get_type (), GimvImage)) -#define GIMV_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_image_get_type, GimvImageClass)) -#define GIMV_IS_IMAGE(obj) (GTK_CHECK_TYPE (obj, gimv_image_get_type ())) -#define GIMV_IS_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE)) - +#define GIMV_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE, GimvImage)) +#define GIMV_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE, GimvImageClass)) +#define GIMV_IS_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE)) +#define GIMV_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE)) +#define GIMV_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE, GimvImageClass)) typedef struct GimvImage_Tag GimvImage; typedef struct GimvImagePriv_Tag GimvImagePriv; typedef struct GimvImageClass_Tag GimvImageClass; - typedef enum { GIMV_IMAGE_NORMAL_MODE = 0, GIMV_IMAGE_DISSOLVE_MODE = 1, @@ -56,12 +54,10 @@ GIMV_IMAGE_VALUE_MODE = 14 } GimvImageLayerMode; - typedef enum { GIMV_IMAGE_VECTOR_FLAGS = 1 << 0 } GimvImageFlags; - typedef enum { GIMV_IMAGE_ROTATE_0, GIMV_IMAGE_ROTATE_90, @@ -69,10 +65,9 @@ GIMV_IMAGE_ROTATE_270 } GimvImageAngle; - struct GimvImage_Tag { - GtkObject parent; + GObject parent; gpointer image; /* library dependent data */ GimvImageAngle angle; @@ -81,14 +76,12 @@ gpointer additional_data; }; - struct GimvImageClass_Tag { - GtkObjectClass parent_class; + GObjectClass parent_class; }; - -GtkType gimv_image_get_type (void); +GType gimv_image_get_type (void); const gchar *gimv_image_detect_type_by_ext (const gchar *str); GimvImage *gimv_image_load_file (const gchar *filename, @@ -139,8 +132,6 @@ guchar *gimv_image_get_pixels (GimvImage *image); const gchar *gimv_image_get_comment (GimvImage *image, const gchar *key); -GimvImage *gimv_image_ref (GimvImage *image); -void gimv_image_unref (GimvImage *image); /* protected */ GimvImage *gimv_image_new (void); diff -Nru gimageview-0.2.27/src/gimv_image_info.c gimageview-0.3.0-0.20101117/src/gimv_image_info.c --- gimageview-0.2.27/src/gimv_image_info.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_info.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_info.c,v 1.6 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_image_info.c 1193 2007-11-02 08:38:59Z makeinu $ */ #include @@ -28,9 +28,7 @@ #include "gimageview.h" -#include "fileutil.h" #include "fr-archive.h" -#include "gfileutil.h" #include "gimv_comment.h" #include "gimv_anim.h" #include "gimv_image.h" @@ -39,7 +37,10 @@ #include "gimv_thumb.h" #include "gimv_thumb_cache.h" #include "prefs.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +G_DEFINE_TYPE (GimvImageInfo, gimv_image_info, G_TYPE_OBJECT); static GHashTable *gimv_image_info_table = NULL; static GHashTable *comment_table = NULL; @@ -52,6 +53,22 @@ * Private Functions. * ******************************************************************************/ +static void +gimv_image_info_class_init (GimvImageInfoClass *klass) +{ + GObjectClass *object_class; + + object_class = (GObjectClass *) klass; + + /*object_class->dispose = gimv_image_info_dispose;*/ +} + + +static void +gimv_image_info_init (GimvImageInfo *info) +{ +} + static GimvImageInfo * gimv_image_info_new (const gchar *filename) { @@ -251,7 +268,7 @@ if (info->flags & GIMV_IMAGE_INFO_ARCHIVE_MEMBER_FLAG) { FRArchive *archive = g_hash_table_lookup (archive_table, info); if (archive) - fr_archive_ref (archive); + g_object_ref (G_OBJECT (archive)); } return info; @@ -275,7 +292,7 @@ } if (archive) - fr_archive_unref (FR_ARCHIVE (archive)); + g_object_unref (G_OBJECT (archive)); } @@ -604,7 +621,7 @@ filename = info->filename; - temp_dir = gtk_object_get_data (GTK_OBJECT (archive), "temp-dir"); + temp_dir = g_object_get_data (G_OBJECT (archive), "temp-dir"); g_return_val_if_fail (temp_dir && *temp_dir, NULL); @@ -664,7 +681,7 @@ filename = info->filename; - temp_dir = gtk_object_get_data (GTK_OBJECT (archive), "temp-dir"); + temp_dir = g_object_get_data (G_OBJECT (archive), "temp-dir"); g_return_val_if_fail (temp_dir && *temp_dir, FALSE); diff -Nru gimageview-0.2.27/src/gimv_image_info.h gimageview-0.3.0-0.20101117/src/gimv_image_info.h --- gimageview-0.2.27/src/gimv_image_info.h 2004-09-18 12:55:34.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_info.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_info.h,v 1.2 2003/07/06 16:46:21 makeinu Exp $ + * $Id: gimv_image_info.h 1193 2007-11-02 08:38:59Z makeinu $ */ #ifndef __GIMV_IMAGE_INFO_H__ @@ -30,6 +30,14 @@ #include "gimageview.h" #include "gimv_io.h" +#define GIMV_TYPE_IMAGE_INFO (gimv_image_info_get_type ()) +#define GIMV_IMAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE_INFO, GimvImageInfo)) +#define GIMV_IMAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE_INFO, GimvImageInfoClass)) +#define GIMV_IS_IMAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE_INFO)) +#define GIMV_IS_IMAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_INFO)) +#define GIMV_IMAGE_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE_INFO, GimvImageInfoClass)) + +typedef struct GimvImageInfoClass_Tag GimvImageInfoClass; typedef enum { @@ -44,9 +52,10 @@ GIMV_IMAGE_INFO_MRL_FLAG = 1 << 9 /* used by xine */ } GimvImageInfoFlags; - struct GimvImageInfo_Tag { + GObject parent; + gchar *filename; /* If the file is a member of a archive, this value sholud be set as relative path. */ const gchar *format; @@ -63,10 +72,15 @@ guint ref_count; }; +struct GimvImageInfoClass_Tag +{ + GObjectClass parent_class; +}; #define GIMV_IMAGE_INFO_IS_SYNCED(info) \ (info ? (info->flags & GIMV_IMAGE_INFO_SYNCED_FLAG) : FALSE) +GType gimv_image_info_get_type (void); /* * Get GimvImageInfo object for specified file. If file is not exist, @@ -136,7 +150,6 @@ GimvImageInfo *gimv_image_info_ref (GimvImageInfo *info); void gimv_image_info_unref (GimvImageInfo *info); - /* * used by fr-command only */ diff -Nru gimageview-0.2.27/src/gimv_image_loader.c gimageview-0.3.0-0.20101117/src/gimv_image_loader.c --- gimageview-0.2.27/src/gimv_image_loader.c 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_loader.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,14 +18,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_loader.c,v 1.9 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_image_loader.c 1193 2007-11-02 08:38:59Z makeinu $ */ #include "gimv_image_loader.h" #include "gimv_anim.h" -#include "gtk2-compat.h" -#include "fileutil.h" +#include "utils_file.h" typedef enum { @@ -69,15 +68,12 @@ GimvImageInfo *next_info; }; -static void gimv_image_loader_class_init (GimvImageLoaderClass *klass); -static void gimv_image_loader_init (GimvImageLoader *loader); -static void gimv_image_loader_destroy (GtkObject *object); +static void gimv_image_loader_dispose (GObject *object); static gboolean idle_gimv_image_loader_load (gpointer data); /* callback */ -static void gimv_image_loader_load_end (GimvImageLoader *loader); +static void gimv_image_loader_load_end (GimvImageLoader *loader); -static GtkObjectClass *parent_class = NULL; static gint gimv_image_loader_signals[LAST_SIGNAL] = {0}; @@ -131,67 +127,43 @@ * * ****************************************************************************/ -GtkType -gimv_image_loader_get_type (void) -{ - static GtkType gimv_image_loader_type = 0; - - if (!gimv_image_loader_type) { - static const GtkTypeInfo gimv_image_loader_info = { - "GimvImageLoader", - sizeof (GimvImageLoader), - sizeof (GimvImageLoaderClass), - (GtkClassInitFunc) gimv_image_loader_class_init, - (GtkObjectInitFunc) gimv_image_loader_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_image_loader_type = gtk_type_unique (gtk_object_get_type (), - &gimv_image_loader_info); - } - - return gimv_image_loader_type; -} - +G_DEFINE_TYPE (GimvImageLoader, gimv_image_loader, G_TYPE_OBJECT) static void gimv_image_loader_class_init (GimvImageLoaderClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + object_class = (GObjectClass *) klass; gimv_image_loader_signals[LOAD_START_SIGNAL] - = gtk_signal_new ("load_start", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageLoaderClass, load_start), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("load_start", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageLoaderClass, load_start), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_loader_signals[PROGRESS_UPDATE_SIGNAL] - = gtk_signal_new ("progress_update", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageLoaderClass, load_end), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("progress_update", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageLoaderClass, load_end), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_loader_signals[LOAD_END_SIGNAL] - = gtk_signal_new ("load_end", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageLoaderClass, load_end), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("load_end", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageLoaderClass, load_end), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, - gimv_image_loader_signals, LAST_SIGNAL); - - object_class->destroy = gimv_image_loader_destroy; + object_class->dispose = gimv_image_loader_dispose; klass->load_start = NULL; klass->progress_update = NULL; @@ -219,11 +191,6 @@ loader->priv->temp_file = NULL; loader->priv->flags = 0; loader->priv->next_info = NULL; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (loader)); - gtk_object_sink (GTK_OBJECT (loader)); -#endif } @@ -231,7 +198,7 @@ gimv_image_loader_new (void) { GimvImageLoader *loader - = GIMV_IMAGE_LOADER (gtk_type_new (gimv_image_loader_get_type ())); + = GIMV_IMAGE_LOADER (g_object_new (GIMV_TYPE_IMAGE_LOADER, NULL)); return loader; } @@ -263,28 +230,8 @@ } -GimvImageLoader * -gimv_image_loader_ref (GimvImageLoader *loader) -{ - g_return_val_if_fail (GIMV_IS_IMAGE_LOADER (loader), NULL); - - gtk_object_ref (GTK_OBJECT (loader)); - - return loader; -} - - -void -gimv_image_loader_unref (GimvImageLoader *loader) -{ - g_return_if_fail (GIMV_IS_IMAGE_LOADER (loader)); - - gtk_object_unref (GTK_OBJECT (loader)); -} - - static void -gimv_image_loader_destroy (GtkObject *object) +gimv_image_loader_dispose (GObject *object) { GimvImageLoader *loader = GIMV_IMAGE_LOADER (object); @@ -309,7 +256,7 @@ loader->priv->gio = NULL; if (loader->priv->image) - gimv_image_unref (loader->priv->image); + g_object_unref (G_OBJECT (loader->priv->image)); loader->priv->image = NULL; if (loader->priv->temp_file) @@ -320,8 +267,8 @@ loader->priv = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_image_loader_parent_class)->dispose) + G_OBJECT_CLASS (gimv_image_loader_parent_class)->dispose (object); } @@ -341,7 +288,7 @@ } if (loader->priv->image) - gimv_image_unref (loader->priv->image); + g_object_unref (G_OBJECT (loader->priv->image)); loader->priv->image = NULL; g_timer_reset (loader->timer); @@ -495,7 +442,7 @@ g_return_if_fail (loader->priv); if (loader->priv->image) - gimv_image_unref (loader->priv->image); + g_object_unref (G_OBJECT (loader->priv->image)); loader->priv->image = NULL; } @@ -595,8 +542,8 @@ g_return_val_if_fail (gimv_image_loader_is_loading (loader), FALSE); g_return_val_if_fail (loader->priv, FALSE); - gtk_signal_emit (GTK_OBJECT(loader), - gimv_image_loader_signals[PROGRESS_UPDATE_SIGNAL]); + g_signal_emit (G_OBJECT(loader), + gimv_image_loader_signals[PROGRESS_UPDATE_SIGNAL], 0); if (loader->priv->flags & GIMV_IMAGE_LOADER_CANCEL_FLAG) return FALSE; @@ -623,8 +570,8 @@ loader->priv->flags &= ~GIMV_IMAGE_LOADER_CANCEL_FLAG; loader->priv->flags |= GIMV_IMAGE_LOADER_LOADING_FLAG; - gtk_signal_emit (GTK_OBJECT(loader), - gimv_image_loader_signals[LOAD_START_SIGNAL]); + g_signal_emit (G_OBJECT(loader), + gimv_image_loader_signals[LOAD_START_SIGNAL], 0); g_timer_reset (loader->timer); g_timer_start (loader->timer); @@ -655,7 +602,7 @@ /* free old image */ if (loader->priv->image) - gimv_image_unref (loader->priv->image); + g_object_unref (G_OBJECT (loader->priv->image)); loader->priv->image = NULL; /* try all loader */ @@ -712,13 +659,13 @@ if (loader->priv->flags & GIMV_IMAGE_LOADER_DEBUG_FLAG) g_print ("----- loading canceled -----\n"); /* emit canceled signal? */ - gtk_signal_emit (GTK_OBJECT(loader), - gimv_image_loader_signals[LOAD_END_SIGNAL]); + g_signal_emit (G_OBJECT(loader), + gimv_image_loader_signals[LOAD_END_SIGNAL], 0); } else { if (loader->priv->flags & GIMV_IMAGE_LOADER_DEBUG_FLAG) g_print ("----- loading done -----\n"); - gtk_signal_emit (GTK_OBJECT(loader), - gimv_image_loader_signals[LOAD_END_SIGNAL]); + g_signal_emit (G_OBJECT(loader), + gimv_image_loader_signals[LOAD_END_SIGNAL], 0); } } diff -Nru gimageview-0.2.27/src/gimv_image_loader.h gimageview-0.3.0-0.20101117/src/gimv_image_loader.h --- gimageview-0.2.27/src/gimv_image_loader.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_loader.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,44 +18,37 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_loader.h,v 1.7 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_image_loader.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef __GIMV_IMAGE_LOADER_H__ #define __GIMV_IMAGE_LOADER_H__ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include +#include #include "gimv_image.h" #include "gimv_image_info.h" #include "gimv_io.h" - #define GIMV_TYPE_IMAGE_LOADER (gimv_image_loader_get_type ()) -#define GIMV_IMAGE_LOADER(obj) (GTK_CHECK_CAST (obj, gimv_image_loader_get_type (), GimvImageLoader)) -#define GIMV_IMAGE_LOADER_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_image_loader_get_type, GimvImageLoaderClass)) -#define GIMV_IS_IMAGE_LOADER(obj) (GTK_CHECK_TYPE (obj, gimv_image_loader_get_type ())) -#define GIMV_IS_IMAGE_LOADER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_LOADER)) - +#define GIMV_IMAGE_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE_LOADER, GimvImageLoader)) +#define GIMV_IMAGE_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE_LOADER, GimvImageLoaderClass)) +#define GIMV_IS_IMAGE_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE_LOADER)) +#define GIMV_IS_IMAGE_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_LOADER)) +#define GIMV_IMAGE_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE_LOADER, GimvImageLoaderClass)) typedef struct GimvImageLoader_Tag GimvImageLoader; typedef struct GimvImageLoaderPriv_Tag GimvImageLoaderPriv; typedef struct GimvImageLoaderClass_Tag GimvImageLoaderClass; - typedef enum { GIMV_IMAGE_LOADER_LOAD_NORMAL, GIMV_IMAGE_LOADER_LOAD_THUMBNAIL } GimvImageLoaderLoadType; - struct GimvImageLoader_Tag { - GtkObject parent; + GObject parent; GimvImageInfo *info; GTimer *timer; @@ -63,10 +56,9 @@ GimvImageLoaderPriv *priv; }; - struct GimvImageLoaderClass_Tag { - GtkObjectClass parent; + GObjectClass parent; void (*load_start) (GimvImageLoader *loader); void (*progress_update) (GimvImageLoader *loader); @@ -74,7 +66,7 @@ }; -#define GIMV_IMAGE_LOADER_IF_VERSION 2 +#define GIMV_IMAGE_LOADER_IF_VERSION 3 /* * for plugin @@ -105,16 +97,13 @@ /* * used by client */ -GtkType gimv_image_loader_get_type (void); +GType gimv_image_loader_get_type (void); GimvImageLoader *gimv_image_loader_new (void); GimvImageLoader *gimv_image_loader_new_with_image_info (GimvImageInfo *info); GimvImageLoader - *gimv_image_loader_new_with_file_name (const gchar *filename); -GimvImageLoader - *gimv_image_loader_ref (GimvImageLoader *loader); -void gimv_image_loader_unref (GimvImageLoader *loader); + *gimv_image_loader_new_with_file_name(const gchar *filename); void gimv_image_loader_set_image_info (GimvImageLoader *loader, GimvImageInfo *info); diff -Nru gimageview-0.2.27/src/gimv_image_saver.c gimageview-0.3.0-0.20101117/src/gimv_image_saver.c --- gimageview-0.2.27/src/gimv_image_saver.c 2004-05-23 14:07:46.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_saver.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,11 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_saver.c,v 1.4 2004/03/07 11:53:30 makeinu Exp $ + * $Id: gimv_image_saver.c 1164 2007-10-20 15:04:59Z makeinu $ */ #include "gimv_image_saver.h" -#include "gtk2-compat.h" typedef enum { @@ -47,13 +46,8 @@ GimvImageSaverFlags flags; }; +static void gimv_image_saver_dispose (GObject *object); -static void gimv_image_saver_class_init (GimvImageSaverClass *klass); -static void gimv_image_saver_init (GimvImageSaver *saver); -static void gimv_image_saver_destroy (GtkObject *object); - - -static GtkObjectClass *parent_class = NULL; static gint gimv_image_saver_signals[LAST_SIGNAL] = {0}; @@ -93,67 +87,44 @@ * * ******************************************************************************/ -GtkType -gimv_image_saver_get_type (void) -{ - static GtkType gimv_image_saver_type = 0; - - if (!gimv_image_saver_type) { - static const GtkTypeInfo gimv_image_saver_info = { - "GimvImageSaver", - sizeof (GimvImageSaver), - sizeof (GimvImageSaverClass), - (GtkClassInitFunc) gimv_image_saver_class_init, - (GtkObjectInitFunc) gimv_image_saver_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_image_saver_type = gtk_type_unique (gtk_object_get_type (), - &gimv_image_saver_info); - } - - return gimv_image_saver_type; -} +G_DEFINE_TYPE (GimvImageSaver, gimv_image_saver, G_TYPE_OBJECT) static void gimv_image_saver_class_init (GimvImageSaverClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; gimv_image_saver_signals[SAVE_START_SIGNAL] - = gtk_signal_new ("save_start", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageSaverClass, save_start), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("save_start", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageSaverClass, save_start), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_saver_signals[PROGRESS_UPDATE_SIGNAL] - = gtk_signal_new ("progress_update", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageSaverClass, save_end), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("progress_update", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageSaverClass, save_end), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_saver_signals[SAVE_END_SIGNAL] - = gtk_signal_new ("save_end", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvImageSaverClass, save_end), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, - gimv_image_saver_signals, LAST_SIGNAL); + = g_signal_new ("save_end", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageSaverClass, save_end), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - object_class->destroy = gimv_image_saver_destroy; + gobject_class->dispose = gimv_image_saver_dispose; klass->save_start = NULL; klass->progress_update = NULL; @@ -176,16 +147,11 @@ saver->priv = g_new0 (GimvImageSaverPriv, 1); saver->priv->flags = 0; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (saver)); - gtk_object_sink (GTK_OBJECT (saver)); -#endif } static void -gimv_image_saver_destroy (GtkObject *object) +gimv_image_saver_dispose (GObject *object) { GimvImageSaver *saver = GIMV_IMAGE_SAVER (object); @@ -201,8 +167,8 @@ saver->priv = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_image_saver_parent_class)->dispose) + G_OBJECT_CLASS (gimv_image_saver_parent_class)->dispose (object); } @@ -210,7 +176,7 @@ gimv_image_saver_new (void) { GimvImageSaver *saver - = GIMV_IMAGE_SAVER (gtk_type_new (gimv_image_saver_get_type ())); + = GIMV_IMAGE_SAVER (g_object_new (GIMV_TYPE_IMAGE_SAVER, NULL)); return saver; } @@ -222,7 +188,7 @@ const gchar *format) { GimvImageSaver *saver - = GIMV_IMAGE_SAVER (gtk_type_new (gimv_image_saver_get_type ())); + = GIMV_IMAGE_SAVER (g_object_new (GIMV_TYPE_IMAGE_SAVER, NULL)); gimv_image_saver_set_image (saver, image); gimv_image_saver_set_path (saver, path); @@ -232,26 +198,6 @@ } -GimvImageSaver * -gimv_image_saver_ref (GimvImageSaver *saver) -{ - g_return_val_if_fail (GIMV_IS_IMAGE_SAVER (saver), NULL); - - gtk_object_ref (GTK_OBJECT (saver)); - - return saver; -} - - -void -gimv_image_saver_unref (GimvImageSaver *saver) -{ - g_return_if_fail (GIMV_IS_IMAGE_SAVER (saver)); - - gtk_object_unref (GTK_OBJECT (saver)); -} - - void gimv_image_saver_reset (GimvImageSaver *saver) { @@ -264,7 +210,7 @@ } if (saver->image) { - gimv_image_unref (saver->image); + g_object_unref (G_OBJECT (saver->image)); saver->image = NULL; } @@ -312,7 +258,8 @@ g_return_if_fail (GIMV_IS_IMAGE_SAVER (saver)); g_return_if_fail (!gimv_image_saver_is_saving (saver)); - saver->image = gimv_image_ref (image); + g_object_ref (G_OBJECT (image)); + saver->image = image; } @@ -394,16 +341,16 @@ saver->priv->flags |= GIMV_IMAGE_SAVER_SAVING_FLAG; - gtk_signal_emit (GTK_OBJECT(saver), - gimv_image_saver_signals[SAVE_START_SIGNAL]); + g_signal_emit (G_OBJECT(saver), + gimv_image_saver_signals[SAVE_START_SIGNAL], 0); g_timer_reset (saver->timer); g_timer_start (saver->timer); saver_funcs = g_hash_table_lookup (image_savers, saver->format); if (!saver_funcs) { - gtk_signal_emit (GTK_OBJECT(saver), - gimv_image_saver_signals[SAVE_END_SIGNAL]); + g_signal_emit (G_OBJECT(saver), + gimv_image_saver_signals[SAVE_END_SIGNAL], 0); g_timer_stop (saver->timer); g_timer_reset (saver->timer); return FALSE; @@ -419,8 +366,8 @@ g_timer_stop (saver->timer); - gtk_signal_emit (GTK_OBJECT(saver), - gimv_image_saver_signals[SAVE_END_SIGNAL]); + g_signal_emit (G_OBJECT(saver), + gimv_image_saver_signals[SAVE_END_SIGNAL], 0); return retval; } @@ -529,8 +476,8 @@ g_return_val_if_fail (gimv_image_saver_is_saving (saver), FALSE); g_return_val_if_fail (saver->priv, FALSE); - gtk_signal_emit (GTK_OBJECT(saver), - gimv_image_saver_signals[PROGRESS_UPDATE_SIGNAL]); + g_signal_emit (G_OBJECT(saver), + gimv_image_saver_signals[PROGRESS_UPDATE_SIGNAL], 0); if (saver->priv->flags & GIMV_IMAGE_SAVER_CANCEL_FLAG) return FALSE; diff -Nru gimageview-0.2.27/src/gimv_image_saver.h gimageview-0.3.0-0.20101117/src/gimv_image_saver.h --- gimageview-0.2.27/src/gimv_image_saver.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_saver.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_saver.h,v 1.5 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_image_saver.h 1163 2007-10-20 11:15:53Z makeinu $ */ #ifndef __GIMV_IMAGE_SAVER_H__ @@ -28,28 +28,26 @@ # include "config.h" #endif -#include +#include #include "gimv_image.h" #include "gimv_image_info.h" - #define GIMV_TYPE_IMAGE_SAVER (gimv_image_saver_get_type ()) -#define GIMV_IMAGE_SAVER(obj) (GTK_CHECK_CAST (obj, gimv_image_saver_get_type (), GimvImageSaver)) -#define GIMV_IMAGE_SAVER_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_image_saver_get_type, GimvImageSaverClass)) -#define GIMV_IS_IMAGE_SAVER(obj) (GTK_CHECK_TYPE (obj, gimv_image_saver_get_type ())) -#define GIMV_IS_IMAGE_SAVER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_SAVER)) - +#define GIMV_IMAGE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE_SAVER, GimvImageSaver)) +#define GIMV_IMAGE_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE_SAVER, GimvImageSaverClass)) +#define GIMV_IS_IMAGE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE_SAVER)) +#define GIMV_IS_IMAGE_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_SAVER)) +#define GIMV_IMAGE_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE_SAVER, GimvImageSaverClass)) typedef struct GimvImageSaver_Tag GimvImageSaver; typedef struct GimvImageSaverPriv_Tag GimvImageSaverPriv; typedef struct GimvImageSaverClass_Tag GimvImageSaverClass; typedef struct GimvImageSaverText_Tag GimvImageSaverText; - struct GimvImageSaver_Tag { - GtkObject parent; + GObject parent; GimvImageInfo *info; GimvImage *image; @@ -66,27 +64,23 @@ GimvImageSaverPriv *priv; }; - struct GimvImageSaverClass_Tag { - GtkObjectClass parent; + GObjectClass parent; void (*save_start) (GimvImageSaver *saver); void (*progress_update) (GimvImageSaver *saver); void (*save_end) (GimvImageSaver *saver); }; - struct GimvImageSaverText_Tag { gchar *key; gchar *text; }; - #define GIMV_IMAGE_SAVER_IF_VERSION 2 - typedef struct GimvImageSaverPlugin_Tag { const guint32 if_version; /* plugin interface version */ @@ -102,16 +96,12 @@ const gchar *format); } GimvImageSaverPlugin; - -GtkType gimv_image_saver_get_type (void); +GType gimv_image_saver_get_type (void); GimvImageSaver *gimv_image_saver_new (void); GimvImageSaver *gimv_image_saver_new_with_attr (GimvImage *image, const gchar *path, const gchar *format); -GimvImageSaver *gimv_image_saver_ref (GimvImageSaver *saver); -void gimv_image_saver_unref (GimvImageSaver *saver); - void gimv_image_saver_reset (GimvImageSaver *saver); void gimv_image_saver_set_image (GimvImageSaver *saver, diff -Nru gimageview-0.2.27/src/gimv_image_view.c gimageview-0.3.0-0.20101117/src/gimv_image_view.c --- gimageview-0.2.27/src/gimv_image_view.c 2004-12-20 09:16:37.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_view.c 2010-11-17 06:10:11.000000000 +0000 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_view.c,v 1.17 2004/09/29 06:13:50 makeinu Exp $ + * $Id: gimv_image_view.c 1208 2009-01-13 05:19:15Z makeinu $ */ #include @@ -27,9 +27,6 @@ #include "gimageview.h" -#include "cursors.h" -#include "dnd.h" -#include "fileutil.h" #include "gimv_image.h" #include "gimv_anim.h" #include "gimv_icon_stock.h" @@ -37,16 +34,17 @@ #include "gimv_image_view.h" #include "gimv_image_win.h" #include "gimv_nav_win.h" -#include "gtk2-compat.h" -#include "gtkutils.h" -#include "menu.h" #include "prefs.h" +#include "utils_dnd.h" +#include "utils_file.h" +#include "utils_gtk.h" +#include "utils_menu.h" #ifdef ENABLE_EXIF #include #include -#include +#include "jpeg-data.h" #endif @@ -159,9 +157,7 @@ /* object class methods */ -static void gimv_image_view_class_init (GimvImageViewClass *klass); -static void gimv_image_view_init (GimvImageView *iv); -static void gimv_image_view_destroy (GtkObject *object); +static void gimv_image_view_dispose (GObject *object); /* image view class methods */ static void gimv_image_view_image_changed (GimvImageView *iv); @@ -262,7 +258,6 @@ static GtkWidget *gimv_image_view_create_player_toolbar (GimvImageView *iv); -static GtkVBoxClass *parent_class = NULL; static gint gimv_image_view_signals[LAST_SIGNAL] = {0}; @@ -403,30 +398,7 @@ * * ****************************************************************************/ -GtkType -gimv_image_view_get_type (void) -{ - static GtkType gimv_image_view_type = 0; - - if (!gimv_image_view_type) { - static const GtkTypeInfo gimv_image_view_info = { - "GimvImageView", - sizeof (GimvImageView), - sizeof (GimvImageViewClass), - (GtkClassInitFunc) gimv_image_view_class_init, - (GtkObjectInitFunc) gimv_image_view_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_image_view_type = gtk_type_unique (gtk_vbox_get_type (), - &gimv_image_view_info); - } - - return gimv_image_view_type; -} - +G_DEFINE_TYPE (GimvImageView, gimv_image_view, GTK_TYPE_VBOX) enum { ARG_0, @@ -535,10 +507,11 @@ static void gimv_image_view_class_init (GimvImageViewClass *klass) { + GObjectClass *gobject_class; GtkObjectClass *object_class; + gobject_class = (GObjectClass *) klass; object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_vbox_get_type ()); gtk_object_add_arg_type ("GimvImageView::x_scale", GTK_TYPE_FLOAT, @@ -582,106 +555,117 @@ ARG_CONTINUANCE_PLAY); gimv_image_view_signals[IMAGE_CHANGED_SIGNAL] - = gtk_signal_new ("image_changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, image_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("image_changed", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, image_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_view_signals[LOAD_START_SIGNAL] - = gtk_signal_new ("load_start", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, load_start), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + = g_signal_new ("load_start", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, load_start), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); gimv_image_view_signals[LOAD_END_SIGNAL] - = gtk_signal_new ("load_end", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, load_end), - gtk_marshal_NONE__POINTER_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT); + = g_signal_new ("load_end", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, load_end), + NULL, NULL, + gtk_marshal_NONE__POINTER_INT, + G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); gimv_image_view_signals[SET_LIST_SIGNAL] - = gtk_signal_new ("set_list", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, set_list), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("set_list", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, set_list), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_view_signals[UNSET_LIST_SIGNAL] - = gtk_signal_new ("unset_list", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, unset_list), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("unset_list", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, unset_list), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_view_signals[RENDERED_SIGNAL] - = gtk_signal_new ("rendered", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, rendered), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("rendered", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, rendered), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_view_signals[TOGGLE_ASPECT_SIGNAL] - = gtk_signal_new ("toggle_aspect", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, toggle_aspect), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, GTK_TYPE_INT); + = g_signal_new ("toggle_aspect", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, toggle_aspect), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, G_TYPE_INT); gimv_image_view_signals[TOGGLE_BUFFER_SIGNAL] - = gtk_signal_new ("toggle_buffer", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, toggle_buffer), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, GTK_TYPE_INT); + = g_signal_new ("toggle_buffer", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, toggle_buffer), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, G_TYPE_INT); gimv_image_view_signals[THUMBNAIL_CREATED_SIGNAL] - = gtk_signal_new ("thumbnail_created", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, thumbnail_created), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + = g_signal_new ("thumbnail_created", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageViewClass, thumbnail_created), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); gimv_image_view_signals[IMAGE_PRESSED_SIGNAL] - = gtk_signal_new ("image_pressed", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, image_pressed), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); + = g_signal_new ("image_pressed", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GimvImageViewClass, image_pressed), + NULL, NULL, + gtk_marshal_BOOL__POINTER, + G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); gimv_image_view_signals[IMAGE_RELEASED_SIGNAL] - = gtk_signal_new ("image_released", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, image_released), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); + = g_signal_new ("image_released", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GimvImageViewClass, image_released), + NULL, NULL, + gtk_marshal_BOOL__POINTER, + G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); gimv_image_view_signals[IMAGE_CLICKED_SIGNAL] - = gtk_signal_new ("image_clicked", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageViewClass, image_clicked), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, gimv_image_view_signals, LAST_SIGNAL); - - object_class->set_arg = gimv_image_view_set_arg; - object_class->get_arg = gimv_image_view_get_arg; - object_class->destroy = gimv_image_view_destroy; + = g_signal_new ("image_clicked", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GimvImageViewClass, image_clicked), + NULL, NULL, + gtk_marshal_BOOL__POINTER, + G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); + + gobject_class->dispose = gimv_image_view_dispose; + + object_class->set_arg = gimv_image_view_set_arg; + object_class->get_arg = gimv_image_view_get_arg; klass->image_changed = gimv_image_view_image_changed; klass->load_start = NULL; @@ -797,14 +781,14 @@ 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); /* set signals */ - gtk_signal_connect (GTK_OBJECT (iv->hadj), "value_changed", - GTK_SIGNAL_FUNC (cb_scrollbar_value_changed), iv); + g_signal_connect (G_OBJECT (iv->hadj), "value_changed", + G_CALLBACK (cb_scrollbar_value_changed), iv); - gtk_signal_connect (GTK_OBJECT (iv->vadj), "value_changed", - GTK_SIGNAL_FUNC (cb_scrollbar_value_changed), iv); + g_signal_connect (G_OBJECT (iv->vadj), "value_changed", + G_CALLBACK (cb_scrollbar_value_changed), iv); - gtk_signal_connect (GTK_OBJECT (event_box), "button_press_event", - GTK_SIGNAL_FUNC (cb_nav_button), iv); + g_signal_connect (G_OBJECT (event_box), "button_press_event", + G_CALLBACK (cb_nav_button), iv); /* add to list */ GimvImageViewList = g_list_append (GimvImageViewList, iv); @@ -818,7 +802,7 @@ GtkWidget* gimv_image_view_new (GimvImageInfo *info) { - GimvImageView *iv = gtk_type_new (gimv_image_view_get_type ()); + GimvImageView *iv = g_object_new (GIMV_TYPE_IMAGE_VIEW, NULL); if (info) { iv->info = gimv_image_info_ref (info); @@ -835,7 +819,7 @@ static void -gimv_image_view_destroy (GtkObject *object) +gimv_image_view_dispose (GObject *object) { GimvImageView *iv = GIMV_IMAGE_VIEW (object); @@ -847,17 +831,17 @@ if (iv->loader) { if (gimv_image_loader_is_loading (iv->loader)) { gimv_image_view_cancel_loading (iv); - gtk_signal_connect (GTK_OBJECT (iv->loader), "load_end", - GTK_SIGNAL_FUNC (cb_destroy_loader), - iv); + g_signal_connect (G_OBJECT (iv->loader), "load_end", + G_CALLBACK (cb_destroy_loader), + iv); } else { - gimv_image_loader_unref (iv->loader); + g_object_unref (G_OBJECT(iv->loader)); } } iv->loader = NULL; if (iv->image) - gimv_image_unref (iv->image); + g_object_unref (G_OBJECT (iv->image)); iv->image = NULL; if (iv->bg_color) @@ -892,8 +876,8 @@ iv->priv = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_image_view_parent_class)->dispose) + G_OBJECT_CLASS (gimv_image_view_parent_class)->dispose (object); } @@ -945,9 +929,9 @@ { iv->priv->keep_aspect = GTK_CHECK_MENU_ITEM(widget)->active; - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[TOGGLE_ASPECT_SIGNAL], - iv->priv->keep_aspect); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[TOGGLE_ASPECT_SIGNAL], 0, + iv->priv->keep_aspect); } @@ -1002,9 +986,9 @@ gimv_image_view_free_image_buf (iv); } - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[TOGGLE_BUFFER_SIGNAL], - iv->priv->buffer); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[TOGGLE_BUFFER_SIGNAL], 0, + iv->priv->buffer); } @@ -1077,7 +1061,7 @@ { const gchar *label; - label = gtk_object_get_data (GTK_OBJECT (widget), "GimvImageView::ViewMode"); + label = g_object_get_data (G_OBJECT (widget), "GimvImageView::ViewMode"); gimv_image_view_change_view_mode (iv, label); } @@ -1172,22 +1156,22 @@ static void cb_destroy_loader (GimvImageLoader *loader, gpointer data) { - gtk_signal_disconnect_by_func (GTK_OBJECT (loader), - GTK_SIGNAL_FUNC (cb_destroy_loader), - data); - gimv_image_loader_unref (loader); + g_signal_handlers_disconnect_by_func (G_OBJECT (loader), + G_CALLBACK (cb_destroy_loader), + data); + g_object_unref (G_OBJECT (loader)); } static void cb_image_map (GtkWidget *widget, GimvImageView *iv) { - gtk_signal_disconnect_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (cb_image_map), iv); + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + G_CALLBACK (cb_image_map), iv); gimv_image_view_show_image (iv); gimv_image_view_playable_play (iv); - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[IMAGE_CHANGED_SIGNAL]); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[IMAGE_CHANGED_SIGNAL], 0); } @@ -1320,9 +1304,9 @@ gtk_widget_grab_focus (widget); - gtk_signal_emit (GTK_OBJECT (iv), - gimv_image_view_signals[IMAGE_PRESSED_SIGNAL], - event, &retval); + g_signal_emit (G_OBJECT (iv), + gimv_image_view_signals[IMAGE_PRESSED_SIGNAL], 0, + event, &retval); if (iv->priv->dragging) return FALSE; @@ -1331,7 +1315,7 @@ if (!iv->priv->pixmap) return FALSE; - cursor = cursor_get (widget->window, CURSOR_HAND_CLOSED); + cursor = gimv_icon_stock_get_cursor (widget->window, CURSOR_HAND_CLOSED); retval = gdk_pointer_grab (widget->window, FALSE, (GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK @@ -1368,14 +1352,14 @@ return FALSE; */ - gtk_signal_emit (GTK_OBJECT (iv), - gimv_image_view_signals[IMAGE_RELEASED_SIGNAL], - event, &retval); + g_signal_emit (G_OBJECT (iv), + gimv_image_view_signals[IMAGE_RELEASED_SIGNAL], 0, + event, &retval); if(iv->priv->pressed && !iv->priv->dragging) - gtk_signal_emit (GTK_OBJECT (iv), - gimv_image_view_signals[IMAGE_CLICKED_SIGNAL], - event, &retval); + g_signal_emit (G_OBJECT (iv), + gimv_image_view_signals[IMAGE_CLICKED_SIGNAL], 0, + event, &retval); if (buffer) { gdk_pixmap_unref (buffer); @@ -1716,14 +1700,14 @@ gtk_widget_show (iv->draw_area); - gtk_signal_connect_after (GTK_OBJECT (iv->draw_area), "key-press-event", - GTK_SIGNAL_FUNC(cb_image_key_press), iv); - gtk_signal_connect (GTK_OBJECT (iv->draw_area), "button_press_event", - GTK_SIGNAL_FUNC (cb_image_button_press), iv); - gtk_signal_connect (GTK_OBJECT (iv->draw_area), "button_release_event", - GTK_SIGNAL_FUNC (cb_image_button_release), iv); - gtk_signal_connect (GTK_OBJECT (iv->draw_area), "motion_notify_event", - GTK_SIGNAL_FUNC (cb_image_motion_notify), iv); + g_signal_connect_after (G_OBJECT (iv->draw_area), "key-press-event", + G_CALLBACK (cb_image_key_press), iv); + g_signal_connect (G_OBJECT (iv->draw_area), "button_press_event", + G_CALLBACK (cb_image_button_press), iv); + g_signal_connect (G_OBJECT (iv->draw_area), "button_release_event", + G_CALLBACK (cb_image_button_release), iv); + g_signal_connect (G_OBJECT (iv->draw_area), "motion_notify_event", + G_CALLBACK (cb_image_motion_notify), iv); SIGNAL_CONNECT_TRANSRATE_SCROLL(iv->draw_area); if (iv->priv->fullscreen) { @@ -1735,8 +1719,8 @@ } /* for droping file list */ - gtk_signal_connect(GTK_OBJECT (iv->draw_area), "drag_data_received", - GTK_SIGNAL_FUNC (cb_drag_data_received), iv); + g_signal_connect (G_OBJECT (iv->draw_area), "drag_data_received", + G_CALLBACK (cb_drag_data_received), iv); dnd_dest_set (iv->draw_area, dnd_types_archive, dnd_types_archive_num); @@ -1910,11 +1894,11 @@ if (GTK_WIDGET_MAPPED (iv->draw_area)) { gimv_image_view_show_image (iv); gimv_image_view_playable_play (iv); - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[IMAGE_CHANGED_SIGNAL]); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[IMAGE_CHANGED_SIGNAL], 0); } else { - gtk_signal_connect_after (GTK_OBJECT (iv->draw_area), "map", - GTK_SIGNAL_FUNC (cb_image_map), iv); + g_signal_connect_after (G_OBJECT (iv->draw_area), "map", + G_CALLBACK (cb_image_map), iv); } } @@ -1933,7 +1917,7 @@ iv->priv->mask = NULL; if (iv->image) - gimv_image_unref (iv->image); + g_object_unref (G_OBJECT (iv->image)); iv->image = NULL; /* free old image info */ @@ -2166,43 +2150,47 @@ iv->player_toolbar = toolbar; /* Reverse button */ - iconw = gimv_icon_stock_get_widget ("rw"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_REWIND, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("RW"), _("Reverse"), _("Reverse"), iconw, - GTK_SIGNAL_FUNC (cb_gimv_image_view_rw), iv); + G_CALLBACK (cb_gimv_image_view_rw), iv); gtk_widget_set_sensitive (button, FALSE); iv->player.rw = button; /* play button */ - iconw = gimv_icon_stock_get_widget ("play"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Play"), _("Play"), _("Play"), iconw, - GTK_SIGNAL_FUNC (cb_gimv_image_view_play), iv); + G_CALLBACK (cb_gimv_image_view_play), iv); gtk_widget_set_sensitive (button, FALSE); iv->player.play = button; iv->player.play_icon = iconw; /* stop button */ - iconw = gimv_icon_stock_get_widget ("stop2"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Stop"), _("Stop"), _("Stop"), iconw, - GTK_SIGNAL_FUNC (cb_gimv_image_view_stop), iv); + G_CALLBACK (cb_gimv_image_view_stop), iv); gtk_widget_set_sensitive (button, FALSE); iv->player.stop = button; /* Forward button */ - iconw = gimv_icon_stock_get_widget ("ff"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_FORWARD, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("FF"), _("Forward"), _("Forward"), iconw, - GTK_SIGNAL_FUNC (cb_gimv_image_view_fw), iv); + G_CALLBACK (cb_gimv_image_view_fw), iv); gtk_widget_set_sensitive (button, FALSE); iv->player.fw = button; @@ -2212,7 +2200,7 @@ _("Eject"), _("Eject"), _("Eject"), iconw, - GTK_SIGNAL_FUNC (cb_gimv_image_view_eject), iv); + G_CALLBACK (cb_gimv_image_view_eject), iv); iv->player.eject = button; gtk_widget_set_sensitive (button, FALSE); @@ -2223,10 +2211,10 @@ gtk_widget_show (seekbar); iv->player.seekbar = seekbar; - gtk_signal_connect (GTK_OBJECT (iv->player.seekbar), "button_press_event", - GTK_SIGNAL_FUNC (cb_seekbar_pressed), iv); - gtk_signal_connect (GTK_OBJECT (iv->player.seekbar), "button_release_event", - GTK_SIGNAL_FUNC (cb_seekbar_released), iv); + g_signal_connect (G_OBJECT (iv->player.seekbar), "button_press_event", + G_CALLBACK (cb_seekbar_pressed), iv); + g_signal_connect (G_OBJECT (iv->player.seekbar), "button_release_event", + G_CALLBACK (cb_seekbar_released), iv); return hbox; } @@ -2297,8 +2285,8 @@ status = gimv_image_view_playable_get_status (iv); gimv_image_view_playable_set_status (iv, status); - gtk_signal_connect (GTK_OBJECT (menu), "destroy", - GTK_SIGNAL_FUNC (cb_movie_menu_destroy), iv); + g_signal_connect (G_OBJECT (menu), "destroy", + G_CALLBACK (cb_movie_menu_destroy), iv); return menu; } @@ -2322,17 +2310,17 @@ if (!vftable) continue; menu_item = gtk_menu_item_new_with_label (_(vftable->label)); - gtk_object_set_data (GTK_OBJECT (menu_item), - "GimvImageView::ViewMode", - (gpointer) vftable->label); - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - GTK_SIGNAL_FUNC (cb_change_view_mode), iv); + g_object_set_data (G_OBJECT (menu_item), + "GimvImageView::ViewMode", + (gpointer) vftable->label); + g_signal_connect (G_OBJECT (menu_item), "activate", + G_CALLBACK(cb_change_view_mode), iv); gtk_menu_append (GTK_MENU (menu), menu_item); gtk_widget_show (menu_item); } - gtk_signal_connect (GTK_OBJECT (menu), "destroy", - GTK_SIGNAL_FUNC (cb_view_modes_menu_destroy), iv); + g_signal_connect (G_OBJECT (menu), "destroy", + G_CALLBACK (cb_view_modes_menu_destroy), iv); return menu; } @@ -2531,13 +2519,13 @@ if (zoom_type >= 0) { gint vx, vy; - gtk_signal_handler_block_by_func (GTK_OBJECT(widget), - GTK_SIGNAL_FUNC (cb_navwin_button_release), - iv); + g_signal_handlers_block_by_func (G_OBJECT(widget), + G_CALLBACK (cb_navwin_button_release), + iv); gimv_image_view_zoom_image (iv, zoom_type, 0, 0); - gtk_signal_handler_unblock_by_func (GTK_OBJECT(widget), - GTK_SIGNAL_FUNC (cb_navwin_button_release), - iv); + g_signal_handlers_unblock_by_func (G_OBJECT(widget), + G_CALLBACK (cb_navwin_button_release), + iv); gimv_nav_win_set_orig_image_size (navwin, iv->priv->width, @@ -2637,13 +2625,13 @@ if (zoom_type >= 0) { gint vx, vy; - gtk_signal_handler_block_by_func (GTK_OBJECT(widget), - GTK_SIGNAL_FUNC (cb_navwin_key_press), - iv); + g_signal_handlers_block_by_func (G_OBJECT(widget), + G_CALLBACK (cb_navwin_key_press), + iv); gimv_image_view_zoom_image (iv, zoom_type, 0, 0); - gtk_signal_handler_unblock_by_func (GTK_OBJECT(widget), - GTK_SIGNAL_FUNC (cb_navwin_key_press), - iv); + g_signal_handlers_unblock_by_func (G_OBJECT(widget), + G_CALLBACK (cb_navwin_key_press), + iv); gimv_nav_win_set_orig_image_size (navwin, iv->priv->width, @@ -2714,12 +2702,12 @@ iv->priv->width, iv->priv->height, fwidth, fheight, fpos_x, fpos_y); - gtk_signal_connect (GTK_OBJECT (navwin), "button_release_event", - GTK_SIGNAL_FUNC (cb_navwin_button_release), iv); - gtk_signal_connect (GTK_OBJECT (navwin), "key-press-event", - GTK_SIGNAL_FUNC(cb_navwin_key_press), iv); - gtk_signal_connect (GTK_OBJECT (navwin), "move", - GTK_SIGNAL_FUNC (cb_navwin_move), iv); + g_signal_connect (G_OBJECT (navwin), "button_release_event", + G_CALLBACK (cb_navwin_button_release), iv); + g_signal_connect (G_OBJECT (navwin), "key-press-event", + G_CALLBACK(cb_navwin_key_press), iv); + g_signal_connect (G_OBJECT (navwin), "move", + G_CALLBACK (cb_navwin_move), iv); gimv_nav_win_show (GIMV_NAV_WIN (navwin), x_root, y_root); iv->priv->navwin = navwin; } @@ -2728,7 +2716,7 @@ gdk_pixmap_unref (pixmap); ERROR: - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); } @@ -2779,7 +2767,7 @@ return; } - gimv_image_unref (iv->image); + g_object_unref (G_OBJECT (iv->image)); iv->image = NULL; } static gint @@ -2817,7 +2805,7 @@ image = gimv_image_loader_get_image (loader); if (!image) goto ERROR; - gimv_image_ref (image); + g_object_ref (G_OBJECT (image)); gimv_image_loader_unref_image (loader); /* FIXME */ @@ -2834,36 +2822,36 @@ bg_r, bg_g, bg_b, iv->priv->ignore_alpha); if (rgb_image) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = rgb_image; } } if (!g_list_find (GimvImageViewList, iv)) { - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); goto ERROR; } else { if (iv->image) - gimv_image_unref (iv->image); + g_object_unref (G_OBJECT (iv->image)); iv->image = image; } gimv_image_view_rotate_render (iv, iv->priv->rotate); ERROR: - gtk_signal_disconnect_by_func (GTK_OBJECT (iv->loader), - GTK_SIGNAL_FUNC (cb_loader_progress_update), - iv); - gtk_signal_disconnect_by_func (GTK_OBJECT (iv->loader), - GTK_SIGNAL_FUNC (cb_loader_load_end), - iv); + g_signal_handlers_disconnect_by_func (G_OBJECT (iv->loader), + G_CALLBACK (cb_loader_progress_update), + iv); + g_signal_handlers_disconnect_by_func (G_OBJECT (iv->loader), + G_CALLBACK (cb_loader_load_end), + iv); iv->priv->loader_progress_update_signal_id = 0; iv->priv->loader_load_end_signal_id = 0; - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[LOAD_END_SIGNAL], - iv->info, FALSE); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[LOAD_END_SIGNAL], 0, + iv->info, FALSE); } @@ -2936,9 +2924,9 @@ filename = gimv_image_info_get_path (iv->info); if (!filename || !*filename) return; - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[LOAD_START_SIGNAL], - iv->info); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[LOAD_START_SIGNAL], 0, + iv->info); if (gimv_image_info_is_in_archive (iv->info)) { guint timer = 0; @@ -2967,19 +2955,19 @@ /* load image buf */ /* iv->loader->flags |= GIMV_IMAGE_LOADER_DEBUG_FLAG; */ if (iv->priv->loader_progress_update_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv->loader), - iv->priv->loader_progress_update_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv->loader), + iv->priv->loader_progress_update_signal_id); iv->priv->loader_progress_update_signal_id = - gtk_signal_connect (GTK_OBJECT (iv->loader), "progress_update", - GTK_SIGNAL_FUNC (cb_loader_progress_update), - iv); + g_signal_connect (G_OBJECT (iv->loader), "progress_update", + G_CALLBACK (cb_loader_progress_update), + iv); if (iv->priv->loader_load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv->loader), - iv->priv->loader_load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv->loader), + iv->priv->loader_load_end_signal_id); iv->priv->loader_load_end_signal_id = - gtk_signal_connect (GTK_OBJECT (iv->loader), "load_end", - GTK_SIGNAL_FUNC (cb_loader_load_end), - iv); + g_signal_connect (G_OBJECT (iv->loader), "load_end", + G_CALLBACK (cb_loader_load_end), + iv); gimv_image_loader_set_image_info (iv->loader, iv->info); gimv_image_loader_set_as_animation (iv->loader, TRUE); @@ -2997,8 +2985,8 @@ cb_loader_load_restart (GimvImageLoader *loader, GimvImageView *iv) { if (iv->priv->loader_load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv->loader), - iv->priv->loader_load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv->loader), + iv->priv->loader_load_end_signal_id); iv->priv->loader_load_end_signal_id = 0; gimv_image_view_load_image_buf_start (iv); } @@ -3013,9 +3001,9 @@ gimv_image_view_cancel_loading (iv); iv->priv->loader_load_end_signal_id - = gtk_signal_connect (GTK_OBJECT (iv->loader), "load_end", - GTK_SIGNAL_FUNC (cb_loader_load_restart), - iv); + = g_signal_connect (G_OBJECT (iv->loader), "load_end", + G_CALLBACK (cb_loader_load_restart), + iv); } else { gimv_image_view_load_image_buf_start (iv); } @@ -3042,19 +3030,19 @@ gimv_image_loader_load_stop (iv->loader); if (iv->priv->loader_progress_update_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv->loader), - iv->priv->loader_progress_update_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv->loader), + iv->priv->loader_progress_update_signal_id); iv->priv->loader_progress_update_signal_id = 0; if (iv->priv->loader_load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv->loader), - iv->priv->loader_load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv->loader), + iv->priv->loader_load_end_signal_id); iv->priv->loader_load_end_signal_id = 0; /* - gtk_signal_emit (GTK_OBJECT(iv), - gimv_image_view_signals[LOAD_END_SIGNAL], - iv->info, TRUE); + g_signal_emit (G_OBJECT(iv), + gimv_image_view_signals[LOAD_END_SIGNAL], 0, + iv->info, TRUE); */ } @@ -3247,7 +3235,7 @@ gchar *path, *cache; if (iv->priv->load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv), iv->priv->load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv), iv->priv->load_end_signal_id); iv->priv->load_end_signal_id = 0; if (cancel) return; @@ -3293,10 +3281,10 @@ func_end: if (iv->priv->load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv), iv->priv->load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv), iv->priv->load_end_signal_id); iv->priv->load_end_signal_id = 0; - gtk_signal_emit (GTK_OBJECT(iv), gimv_image_view_signals[RENDERED_SIGNAL]); + g_signal_emit (G_OBJECT(iv), gimv_image_view_signals[RENDERED_SIGNAL], 0); } @@ -3306,18 +3294,16 @@ RotateData *data; if (iv->priv->load_end_signal_id) - gtk_signal_disconnect (GTK_OBJECT (iv), iv->priv->load_end_signal_id); + g_signal_handler_disconnect (G_OBJECT (iv), iv->priv->load_end_signal_id); data = g_new0 (RotateData, 1); data->angle = angle; if (gimv_image_view_need_load (iv)) { iv->priv->load_end_signal_id - = gtk_signal_connect_full (GTK_OBJECT (iv), "load_end", - GTK_SIGNAL_FUNC (cb_gimv_image_view_rotate_load_end), - NULL, - data, (GtkDestroyNotify) g_free, - FALSE, FALSE); + = g_signal_connect_data (G_OBJECT (iv), "load_end", + G_CALLBACK (cb_gimv_image_view_rotate_load_end), + data, (GClosureNotify) g_free, 0); gimv_image_view_load_image_buf (iv); } else { @@ -3449,8 +3435,8 @@ move_scrollbar_by_user = FALSE; - gtk_signal_emit_by_name (GTK_OBJECT(iv->hadj), "changed"); - gtk_signal_emit_by_name (GTK_OBJECT(iv->vadj), "changed"); + g_signal_emit_by_name (G_OBJECT(iv->hadj), "changed"); + g_signal_emit_by_name (G_OBJECT(iv->vadj), "changed"); move_scrollbar_by_user = TRUE; } @@ -3684,7 +3670,7 @@ iv->priv->image_list->remove_list_fn = remove_list_fn; iv->priv->image_list->list_fn_user_data = list_fn_user_data; - gtk_signal_emit (GTK_OBJECT(iv), gimv_image_view_signals[SET_LIST_SIGNAL]); + g_signal_emit (G_OBJECT(iv), gimv_image_view_signals[SET_LIST_SIGNAL], 0); } @@ -3707,7 +3693,7 @@ g_free (iv->priv->image_list); iv->priv->image_list = NULL; - gtk_signal_emit (GTK_OBJECT(iv), gimv_image_view_signals[UNSET_LIST_SIGNAL]); + g_signal_emit (G_OBJECT(iv), gimv_image_view_signals[UNSET_LIST_SIGNAL], 0); } @@ -4000,7 +3986,9 @@ } if (status == GimvImageViewPlayableDisable) { - gimv_icon_stock_change_widget_icon (iv->player.play_icon, "play"); + gtk_image_set_from_stock(GTK_IMAGE(iv->player.play_icon), + GTK_STOCK_MEDIA_PLAY, + GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_set_sensitive (iv->player.play, FALSE); gtk_widget_set_sensitive (iv->player.stop, FALSE); gtk_widget_set_sensitive (iv->player.fw, FALSE); @@ -4081,9 +4069,13 @@ } if (status == GimvImageViewPlayablePlay && playable->pause_fn) { - gimv_icon_stock_change_widget_icon (iv->player.play_icon, "pause"); - } else { - gimv_icon_stock_change_widget_icon (iv->player.play_icon, "play"); + gtk_image_set_from_stock(GTK_IMAGE(iv->player.play_icon), + GTK_STOCK_MEDIA_PAUSE, + GTK_ICON_SIZE_SMALL_TOOLBAR); + } else { + gtk_image_set_from_stock(GTK_IMAGE(iv->player.play_icon), + GTK_STOCK_MEDIA_PLAY, + GTK_ICON_SIZE_SMALL_TOOLBAR); } } @@ -4099,7 +4091,7 @@ if (iv->priv && !(iv->priv->player_flags & GimvImageViewSeekBarDraggingFlag)) { adj->value = pos; - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(adj), "value_changed"); } } diff -Nru gimageview-0.2.27/src/gimv_image_view_draw.c gimageview-0.3.0-0.20101117/src/gimv_image_view_draw.c --- gimageview-0.2.27/src/gimv_image_view_draw.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_view_draw.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,451 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_image_view_draw.c 1173 2007-10-21 11:58:09Z makeinu $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + +#include "gimv_anim.h" +#include "gimv_icon_stock.h" +#include "gimv_image_view.h" +#include "gimv_thumb_cache.h" +#include "prefs.h" + + +static gboolean cb_image_configure (GtkWidget *widget, + GdkEventConfigure *event, + GimvImageView *iv); +static gboolean cb_image_expose (GtkWidget *widget, + GdkEventExpose *event, + GimvImageView *iv); + +/* virtual functions */ +static GtkWidget *imageview_draw_create (GimvImageView *iv); +static void imageview_draw_create_thumbnail (GimvImageView *iv, + const gchar *type); + +static gboolean imageview_draw_is_playable (GimvImageView *iv, + GimvImageInfo *info); +static void imageview_animation_play (GimvImageView *iv); +static void imageview_animation_stop (GimvImageView *iv); +#if 0 +static void imageview_animation_pause (GimvImageView *iv); +#endif +static GimvImageViewPlayableStatus + imageview_draw_get_status (GimvImageView *iv); + + +static GimvImageViewPlayableIF imageview_draw_playable_table = { + is_playable_fn: imageview_draw_is_playable, + is_seekable_fn: NULL, + play_fn: imageview_animation_play, + stop_fn: imageview_animation_stop, +#if 0 + pause_fn: imageview_animation_pause, +#else + pause_fn: NULL, +#endif + forward_fn: NULL, + reverse_fn: NULL, + seek_fn: NULL, + eject_fn: NULL, + get_status_fn: imageview_draw_get_status, + get_length_fn: NULL, + get_position_fn: NULL, +}; + + +GimvImageViewPlugin imageview_draw_vfunc_table = { + label: GIMV_IMAGE_VIEW_DEFAULT_VIEW_MODE, + priority_hint: G_PRIORITY_LOW, + is_supported_fn: NULL, + create_fn: imageview_draw_create, + create_thumbnail_fn: imageview_draw_create_thumbnail, + fullscreen_fn: NULL, + + scalable: NULL, + rotatable: NULL, + playable: &imageview_draw_playable_table, +}; + + +static GHashTable *animation_id_table = NULL; +static GHashTable *create_thumbnail_id_table = NULL; + + +/***************************************************************************** + * + * callback functions + * + *****************************************************************************/ +static void +cb_destroy (GtkWidget *widget, GimvImageView *iv) +{ + g_return_if_fail (iv); + + imageview_animation_stop (iv); +} + + +static void +cb_load_end_create_thumbnail (GimvImageView *iv, GimvImageInfo *info, + gboolean cancel, gpointer data) +{ + GimvImage *imcache; + gchar *filename; + gboolean free_buf = GPOINTER_TO_INT (data); + gpointer id_p; + guint id; + + g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); + + id_p = g_hash_table_lookup (create_thumbnail_id_table, iv); + id = GPOINTER_TO_UINT (id_p); + if (id > 0) + g_signal_handler_disconnect (GTK_OBJECT (iv), id); + g_hash_table_remove (create_thumbnail_id_table, iv); + + if (cancel) return; + if (!iv->image) return; + if (iv->info != iv->loader->info) return; + + filename = gimv_image_info_get_path_with_archive (iv->info); + + /* FIXME: conf.cache_write_type is hard coded */ + imcache = gimv_thumb_cache_save (filename, + conf.cache_write_type, + iv->image, + iv->info); + + g_free (filename); + + if (free_buf) + gimv_image_view_free_image_buf (iv); + + if (imcache) { + g_object_unref (G_OBJECT (imcache)); + g_signal_emit_by_name (G_OBJECT (iv), + "thumbnail_created", + iv->info); + } +} + + +static void +cb_draw_area_map (GtkWidget *widget, GimvImageView *iv) +{ + if (iv->bg_color) { + gimv_image_view_set_bg_color (iv, + iv->bg_color->red, + iv->bg_color->green, + iv->bg_color->blue); + } + + /* set cursor */ + if (!iv->cursor) + iv->cursor = gimv_icon_stock_get_cursor (iv->draw_area->window, + CURSOR_HAND_OPEN); + gdk_window_set_cursor (iv->draw_area->window, iv->cursor); +} + + +static gboolean +cb_image_configure (GtkWidget *widget, GdkEventConfigure *event, GimvImageView *iv) +{ + gint width, height; + gint fwidth, fheight; + gint x_pos, y_pos; + + gimv_image_view_get_view_position (iv, &x_pos, &y_pos); + gimv_image_view_get_image_size (iv, &width, &height); + gimv_image_view_get_image_frame_size (iv, &fwidth, &fheight); + + if (fwidth < width) { + if (x_pos < 0 || x_pos < 0 - fwidth || x_pos > width) + x_pos = 0; + } else { + x_pos = (width - fwidth) / 2; + } + + if (fheight < height) { + if (y_pos < 0 || y_pos < 0 - fheight || y_pos > height) + y_pos = 0; + } else { + + y_pos = (height - fheight) / 2; + } + + gimv_image_view_set_view_position (iv, x_pos, y_pos); + gimv_image_view_draw_image (iv); + + return TRUE; +} + + +static gboolean +cb_image_expose (GtkWidget *widget, GdkEventExpose *event, GimvImageView *iv) +{ + gimv_image_view_draw_image (iv); + return TRUE; +} + + + +/***************************************************************************** + * + * other private functions + * + *****************************************************************************/ +static gboolean +timeout_animation (gpointer data) +{ + GimvImageView *iv = data; + gint idx, interval; + + if (!iv->image) goto END; + if (!GIMV_IS_ANIM (iv->image)) goto END; + + idx = gimv_anim_iterate ((GimvAnim *) iv->image); + + /* repeat */ + if (idx < 0) { + if (!gimv_anim_seek ((GimvAnim *) iv->image, 0)) + goto END; + } + + gimv_image_view_show_image (iv); + + interval = gimv_anim_get_interval ((GimvAnim *) iv->image); + if (interval > 0) { + guint timer = gtk_timeout_add (interval, timeout_animation, iv); + g_hash_table_insert (animation_id_table, + iv, GUINT_TO_POINTER (timer)); + } else { + goto END; + } + + return FALSE; + +END: + g_hash_table_remove (animation_id_table, iv); + gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); + return FALSE; +} + + +static gboolean +idle_animation_play (gpointer data) +{ + GimvImageView *iv = data; + gint interval; + + if (!GIMV_IS_IMAGE_VIEW (iv)) goto END; + if (!iv->info) goto END; + + if (!gimv_image_info_is_animation (iv->info)) goto END; + + imageview_animation_stop (iv); + + interval = gimv_anim_get_interval ((GimvAnim *) iv->image); + if (interval > 0) { + guint timer = gtk_timeout_add (interval, timeout_animation, iv); + g_hash_table_insert (animation_id_table, + iv, GUINT_TO_POINTER (timer)); + gimv_image_view_playable_set_status (iv, GimvImageViewPlayablePlay); + } else { + goto END; + } + + return FALSE; + +END: + g_hash_table_remove (animation_id_table, iv); + gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); + return FALSE; +} + + + +/***************************************************************************** + * + * Virtual functions + * + *****************************************************************************/ +static GtkWidget * +imageview_draw_create (GimvImageView *iv) +{ + GtkWidget *widget; + + if (!animation_id_table) + animation_id_table + = g_hash_table_new (g_direct_hash, g_direct_equal); + + if (!create_thumbnail_id_table) + create_thumbnail_id_table + = g_hash_table_new (g_direct_hash, g_direct_equal); + + widget = gtk_drawing_area_new (); + + g_signal_connect (G_OBJECT (widget), "destroy", + G_CALLBACK (cb_destroy), iv); + g_signal_connect_after (G_OBJECT (widget), "map", + G_CALLBACK (cb_draw_area_map), iv); + g_signal_connect (G_OBJECT (widget), "configure_event", + G_CALLBACK (cb_image_configure), iv); + g_signal_connect (G_OBJECT (widget), "expose_event", + G_CALLBACK (cb_image_expose), iv); + + gtk_widget_add_events (widget, + GDK_FOCUS_CHANGE + | GDK_BUTTON_PRESS_MASK | GDK_2BUTTON_PRESS + | GDK_KEY_PRESS | GDK_KEY_RELEASE + | GDK_BUTTON_RELEASE_MASK + | GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK); + + return widget; +} + + +static void +imageview_draw_create_thumbnail (GimvImageView *iv, const gchar *cache_write_type) +{ + if (!iv->image) { + gpointer id_p; + guint id; + + id_p = g_hash_table_lookup (create_thumbnail_id_table, iv); + id = GPOINTER_TO_UINT (id_p); + if (id > 0) + g_signal_handler_disconnect (GTK_OBJECT (iv), id); + id = g_signal_connect (G_OBJECT (iv), "load_end", + G_CALLBACK (cb_load_end_create_thumbnail), + GINT_TO_POINTER (TRUE)); + g_hash_table_insert (create_thumbnail_id_table, + iv, GUINT_TO_POINTER (id)); + gimv_image_view_load_image_buf (iv); + } else { + cb_load_end_create_thumbnail (iv, iv->info, + FALSE, GINT_TO_POINTER (FALSE)); + } +} + + +static gboolean +imageview_draw_is_playable (GimvImageView *iv, GimvImageInfo *info) +{ + g_return_val_if_fail (GIMV_IS_IMAGE_VIEW (iv), FALSE); + if (!info) return FALSE; + + return gimv_image_info_is_animation (info); +} + + +static void +imageview_animation_play (GimvImageView *iv) +{ + g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); + gtk_idle_add (idle_animation_play, iv); +} + + +#if 0 +static void +imageview_animation_stop (GimvImageView *iv) +{ + g_return_if_fail (iv); + + imageview_animation_pause (iv); + + if (!iv->info) return; + if (!gimv_image_info_is_animation (iv->info)) return; + + gimv_anim_seek ((GimvAnim *) iv->image, 0); + + imageview_show_image (iv); + + imageview_playable_set_status (iv, GimvImageViewPlayableStop); +} + + +static void +imageview_animation_pause (GimvImageView *iv) +{ + gpointer id_p; + guint id; + + g_return_if_fail (iv); + + if (!animation_id_table) return; + + id_p = g_hash_table_lookup (animation_id_table, iv); + id = GPOINTER_TO_UINT (id_p); + if (id > 0) + gtk_timeout_remove (id); + g_hash_table_remove (animation_id_table, iv); + + imageview_playable_set_status (iv, GimvImageViewPlayablePause); +} + +#else + +static void +imageview_animation_stop (GimvImageView *iv) +{ + gpointer id_p; + guint id; + + g_return_if_fail (iv); + + if (!animation_id_table) return; + + id_p = g_hash_table_lookup (animation_id_table, iv); + id = GPOINTER_TO_UINT (id_p); + if (id > 0) + gtk_timeout_remove (id); + g_hash_table_remove (animation_id_table, iv); + + gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); +} + +#endif + + +static GimvImageViewPlayableStatus +imageview_draw_get_status (GimvImageView *iv) +{ + gpointer timer_p; + guint timer; + + g_return_val_if_fail (GIMV_IS_IMAGE_VIEW (iv), GimvImageViewPlayableDisable); + + if (!iv->info || !gimv_image_info_is_animation (iv->info)) + return GimvImageViewPlayableDisable; + + timer_p = g_hash_table_lookup (animation_id_table, iv); + timer = GPOINTER_TO_UINT (timer_p); + if (timer > 0) + return GimvImageViewPlayablePlay; + else + return GimvImageViewPlayableStop; +} diff -Nru gimageview-0.2.27/src/gimv_image_view.h gimageview-0.3.0-0.20101117/src/gimv_image_view.h --- gimageview-0.2.27/src/gimv_image_view.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_view.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_view.h,v 1.11 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_image_view.h 1142 2007-10-17 13:02:27Z makeinu $ */ #ifndef __GIMV_IMAGE_VIEW_H__ @@ -31,10 +31,11 @@ #include "gimv_image_loader.h" #define GIMV_TYPE_IMAGE_VIEW (gimv_image_view_get_type ()) -#define GIMV_IMAGE_VIEW(obj) (GTK_CHECK_CAST (obj, gimv_image_view_get_type (), GimvImageView)) -#define GIMV_IMAGE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_image_view_get_type, GimvImageViewClass)) -#define GIMV_IS_IMAGE_VIEW(obj) (GTK_CHECK_TYPE (obj, gimv_image_view_get_type ())) -#define GIMV_IS_IMAGE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_VIEW)) +#define GIMV_IMAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE_VIEW, GimvImageView)) +#define GIMV_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE_VIEW, GimvImageViewClass)) +#define GIMV_IS_IMAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE_VIEW)) +#define GIMV_IS_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_VIEW)) +#define GIMV_IMAGE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE_VIEW, GimvImageViewClass)) #define GIMV_IMAGE_VIEW_DEFAULT_VIEW_MODE N_("Default Image Viewer") @@ -201,7 +202,7 @@ GList *gimv_image_view_get_list (void); -GtkType gimv_image_view_get_type (void); +GType gimv_image_view_get_type (void); GtkWidget *gimv_image_view_new (GimvImageInfo *info); void gimv_image_view_change_image (GimvImageView *iv, diff -Nru gimageview-0.2.27/src/gimv_image_win.c gimageview-0.3.0-0.20101117/src/gimv_image_win.c --- gimageview-0.2.27/src/gimv_image_win.c 2004-12-20 15:57:07.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_win.c,v 1.19 2004/12/20 15:57:07 makeinu Exp $ + * $Id: gimv_image_win.c 1209 2009-01-13 05:31:59Z makeinu $ */ #include @@ -26,10 +26,6 @@ #include "gimageview.h" -#include "charset.h" -#include "cursors.h" -#include "gtk2-compat.h" -#include "gtkutils.h" #include "gimv_comment_view.h" #include "gimv_icon_stock.h" #include "gimv_image_view.h" @@ -37,11 +33,13 @@ #include "gimv_prefs_win.h" #include "gimv_thumb_win.h" #include "help.h" -#include "menu.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_gtk.h" +#include "utils_menu.h" #ifdef ENABLE_EXIF -# include "exif_view.h" +# include "gimv_exif_view.h" #endif /* ENABLE_EXIF */ @@ -99,9 +97,7 @@ }; -static void gimv_image_win_class_init (GimvImageWinClass *klass); -static void gimv_image_win_init (GimvImageWin *iw); -static void gimv_image_win_destroy (GtkObject *object); +static void gimv_image_win_dispose (GObject *object); static void gimv_image_win_realize (GtkWidget *widget); static void gimv_image_win_real_show_fullscreen (GimvImageWin *iw); static void gimv_image_win_real_hide_fullscreen (GimvImageWin *iw); @@ -282,7 +278,9 @@ {N_("/_Edit"), NULL, NULL, 0, ""}, {N_("/_Edit/Edit _Comment..."), NULL, cb_edit_comment, 0, NULL}, +#ifdef ENABLE_EXIF {N_("/_Edit/Scan E_XIF Data..."), NULL, cb_exif, 0, NULL}, +#endif /* ENABLE_EXIF */ {N_("/_Edit/Create _Thumbnail"), "T", cb_create_thumb, 0, NULL}, {N_("/_Edit/---"), NULL, NULL, 0, ""}, {N_("/_Edit/_Options..."), "O", cb_options, 0, NULL}, @@ -293,7 +291,7 @@ {N_("/M_ovie"), NULL, NULL, 0, ""}, - {N_("/_Help"), NULL, NULL, 0, ""}, + {N_("/_Help"), NULL, NULL, 0, ""}, {NULL, NULL, NULL, 0, NULL}, }; @@ -335,7 +333,6 @@ }; -static GtkWindowClass *parent_class = NULL; static gint gimv_image_win_signals[LAST_SIGNAL] = {0}; @@ -343,59 +340,36 @@ static GimvImageWin *shared_img_win = NULL; -GtkType -gimv_image_win_get_type (void) -{ - static GtkType gimv_image_win_type = 0; - - if (!gimv_image_win_type) { - static const GtkTypeInfo gimv_image_win_info = { - "GimvImageWin", - sizeof (GimvImageWin), - sizeof (GimvImageWinClass), - (GtkClassInitFunc) gimv_image_win_class_init, - (GtkObjectInitFunc) gimv_image_win_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_image_win_type = gtk_type_unique (GTK_TYPE_WINDOW, - &gimv_image_win_info); - } - - return gimv_image_win_type; -} +G_DEFINE_TYPE (GimvImageWin, gimv_image_win, GTK_TYPE_WINDOW) static void gimv_image_win_class_init (GimvImageWinClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) klass; + gobject_class = (GObjectClass *) klass; widget_class = (GtkWidgetClass *) klass; - parent_class = gtk_type_class (GTK_TYPE_WINDOW); gimv_image_win_signals[SHOW_FULLSCREEN_SIGNAL] - = gtk_signal_new ("show_fullscreen", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageWinClass, show_fullscreen), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + = g_signal_new ("show_fullscreen", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageWinClass, show_fullscreen), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gimv_image_win_signals[HIDE_FULLSCREEN_SIGNAL] - = gtk_signal_new ("hide_fullscreen", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvImageWinClass, hide_fullscreen), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, gimv_image_win_signals, LAST_SIGNAL); + = g_signal_new ("hide_fullscreen", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvImageWinClass, hide_fullscreen), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - object_class->destroy = gimv_image_win_destroy; + gobject_class->dispose = gimv_image_win_dispose; widget_class->realize = gimv_image_win_realize; @@ -438,7 +412,7 @@ iw->priv->slideshow_interval = conf.slideshow_interval * 1000; iw->priv->slideshow_timer_id = 0; if (conf.slideshow_repeat) - iw->priv->flags |= GimvImageWinSlideShowRepeatFlag; + iw->priv->flags |= GimvImageWinSlideshowRepeatFlag; /* set bg color */ if (conf.imgwin_set_bg) { @@ -522,38 +496,38 @@ TRUE, TRUE, 0); gtk_widget_show (GTK_WIDGET (iw->iv)); - gtk_signal_connect (GTK_OBJECT (iw->iv), "image_changed", - GTK_SIGNAL_FUNC (cb_image_changed), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "load_start", - GTK_SIGNAL_FUNC (cb_load_start), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "load_end", - GTK_SIGNAL_FUNC (cb_load_end), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "set_list", - GTK_SIGNAL_FUNC (cb_set_list), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "unset_list", - GTK_SIGNAL_FUNC (cb_unset_list), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "rendered", - GTK_SIGNAL_FUNC (cb_rendered), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "toggle_aspect", - GTK_SIGNAL_FUNC (cb_toggle_aspect), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "image_pressed", - GTK_SIGNAL_FUNC (cb_imageview_pressed), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv), "image_clicked", - GTK_SIGNAL_FUNC (cb_imageview_clicked), iw); - gtk_signal_connect (GTK_OBJECT (iw->iv->draw_area), "key_press_event", - GTK_SIGNAL_FUNC (cb_draw_area_key_press), iw); + g_signal_connect (G_OBJECT (iw->iv), "image_changed", + G_CALLBACK (cb_image_changed), iw); + g_signal_connect (G_OBJECT (iw->iv), "load_start", + G_CALLBACK (cb_load_start), iw); + g_signal_connect (G_OBJECT (iw->iv), "load_end", + G_CALLBACK (cb_load_end), iw); + g_signal_connect (G_OBJECT (iw->iv), "set_list", + G_CALLBACK (cb_set_list), iw); + g_signal_connect (G_OBJECT (iw->iv), "unset_list", + G_CALLBACK (cb_unset_list), iw); + g_signal_connect (G_OBJECT (iw->iv), "rendered", + G_CALLBACK (cb_rendered), iw); + g_signal_connect (G_OBJECT (iw->iv), "toggle_aspect", + G_CALLBACK (cb_toggle_aspect), iw); + g_signal_connect (G_OBJECT (iw->iv), "image_pressed", + G_CALLBACK (cb_imageview_pressed), iw); + g_signal_connect (G_OBJECT (iw->iv), "image_clicked", + G_CALLBACK (cb_imageview_clicked), iw); + g_signal_connect (G_OBJECT (iw->iv->draw_area), "key_press_event", + G_CALLBACK (cb_draw_area_key_press), iw); iw->player.seekbar = gtk_hscale_new (GTK_ADJUSTMENT (adj)); gtk_scale_set_draw_value (GTK_SCALE (iw->player.seekbar), FALSE); gtk_box_pack_start (GTK_BOX (hbox), iw->player.seekbar, TRUE, TRUE, 0); gtk_widget_show (iw->player.seekbar); - gtk_signal_connect (GTK_OBJECT (iw->player.seekbar), - "button_press_event", - GTK_SIGNAL_FUNC (cb_seekbar_pressed), iw); - gtk_signal_connect (GTK_OBJECT (iw->player.seekbar), - "button_release_event", - GTK_SIGNAL_FUNC (cb_seekbar_released), iw); + g_signal_connect (G_OBJECT (iw->player.seekbar), + "button_press_event", + G_CALLBACK (cb_seekbar_pressed), iw); + g_signal_connect (G_OBJECT (iw->player.seekbar), + "button_release_event", + G_CALLBACK (cb_seekbar_released), iw); gtk_toolbar_set_style (GTK_TOOLBAR(iw->player_bar), conf.imgwin_toolbar_style); @@ -570,17 +544,19 @@ gtk_widget_show (hbox); iw->status_bar1 = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(iw->status_bar1), FALSE); gtk_widget_set_name (iw->status_bar1, "StatuBar1"); gtk_container_border_width (GTK_CONTAINER (iw->status_bar1), 1); - gtk_widget_set_usize(iw->status_bar1, 200, -1); + gtk_widget_set_size_request(iw->status_bar1, 200, -1); gtk_box_pack_start (GTK_BOX (hbox), iw->status_bar1, TRUE, TRUE, 0); gtk_statusbar_push(GTK_STATUSBAR (iw->status_bar1), 1, _("New Window")); gtk_widget_show (iw->status_bar1); iw->status_bar2 = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(iw->status_bar2), FALSE); gtk_widget_set_name (iw->status_bar1, "StatuBar2"); gtk_container_border_width (GTK_CONTAINER (iw->status_bar2), 1); - gtk_widget_set_usize(iw->status_bar2, 50, -1); + gtk_widget_set_size_request(iw->status_bar2, 50, -1); gtk_box_pack_start (GTK_BOX (hbox), iw->status_bar2, TRUE, TRUE, 0); gtk_widget_show (iw->status_bar2); @@ -612,7 +588,7 @@ GtkWidget * gimv_image_win_new (GimvImageInfo *info) { - GimvImageWin *iw = gtk_type_new (GIMV_TYPE_IMAGE_WIN); + GimvImageWin *iw = g_object_new (GIMV_TYPE_IMAGE_WIN, NULL); gimv_image_view_change_image (iw->iv, info); @@ -621,12 +597,12 @@ static void -gimv_image_win_destroy (GtkObject *object) +gimv_image_win_dispose (GObject *object) { GimvImageWin *iw = GIMV_IMAGE_WIN (object); if (iw->priv) { - if (iw->priv->flags & GimvImageWinSlideShowPlayingFlag) + if (iw->priv->flags & GimvImageWinSlideshowPlayingFlag) gimv_image_win_slideshow_stop (iw); if (g_list_length (ImageWinList) == 1 && conf.imgwin_save_win_state) @@ -640,10 +616,10 @@ } if (iw->iv) { - gtk_signal_disconnect_by_func (GTK_OBJECT (iw->iv), - (GtkSignalFunc) cb_set_list, iw); - gtk_signal_disconnect_by_func (GTK_OBJECT (iw->iv), - (GtkSignalFunc) cb_unset_list, iw); + g_signal_handlers_disconnect_by_func (G_OBJECT (iw->iv), + G_CALLBACK (cb_set_list), iw); + g_signal_handlers_disconnect_by_func (G_OBJECT (iw->iv), + G_CALLBACK (cb_unset_list), iw); iw->iv = NULL; } @@ -653,8 +629,8 @@ if (iw == shared_img_win) shared_img_win = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_image_win_parent_class)->dispose) + G_OBJECT_CLASS (gimv_image_win_parent_class)->dispose (object); /* quit when last window */ if (!gimv_image_win_get_list() && !gimv_thumb_win_get_list()) { @@ -668,8 +644,8 @@ { GimvImageWin *iw = GIMV_IMAGE_WIN (widget); - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); + if (GTK_WIDGET_CLASS (gimv_image_win_parent_class)->realize) + GTK_WIDGET_CLASS (gimv_image_win_parent_class)->realize (widget); if (iw->priv->flags & GimvImageWinHideFrameFlag) gdk_window_set_decorations (GTK_WIDGET(iw)->window, 0); @@ -694,9 +670,6 @@ gimv_image_win_menu_items, n_menu_items, "", iw); gtk_container_add(GTK_CONTAINER(iw->menubar_handle), iw->menubar); -#ifndef USE_GTK2 - gtk_menu_bar_set_shadow_type (GTK_MENU_BAR(iw->menubar), GTK_SHADOW_NONE); -#endif /* USE_GTK2 */ gtk_widget_show (iw->menubar); /* sub menu */ @@ -739,10 +712,10 @@ iw->iv->imageview_popup = iw->view_menu; /* initialize menubar check items */ - gtk_object_get (GTK_OBJECT (iw->iv), - "show_scrollbar", &show_scrollbar, - "keep_buffer", &keep_buffer, - NULL); + g_object_get (G_OBJECT (iw->iv), + "show_scrollbar", &show_scrollbar, + "keep_buffer", &keep_buffer, + NULL); menu_check_item_set_active (iw->menubar, "/File/Memory Buffer", keep_buffer); @@ -797,47 +770,51 @@ toolbar = gtkutil_create_toolbar (); /* file open button */ - iconw = gimv_icon_stock_get_widget ("nfolder"); + iconw = gtk_image_new_from_stock(GTK_STOCK_OPEN, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Open"), _("File Open"), _("File Open"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_open_button), + G_CALLBACK (cb_toolbar_open_button), NULL); /* preference button */ - iconw = gimv_icon_stock_get_widget ("prefs"); + iconw = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Prefs"), _("Preference"), _("Preference"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_prefs_button), + G_CALLBACK (cb_toolbar_prefs_button), iw); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); /* prev button */ - iconw = gimv_icon_stock_get_widget ("back"); + iconw = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Prev"), _("Previous Image"), _("Previous Image"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_prev_button), + G_CALLBACK (cb_toolbar_prev_button), iw); iw->button.prev = button; /* gtk_widget_set_sensitive (button, FALSE); */ /* next button */ - iconw = gimv_icon_stock_get_widget ("forward"); + iconw = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Next"), _("Next Image"), _("Next Image"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_next_button), + G_CALLBACK (cb_toolbar_next_button), iw); iw->button.next = button; /* gtk_widget_set_sensitive (button, FALSE); */ @@ -845,49 +822,53 @@ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); /* no zoom button */ - iconw = gimv_icon_stock_get_widget ("no_zoom"); + iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_100, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("No Zoom"), _("No Zoom"), _("No Zoom"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_no_zoom), + G_CALLBACK (cb_toolbar_no_zoom), iw); /* zoom in button */ - iconw = gimv_icon_stock_get_widget ("zoom_in"); + iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Zoom in"), _("Zoom in"), _("Zoom in"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_zoom_in), + G_CALLBACK (cb_toolbar_zoom_in), iw); /* zoom out button */ - iconw = gimv_icon_stock_get_widget ("zoom_out"); + iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Zoom out"), _("Zoom out"), _("Zoom out"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_zoom_out), + G_CALLBACK (cb_toolbar_zoom_out), iw); /* zoom fit button */ - iconw = gimv_icon_stock_get_widget ("zoom_fit"); + iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_FIT, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Zoom fit"), _("Zoom fit"), _("Zoom fit"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_zoom_fit), + G_CALLBACK (cb_toolbar_zoom_fit), iw); - gtk_object_get (GTK_OBJECT (iw->iv), - "x_scale", &x_scale, - "y_scale", &y_scale, - NULL); + g_object_get (G_OBJECT (iw->iv), + "x_scale", &x_scale, + "y_scale", &y_scale, + NULL); /* x scale spinner */ adj = (GtkAdjustment *) gtk_adjustment_new (x_scale, @@ -898,11 +879,11 @@ gtk_widget_set_name (spinner, "XScaleSpinner"); gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), spinner, _("X Scale"), _("X Scale")); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (cb_toolbar_keep_aspect), iw); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (cb_toolbar_keep_aspect), iw); iw->button.xscale = spinner; - gtk_signal_connect (GTK_OBJECT(spinner), "key-press-event", - GTK_SIGNAL_FUNC(cb_scale_spinner_key_press), iw); + g_signal_connect (G_OBJECT(spinner), "key-press-event", + G_CALLBACK(cb_scale_spinner_key_press), iw); /* y scale spinner */ adj = (GtkAdjustment *) gtk_adjustment_new (y_scale, @@ -916,13 +897,14 @@ iw->button.yscale = spinner; /* zoom button */ - iconw = gimv_icon_stock_get_widget ("zoom"); + iconw = gtk_image_new_from_stock(GTK_STOCK_OK, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Zoom"), _("Zoom"), _("Zoom"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_zoom), + G_CALLBACK (cb_toolbar_zoom), iw); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); @@ -930,8 +912,8 @@ /* rotate button */ menu = create_option_menu (rotate_labels, 1, cb_rotate_menu, iw); - gtk_signal_connect (GTK_OBJECT (menu), "button_press_event", - GTK_SIGNAL_FUNC (cb_rotate_menu_button_press), iw); + g_signal_connect (G_OBJECT (menu), "button_press_event", + G_CALLBACK (cb_rotate_menu_button_press), iw); gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), menu, _("Rotate"), _("Rotate the image")); iw->button.rotate = menu; @@ -945,18 +927,19 @@ _("Fit Window Size to Image"), _("Fit Window Size to Image"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_fit_window), + G_CALLBACK (cb_toolbar_fit_window), iw); /* fullscreen button */ - iconw = gimv_icon_stock_get_widget ("fullscreen"); + iconw = gtk_image_new_from_stock(GTK_STOCK_FULLSCREEN, + GTK_ICON_SIZE_SMALL_TOOLBAR); /* button = gtk_toggle_button_new (); */ button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Full"), _("Fullscreen"), _("Fullscreen"), iconw, - GTK_SIGNAL_FUNC (cb_toolbar_fullscreen), + G_CALLBACK (cb_toolbar_fullscreen), iw); gtk_widget_set_sensitive (iw->button.prev, FALSE); @@ -976,57 +959,63 @@ toolbar = gtkutil_create_toolbar (); /* previous button */ - iconw = gimv_icon_stock_get_widget ("prev_t"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PREVIOUS, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("First"), _("First"), _("First"), iconw, - GTK_SIGNAL_FUNC (cb_first_clicked), iw); + G_CALLBACK (cb_first_clicked), iw); iw->player.prev = button; /* Reverse button */ - iconw = gimv_icon_stock_get_widget ("rw"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_REWIND, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Prev"), _("Previous"), _("Previous"), iconw, - GTK_SIGNAL_FUNC (cb_prev_clicked), iw); + G_CALLBACK (cb_prev_clicked), iw); iw->player.rw = button; /* play button */ - iconw = gimv_icon_stock_get_widget ("play"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Play"), _("Play Slide Show"), _("Play Slide Show"), iconw, - GTK_SIGNAL_FUNC (cb_play_clicked), iw); + G_CALLBACK (cb_play_clicked), iw); iw->player.play = button; /* stop button */ - iconw = gimv_icon_stock_get_widget ("stop2"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Stop"), _("Stop Slide Show"), _("Stop Slide Show"), iconw, - GTK_SIGNAL_FUNC (cb_stop_clicked), iw); + G_CALLBACK (cb_stop_clicked), iw); iw->player.stop = button; /* Forward button */ - iconw = gimv_icon_stock_get_widget ("ff"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_FORWARD, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Next"), _("Next"), _("Next"), iconw, - GTK_SIGNAL_FUNC (cb_next_clicked), iw); + G_CALLBACK (cb_next_clicked), iw); iw->player.fw = button; /* Next button */ - iconw = gimv_icon_stock_get_widget ("next_t"); + iconw = gtk_image_new_from_stock(GTK_STOCK_MEDIA_NEXT, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), _("Last"), _("Last"), _("Last"), iconw, - GTK_SIGNAL_FUNC (cb_last_clicked), iw); + G_CALLBACK (cb_last_clicked), iw); iw->player.next = button; return toolbar; @@ -1042,13 +1031,15 @@ GimvImageViewOrientation rotate; if (!GIMV_IS_IMAGE_WIN (iw)) return; + if (!GIMV_IS_IMAGE_WIN (iw->iv)) return; + if (!GIMV_IS_IMAGE_WIN (iw->iv->info)) return; if (iw->priv->flags & GimvImageWinMaximizeFlag) return; if (iw->priv->flags & GimvImageWinFullScreenFlag) return; - gtk_object_get (GTK_OBJECT (iw->iv), - "x_scale", &x_scale, - "y_scale", &y_scale, - NULL); + g_object_get (G_OBJECT (iw->iv), + "x_scale", &x_scale, + "y_scale", &y_scale, + NULL); if (x_scale < 0.001 || y_scale < 0.001) return; rotate = gimv_image_view_get_orientation (iw->iv); @@ -1081,9 +1072,9 @@ if (GTK_WIDGET_VISIBLE (iw->iv->player_container)) y_size += iw->iv->player_container->allocation.height; - gtk_object_get (GTK_OBJECT (iw->iv), - "show_scrollbar", &show_scrollbar, - NULL); + g_object_get (G_OBJECT (iw->iv), + "show_scrollbar", &show_scrollbar, + NULL); if (show_scrollbar) { x_size += iw->iv->vscrollbar->allocation.width; y_size += iw->iv->hscrollbar->allocation.height; @@ -1129,9 +1120,9 @@ conf.charset_auto_detect_fn, conf.charset_filename_mode); - gtk_object_get (GTK_OBJECT (iw->iv), - "keep_buffer", &keep_buffer, - NULL); + g_object_get (G_OBJECT (iw->iv), + "keep_buffer", &keep_buffer, + NULL); if (tmpstr1 && tmpstr2 && *tmpstr1 && *tmpstr2) { if (keep_buffer) @@ -1180,9 +1171,9 @@ conf.charset_auto_detect_fn, conf.charset_filename_mode); - gtk_object_get (GTK_OBJECT (iw->iv), - "keep_buffer", &keep_buffer, - NULL); + g_object_get (G_OBJECT (iw->iv), + "keep_buffer", &keep_buffer, + NULL); if (tmpstr && *tmpstr) { if (keep_buffer) @@ -1247,9 +1238,9 @@ gimv_image_view_free_image_buf (iw->iv); } - gtk_object_set (GTK_OBJECT (iw->iv), - "keep_buffer", keep_buffer, - NULL); + g_object_set (G_OBJECT (iw->iv), + "keep_buffer", keep_buffer, + NULL); gimv_image_win_set_window_title (iw); gimv_image_win_set_statusbar_info (iw); @@ -1277,9 +1268,9 @@ { g_return_if_fail (GIMV_IS_IMAGE_WIN(iw)); - gtk_object_set (GTK_OBJECT (iw->iv), - "ignore_alpha", GTK_CHECK_MENU_ITEM (widget)->active, - NULL); + g_object_set (G_OBJECT (iw->iv), + "ignore_alpha", GTK_CHECK_MENU_ITEM (widget)->active, + NULL); gimv_image_view_show_image (iw->iv); } @@ -1443,8 +1434,8 @@ g_return_if_fail (GIMV_IS_IMAGE_WIN(iw)); if (iw->iv->info) - exif_view_create_window (gimv_image_info_get_path (iw->iv->info), - GTK_WINDOW (iw)); + gimv_exif_view_create_window (gimv_image_info_get_path (iw->iv->info), + GTK_WINDOW (iw)); } #endif /* ENABLE_EXIF */ @@ -1593,9 +1584,9 @@ g_return_if_fail (iw); - gtk_object_get (GTK_OBJECT (iw->iv), - "keep_aspect", &keep_aspect, - NULL); + g_object_get (G_OBJECT (iw->iv), + "keep_aspect", &keep_aspect, + NULL); if (!keep_aspect) return; @@ -1644,7 +1635,7 @@ { gint angle; g_return_if_fail (GTK_IS_MENU_ITEM (widget)); - angle = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + angle = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); switch (angle) { case 0: @@ -1762,7 +1753,7 @@ { g_return_val_if_fail (iw, FALSE); - iw->priv->flags |= GimvImageWinSlideShowSeekBarDraggingFlag; + iw->priv->flags |= GimvImageWinSlideshowSeekBarDraggingFlag; return FALSE; } @@ -1783,7 +1774,7 @@ gimv_image_view_nth (iw->iv, pos); - iw->priv->flags &= ~GimvImageWinSlideShowSeekBarDraggingFlag; + iw->priv->flags &= ~GimvImageWinSlideshowSeekBarDraggingFlag; return FALSE; } @@ -1800,7 +1791,7 @@ { g_return_if_fail (iw); - if (!(iw->priv->flags & GimvImageWinSlideShowSeekBarDraggingFlag)) { + if (!(iw->priv->flags & GimvImageWinSlideshowSeekBarDraggingFlag)) { gint pos; GtkAdjustment *adj; @@ -1933,11 +1924,11 @@ if (!(iw->priv->flags & GimvImageWinMaximizeFlag) && conf.imgwin_fit_to_image) gimv_image_win_set_win_size (iw); - gtk_object_get (GTK_OBJECT (iw->iv), - "x_scale", &x_scale, - "y_scale", &y_scale, - "orientation", &rotate, - NULL); + g_object_get (G_OBJECT (iw->iv), + "x_scale", &x_scale, + "y_scale", &y_scale, + "orientation", &rotate, + NULL); switch (rotate) { case GIMV_IMAGE_VIEW_ROTATE_0: @@ -2107,8 +2098,8 @@ g_return_if_fail (iw->iv->draw_area); g_return_if_fail (GTK_WIDGET_MAPPED (iw->iv->draw_area)); - cursor = cursor_get (iw->iv->draw_area->window, - CURSOR_HAND_OPEN); + cursor = gimv_icon_stock_get_cursor (iw->iv->draw_area->window, + CURSOR_HAND_OPEN); gdk_window_set_cursor (iw->iv->draw_area->window, cursor); gdk_cursor_destroy (cursor); @@ -2125,8 +2116,8 @@ g_return_if_fail (iw->iv->draw_area); g_return_if_fail (GTK_WIDGET_MAPPED (iw->iv->draw_area)); - cursor = cursor_get (iw->iv->draw_area->window, - CURSOR_VOID); + cursor = gimv_icon_stock_get_cursor (iw->iv->draw_area->window, + CURSOR_VOID); gdk_window_set_cursor (iw->iv->draw_area->window, cursor); gdk_cursor_destroy (cursor); @@ -2161,13 +2152,8 @@ break; } -#ifdef USE_GTK2 gtk_accel_groups_activate (G_OBJECT (iw), event->keyval, event->state); -#else /* USE_GTK2 */ - gtk_accel_groups_activate (GTK_OBJECT (iw), - event->keyval, event->state); -#endif /* USE_GTK2 */ return TRUE; } @@ -2224,8 +2210,8 @@ if (iw->fullscreen) return; - gtk_signal_emit (GTK_OBJECT(iw), - gimv_image_win_signals[SHOW_FULLSCREEN_SIGNAL]); + g_signal_emit (G_OBJECT(iw), + gimv_image_win_signals[SHOW_FULLSCREEN_SIGNAL], 0); } @@ -2236,8 +2222,8 @@ if (!iw->fullscreen) return; - gtk_signal_emit (GTK_OBJECT(iw), - gimv_image_win_signals[HIDE_FULLSCREEN_SIGNAL]); + g_signal_emit (G_OBJECT(iw), + gimv_image_win_signals[HIDE_FULLSCREEN_SIGNAL], 0); } @@ -2315,14 +2301,14 @@ gdk_screen_width (), gdk_screen_height ()); - gtk_signal_connect (GTK_OBJECT (iw->fullscreen), - "key_press_event", - (GtkSignalFunc) cb_fullscreen_key_press, - iw); - gtk_signal_connect (GTK_OBJECT (iw->fullscreen), - "motion_notify_event", - (GtkSignalFunc) cb_fullscreen_motion_notify, - iw); + g_signal_connect (G_OBJECT (iw->fullscreen), + "key_press_event", + G_CALLBACK (cb_fullscreen_key_press), + iw); + g_signal_connect (G_OBJECT (iw->fullscreen), + "motion_notify_event", + G_CALLBACK (cb_fullscreen_motion_notify), + iw); /* set draw widget */ if (iw->priv->fs_bg_color) { @@ -2332,10 +2318,10 @@ /* save current color */ style = gtk_widget_get_style (iw->iv->draw_area); *color = style->bg[GTK_STATE_NORMAL]; - gtk_object_set_data_full (GTK_OBJECT (iw->fullscreen), - "GimvImageWin::FullScreen::OrigColor", - color, - (GtkDestroyNotify) g_free); + g_object_set_data_full (G_OBJECT (iw->fullscreen), + "GimvImageWin::FullScreen::OrigColor", + color, + (GtkDestroyNotify) g_free); /* set bg color */ gimv_image_view_set_bg_color (iw->iv, @@ -2348,18 +2334,12 @@ need_resize = get_fullscreen_geometory (iw, &area); -#if (GTK_MAJOR_VERION >= 2) && (GTK_MINOR_VERSION >= 2) gdk_window_fullscreen (iw->fullscreen->window); if (need_resize) { - gtk_window_move (iw->fullscreen, area.x, area.y); + gtk_window_move (GTK_WINDOW (iw->fullscreen), area.x, area.y); gtk_window_resize (GTK_WINDOW (iw->fullscreen), area.width, area.height); } -#else /* (GTK_MAJOR_VERION >= 2) && (GTK_MINOR_VERSION >= 2) */ - gtk_widget_set_uposition (iw->fullscreen, area.x, area.y); - gtk_window_set_default_size (GTK_WINDOW (iw->fullscreen), - area.width, area.height); -#endif /* (GTK_MAJOR_VERION >= 2) && (GTK_MINOR_VERSION >= 2) */ gimv_image_view_set_fullscreen (iw->iv, GTK_WINDOW (iw->fullscreen)); @@ -2385,8 +2365,8 @@ g_return_if_fail (iw); /* restore draw widget */ - color = gtk_object_get_data (GTK_OBJECT (iw->fullscreen), - "GimvImageWin::FullScreen::OrigColor"); + color = g_object_get_data (G_OBJECT (iw->fullscreen), + "GimvImageWin::FullScreen::OrigColor"); if (color) gimv_image_view_set_bg_color (iw->iv, color->red, color->green, color->blue); @@ -2477,9 +2457,9 @@ * the user if both options are set together. */ - gtk_object_get (GTK_OBJECT (iw->iv), - "default_zoom", &default_zoom, - NULL); + g_object_get (G_OBJECT (iw->iv), + "default_zoom", &default_zoom, + NULL); if ((default_zoom > 1) && conf.imgwin_fit_to_image && !(iw->priv->flags & GimvImageWinMaximizeFlag)) { @@ -2519,10 +2499,10 @@ conf.imgwin_show_player = iw->priv->flags & GimvImageWinShowPlayerFlag; conf.imgwin_show_statusbar = iw->priv->flags & GimvImageWinShowStatusBarFlag; conf.imgview_player_visible = iw->priv->player_visible; - gtk_object_get (GTK_OBJECT (iw->iv), - "show_scrollbar", &conf.imgview_scrollbar, - "continuance_play", &conf.imgview_movie_continuance, - NULL); + g_object_get (G_OBJECT (iw->iv), + "show_scrollbar", &conf.imgview_scrollbar, + "continuance_play", &conf.imgview_movie_continuance, + NULL); } @@ -2581,8 +2561,8 @@ if ((current && !g_list_next (current) - && !(iw->priv->flags & GimvImageWinSlideShowRepeatFlag)) - || !(iw->priv->flags & GimvImageWinSlideShowPlayingFlag)) + && !(iw->priv->flags & GimvImageWinSlideshowRepeatFlag)) + || !(iw->priv->flags & GimvImageWinSlideshowPlayingFlag)) { gimv_image_win_slideshow_stop (iw); return FALSE; @@ -2608,7 +2588,7 @@ g_return_if_fail (iw); if (iw->priv->slideshow_interval > 0) { - iw->priv->flags |= GimvImageWinSlideShowPlayingFlag; + iw->priv->flags |= GimvImageWinSlideshowPlayingFlag; iw->priv->slideshow_timer_id = gtk_timeout_add (iw->priv->slideshow_interval, (GtkFunction) timeout_slideshow, iw); @@ -2624,9 +2604,9 @@ { g_return_if_fail (iw); - if (!(iw->priv->flags & GimvImageWinSlideShowPlayingFlag)) return; + if (!(iw->priv->flags & GimvImageWinSlideshowPlayingFlag)) return; - iw->priv->flags &= ~GimvImageWinSlideShowPlayingFlag; + iw->priv->flags &= ~GimvImageWinSlideshowPlayingFlag; if (iw->priv->slideshow_timer_id) gtk_timeout_remove (iw->priv->slideshow_timer_id); @@ -2643,7 +2623,7 @@ g_return_if_fail (iw); iw->priv->slideshow_interval = interval; - if (iw->priv->flags & GimvImageWinSlideShowPlayingFlag) { + if (iw->priv->flags & GimvImageWinSlideshowPlayingFlag) { gimv_image_win_slideshow_stop (iw); gimv_image_win_slideshow_play (iw); } @@ -2656,9 +2636,9 @@ g_return_if_fail (iw); if (repeat) - iw->priv->flags |= GimvImageWinSlideShowRepeatFlag; + iw->priv->flags |= GimvImageWinSlideshowRepeatFlag; else - iw->priv->flags &= ~GimvImageWinSlideShowRepeatFlag; + iw->priv->flags &= ~GimvImageWinSlideshowRepeatFlag; } diff -Nru gimageview-0.2.27/src/gimv_image_win.h gimageview-0.3.0-0.20101117/src/gimv_image_win.h --- gimageview-0.2.27/src/gimv_image_win.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_image_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_image_win.h,v 1.7 2004/03/07 11:53:31 makeinu Exp $ + * $Id: gimv_image_win.h 1159 2007-10-19 05:50:47Z makeinu $ */ #ifndef __GIMV_IMAGE_WIN_H__ @@ -27,18 +27,16 @@ #include "gimageview.h" #include "gimv_image_view.h" - #define GIMV_TYPE_IMAGE_WIN (gimv_image_win_get_type ()) -#define GIMV_IMAGE_WIN(obj) (GTK_CHECK_CAST (obj, gimv_image_win_get_type (), GimvImageWin)) -#define GIMV_IMAGE_WIN_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_image_win_get_type, GimvImageWinClass)) -#define GIMV_IS_IMAGE_WIN(obj) (GTK_CHECK_TYPE (obj, gimv_image_win_get_type ())) -#define GIMV_IS_IMAGE_WIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_WIN)) - +#define GIMV_IMAGE_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_IMAGE_WIN, GimvImageWin)) +#define GIMV_IMAGE_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_IMAGE_WIN, GimvImageWinClass)) +#define GIMV_IS_IMAGE_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_IMAGE_WIN)) +#define GIMV_IS_IMAGE_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_IMAGE_WIN)) +#define GIMV_IMAGE_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_IMAGE_WIN, GimvImageWinClass)) typedef struct GimvImageWinClass_Tag GimvImageWinClass; typedef struct GimvImageWinPriv_Tag GimvImageWinPriv; - typedef enum { GimvImageWinCreatingFlag = 1 << 0, GimvImageWinShowMenuBarFlag = 1 << 1, @@ -50,13 +48,12 @@ GimvImageWinMovieFlag = 1 << 7, GimvImageWinMaximizeFlag = 1 << 8, GimvImageWinFullScreenFlag = 1 << 9, - GimvImageWinSlideShowRepeatFlag = 1 << 10, - GimvImageWinSlideShowPlayingFlag = 1 << 11, - GimvImageWinSlideShowSeekBarDraggingFlag = 1 << 12, + GimvImageWinSlideshowRepeatFlag = 1 << 10, + GimvImageWinSlideshowPlayingFlag = 1 << 11, + GimvImageWinSlideshowSeekBarDraggingFlag = 1 << 12, GimvImageWinNotSaveStateFlag = 1 << 13 } GimvImageWinFlags; - struct GimvImageWin_Tag { GtkWindow parent; @@ -112,7 +109,6 @@ GimvImageWinPriv *priv; }; - struct GimvImageWinClass_Tag { GtkWindowClass parent_class; @@ -122,8 +118,7 @@ void (*hide_fullscreen) (GimvImageWin *iw); }; - -GtkType gimv_image_win_get_type (void); +GType gimv_image_win_get_type (void); GtkWidget *gimv_image_win_new (GimvImageInfo *info); GimvImageWin *gimv_image_win_open_window (GimvImageInfo *info); GimvImageWin *gimv_image_win_open_shared_window (GimvImageInfo *info); diff -Nru gimageview-0.2.27/src/gimv_io.c gimageview-0.3.0-0.20101117/src/gimv_io.c --- gimageview-0.2.27/src/gimv_io.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io.c,v 1.10 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_io.c 1036 2004-09-21 08:44:33Z makeinu $ */ #include diff -Nru gimageview-0.2.27/src/gimv_io_file.c gimageview-0.3.0-0.20101117/src/gimv_io_file.c --- gimageview-0.2.27/src/gimv_io_file.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io_file.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io_file.c,v 1.1 2003/06/18 09:26:56 makeinu Exp $ + * $Id: gimv_io_file.c 939 2003-06-18 09:26:56Z makeinu $ */ #include diff -Nru gimageview-0.2.27/src/gimv_io_file.h gimageview-0.3.0-0.20101117/src/gimv_io_file.h --- gimageview-0.2.27/src/gimv_io_file.h 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io_file.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io_file.h,v 1.1 2003/06/18 09:26:56 makeinu Exp $ + * $Id: gimv_io_file.h 939 2003-06-18 09:26:56Z makeinu $ */ #ifndef __GIMV_IO_FILE_H__ diff -Nru gimageview-0.2.27/src/gimv_io.h gimageview-0.3.0-0.20101117/src/gimv_io.h --- gimageview-0.2.27/src/gimv_io.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io.h,v 1.5 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_io.h 1036 2004-09-21 08:44:33Z makeinu $ */ #ifndef __GIMV_IO__ diff -Nru gimageview-0.2.27/src/gimv_io_mem.c gimageview-0.3.0-0.20101117/src/gimv_io_mem.c --- gimageview-0.2.27/src/gimv_io_mem.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io_mem.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io_mem.c,v 1.2 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_io_mem.c 1036 2004-09-21 08:44:33Z makeinu $ */ #include "gimv_io_mem.h" diff -Nru gimageview-0.2.27/src/gimv_io_mem.h gimageview-0.3.0-0.20101117/src/gimv_io_mem.h --- gimageview-0.2.27/src/gimv_io_mem.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_io_mem.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_io_mem.h,v 1.1 2003/06/18 09:26:56 makeinu Exp $ + * $Id: gimv_io_mem.h 939 2003-06-18 09:26:56Z makeinu $ */ #ifndef __GIMV_IO_MEM_H__ diff -Nru gimageview-0.2.27/src/gimv_marshal.c gimageview-0.3.0-0.20101117/src/gimv_marshal.c --- gimageview-0.2.27/src/gimv_marshal.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_marshal.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_marshal.c,v 1.2 2003/06/13 09:43:31 makeinu Exp $ + * $Id: gimv_marshal.c 931 2003-06-13 09:43:48Z makeinu $ */ diff -Nru gimageview-0.2.27/src/gimv_marshal.h gimageview-0.3.0-0.20101117/src/gimv_marshal.h --- gimageview-0.2.27/src/gimv_marshal.h 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_marshal.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_marshal.h,v 1.2 2003/06/13 09:43:32 makeinu Exp $ + * $Id: gimv_marshal.h 931 2003-06-13 09:43:48Z makeinu $ */ diff -Nru gimageview-0.2.27/src/gimv_mime_types.c gimageview-0.3.0-0.20101117/src/gimv_mime_types.c --- gimageview-0.2.27/src/gimv_mime_types.c 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_mime_types.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_mime_types.c,v 1.2 2003/06/13 09:43:32 makeinu Exp $ + * $Id: gimv_mime_types.c 931 2003-06-13 09:43:48Z makeinu $ */ #include "gimv_mime_types.h" diff -Nru gimageview-0.2.27/src/gimv_mime_types.h gimageview-0.3.0-0.20101117/src/gimv_mime_types.h --- gimageview-0.2.27/src/gimv_mime_types.h 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_mime_types.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_mime_types.h,v 1.2 2003/06/13 09:43:32 makeinu Exp $ + * $Id: gimv_mime_types.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __GIMV_MIME_TYPES_H__ diff -Nru gimageview-0.2.27/src/gimv_nav_win.c gimageview-0.3.0-0.20101117/src/gimv_nav_win.c --- gimageview-0.2.27/src/gimv_nav_win.c 2004-05-23 14:07:41.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_nav_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_nav_win.c,v 1.4 2004/03/07 11:53:31 makeinu Exp $ + * $Id: gimv_nav_win.c 1147 2007-10-17 15:32:12Z makeinu $ */ /* @@ -30,29 +30,52 @@ #include #include "gimageview.h" - #include "gimv_nav_win.h" -#include "gtk2-compat.h" +G_DEFINE_TYPE (GimvNavWin, gimv_nav_win, GTK_TYPE_WINDOW) +#define GIMV_NAV_WIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GIMV_TYPE_NAV_WIN, GimvNavWinPrivate)) #define PEN_WIDTH 3 /* Square border width. */ #define BORDER_WIDTH 4 /* Window border width. */ - enum { MOVE_SIGNAL, LAST_SIGNAL }; +typedef struct GimvNavWinPrivate_Tag +{ + GtkWidget *out_frame; + GtkWidget *in_frame; + GtkWidget *preview; -static GtkWindowClass *parent_class = NULL; -static gint gimv_nav_win_signals[LAST_SIGNAL] = {0}; + GdkPixmap *pixmap; + GdkBitmap *mask; + GdkGC *gc; + + gint x_root, y_root; + + gint image_width, image_height; + + gint view_width, view_height; + gint view_pos_x, view_pos_y; + + gint popup_x, popup_y; + gint popup_width, popup_height; + + gint sqr_x, sqr_y; + gint sqr_width, sqr_height; + + gint fix_x_pos, fix_y_pos; + + gdouble factor; +} GimvNavWinPrivate; + +static gint gimv_nav_win_signals[LAST_SIGNAL] = {0}; /* object class */ -static void gimv_nav_win_class_init (GimvNavWinClass *klass); -static void gimv_nav_win_init (GimvNavWin *navwin); -static void gimv_nav_win_destroy (GtkObject *object); +static void gimv_nav_win_dispose (GObject *object); /* widget class */ static void gimv_nav_win_realize (GtkWidget *widget); @@ -81,42 +104,16 @@ static void navwin_set_win_pos_size (GimvNavWin *navwin); -GtkType -gimv_nav_win_get_type (void) -{ - static GtkType gimv_nav_win_type = 0; - - if (!gimv_nav_win_type) { - static const GtkTypeInfo gimv_nav_win_info = { - "GimvNavWin", - sizeof (GimvNavWin), - sizeof (GimvNavWinClass), - (GtkClassInitFunc) gimv_nav_win_class_init, - (GtkObjectInitFunc) gimv_nav_win_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_nav_win_type = gtk_type_unique (GTK_TYPE_WINDOW, - &gimv_nav_win_info); - } - - return gimv_nav_win_type; -} - - static void gimv_nav_win_class_init (GimvNavWinClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) klass; - widget_class = (GtkWidgetClass *) klass; - parent_class = gtk_type_class (GTK_TYPE_WINDOW); + gobject_class = (GObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; - object_class->destroy = gimv_nav_win_destroy; + gobject_class->dispose = gimv_nav_win_dispose; widget_class->realize = gimv_nav_win_realize; widget_class->unrealize = gimv_nav_win_unrealize; @@ -126,74 +123,73 @@ widget_class->motion_notify_event = gimv_nav_win_motion_notify; gimv_nav_win_signals[MOVE_SIGNAL] - = gtk_signal_new ("move", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GimvNavWinClass, move), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); - - gtk_object_class_add_signals (object_class, - gimv_nav_win_signals, - LAST_SIGNAL); + = g_signal_new ("move", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimvNavWinClass, move), + NULL, NULL, + gtk_marshal_NONE__INT_INT, + G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + + g_type_class_add_private (gobject_class, sizeof (GimvNavWinPrivate)); } static void gimv_nav_win_init (GimvNavWin *navwin) { - navwin->fix_x_pos = navwin->fix_x_pos = 1; + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->fix_x_pos = priv->fix_x_pos = 1; - navwin->gc = NULL; - navwin->pixmap = NULL; - navwin->mask = NULL; + priv->gc = NULL; + priv->pixmap = NULL; + priv->mask = NULL; - navwin->out_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (navwin->out_frame), GTK_SHADOW_OUT); - gtk_container_add (GTK_CONTAINER (navwin), navwin->out_frame); - gtk_widget_show (navwin->out_frame); + priv->out_frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (priv->out_frame), GTK_SHADOW_OUT); + gtk_container_add (GTK_CONTAINER (navwin), priv->out_frame); + gtk_widget_show (priv->out_frame); - navwin->in_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (navwin->in_frame), GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (navwin->out_frame), navwin->in_frame); - gtk_widget_show (navwin->in_frame); + priv->in_frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (priv->in_frame), GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (priv->out_frame), priv->in_frame); + gtk_widget_show (priv->in_frame); - navwin->preview = gtk_drawing_area_new (); - gtk_container_add (GTK_CONTAINER (navwin->in_frame), navwin->preview); - gtk_widget_show (navwin->preview); + priv->preview = gtk_drawing_area_new (); + gtk_container_add (GTK_CONTAINER (priv->in_frame), priv->preview); + gtk_widget_show (priv->preview); } static void -gimv_nav_win_destroy (GtkObject *object) +gimv_nav_win_dispose (GObject *object) { GimvNavWin *navwin = GIMV_NAV_WIN (object); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); - if (navwin->pixmap) - gdk_pixmap_unref (navwin->pixmap); - navwin->pixmap = NULL; + if (priv->pixmap) + gdk_pixmap_unref (priv->pixmap); + priv->pixmap = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_nav_win_parent_class)->dispose) + G_OBJECT_CLASS (gimv_nav_win_parent_class)->dispose (object); } static void gimv_nav_win_realize (GtkWidget *widget) { - GimvNavWin *navwin; - - g_return_if_fail (GIMV_IS_NAV_WIN (widget)); - - navwin = GIMV_NAV_WIN (widget); + GimvNavWin *navwin = GIMV_NAV_WIN (widget); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->realize) + GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->realize (widget); - if (!navwin->gc) { - navwin->gc = gdk_gc_new (widget->window); - gdk_gc_set_function (navwin->gc, GDK_INVERT); - gdk_gc_set_line_attributes (navwin->gc, + if (!priv->gc) { + priv->gc = gdk_gc_new (widget->window); + gdk_gc_set_function (priv->gc, GDK_INVERT); + gdk_gc_set_line_attributes (priv->gc, PEN_WIDTH, GDK_LINE_SOLID, GDK_CAP_BUTT, @@ -205,18 +201,15 @@ static void gimv_nav_win_unrealize (GtkWidget *widget) { - GimvNavWin *navwin; - - g_return_if_fail (GIMV_IS_NAV_WIN (widget)); + GimvNavWin *navwin = GIMV_NAV_WIN (widget); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); - navwin = GIMV_NAV_WIN (widget); + if (priv->gc) + gdk_gc_destroy (priv->gc); + priv->gc = NULL; - if (navwin->gc) - gdk_gc_destroy (navwin->gc); - navwin->gc = NULL; - - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->unrealize) + GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->unrealize (widget); } @@ -224,19 +217,15 @@ gimv_nav_win_expose (GtkWidget *widget, GdkEventExpose *event) { - GimvNavWin *navwin; - - g_return_val_if_fail (GIMV_IS_NAV_WIN (widget), FALSE); - - navwin = GIMV_NAV_WIN (widget); + GimvNavWin *navwin = GIMV_NAV_WIN (widget); navwin_draw (navwin); if(gtk_grab_get_current() != GTK_WIDGET (navwin)) navwin_grab_pointer(navwin); - if (GTK_WIDGET_CLASS (parent_class)->expose_event) - return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->expose_event) + return GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->expose_event (widget, event); return FALSE; } @@ -246,18 +235,15 @@ gimv_nav_win_key_press (GtkWidget *widget, GdkEventKey *event) { - GimvNavWin *navwin; + GimvNavWin *navwin = GIMV_NAV_WIN (widget); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); gboolean move = FALSE; gint mx, my; guint keyval; GdkModifierType modval; - g_return_val_if_fail (GIMV_IS_NAV_WIN (widget), FALSE); - - navwin = GIMV_NAV_WIN (widget); - - mx = navwin->view_pos_x; - my = navwin->view_pos_y; + mx = priv->view_pos_x; + my = priv->view_pos_y; keyval = event->keyval; modval = event->state; @@ -277,20 +263,20 @@ } if (move) { - if (navwin->fix_x_pos < 0) mx = navwin->fix_x_pos; - if (navwin->fix_y_pos < 0) my = navwin->fix_y_pos; - navwin->view_pos_x = mx; - navwin->view_pos_y = my; - gtk_signal_emit (GTK_OBJECT (navwin), - gimv_nav_win_signals[MOVE_SIGNAL], - mx, my); - mx *= navwin->factor; - my *= navwin->factor; + if (priv->fix_x_pos < 0) mx = priv->fix_x_pos; + if (priv->fix_y_pos < 0) my = priv->fix_y_pos; + priv->view_pos_x = mx; + priv->view_pos_y = my; + g_signal_emit (G_OBJECT (navwin), + gimv_nav_win_signals[MOVE_SIGNAL], 0, + mx, my); + mx *= priv->factor; + my *= priv->factor; navwin_draw_sqr (navwin, TRUE, mx, my); } - if (GTK_WIDGET_CLASS (parent_class)->key_press_event) - return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->key_press_event) + return GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->key_press_event (widget, event); return FALSE; } @@ -300,16 +286,12 @@ gimv_nav_win_button_release (GtkWidget *widget, GdkEventButton *event) { - GimvNavWin *navwin; - - g_return_val_if_fail (GIMV_IS_NAV_WIN (widget), FALSE); - - navwin = GIMV_NAV_WIN (widget); + GimvNavWin *navwin = GIMV_NAV_WIN (widget); switch (event->button) { case 1: - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), - "button_release_event"); + g_signal_stop_emission_by_name (G_OBJECT (widget), + "button_release_event"); gimv_nav_win_hide (navwin); /* gtk_widget_destroy (GTK_WIDGET (navwin)); */ return TRUE; @@ -318,8 +300,8 @@ break; } - if (GTK_WIDGET_CLASS (parent_class)->button_release_event) - return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->button_release_event) + return GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->button_release_event (widget, event); return FALSE; } @@ -329,15 +311,12 @@ gimv_nav_win_motion_notify (GtkWidget *widget, GdkEventMotion *event) { - GimvNavWin *navwin; + GimvNavWin *navwin = GIMV_NAV_WIN (widget); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); GdkModifierType mask; gint mx, my; gdouble x, y; - g_return_val_if_fail (GIMV_IS_NAV_WIN (widget), FALSE); - - navwin = GIMV_NAV_WIN (widget); - gdk_window_get_pointer (widget->window, &mx, &my, &mask); get_sqr_origin_as_double (navwin, mx, my, &x, &y); @@ -345,17 +324,17 @@ my = (gint) y; navwin_draw_sqr (navwin, TRUE, mx, my); - mx = (gint) (x / navwin->factor); - my = (gint) (y / navwin->factor); - if (navwin->fix_x_pos < 0) mx = navwin->fix_x_pos; - if (navwin->fix_y_pos < 0) my = navwin->fix_y_pos; - - gtk_signal_emit (GTK_OBJECT (navwin), - gimv_nav_win_signals[MOVE_SIGNAL], - mx, my); + mx = (gint) (x / priv->factor); + my = (gint) (y / priv->factor); + if (priv->fix_x_pos < 0) mx = priv->fix_x_pos; + if (priv->fix_y_pos < 0) my = priv->fix_y_pos; + + g_signal_emit (G_OBJECT (navwin), + gimv_nav_win_signals[MOVE_SIGNAL], 0, + mx, my); - if (GTK_WIDGET_CLASS (parent_class)->motion_notify_event) - return GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event); + if (GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->motion_notify_event) + return GTK_WIDGET_CLASS (gimv_nav_win_parent_class)->motion_notify_event (widget, event); return FALSE; } @@ -368,26 +347,28 @@ gint fpos_x, gint fpos_y) { GimvNavWin *navwin; + GimvNavWinPrivate *priv; g_return_val_if_fail (pixmap, NULL); - navwin = GIMV_NAV_WIN (gtk_object_new (GIMV_TYPE_NAV_WIN, - "type", GTK_WINDOW_POPUP, - NULL)); - - navwin->pixmap = gdk_pixmap_ref (pixmap); - if (mask) navwin->mask = gdk_bitmap_ref (mask); - - navwin->x_root = 0; - navwin->y_root = 0; - - navwin->image_width = image_width; - navwin->image_height = image_height; - - navwin->view_width = view_width; - navwin->view_height = view_height; - navwin->view_pos_x = fpos_x; - navwin->view_pos_y = fpos_y; + navwin = GIMV_NAV_WIN (g_object_new (GIMV_TYPE_NAV_WIN, + "type", GTK_WINDOW_POPUP, + NULL)); + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->pixmap = gdk_pixmap_ref (pixmap); + if (mask) priv->mask = gdk_bitmap_ref (mask); + + priv->x_root = 0; + priv->y_root = 0; + + priv->image_width = image_width; + priv->image_height = image_height; + + priv->view_width = view_width; + priv->view_height = view_height; + priv->view_pos_x = fpos_x; + priv->view_pos_y = fpos_y; navwin_update_view (navwin); @@ -398,10 +379,14 @@ void gimv_nav_win_show (GimvNavWin *navwin, gint x_root, gint y_root) { + GimvNavWinPrivate *priv; + g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); - navwin->x_root = x_root; - navwin->y_root = y_root; + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->x_root = x_root; + priv->y_root = y_root; navwin_update_view (navwin); navwin_set_win_pos_size (navwin); @@ -428,19 +413,23 @@ GdkPixmap *pixmap, GdkBitmap *mask, gint image_width, gint image_height) { + GimvNavWinPrivate *priv; + g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); g_return_if_fail (pixmap); - if (navwin->pixmap) - gdk_pixmap_unref (navwin->pixmap); - navwin->pixmap = NULL; - navwin->mask = NULL; + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + if (priv->pixmap) + gdk_pixmap_unref (priv->pixmap); + priv->pixmap = NULL; + priv->mask = NULL; - navwin->pixmap = gdk_pixmap_ref (pixmap); - if (mask) navwin->mask = gdk_bitmap_ref (mask); + priv->pixmap = gdk_pixmap_ref (pixmap); + if (mask) priv->mask = gdk_bitmap_ref (mask); - navwin->image_width = image_width; - navwin->image_height = image_height; + priv->image_width = image_width; + priv->image_height = image_height; if (GTK_WIDGET_MAPPED (navwin)) { navwin_update_view (navwin); @@ -454,10 +443,14 @@ gimv_nav_win_set_orig_image_size (GimvNavWin *navwin, gint width, gint height) { + GimvNavWinPrivate *priv; + g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); - navwin->image_width = width; - navwin->image_height = height; + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->image_width = width; + priv->image_height = height; if (GTK_WIDGET_MAPPED (navwin)) { navwin_update_view (navwin); @@ -470,10 +463,14 @@ gimv_nav_win_set_view_size (GimvNavWin *navwin, gint width, gint height) { + GimvNavWinPrivate *priv; + g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); - navwin->view_width = width; - navwin->view_height = height; + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->view_width = width; + priv->view_height = height; if (GTK_WIDGET_MAPPED (navwin)) { navwin_update_view (navwin); @@ -486,10 +483,14 @@ gimv_nav_win_set_view_position (GimvNavWin *navwin, gint x, gint y) { + GimvNavWinPrivate *priv; + g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); - navwin->view_pos_x = x; - navwin->view_pos_y = y; + priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + priv->view_pos_x = x; + priv->view_pos_y = y; if (GTK_WIDGET_MAPPED (navwin)) { navwin_update_view (navwin); @@ -510,33 +511,35 @@ gint x, gint y) { - if ((navwin->sqr_x == x) && (navwin->sqr_y == y) && undraw) + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + + if ((priv->sqr_x == x) && (priv->sqr_y == y) && undraw) return; - if ((navwin->sqr_x == 0) - && (navwin->sqr_y == 0) - && (navwin->sqr_width == navwin->popup_width) - && (navwin->sqr_height == navwin->popup_height)) + if ((priv->sqr_x == 0) + && (priv->sqr_y == 0) + && (priv->sqr_width == priv->popup_width) + && (priv->sqr_height == priv->popup_height)) return; if (undraw) { - gdk_draw_rectangle (navwin->preview->window, - navwin->gc, FALSE, - navwin->sqr_x + 1, - navwin->sqr_y + 1, - navwin->sqr_width - PEN_WIDTH, - navwin->sqr_height - PEN_WIDTH); + gdk_draw_rectangle (priv->preview->window, + priv->gc, FALSE, + priv->sqr_x + 1, + priv->sqr_y + 1, + priv->sqr_width - PEN_WIDTH, + priv->sqr_height - PEN_WIDTH); } - gdk_draw_rectangle (navwin->preview->window, - navwin->gc, FALSE, + gdk_draw_rectangle (priv->preview->window, + priv->gc, FALSE, x + 1, y + 1, - navwin->sqr_width - PEN_WIDTH, - navwin->sqr_height - PEN_WIDTH); + priv->sqr_width - PEN_WIDTH, + priv->sqr_height - PEN_WIDTH); - navwin->sqr_x = x; - navwin->sqr_y = y; + priv->sqr_x = x; + priv->sqr_y = y; } @@ -547,101 +550,105 @@ gdouble *x, gdouble *y) { + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); + *x = MIN (mx - BORDER_WIDTH, GIMV_NAV_WIN_SIZE); *y = MIN (my - BORDER_WIDTH, GIMV_NAV_WIN_SIZE); - if (*x - navwin->sqr_width / 2.0 < 0.0) - *x = navwin->sqr_width / 2.0; + if (*x - priv->sqr_width / 2.0 < 0.0) + *x = priv->sqr_width / 2.0; - if (*y - navwin->sqr_height / 2.0 < 0.0) - *y = navwin->sqr_height / 2.0; + if (*y - priv->sqr_height / 2.0 < 0.0) + *y = priv->sqr_height / 2.0; - if (*x + navwin->sqr_width / 2.0 > navwin->popup_width - 0) - *x = navwin->popup_width - 0 - navwin->sqr_width / 2.0; + if (*x + priv->sqr_width / 2.0 > priv->popup_width - 0) + *x = priv->popup_width - 0 - priv->sqr_width / 2.0; - if (*y + navwin->sqr_height / 2.0 > navwin->popup_height - 0) - *y = navwin->popup_height - 0 - navwin->sqr_height / 2.0; + if (*y + priv->sqr_height / 2.0 > priv->popup_height - 0) + *y = priv->popup_height - 0 - priv->sqr_height / 2.0; - *x = *x - navwin->sqr_width / 2.0; - *y = *y - navwin->sqr_height / 2.0; + *x = *x - priv->sqr_width / 2.0; + *y = *y - priv->sqr_height / 2.0; } static void navwin_update_view (GimvNavWin *navwin) { + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); gint popup_x, popup_y; gint popup_width, popup_height; gint w, h, x_pos, y_pos; gdouble factor; - w = navwin->image_width; - h = navwin->image_height; + w = priv->image_width; + h = priv->image_height; factor = MIN ((gdouble) (GIMV_NAV_WIN_SIZE) / w, (gdouble) (GIMV_NAV_WIN_SIZE) / h); - navwin->factor = factor; + priv->factor = factor; /* Popup window size. */ popup_width = MAX ((gint) floor (factor * w + 0.5), 1); popup_height = MAX ((gint) floor (factor * h + 0.5), 1); - gtk_drawing_area_size (GTK_DRAWING_AREA (navwin->preview), + gtk_drawing_area_size (GTK_DRAWING_AREA (priv->preview), popup_width, popup_height); /* The square. */ - x_pos = navwin->view_pos_x; - y_pos = navwin->view_pos_y; + x_pos = priv->view_pos_x; + y_pos = priv->view_pos_y; - navwin->sqr_width = navwin->view_width * factor; - navwin->sqr_width = MAX (navwin->sqr_width, BORDER_WIDTH); - navwin->sqr_width = MIN (navwin->sqr_width, popup_width); - - navwin->sqr_height = navwin->view_height * factor; - navwin->sqr_height = MAX (navwin->sqr_height, BORDER_WIDTH); - navwin->sqr_height = MIN (navwin->sqr_height, popup_height); - - navwin->sqr_x = x_pos * factor; - if (navwin->sqr_x < 0) navwin->sqr_x = 0; - navwin->sqr_y = y_pos * factor; - if (navwin->sqr_y < 0) navwin->sqr_y = 0; + priv->sqr_width = priv->view_width * factor; + priv->sqr_width = MAX (priv->sqr_width, BORDER_WIDTH); + priv->sqr_width = MIN (priv->sqr_width, popup_width); + + priv->sqr_height = priv->view_height * factor; + priv->sqr_height = MAX (priv->sqr_height, BORDER_WIDTH); + priv->sqr_height = MIN (priv->sqr_height, popup_height); + + priv->sqr_x = x_pos * factor; + if (priv->sqr_x < 0) priv->sqr_x = 0; + priv->sqr_y = y_pos * factor; + if (priv->sqr_y < 0) priv->sqr_y = 0; /* fix x (or y) if image is smaller than frame */ - if (navwin->view_width > navwin->image_width) - navwin->fix_x_pos = x_pos; + if (priv->view_width > priv->image_width) + priv->fix_x_pos = x_pos; else - navwin->fix_x_pos = 1; - if (navwin->view_height > navwin->image_height) - navwin->fix_y_pos = y_pos; + priv->fix_x_pos = 1; + if (priv->view_height > priv->image_height) + priv->fix_y_pos = y_pos; else - navwin->fix_y_pos = 1; + priv->fix_y_pos = 1; /* Popup window position. */ - popup_x = MIN (navwin->x_root - navwin->sqr_x + popup_x = MIN (priv->x_root - priv->sqr_x - BORDER_WIDTH - - navwin->sqr_width / 2, + - priv->sqr_width / 2, gdk_screen_width () - popup_width - BORDER_WIDTH * 2); - popup_y = MIN (navwin->y_root - navwin->sqr_y + popup_y = MIN (priv->y_root - priv->sqr_y - BORDER_WIDTH - - navwin->sqr_height / 2, + - priv->sqr_height / 2, gdk_screen_height () - popup_height - BORDER_WIDTH * 2); - navwin->popup_x = popup_x; - navwin->popup_y = popup_y; - navwin->popup_width = popup_width; - navwin->popup_height = popup_height; + priv->popup_x = popup_x; + priv->popup_y = popup_y; + priv->popup_width = popup_width; + priv->popup_height = popup_height; - navwin->view_pos_x = x_pos; - navwin->view_pos_y = y_pos; + priv->view_pos_x = x_pos; + priv->view_pos_y = y_pos; - gtk_widget_draw (navwin->preview, NULL); + gtk_widget_draw (priv->preview, NULL); } static void navwin_grab_pointer (GimvNavWin *navwin) { + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); GdkCursor *cursor; gtk_grab_add (GTK_WIDGET (navwin)); @@ -653,7 +660,7 @@ GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_EXTENSION_EVENTS_ALL, - navwin->preview->window, + priv->preview->window, cursor, 0); gdk_cursor_destroy (cursor); @@ -667,37 +674,28 @@ static void navwin_draw (GimvNavWin *navwin) { - g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); - gdk_draw_pixmap (navwin->preview->window, - navwin->preview->style->white_gc, - navwin->pixmap, + gdk_draw_pixmap (priv->preview->window, + priv->preview->style->white_gc, + priv->pixmap, 0, 0, 0, 0, -1, -1); navwin_draw_sqr (navwin, FALSE, - navwin->sqr_x, - navwin->sqr_y); + priv->sqr_x, + priv->sqr_y); } static void navwin_set_win_pos_size (GimvNavWin *navwin) { - g_return_if_fail (GIMV_IS_NAV_WIN (navwin)); + GimvNavWinPrivate *priv = GIMV_NAV_WIN_GET_PRIVATE (navwin); -#ifdef USE_GTK2 gtk_window_move (GTK_WINDOW (navwin), - navwin->popup_x, - navwin->popup_y); + priv->popup_x, + priv->popup_y); gtk_window_resize (GTK_WINDOW (navwin), - navwin->popup_width + BORDER_WIDTH * 2, - navwin->popup_height + BORDER_WIDTH * 2); -#else /* USE_GTK2 */ - gtk_widget_set_uposition (GTK_WIDGET (navwin), - navwin->popup_x, - navwin->popup_y); - gtk_widget_set_usize (GTK_WIDGET (navwin), - navwin->popup_width + BORDER_WIDTH * 2, - navwin->popup_height + BORDER_WIDTH * 2); -#endif /* USE_GTK2 */ + priv->popup_width + BORDER_WIDTH * 2, + priv->popup_height + BORDER_WIDTH * 2); } diff -Nru gimageview-0.2.27/src/gimv_nav_win.h gimageview-0.3.0-0.20101117/src/gimv_nav_win.h --- gimageview-0.2.27/src/gimv_nav_win.h 2004-05-23 14:07:41.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_nav_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_nav_win.h,v 1.2 2004/03/07 11:53:31 makeinu Exp $ + * $Id: gimv_nav_win.h 1147 2007-10-17 15:32:12Z makeinu $ */ /* @@ -32,54 +32,23 @@ #include "gimageview.h" - #define GIMV_TYPE_NAV_WIN (gimv_nav_win_get_type ()) -#define GIMV_NAV_WIN(obj) (GTK_CHECK_CAST (obj, gimv_nav_win_get_type (), GimvNavWin)) -#define GIMV_NAV_WIN_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_nav_win_get_type, GimvNavWinClass)) -#define GIMV_IS_NAV_WIN(obj) (GTK_CHECK_TYPE (obj, gimv_nav_win_get_type ())) -#define GIMV_IS_NAV_WIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_NAV_WIN)) - +#define GIMV_NAV_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_NAV_WIN, GimvNavWin)) +#define GIMV_NAV_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_NAV_WIN, GimvNavWinClass)) +#define GIMV_IS_NAV_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_NAV_WIN)) +#define GIMV_IS_NAV_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_NAV_WIN)) +#define GIMV_NAV_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_NAV_WIN, GimvNavWinClass)) #define GIMV_NAV_WIN_SIZE 128 /* Max size of the window. */ - typedef struct GimvNavWin_Tag GimvNavWin; -typedef struct GimvNavWinPriv_Tag GimvNavWinPriv; typedef struct GimvNavWinClass_Tag GimvNavWinClass; - struct GimvNavWin_Tag { GtkWindow parent; - - GtkWidget *out_frame; - GtkWidget *in_frame; - GtkWidget *preview; - - GdkPixmap *pixmap; - GdkBitmap *mask; - - GdkGC *gc; - - gint x_root, y_root; - - gint image_width, image_height; - - gint view_width, view_height; - gint view_pos_x, view_pos_y; - - gint popup_x, popup_y; - gint popup_width, popup_height; - - gint sqr_x, sqr_y; - gint sqr_width, sqr_height; - - gint fix_x_pos, fix_y_pos; - - gdouble factor; }; - struct GimvNavWinClass_Tag { GtkWindowClass parent_class; @@ -90,8 +59,7 @@ gint y); }; - -GtkType gimv_nav_win_get_type (void); +GType gimv_nav_win_get_type (void); GtkWidget *gimv_nav_win_new (GdkPixmap *pixmap, GdkBitmap *mask, gint image_width, diff -Nru gimageview-0.2.27/src/gimv_paned.c gimageview-0.3.0-0.20101117/src/gimv_paned.c --- gimageview-0.2.27/src/gimv_paned.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_paned.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,848 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_paned.c,v 1.2 2003/06/13 09:43:32 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#include "gimv_paned.h" - -#ifndef USE_NORMAL_PANED - -#ifndef GTK_OBJECT_GET_CLASS -#define GTK_OBJECT_GET_CLASS(object) \ - GTK_OBJECT (object)->klass -#endif - -char gray50_bits[] = {0x02, 0x01}; - -enum { - ARG_0, - ARG_GUTTER_SIZE -}; - -static void gimv_paned_class_init (GimvPanedClass *klass); -static void gimv_paned_init (GimvPaned *paned); -static void gimv_paned_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void gimv_paned_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void gimv_paned_realize (GtkWidget *widget); -static void gimv_paned_map (GtkWidget *widget); -static void gimv_paned_unmap (GtkWidget *widget); -static void gimv_paned_unrealize (GtkWidget *widget); -static gint gimv_paned_expose (GtkWidget *widget, - GdkEventExpose *event); -static void gimv_paned_add (GtkContainer *container, - GtkWidget *widget); -static void gimv_paned_remove (GtkContainer *container, - GtkWidget *widget); -static void gimv_paned_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); -static GtkType gimv_paned_child_type (GtkContainer *container); -static gint gimv_paned_motion (GtkWidget *widget, - GdkEventMotion *event); - - -static GtkContainerClass *parent_class = NULL; - - -GtkType -gimv_paned_get_type (void) -{ - static GtkType paned_type = 0; - - if (!paned_type) { - static const GtkTypeInfo paned_info = { - "GimvPaned", - sizeof (GimvPaned), - sizeof (GimvPanedClass), - (GtkClassInitFunc) gimv_paned_class_init, - (GtkObjectInitFunc) gimv_paned_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - paned_type = gtk_type_unique (GTK_TYPE_CONTAINER, &paned_info); - } - - return paned_type; -} - - -static void -gimv_paned_virtual_xor_line (GimvPaned *paned) -{ - g_warning ("gimv_paned_virtual_xor_line reached !"); -} - - -static void -gimv_paned_class_init (GimvPanedClass *class) -{ - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; - - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; - - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); - - object_class->set_arg = gimv_paned_set_arg; - object_class->get_arg = gimv_paned_get_arg; - - widget_class->realize = gimv_paned_realize; - widget_class->map = gimv_paned_map; - widget_class->unmap = gimv_paned_unmap; - widget_class->unrealize = gimv_paned_unrealize; - widget_class->expose_event = gimv_paned_expose; - widget_class->motion_notify_event = gimv_paned_motion; - - container_class->add = gimv_paned_add; - container_class->remove = gimv_paned_remove; - container_class->forall = gimv_paned_forall; - container_class->child_type = gimv_paned_child_type; - - class->xor_line = gimv_paned_virtual_xor_line; - - gtk_object_add_arg_type ("GimvPaned::gutter_size", GTK_TYPE_UINT, - GTK_ARG_READWRITE, ARG_GUTTER_SIZE); -} - - -static GtkType -gimv_paned_child_type (GtkContainer *container) -{ - if (!GIMV_PANED (container)->child1 || !GIMV_PANED (container)->child2) - return GTK_TYPE_WIDGET; - else - return GTK_TYPE_NONE; -} - - -static void -gimv_paned_init (GimvPaned *paned) -{ - GTK_WIDGET_UNSET_FLAGS (paned, GTK_NO_WINDOW); - - paned->child1 = NULL; - paned->child2 = NULL; - paned->handle = NULL; - paned->xor_gc = NULL; - - paned->gutter_size = 6; - paned->position_set = FALSE; - paned->last_allocation = -1; - paned->in_drag = FALSE; - - paned->handle_xpos = -1; - paned->handle_ypos = -1; - - paned->horizontal = TRUE; - - paned->child1_minsize = 0; - paned->child2_minsize = 0; - paned->child1_use_minsize = FALSE; - paned->child2_use_minsize = FALSE; - - paned->child_hidden = 0; -} - - -static void -gimv_paned_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) -{ - GimvPaned *paned = GIMV_PANED (object); - - switch (arg_id) { - case ARG_GUTTER_SIZE: - gimv_paned_set_gutter_size (paned, GTK_VALUE_UINT (*arg)); - break; - } -} - - -static void -gimv_paned_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) -{ - GimvPaned *paned = GIMV_PANED (object); - - switch (arg_id) { - case ARG_GUTTER_SIZE: - GTK_VALUE_UINT (*arg) = paned->gutter_size; - break; - default: - arg->type = GTK_TYPE_INVALID; - break; - } -} - - -static void -gimv_paned_realize (GtkWidget *widget) -{ - GimvPaned *paned; - GdkWindowAttr attributes; - gint attributes_mask; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - paned = GIMV_PANED (widget); - - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK; - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); - gdk_window_set_user_data (widget->window, paned); - - attributes.x = paned->handle_xpos; - attributes.y = paned->handle_ypos; - if (paned->horizontal) { - attributes.width = paned->gutter_size; - attributes.height = widget->allocation.height; - attributes.cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); - } else { - attributes.width = widget->allocation.width; - attributes.height = paned->gutter_size; - attributes.cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW); - } - attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK); - attributes_mask |= GDK_WA_CURSOR; - - paned->handle = gdk_window_new (widget->window, - &attributes, attributes_mask); - gdk_window_set_user_data (paned->handle, paned); - gdk_cursor_destroy (attributes.cursor); - - widget->style = gtk_style_attach (widget->style, widget->window); - - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); - gtk_style_set_background (widget->style, paned->handle, GTK_STATE_NORMAL); - - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); - - gdk_window_show (paned->handle); -} - - -static void -gimv_paned_map (GtkWidget *widget) -{ - GimvPaned *paned; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - paned = GIMV_PANED (widget); - - if (paned->child1 - && GTK_WIDGET_VISIBLE (paned->child1) - && !GTK_WIDGET_MAPPED (paned->child1)) - gtk_widget_map (paned->child1); - if (paned->child2 - && GTK_WIDGET_VISIBLE (paned->child2) - && !GTK_WIDGET_MAPPED (paned->child2)) - gtk_widget_map (paned->child2); - - gdk_window_show (widget->window); -} - - -static void -gimv_paned_unmap (GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); - - gdk_window_hide (widget->window); -} - - -static void -gimv_paned_unrealize (GtkWidget *widget) -{ - GimvPaned *paned; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - paned = GIMV_PANED (widget); - - if (paned->xor_gc) { - gdk_gc_destroy (paned->xor_gc); - paned->xor_gc = NULL; - } - - if (paned->handle) { - gdk_window_set_user_data (paned->handle, NULL); - gdk_window_destroy (paned->handle); - paned->handle = NULL; - } - - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); -} - - -static gint -gimv_paned_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GimvPaned *paned; - GdkEventExpose child_event; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - if (GTK_WIDGET_DRAWABLE (widget)) { - paned = GIMV_PANED (widget); - - /* An expose event for the handle */ - if (event->window == paned->handle) { - gint width, height; - - gdk_window_get_size (paned->handle, &width, &height); - - gtk_paint_flat_box (widget->style, paned->handle, - GTK_WIDGET_STATE (widget), - GTK_SHADOW_NONE, - &event->area, widget, "paned", - 0, 0, - width, height); - } else { - child_event = *event; - if (paned->child1 - && GTK_WIDGET_NO_WINDOW (paned->child1) - && gtk_widget_intersect (paned->child1, - &event->area, - &child_event.area)) - gtk_widget_event (paned->child1, - (GdkEvent*) &child_event); - - if (paned->child2 - && GTK_WIDGET_NO_WINDOW (paned->child2) - && gtk_widget_intersect (paned->child2, - &event->area, - &child_event.area)) - gtk_widget_event (paned->child2, - (GdkEvent*) &child_event); - } - } - return FALSE; -} - - -void -gimv_paned_add1 (GimvPaned *paned, - GtkWidget *widget) -{ - gimv_paned_pack1 (paned, widget, FALSE, TRUE); -} - - -void -gimv_paned_add2 (GimvPaned *paned, GtkWidget *widget) -{ - gimv_paned_pack2 (paned, widget, TRUE, TRUE); -} - - -void -gimv_paned_pack1 (GimvPaned *paned, - GtkWidget *child, - gboolean resize, - gboolean shrink) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - g_return_if_fail (GTK_IS_WIDGET (child)); - - if (!paned->child1) { - paned->child1 = child; - paned->child1_resize = resize; - paned->child1_shrink = shrink; - - gtk_widget_set_parent (child, GTK_WIDGET (paned)); - - if (GTK_WIDGET_REALIZED (child->parent)) - gtk_widget_realize (child); - - if (GTK_WIDGET_VISIBLE (child->parent) - && GTK_WIDGET_VISIBLE (child)) - { - if (GTK_WIDGET_MAPPED (child->parent)) - gtk_widget_map (child); - - gtk_widget_queue_resize (child); - } - } -} - - -void -gimv_paned_pack2 (GimvPaned *paned, - GtkWidget *child, - gboolean resize, - gboolean shrink) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - g_return_if_fail (GTK_IS_WIDGET (child)); - - if (!paned->child2) { - paned->child2 = child; - paned->child2_resize = resize; - paned->child2_shrink = shrink; - - gtk_widget_set_parent (child, GTK_WIDGET (paned)); - - if (GTK_WIDGET_REALIZED (child->parent)) - gtk_widget_realize (child); - - if (GTK_WIDGET_VISIBLE (child->parent) - && GTK_WIDGET_VISIBLE (child)) - { - if (GTK_WIDGET_MAPPED (child->parent)) - gtk_widget_map (child); - - gtk_widget_queue_resize (child); - } - } -} - - -static void -gimv_paned_add (GtkContainer *container, - GtkWidget *widget) -{ - GimvPaned *paned; - - g_return_if_fail (container != NULL); - g_return_if_fail (GIMV_IS_PANED (container)); - g_return_if_fail (widget != NULL); - - paned = GIMV_PANED (container); - - if (!paned->child1) - gimv_paned_add1 (GIMV_PANED (container),widget); - else if (!paned->child2) - gimv_paned_add2 (GIMV_PANED (container),widget); -} - - -static void -gimv_paned_remove (GtkContainer *container, - GtkWidget *widget) -{ - GimvPaned *paned; - gboolean was_visible; - - g_return_if_fail (container != NULL); - g_return_if_fail (GIMV_IS_PANED (container)); - g_return_if_fail (widget != NULL); - - paned = GIMV_PANED (container); - was_visible = GTK_WIDGET_VISIBLE (widget); - - if (paned->child1 == widget) { - gtk_widget_unparent (widget); - - paned->child1 = NULL; - - if (was_visible && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (GTK_WIDGET (container)); - } else if (paned->child2 == widget) { - gtk_widget_unparent (widget); - - paned->child2 = NULL; - - if (was_visible && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (GTK_WIDGET (container)); - } -} - - -static void -gimv_paned_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GimvPaned *paned; - - g_return_if_fail (container != NULL); - g_return_if_fail (GIMV_IS_PANED (container)); - g_return_if_fail (callback != NULL); - - paned = GIMV_PANED (container); - - if (paned->child1) - (* callback) (paned->child1, callback_data); - if (paned->child2) - (* callback) (paned->child2, callback_data); -} - - -void -gimv_paned_set_position (GimvPaned *paned, - gint position) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - if (position >= 0) { - /* We don't clamp here - the assumption is that - * if the total allocation changes at the same time - * as the position, the position set is with reference - * to the new total size. If only the position changes, - * then clamping will occur in gimv_paned_compute_position() - */ - paned->child1_size = position; - paned->position_set = TRUE; - - paned->child_hidden = 0; - } else - paned->position_set = FALSE; - - gtk_widget_queue_resize (GTK_WIDGET (paned)); -} - - -gint -gimv_paned_get_position (GimvPaned *paned) -{ - g_return_val_if_fail (paned != NULL, 0); - g_return_val_if_fail (GIMV_IS_PANED (paned), 0); - - return paned->child1_size; -} - - -void -gimv_paned_set_gutter_size (GimvPaned *paned, - guint16 size) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - paned->gutter_size = size; - - if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned))) - gtk_widget_queue_resize (GTK_WIDGET (paned)); -} - - -void -gimv_paned_xor_line (GimvPaned *paned) -{ - GIMV_PANED_CLASS (GTK_OBJECT_GET_CLASS (paned))->xor_line (paned); -} - - -/** - * gimv_paned_child1_use_minsize: Set a minimum size for child 1. - * @paned: The paned object. - * @use_minsize: Whether or not to use the minimum size option. - * @minsize: The minimun size to use if the option is enabled. - * - * If @use_minsize = TRUE then set @minsize as the minimal size child 1 can - * be set to. - * If @use_minsize = FALSE then disable this option, that is, child 1 can have - * any size. - **/ -void -gimv_paned_child1_use_minsize (GimvPaned *paned, - gboolean use_minsize, - gint minsize) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - paned->child1_use_minsize = use_minsize; - if (use_minsize) - paned->child1_minsize = minsize; -} - - -/** - * gimv_paned_child1_use_minsize: Set a minimum size for child 2. - * @paned: The paned object. - * @use_minsize: Whether or not to use the minimum size option. - * @minsize: The minimun size to use if the option is enabled. - * - * If @use_minsize = TRUE then set @minsize as the minimal size child 2 can - * be set to. - * If @use_minsize = FALSE then disable this option, that is, child 2 can have - * any size. - **/ -void -gimv_paned_child2_use_minsize (GimvPaned *paned, - gboolean use_minsize, - gint minsize) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - paned->child2_use_minsize = use_minsize; - if (use_minsize) - paned->child2_minsize = minsize; -} - - -void -gimv_paned_compute_position (GimvPaned *paned, - gint allocation, - gint child1_req, - gint child2_req) -{ - gint child2_size; - - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - paned->min_position = paned->child1_shrink ? 0 : child1_req; - - paned->max_position = allocation; - if (!paned->child2_shrink) - paned->max_position = MAX (1, paned->max_position - child2_req); - - if (!paned->position_set) { - if (paned->child1_resize && !paned->child2_resize) - paned->child1_size = MAX (1, allocation - child2_req); - else if (!paned->child1_resize && paned->child2_resize) - paned->child1_size = child1_req; - else if (child1_req + child2_req != 0) - paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req)); - else - paned->child1_size = allocation * 0.5; - } else { - /* If the position was set before the initial allocation. - * (paned->last_allocation <= 0) just clamp it and leave it. - */ - if (paned->last_allocation > 0) { - if (paned->child1_resize && !paned->child2_resize) - paned->child1_size += (allocation - paned->last_allocation); - else if (!(!paned->child1_resize && paned->child2_resize)) - paned->child1_size = allocation * ((gdouble)paned->child1_size / (paned->last_allocation)); - } - } - - paned->child1_size = CLAMP (paned->child1_size, - paned->min_position, - paned->max_position); - - child2_size = allocation - paned->child1_size; - - - /* Ensure that minimum sizes, if enabled, are respected. */ - if (paned->child1_use_minsize) { - if (paned->child1_size < paned->child1_minsize) - paned->child1_size = paned->child1_minsize; - } else if (paned->child2_use_minsize) { - if (child2_size < paned->child2_minsize) - paned->child1_size = paned->child2_minsize; - } - - if (paned->child_hidden == 1) - paned->child1_size = 0; - else if (paned->child_hidden == 2) { - paned->child1_size = allocation; - paned->child1_size += paned->gutter_size; - } - - paned->last_allocation = allocation; -} - - -/** - * gimv_paned_hide_child1: hide child 1. - * @paned: The paned widget. - * - * Hide the child number 1. - **/ -void -gimv_paned_hide_child1 (GimvPaned *paned) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - if (paned->child_hidden != 0) - return; - - paned->child_hidden = 1; - gtk_widget_queue_resize (GTK_WIDGET (paned)); -} - - -/** - * gimv_paned_hide_child2: collapse child 2. - * @paned: The paned widget. - * - * Hide the child number 2. - **/ -void -gimv_paned_hide_child2 (GimvPaned *paned) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - if (paned->child_hidden != 0) - return; - - paned->child_hidden = 2; - gtk_widget_queue_resize (GTK_WIDGET (paned)); -} - - -/** - * gimv_paned_split: split the paned widget in two halves. - * @paned: The paned widget. - * - * Give both children the same size. - **/ -void -gimv_paned_split (GimvPaned *paned) -{ - g_return_if_fail (paned != NULL); - g_return_if_fail (GIMV_IS_PANED (paned)); - - gimv_paned_set_position (paned, paned->last_allocation / 2); -} - - -guint -gimv_paned_which_hidden (GimvPaned *paned) -{ - g_return_val_if_fail (paned != NULL, 0); - g_return_val_if_fail (GIMV_IS_PANED (paned), 0); - - return paned->child_hidden; -} - - -static gint -gimv_paned_motion (GtkWidget *widget, - GdkEventMotion *event) -{ - GimvPaned *paned; - gint pos; - static gint last_size = -1; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget), FALSE); - - paned = GIMV_PANED (widget); - - if (event->is_hint || event->window != widget->window) { - if (paned->horizontal) - gtk_widget_get_pointer (widget, &pos, NULL); - else - gtk_widget_get_pointer (widget, NULL, &pos); - } else - pos = (paned->horizontal) ? event->x : event->y; - - if (paned->in_drag) { - gint child1_size, child2_size; - - child1_size = (pos - GTK_CONTAINER (paned)->border_width - - paned->gutter_size / 2); - child2_size = paned->last_allocation - child1_size; - - if (paned->child1_use_minsize - && (child1_size < paned->child1_minsize)) - child1_size = paned->child1_minsize; - - if (paned->child2_use_minsize - && (child2_size < paned->child2_minsize)) - child1_size = paned->last_allocation - paned->child2_minsize; - - /* Avoid blinking. */ - if (child1_size == last_size) - return FALSE; - - last_size = child1_size; - - gimv_paned_xor_line (paned); - paned->child1_size = CLAMP (child1_size, - paned->min_position, - paned->max_position); - gimv_paned_xor_line (paned); - } - - return FALSE; -} - -#else - -guint -gimv_paned_which_hidden (GimvPaned *paned) -{ - g_return_val_if_fail (GIMV_IS_PANED (paned), 0); - g_return_val_if_fail (paned->child1 && paned->child2, 0); - - if (!GTK_WIDGET_VISIBLE (paned->child1) - && GTK_WIDGET_VISIBLE (paned->child2)) - { - return 1; - - } else if (GTK_WIDGET_VISIBLE (paned->child1) - && !GTK_WIDGET_VISIBLE (paned->child2)) - { - return 2; - - } else { - return 0; - } -} - -#endif /* USE_NORMAL_PANED */ diff -Nru gimageview-0.2.27/src/gimv_paned.h gimageview-0.3.0-0.20101117/src/gimv_paned.h --- gimageview-0.2.27/src/gimv_paned.h 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_paned.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,187 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_paned.h,v 1.2 2003/06/13 09:43:32 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifndef __GIMV_PANED_H__ -#define __GIMV_PANED_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#ifndef USE_NORMAL_PANED - -#define GIMV_TYPE_PANED (gimv_paned_get_type ()) -#define GIMV_PANED(obj) (GTK_CHECK_CAST ((obj), GIMV_TYPE_PANED, GimvPaned)) -#define GIMV_PANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMV_TYPE_PANED, GimvPanedClass)) -#define GIMV_IS_PANED(obj) (GTK_CHECK_TYPE ((obj), GIMV_TYPE_PANED)) -#define GIMV_IS_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_PANED)) - -typedef struct _GimvPaned GimvPaned; -typedef struct _GimvPanedClass GimvPanedClass; - -struct _GimvPaned -{ - GtkContainer container; - - GtkWidget *child1; - GtkWidget *child2; - - GdkWindow *handle; - GdkGC *xor_gc; - - /*< public >*/ - guint16 gutter_size; - - /*< private >*/ - gint child1_size; - gint last_allocation; - gint min_position; - gint max_position; - - guint position_set : 1; - guint in_drag : 1; - guint child1_shrink : 1; - guint child1_resize : 1; - guint child2_shrink : 1; - guint child2_resize : 1; - - gint16 handle_xpos; - gint16 handle_ypos; - - /* whether it is an horizontal or a vertical paned. */ - guint horizontal : 1; - - /* minimal sizes for child1 and child2. (default value : 0) */ - gint child1_minsize; - gint child2_minsize; - - /* whether the minimal size option is enabled or not. */ - guint child1_use_minsize : 1; - guint child2_use_minsize : 1; - - /* stores what child is hiden, if any: - * 0 : no child collapsed. - * 1,2 : index of the collapsed child. */ - guint child_hidden : 2; -}; - -struct _GimvPanedClass -{ - GtkContainerClass parent_class; - - void (*xor_line) (GimvPaned *); -}; - - -GtkType gimv_paned_get_type (void); -void gimv_paned_add1 (GimvPaned *paned, - GtkWidget *child); -void gimv_paned_add2 (GimvPaned *paned, - GtkWidget *child); -void gimv_paned_pack1 (GimvPaned *paned, - GtkWidget *child, - gboolean resize, - gboolean shrink); -void gimv_paned_pack2 (GimvPaned *paned, - GtkWidget *child, - gboolean resize, - gboolean shrink); -void gimv_paned_set_position (GimvPaned *paned, - gint position); -gint gimv_paned_get_position (GimvPaned *paned); - -void gimv_paned_set_gutter_size (GimvPaned *paned, - guint16 size); - -void gimv_paned_xor_line (GimvPaned *paned); - -/* Set a minimal size for a child. Unset the collapse option if setted. */ -void gimv_paned_child1_use_minsize (GimvPaned *paned, - gboolean use_minsize, - gint minsize); -void gimv_paned_child2_use_minsize (GimvPaned *paned, - gboolean use_minsize, - gint minsize); - -void gimv_paned_hide_child1 (GimvPaned *paned); -void gimv_paned_hide_child2 (GimvPaned *paned); -void gimv_paned_split (GimvPaned *paned); -guint gimv_paned_which_hidden (GimvPaned *paned); - -/* Internal function */ -void gimv_paned_compute_position (GimvPaned *paned, - gint allocation, - gint child1_req, - gint child2_req); - -#define gray50_width 2 -#define gray50_height 2 -extern char gray50_bits[]; - -#else /* USE_NORMAL_PANED */ - -#include - -#define GimvPaned GtkPaned -#define GIMV_TYPE_PANED GTK_TYPE_PANED -#define GIMV_PANED(paned) GTK_PANED(paned) -#define GIMV_IS_PANED(obj) GTK_IS_PANED(paned) -#define GIMV_IS_PANED_CLASS(klass) GTK_IS_PANED_CLASS(paned) -#define gimv_paned_add1(paned, widget) gtk_paned_add1(paned, widget) -#define gimv_paned_add2(paned, widget) gtk_paned_add2(paned, widget) -#define gimv_paned_set_position(paned, size) gtk_paned_set_position(paned, size) -#define gimv_paned_get_position(paned) gtk_paned_get_position(paned) -#define gimv_paned_split(paned) \ -{ \ - gtk_widget_show (paned->child1); \ - gtk_widget_show (paned->child2); \ -} -#define gimv_paned_hide_child1(paned) gtk_widget_hide (paned->child1) -#define gimv_paned_hide_child2(paned) gtk_widget_hide (paned->child2) - -guint gimv_paned_which_hidden (GimvPaned *paned); - -#endif /* USE_NORMAL_PANED */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GIMV_PANED_H__ */ diff -Nru gimageview-0.2.27/src/gimv_plugin.c gimageview-0.3.0-0.20101117/src/gimv_plugin.c --- gimageview-0.2.27/src/gimv_plugin.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_plugin.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_plugin.c,v 1.6 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_plugin.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -27,10 +27,10 @@ #include "gimageview.h" -#include "fileutil.h" -#include "gfileutil.h" #include "gimv_plugin.h" #include "prefs.h" +#include "utils_file.h" +#include "utils_file_gtk.h" #define PLUGIN_RC_DIR "pluginrc" diff -Nru gimageview-0.2.27/src/gimv_plugin.h gimageview-0.3.0-0.20101117/src/gimv_plugin.h --- gimageview-0.2.27/src/gimv_plugin.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_plugin.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_plugin.h,v 1.4 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_plugin.h 1104 2007-10-12 07:55:54Z makeinu $ */ #ifndef __GIMV_PLUGIN_H__ @@ -34,11 +34,7 @@ #include "gimv_mime_types.h" #include "gimv_prefs_win.h" -#ifdef USE_GTK2 -# define GIMV_PLUGIN_IF_VERSION 20004 -#else -# define GIMV_PLUGIN_IF_VERSION 4 -#endif +#define GIMV_PLUGIN_IF_VERSION 20004 #define GIMV_PLUGIN_IO_STREAMER "IOStreamer" #define GIMV_PLUGIN_IMAGE_LOADER "ImageLoader" diff -Nru gimageview-0.2.27/src/gimv_prefs.c gimageview-0.3.0-0.20101117/src/gimv_prefs.c --- gimageview-0.2.27/src/gimv_prefs.c 2004-09-21 06:04:17.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1053 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Profile - * copyright (c) 2002-2003 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org - - * 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 - */ - -/* - * 2004-02-24 Takuro Ashie - * Adapt to GImageView. - * - * 2003-10-26 Takuro Ashie - * Copy section and key string before delete it. - * - * 2003-09-03 Takuro Ashie - * Added Kz and kz_ prefix. - * GObjectize. - * Remove also space befor a section when delete it. - * Added const keyword for value field of KzPrrofileList. - * - * 2003-08-28 Takuro Ashie - * Translated comments into English. - * - * 2003-08-27 Takuro Ashie - * Aggregated related codes into this file. - * Modified coding style. - * Simplize profile_open(). - */ - -#include "gimv_prefs.h" - -#include -#include -#include - -#include "gtk2-compat.h" - - -enum { - SECTION_ADDED_SIGNAL, - SECTION_DELETED_SIGNAL, - KEY_ADDED_SIGNAL, - KEY_DELETED_SIGNAL, - CHANGED_SIGNAL, - LAST_SIGNAL -}; - - -#define g_strlen(s) ((s)!=NULL?strlen(s):0) -#define g_strcmp(s1,s2) ((s1)!=NULL && (s2)!=NULL?strcmp(s1,s2):0) - - -static void gimv_prefs_class_init (GimvPrefsClass *klass); -static void gimv_prefs_init (GimvPrefs *profile); -static void gimv_prefs_destroy (GtkObject *object); - - -static GtkObjectClass *parent_class = NULL; - -static gint gimv_prefs_signals[LAST_SIGNAL] = {0}; - - -GtkType -gimv_prefs_get_type (void) -{ - static GtkType gimv_prefs_type = 0; - - if (!gimv_prefs_type) { - static const GtkTypeInfo gimv_prefs_info = { - "GimvPrefs", - sizeof (GimvPrefs), - sizeof (GimvPrefsClass), - (GtkClassInitFunc) gimv_prefs_class_init, - (GtkObjectInitFunc) gimv_prefs_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_prefs_type = gtk_type_unique (gtk_object_get_type (), - &gimv_prefs_info); - } - - return gimv_prefs_type; -} - - -static void -gimv_prefs_class_init (GimvPrefsClass *klass) -{ - GtkObjectClass *object_class; - - parent_class = gtk_type_class (gtk_object_get_type ()); - object_class = (GtkObjectClass *) klass; - - object_class->destroy = gimv_prefs_destroy; - - klass->section_added = NULL; - klass->section_deleted = NULL; - klass->key_added = NULL; - klass->key_deleted = NULL; - klass->changed = NULL; - - gimv_prefs_signals[SECTION_ADDED_SIGNAL] - = gtk_signal_new ("section-added", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvPrefsClass, section_added), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, - GTK_TYPE_STRING); - - gimv_prefs_signals[SECTION_DELETED_SIGNAL] - = gtk_signal_new ("section-deleted", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvPrefsClass, section_deleted), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, - GTK_TYPE_STRING); - - gimv_prefs_signals[KEY_ADDED_SIGNAL] - = gtk_signal_new ("key-added", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvPrefsClass, key_added), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, - GTK_TYPE_STRING, GTK_TYPE_STRING); - - gimv_prefs_signals[KEY_DELETED_SIGNAL] - = gtk_signal_new ("key-deleted", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvPrefsClass, key_deleted), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, - GTK_TYPE_STRING, GTK_TYPE_STRING); - - gimv_prefs_signals[CHANGED_SIGNAL] - = gtk_signal_new ("changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GimvPrefsClass, changed), - gtk_marshal_NONE__POINTER_POINTER_POINTER, - GTK_TYPE_NONE, 3, - GTK_TYPE_STRING, GTK_TYPE_STRING, GTK_TYPE_STRING); -} - - -static void -gimv_prefs_init (GimvPrefs *profile) -{ - profile->edit = FALSE; - profile->file = NULL; - profile->subfile = NULL; - profile->list = NULL; - profile->sublist = NULL; -} - - -static void -gimv_prefs_destroy (GtkObject *object) -{ - GimvPrefs *profile = GIMV_PREFS(object); - GimvPrefsList *p, *q; - - if (profile->file) - { - g_free(profile->file); - profile->file = NULL; - } - - if (profile->subfile) - { - g_free(profile->subfile); - profile->subfile = NULL; - } - - for (p = profile->list; p; p = q) - { - q = p->next; - g_free(p->data); - g_free(p->section); - g_free(p->key); - g_free(p); - } - profile->list = NULL; - - for (p = profile->sublist; p; p = q) - { - q = p->next; - g_free(p->data); - g_free(p->section); - g_free(p->key); - g_free(p); - } - profile->sublist = NULL; - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy(object); -} - - -GimvPrefs * -gimv_prefs_new (void) -{ - GimvPrefs *profile = GIMV_PREFS(gtk_object_new(GIMV_TYPE_PREFS, NULL)); - return profile; -} - - -/****************************************************************************** -* * -* Converting between numerical value and string functions * -* * -******************************************************************************/ -const static gchar hex[16]={'0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - -/* - * string -> value - * value,value - * str,string - * radix,radix - * flag,TRUE:signed,FALSE:unsigned - * RET,TRUE:normal exit,FALSE:error - */ -static gboolean -misc_str_to_val(gint *value,const gchar *str,const gint radix, - const gboolean flag) -{ - gchar c; - gint i,j,t; - - *value = 0; - for (i = 0; str[i] != '\0' && str[i] == ' '; i++); - if (str[i] == '\0') - return FALSE; - if (flag && str[i] == '-') - { - i++; - while (str[i] != '\0') - { - t = *value; - *value *= radix; - c = toupper(str[i]); - for (j = 0; j < radix; j++) - if (hex[j] == c) - break; - *value += j; - if (j == radix || *value < t) - { - *value = t; - return FALSE; - } - i++; - } - if (*value < 0) - { - *value = 0; - return FALSE; - } - *value =- *value; - } - else - { - while (str[i] != '\0') - { - t = *value; - *value *= radix; - c = toupper(str[i]); - for (j = 0; j < radix; j++) - if (hex[j] == c) - break; - *value += j; - if (j == radix || *value < t) - { - *value = t; - return FALSE; - } - i++; - } - } - return TRUE; -} - - -/* - * string -> array of value - * size,bytes - * text,string - * radix,radix - * flag,TRUE:signed,FALSE:unsigned - * RET,array of value - */ -static guint8 * -misc_str_to_array(gint *size,const gchar *text, - const gint radix,const gboolean flag) -{ - gchar *p; - guint8 *array = NULL; - gint i, j, value; - - *size = 0; - if (!text) - return NULL; - p = g_malloc((g_strlen(text) + 2) * sizeof(gchar)); - strcpy(p, text); - for (i = 0; p[i] != '\0'; i++) - { - for (j = 0; j < radix; j++) - if (p[i] == hex[j]) - break; - if (j >= radix) - p[i] = '\0'; - } - p[i+1] = '\0'; - i = 0; - while (p[i] != '\0') - { - if (!misc_str_to_val(&value, p+i, radix, flag)) - { - g_free(p); - g_free(array); - *size = 0; - return NULL; - } - array = g_realloc(array, *size + 1); - array[(*size)++] = value; - i += g_strlen(p + i) + 1; - } - g_free(p); - return array; -} - -/****************************************************************************** -* * -* Initialize file related functions * -* * -******************************************************************************/ -/* - * listize the file. - * file,file name - * RET,list - */ -static GimvPrefsList * -gimv_prefs_list (const gchar *file) -{ - gchar buf[256], *data = NULL, *tmp, *section = NULL; - gint n; - FILE *fio; - GimvPrefsList *p = NULL, *q, *r; - - fio = fopen(file, "rt"); - if (!fio) - return NULL; - while (fgets (buf, 256, fio)) - { - if (!data) - { - data = g_strdup(buf); - } - else - { - tmp = data; - data = g_strconcat(tmp, buf, NULL); - g_free(tmp); - } - n = data ? g_strlen(data) : 0; - if (n > 0 && data[n - 1] == '\n') - { - data[n - 1] = '\0'; - q = g_malloc0(sizeof(GimvPrefsList)); - q->data = data; - q->prev = p; - if (p) - p->next = q; - p = q; - data = NULL; - } - } - if (fclose(fio) != 0 || !p) - { - while (p) - { - q = p->prev; - g_free(p->data); - g_free(p); - p = q; - } - return NULL; - } - while (p->prev) - p = p->prev; - r = p; - /* arrange the list */ - while (p) - { - data = p->data ? g_strstrip(g_strdup(p->data)) : NULL; - n = data ? g_strlen(data) : 0; - if (n <= 0) - { - p->type = GIMV_PREFS_DATA_TYPE_SPACE; - } - else if (data[0] == '#' || data[0] == ';') - { - p->type = GIMV_PREFS_DATA_TYPE_COMMENT; - } - else if (data[0] == '[' && data[n - 1] == ']') - { - p->type = GIMV_PREFS_DATA_TYPE_SECTION; - g_free (section); - section = g_strdup(data + 1); - section[n - 2] = '\0'; - for (q = p->prev; q && q->type == GIMV_PREFS_DATA_TYPE_SPACE; - q = q->prev) - { - g_free(q->section); - q->section = NULL; - } - } - else if (strchr(data, '=')) - { - p->type = GIMV_PREFS_DATA_TYPE_KEY; - p->key = g_strdup(data); - *strchr(p->key, '=') = '\0'; - p->value = strchr(p->data, '=') + 1; - } - else - { - p->type = GIMV_PREFS_DATA_TYPE_UNKNOW; - } - p->section = g_strdup(section); - g_free(data); - p = p->next; - } - g_free (section); - return r; -} - - -/* - * Open the initialize file. - * file,file name - * RET,the GimvPrefs struct - */ -GimvPrefs * -gimv_prefs_open (const gchar *file, const gchar *subfile) -{ - GimvPrefs *profile; - - profile = gimv_prefs_new(); - - profile->subfile = subfile ? g_strdup(subfile) : NULL; - profile->sublist = profile->subfile - ? gimv_prefs_list(profile->subfile) : NULL; - - profile->file = file ? g_strdup(file) : NULL; - profile->list = profile->file - ? gimv_prefs_list(profile->file) : NULL; - - return profile; -} - - -/* - * Close the initialize file. - * profile,the GimvPrefs struct - * RET,TRUE:normal exit,FALSE:error - */ -gboolean -gimv_prefs_close (GimvPrefs *profile) -{ - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - gimv_prefs_save (profile); - gtk_object_destroy(GTK_OBJECT(profile)); - - return TRUE; -} - - -/* - * Save the initialize file. - * profile,the GimvPrefs struct - * RET,TRUE:normal exit,FALSE:error - */ -gboolean -gimv_prefs_save (GimvPrefs *profile) -{ - FILE *fio; - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - if (!profile->edit) return TRUE; - if (!profile->file) return FALSE; - - fio = fopen(profile->file, "wt"); - if (!fio) return FALSE; - - /* when the profile was modified */ - for (p = profile->list; p; p = p->next) - { - if (p->data) - fputs(p->data, fio); - fputc('\n', fio); - } - fclose(fio); - - profile->edit = FALSE; - - return TRUE; -} - - -/* - * Get a string from the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * key,name of the key - * RET,string,NULL:error - */ -gchar * -gimv_prefs_get_string (GimvPrefs *profile, - const gchar *section,const gchar *key) -{ - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), NULL); - - if (!profile || !section || !key) - return FALSE; - for (p = profile->list; p; p = p->next) - { - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - return g_strdup(p->value); - } - } - for (p = profile->sublist; p; p = p->next) - { - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - return g_strdup(p->value); - } - } - return NULL; -} - - -/* - * Get size of a value. - * profile,the GimvPrefs struct - * section,name of the section - * key,name of the key - * type,value type - * RET,bytes,0:error - */ -gint -gimv_prefs_get_size (GimvPrefs *profile, - const gchar *section,const gchar *key,const guint type) -{ - guint8 *array; - gint n; - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), 0); - - if (!section || !key) - return 0; - for (p = profile->list; p; p = p->next) - { - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - break; - } - } - if (!p) - { - for (p = profile->sublist; p; p = p->next) - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - break; - } - } - if (!p) - return 0; - switch (type) - { - case GIMV_PREFS_VALUE_TYPE_BOOL: - return g_strcmp(p->value, "true") == 0 - || g_strcmp(p->value, "false") == 0 ? sizeof(gboolean) : 0; - case GIMV_PREFS_VALUE_TYPE_INT: - return sizeof(gint); - case GIMV_PREFS_VALUE_TYPE_STRING: - return g_strlen(p->value) + 1; - case GIMV_PREFS_VALUE_TYPE_ARRAY: - if (!(array=misc_str_to_array(&n, p->value, 10, FALSE))) - return 0; - g_free(array); - return n; - } - return 0; -} - - -/* - * Get a value from the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * key,name of the key - * value,buffer to store value. - * size,size of buffer to store value. - * type,value type - * RET,TRUE:normal exit,FALSE:error - */ -gboolean -gimv_prefs_get_value (GimvPrefs *profile, - const gchar *section,const gchar *key, - gpointer value,const gint size,const guint type) -{ - guint8 *array; - gint n; - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - if (!section || !key || !value) - return FALSE; - for (p = profile->list; p; p = p->next) - { - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - break; - } - } - if (!p) - { - for (p = profile->sublist; p; p = p->next) - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - break; - } - } - if (!p) - return FALSE; - switch (type) - { - case GIMV_PREFS_VALUE_TYPE_BOOL: - if (size < (gint) sizeof(gboolean)) - return FALSE; - if (strcasecmp (p->value, "true") == 0) - *((gboolean *)value) = TRUE; - else if (strcasecmp (p->value, "false") == 0) - *((gboolean *)value) = FALSE; - else - return FALSE; - break; - case GIMV_PREFS_VALUE_TYPE_INT: - if (size < (gint) sizeof(gint)) - return FALSE; - misc_str_to_val((gint *)value, p->value, 10, TRUE); - break; - case GIMV_PREFS_VALUE_TYPE_STRING: - if (size < (gint) g_strlen(p->value) + 1) - return FALSE; - strcpy((gchar *)value,p->value); - break; - case GIMV_PREFS_VALUE_TYPE_ARRAY: - if (!(array = misc_str_to_array(&n, p->value, 10, FALSE))) - return FALSE; - if (size <= n) - g_memmove(value, array, size); - g_free(array); - if (n < size) - return FALSE; - break; - default: - return FALSE; - } - return TRUE; -} - - -/* - * Set a value into the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * key,name of the key - * value,buffer which store the value. - * size,size of buffer which store the value. - * type,value type - * RET,TRUE:normal exit,FALSE:error - */ -gboolean -gimv_prefs_set_value (GimvPrefs *profile, - const gchar *section,const gchar *key, - gconstpointer value,const gint size,const guint type) -{ - gchar *old_value = NULL; - gint i; - GimvPrefsList *p,*q = NULL; - GQuark quark; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - if (!section || !key || !value) - return FALSE; - - quark = g_quark_from_string(section); - - for (p = profile->list; p; q = p, p = p->next) - { - if (p->type == GIMV_PREFS_DATA_TYPE_KEY - && g_strcmp(p->section, section) == 0 - && g_strcmp(p->key, key) == 0) - { - break; - } - } - - if (p) - { - if (p->data) - old_value = g_strdup(p->data); - } - else - { - for (p = q; p; p = p->prev) - { - if (p->section && g_strcmp(p->section, section) == 0) - break; - } - if (!p) - { - if (q) - { - /* insert space between previous data and current data */ - p = g_malloc(sizeof(GimvPrefsList)); - p->type=GIMV_PREFS_DATA_TYPE_SPACE; - p->value = p->data = p->section = p->key = NULL; - p->prev = q; - p->next = q->next; - q->next = p; - q = p; - } - /* create a section if neither section and key aren't exist */ - p = g_malloc(sizeof(GimvPrefsList)); - p->type = GIMV_PREFS_DATA_TYPE_SECTION; - p->data = g_strdup_printf("[%s]", section); - p->section = g_strdup(section); - p->value = p->key = NULL; - p->prev = q; - if (q) - { - p->next = q->next; - q->next = p; - } - else - { - p->next = NULL; - profile->list = p; - } - gtk_signal_emit(GTK_OBJECT(profile), - gimv_prefs_signals[SECTION_ADDED_SIGNAL], - quark, p->section); - } - q = p; - while (q->type == GIMV_PREFS_DATA_TYPE_SPACE && q->section - && g_strcmp(p->section, section) == 0 && q->prev) - q = q->prev; - /* create a key into last of the section */ - p = g_malloc(sizeof(GimvPrefsList)); - p->type = GIMV_PREFS_DATA_TYPE_KEY; - p->data = g_strdup_printf("%s=", key); - p->section = g_strdup(section); - p->key = g_strdup(key); - p->value = strchr(p->data,'=')+1; - p->prev = q; - p->next = q->next; - q->next = p; - if (p->next) - p->next->prev = p; - gtk_signal_emit(GTK_OBJECT(profile), - gimv_prefs_signals[KEY_ADDED_SIGNAL], - quark, p->section, p->key); - } - - switch (type) - { - case GIMV_PREFS_VALUE_TYPE_BOOL: - g_free(p->data); - p->data = g_strdup_printf("%s=%s", - p->key, *((gboolean *)value) ? "true" : "false"); - break; - case GIMV_PREFS_VALUE_TYPE_INT: - g_free(p->data); - p->data = g_strdup_printf("%s=%d", p->key, *((gint *)value)); - break; - case GIMV_PREFS_VALUE_TYPE_STRING: - g_free(p->data); - p->data = g_strdup_printf("%s=%s", p->key, (gchar *)value); - break; - case GIMV_PREFS_VALUE_TYPE_ARRAY: - g_free(p->data); - p->data = g_strdup_printf("%s=%u", p->key, ((guint8 *)value)[0]); - for (i = 1; i < size; i++) - { - gchar *data; - data = g_strdup_printf("%s %u", p->data, ((guint8 *)value)[i]); - g_free(p->data); - p->data = data; - } - break; - default: - g_free(old_value); - return FALSE; - } - - p->value = strchr(p->data,'=') + 1; - profile->edit = TRUE; - - gtk_signal_emit(GTK_OBJECT(profile), gimv_prefs_signals[CHANGED_SIGNAL], - quark, p->section, p->key, old_value); - - g_free(old_value); - - return TRUE; -} - - -static void -gimv_prefs_list_free (GimvPrefs *profile, GimvPrefsList *p) -{ - if (!p) return; - - if (p == profile->list) - profile->list = p->next; - if (p->prev) - p->prev->next = p->next; - if (p->next) - p->next->prev = p->prev; - - g_free(p->data); - g_free(p->section); - g_free(p->key); - g_free(p); -} - - -/* - * Delete a section from the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * RET,TRUE:normal exit,FALSE:error - */ -gboolean -gimv_prefs_delete_section (GimvPrefs *profile, const gchar *section) -{ - gboolean result = FALSE; - GimvPrefsList *p,*q; - gchar *section_tmp; - GQuark quark; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - if (!section) - return FALSE; - - /* - * section and p->section may be same memory chunk. - */ - section_tmp = g_strdup(section); - - for (p = profile->list; p; p = q) - { - q = p->next; - if (p->section && g_strcmp(p->section, section_tmp) == 0) - { - if (p->prev && p->prev->type == GIMV_PREFS_DATA_TYPE_SPACE) - gimv_prefs_list_free(profile, p->prev); - gimv_prefs_list_free(profile, p); - profile->edit = TRUE; - result = TRUE; - } - } - - quark = g_quark_from_string(section_tmp); - gtk_signal_emit(GTK_OBJECT(profile), - gimv_prefs_signals[SECTION_DELETED_SIGNAL], - quark, section_tmp); - - g_free(section_tmp); - - return result; -} - - -/* - * Delete a key from the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * key,key - * RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_delete_key (GimvPrefs *profile, - const gchar *section, const gchar *key) -{ - gboolean result = FALSE; - GimvPrefsList *p,*q; - gchar *section_tmp, *key_tmp; - GQuark quark; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - if (!section || !key) - return FALSE; - - /* - * section and p->section (also key and p->key) may be same memory - * chunk. - */ - section_tmp = g_strdup(section); - key_tmp = g_strdup(key); - - for (p = profile->list; p; p = q) - { - q = p->next; - if (p->section && p->key - && g_strcmp(p->section, section_tmp) == 0 - && g_strcmp(p->key, key_tmp) == 0) - { - gimv_prefs_list_free(profile, p); - profile->edit = TRUE; - result = TRUE; - } - } - - quark = g_quark_from_string(section_tmp); - gtk_signal_emit(GTK_OBJECT(profile), - gimv_prefs_signals[KEY_DELETED_SIGNAL], - quark, section_tmp, key_tmp); - - g_free(section_tmp); - g_free(key_tmp); - - return result; -} - - -/* - * Enumerate sections in the initialize file. - * profile,the GimvPrefs struct - * RET,list of sections,NULL:error - */ -GList * -gimv_prefs_enum_section (GimvPrefs *profile) -{ - GList *glist = NULL; - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - for (p = profile->list; p; p = p->next) - { - if (p->section - && (!glist || !g_list_find_custom(glist, p->section, - (GCompareFunc)strcmp))) - { - glist = g_list_insert_sorted(glist, p->section, - (GCompareFunc)strcmp); - } - } - for (p = profile->sublist; p; p = p->next) - { - if (p->section - && (!glist || !g_list_find_custom(glist, p->section, - (GCompareFunc)strcmp))) - { - glist = g_list_insert_sorted(glist, p->section, - (GCompareFunc)strcmp); - } - } - return glist; -} - - -/* - * Enumelate keys in the initialize file. - * profile,the GimvPrefs struct - * section,name of the section - * RET,list of keys,NULL:error -*/ -GList * -gimv_prefs_enum_key (GimvPrefs *profile, const gchar *section) -{ - GList *glist = NULL; - GimvPrefsList *p; - - g_return_val_if_fail(GIMV_IS_PREFS(profile), FALSE); - - for (p = profile->list; p; p = p->next) - { - if (p->section && p->key - && g_strcmp(p->section, section) == 0 - && (!glist || !g_list_find_custom(glist, p->key, - (GCompareFunc)strcmp))) - { - glist = g_list_insert_sorted(glist, p->key, - (GCompareFunc)strcmp); - } - } - for (p = profile->sublist; p; p = p->next) - { - if (p->section && p->key - && g_strcmp (p->section, section) == 0 - && (!glist || !g_list_find_custom(glist, p->key, - (GCompareFunc)strcmp))) - { - glist = g_list_insert_sorted(glist, p->key, - (GCompareFunc)strcmp); - } - } - return glist; -} diff -Nru gimageview-0.2.27/src/gimv_prefs.h gimageview-0.3.0-0.20101117/src/gimv_prefs.h --- gimageview-0.2.27/src/gimv_prefs.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,242 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Profile - * copyright (c) 2002-2003 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org - * - * 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 - */ - -/* - * 2004-02-24 Takuro Ashie - * Adapt to GImageView. - * - * 2003-09-03 Takuro Ashie - * Added Kz and kz_ prefix. - * GObjectize. - * Added const keyword for value field of KzPrrofileList. - * - * 2003-08-28 Takuro Ashie - * Translated comments into English. - * - * 2003-08-27 Takuro Ashie - * Modified coding style. - * Changed interface of profile_open(). - */ - -#ifndef __GIMV_PREFS_H__ -#define __GIMV_PREFS_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -#define GIMV_TYPE_PREFS (gimv_prefs_get_type ()) -#define GIMV_PREFS(obj) (GTK_CHECK_CAST (obj, gimv_prefs_get_type (), GimvPrefs)) -#define GIMV_PREFS_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_prefs_get_type, GimvPrefsClass)) -#define GIMV_IS_PREFS(obj) (GTK_CHECK_TYPE (obj, gimv_prefs_get_type ())) -#define GIMV_IS_PREFS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_PREFS)) - - -typedef struct GimvPrefs_Tag GimvPrefs; -typedef struct GimvPrefsClass_Tag GimvPrefsClass; -typedef struct GimvPrefsList_Tag GimvPrefsList; - - -#define GIMV_PREFS_DATA_TYPE_UNKNOW 0 -#define GIMV_PREFS_DATA_TYPE_SPACE 1 -#define GIMV_PREFS_DATA_TYPE_COMMENT 2 -#define GIMV_PREFS_DATA_TYPE_SECTION 3 -#define GIMV_PREFS_DATA_TYPE_KEY 4 - -#define GIMV_PREFS_VALUE_TYPE_BOOL 0 -#define GIMV_PREFS_VALUE_TYPE_INT 1 -#define GIMV_PREFS_VALUE_TYPE_STRING 2 -#define GIMV_PREFS_VALUE_TYPE_ARRAY 3 - - -struct GimvPrefs_Tag -{ - GtkObject parent; - - gboolean edit; - gchar *file, *subfile; - GimvPrefsList *list, *sublist; -}; - - -struct GimvPrefsList_Tag -{ - gchar *data, *section, *key; - const gchar *value; - guint type; - struct GimvPrefsList_Tag *prev, *next; -}; - - -struct GimvPrefsClass_Tag -{ - GtkObjectClass parent_class; - - /* -- signals -- */ - void (*section_added) (GimvPrefs *profile, - const gchar *section); - void (*section_deleted) (GimvPrefs *profile, - const gchar *section); - void (*key_added) (GimvPrefs *profile, - const gchar *section, - const gchar *key); - void (*key_deleted) (GimvPrefs *profile, - const gchar *section, - const gchar *key); - void (*changed) (GimvPrefs *profile, - const gchar *section, - const gchar *key, - const gchar *old_value); -}; - - -GtkType gimv_prefs_get_type (void); -GimvPrefs *gimv_prefs_new (void); - - -/* - * Open the initialize file. - * @file,file name - * @RET,the GimvPrefs struct - */ -GimvPrefs *gimv_prefs_open (const gchar *file, - const gchar *subfile); - -/* - * Close the initialize file. - * @profile,the GimvPrefs struct - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_close (GimvPrefs *profile); - - -/* - * Save the initialize file. - * @profile,the GimvPrefs struct - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_save (GimvPrefs *profile); - - -/* - * Get a string from the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @key,name of the key - * @RET,string,NULL:error - */ -gchar *gimv_prefs_get_string (GimvPrefs *profile, - const gchar *section, - const gchar *key); - - -/* - * Get size of a value. - * @profile,the GimvPrefs struct - * @section,name of the section - * @key,name of the key - * @type,value type - * @RET,bytes,0:error - */ -gint gimv_prefs_get_size (GimvPrefs *profile, - const gchar *section, - const gchar *key, - const guint type); - - -/* - * Get a value from the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @key,name of the key - * @value,buffer to store value. - * @size,size of buffer to store value. - * @type,value type - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_get_value (GimvPrefs *profile, - const gchar *section, - const gchar *key, - gpointer value, - const gint size, - const guint type); - - -/* - * Set a value into the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @key,name of the key - * @value,buffer which store the value. - * @size,size of buffer which store the value. - * @type,value type - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_set_value (GimvPrefs *profile, - const gchar *section, - const gchar *key, - gconstpointer value, - const gint size, - const guint type); - - -/* - * Delete a section from the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_delete_section (GimvPrefs *profile, - const gchar *section); - - -/* - * Delete a key from the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @key,key - * @RET,TRUE:normal exit,FALSE:error - */ -gboolean gimv_prefs_delete_key (GimvPrefs *profile, - const gchar *section, - const gchar *key); - - -/* - * Enumerate sections in the initialize file. - * @profile,the GimvPrefs struct - * @RET,list of sections,NULL:error - */ -GList *gimv_prefs_enum_section (GimvPrefs *profile); - - -/* - * Enumelate keys in the initialize file. - * @profile,the GimvPrefs struct - * @section,name of the section - * @RET,list of keys,NULL:error -*/ -GList *gimv_prefs_enum_key (GimvPrefs *profile, - const gchar *section); - -#endif /* __GIMV_PREFS_H__ */ diff -Nru gimageview-0.2.27/src/gimv_prefs_ui_utils.c gimageview-0.3.0-0.20101117/src/gimv_prefs_ui_utils.c --- gimageview-0.2.27/src/gimv_prefs_ui_utils.c 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs_ui_utils.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,21 +18,21 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 3S30, Boston, MA 02111-1307, USA. * - * $Id: gimv_prefs_ui_utils.c,v 1.2 2003/06/13 09:43:32 makeinu Exp $ + * $Id: gimv_prefs_ui_utils.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include +#include #include "gimv_prefs_ui_utils.h" -#include "charset.h" #include "gimv_dlist.h" #include "gimv_elist.h" -#include "gtkutils.h" -#include "intl.h" -#include "prefs.h" #include "gimv_prefs_win.h" +#include "prefs.h" +#include "utils_char_code.h" +#include "utils_gtk.h" /******************************************************************************* * @@ -51,12 +51,12 @@ g_return_if_fail (menu_item); g_return_if_fail (src && *src && **src); - bid_p = gtk_object_get_data (GTK_OBJECT (menu_item), "button-id"); - mid_p = gtk_object_get_data (GTK_OBJECT (menu_item), "mod-id"); - num_p = gtk_object_get_data (GTK_OBJECT (menu_item), "num"); - defval = gtk_object_get_data (GTK_OBJECT (menu_item), "prefs-prechanged"); - pressed = gtk_object_get_data (GTK_OBJECT (menu_item), "pressed"); - released = gtk_object_get_data (GTK_OBJECT (menu_item), "released"); + bid_p = g_object_get_data (G_OBJECT (menu_item), "button-id"); + mid_p = g_object_get_data (G_OBJECT (menu_item), "mod-id"); + num_p = g_object_get_data (G_OBJECT (menu_item), "num"); + defval = g_object_get_data (G_OBJECT (menu_item), "prefs-prechanged"); + pressed = g_object_get_data (G_OBJECT (menu_item), "pressed"); + released = g_object_get_data (G_OBJECT (menu_item), "released"); bid = GPOINTER_TO_INT (bid_p); mid = GPOINTER_TO_INT (mid_p); @@ -110,8 +110,8 @@ g_return_if_fail (option_menu); if (option_menu->menu_item) - gtk_signal_emit_by_name (GTK_OBJECT (option_menu->menu_item), - "activate"); + g_signal_emit_by_name (G_OBJECT (option_menu->menu_item), + "activate"); } @@ -245,12 +245,12 @@ radio1 = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio0), _("Released")); gtk_box_pack_start (GTK_BOX (hbox), radio1, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio0), "toggled", - GTK_SIGNAL_FUNC (cb_mouse_prefs_pressed_radio), - option_menu); - gtk_signal_connect (GTK_OBJECT (radio1), "toggled", - GTK_SIGNAL_FUNC (cb_mouse_prefs_pressed_radio), - option_menu); + g_signal_connect (G_OBJECT (radio0), "toggled", + G_CALLBACK (cb_mouse_prefs_pressed_radio), + option_menu); + g_signal_connect (G_OBJECT (radio1), "toggled", + G_CALLBACK (cb_mouse_prefs_pressed_radio), + option_menu); if (def < 0) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio1), TRUE); @@ -265,28 +265,28 @@ /* create option menu items */ for (k = 0; items[k]; k++) { menu_item = gtk_menu_item_new_with_label (_(items[k])); - gtk_object_set_data (GTK_OBJECT (menu_item), - "button-id", - GINT_TO_POINTER(id)); - gtk_object_set_data (GTK_OBJECT (menu_item), - "mod-id", - GINT_TO_POINTER(j)); - gtk_object_set_data (GTK_OBJECT (menu_item), - "num", - GINT_TO_POINTER(k)); - gtk_object_set_data (GTK_OBJECT (menu_item), - "prefs-prechanged", - (gpointer) defval); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(cb_mouse_button), - dest); - - gtk_object_set_data (GTK_OBJECT (menu_item), - "pressed", - (gpointer) radio0); - gtk_object_set_data (GTK_OBJECT (menu_item), - "released", - (gpointer) radio1); + g_object_set_data (G_OBJECT (menu_item), + "button-id", + GINT_TO_POINTER(id)); + g_object_set_data (G_OBJECT (menu_item), + "mod-id", + GINT_TO_POINTER(j)); + g_object_set_data (G_OBJECT (menu_item), + "num", + GINT_TO_POINTER(k)); + g_object_set_data (G_OBJECT (menu_item), + "prefs-prechanged", + (gpointer) defval); + g_signal_connect(G_OBJECT(menu_item), "activate", + G_CALLBACK(cb_mouse_button), + dest); + + g_object_set_data (G_OBJECT (menu_item), + "pressed", + (gpointer) radio0); + g_object_set_data (G_OBJECT (menu_item), + "released", + (gpointer) radio1); gtk_menu_append (GTK_MENU(menu), menu_item); gtk_widget_show (menu_item); } @@ -435,9 +435,9 @@ gtk_container_set_border_width (GTK_CONTAINER (frame), 5); gtk_container_add (GTK_CONTAINER (frame), frame_vbox); - gtk_signal_connect (GTK_OBJECT (frame),"destroy", - GTK_SIGNAL_FUNC (cb_dirprefs_destroy), - dirprefs); + g_signal_connect (G_OBJECT (frame),"destroy", + G_CALLBACK (cb_dirprefs_destroy), + dirprefs); /* clist */ dirprefs->editlist = editlist @@ -445,8 +445,8 @@ gimv_elist_set_column_title_visible (GIMV_ELIST (editlist), FALSE); gtk_box_pack_start (GTK_BOX (frame_vbox), editlist, TRUE, TRUE, 0); set_default_dir_list (dirprefs); - gtk_signal_connect (GTK_OBJECT (editlist), "list_updated", - GTK_SIGNAL_FUNC (cb_dirprefs_editlist_updated), dirprefs); + g_signal_connect (G_OBJECT (editlist), "list_updated", + G_CALLBACK (cb_dirprefs_editlist_updated), dirprefs); /* entry area */ hbox = GIMV_ELIST (editlist)->edit_area; @@ -462,8 +462,8 @@ button = dirprefs->select_button = gtk_button_new_with_label (_("Select")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_dirprefs_dirsel_pressed), dirprefs); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_dirprefs_dirsel_pressed), dirprefs); return frame; } @@ -578,11 +578,11 @@ g_strfreev (titles); } - gtk_signal_connect (GTK_OBJECT (dslist), "destroy", - GTK_SIGNAL_FUNC (cb_dslist_destroy), dsdata); - gtk_signal_connect (GTK_OBJECT (dslist), "enabled_list_updated", - GTK_SIGNAL_FUNC (cb_gimv_dlist_updated), - dsdata); + g_signal_connect (G_OBJECT (dslist), "destroy", + G_CALLBACK (cb_dslist_destroy), dsdata); + g_signal_connect (G_OBJECT (dslist), "enabled_list_updated", + G_CALLBACK (cb_gimv_dlist_updated), + dsdata); return frame; } diff -Nru gimageview-0.2.27/src/gimv_prefs_ui_utils.h gimageview-0.3.0-0.20101117/src/gimv_prefs_ui_utils.h --- gimageview-0.2.27/src/gimv_prefs_ui_utils.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs_ui_utils.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_prefs_ui_utils.h,v 1.2 2003/06/13 09:43:33 makeinu Exp $ + * $Id: gimv_prefs_ui_utils.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __GIMV_PREFS_UI_UTILS_H__ diff -Nru gimageview-0.2.27/src/gimv_prefs_win.c gimageview-0.3.0-0.20101117/src/gimv_prefs_win.c --- gimageview-0.2.27/src/gimv_prefs_win.c 2004-09-22 15:37:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_prefs_win.c,v 1.8 2004/09/22 15:37:11 makeinu Exp $ + * $Id: gimv_prefs_win.c 1194 2008-12-02 06:40:41Z makeinu $ */ #include "gimv_prefs_win.h" @@ -28,8 +28,6 @@ #include "gimageview.h" -#include "gimv_hpaned.h" -#include "gtk2-compat.h" #include "gimv_cell_pixmap.h" #include "gimv_icon_stock.h" #include "help.h" @@ -55,9 +53,6 @@ { GimvPrefsWinPage *page; GtkWidget *widget; -#ifndef ENABLE_TREEVIEW - GtkCTreeNode *node; -#endif /* ENABLE_TREEVIEW */ } GimvPrefsWinPagePrivate; @@ -274,11 +269,6 @@ priv->widget); if (num >= 0) gtk_notebook_set_page (GTK_NOTEBOOK (prefs_win.notebook), num); - -#ifdef ENABLE_TREEVIEW -#else /* ENABLE_TREEVIEW */ - /* gtk_ctree_select (GTK_CTREE (prefs_win.tree), priv->node); */ -#endif /* ENABLE_TREEVIEW */ } @@ -310,8 +300,6 @@ } -#ifdef ENABLE_TREEVIEW - typedef enum { COLUMN_TERMINATOR = -1, COLUMN_ICON_OPEN, @@ -430,14 +418,19 @@ cb_tree_cursor_changed (GtkTreeView *treeview, gpointer data) { GtkTreeSelection *selection; - GtkTreeModel *model; + GtkTreeModel *model = NULL; GtkTreeIter iter; - GimvPrefsWinPagePrivate *priv; + GimvPrefsWinPagePrivate *priv = NULL; - g_return_if_fail (treeview); + g_return_if_fail (GTK_IS_TREE_VIEW(treeview)); selection = gtk_tree_view_get_selection (treeview); - gtk_tree_selection_get_selected (selection, &model, &iter); + g_return_if_fail(GTK_IS_TREE_SELECTION(selection)); + + if (!gtk_tree_selection_get_selected (selection, &model, &iter)) + return; + g_return_if_fail(GTK_IS_TREE_MODEL(model)); + gtk_tree_model_get (model, &iter, COLUMN_PRIV_DATA, &priv, COLUMN_TERMINATOR); @@ -543,147 +536,6 @@ return tree; } -#else /* ENABLE_TREEVIEW */ - -static gboolean -cb_ctree_key_press (GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - GList *sel; - GtkCTreeNode *node; - - g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE); - - sel = GTK_CLIST (widget)->selection; - if (!sel) return FALSE; - node = sel->data; - - switch (event->keyval) { - case GDK_KP_Enter: - case GDK_Return: - case GDK_ISO_Enter: - case GDK_space: - gtk_ctree_toggle_expansion (GTK_CTREE (widget), node); - break; - case GDK_Right: - gtk_ctree_expand (GTK_CTREE (widget), node); - return TRUE; - break; - case GDK_Left: - gtk_ctree_collapse (GTK_CTREE (widget), node); - return TRUE; - break; - default: - break; - } - - return FALSE; -} - - -static void -cb_ctree_select_row (GtkWidget *widget, gint row, gint column, - GdkEventButton *event, gpointer data) -{ - GtkCTreeNode *node; - GimvPrefsWinPagePrivate *priv; - - node = gtk_ctree_node_nth (GTK_CTREE (widget), row); - if (!node) return; - - priv = gtk_ctree_node_get_row_data (GTK_CTREE (widget), node); - if (priv->page) - prefs_win_set_page (priv->page->path); -} - - -static GtkCTreeNode * -prefs_win_navtree_get_parent (GimvPrefsWinPage *page) -{ - GList *node = NULL; - gchar *parent; - - g_return_val_if_fail (page, NULL); - g_return_val_if_fail (page->path, NULL); - - if (!page->path) return NULL; - parent = g_dirname (page->path); - - for (node = priv_page_list; node; node = g_list_next (node)) { - GimvPrefsWinPagePrivate *priv = node->data; - if (priv && priv->page && !strcmp (parent, priv->page->path)) { - g_free (parent); - return priv->node; - } - } - - g_free (parent); - - return NULL; -} - - -static GtkWidget * -prefs_win_create_navtree (void) -{ - GtkWidget *ctree; - GtkCTreeNode *node, *parent = NULL; - GList *lnode; - - /* create tree */ - ctree = prefs_win.tree = gtk_ctree_new (1,0); - prefs_win.tree = ctree; - gtk_clist_set_column_auto_resize (GTK_CLIST (ctree), 0, TRUE); - gtk_clist_set_selection_mode (GTK_CLIST (ctree), GTK_SELECTION_BROWSE); - gtk_ctree_set_line_style (GTK_CTREE (ctree), conf.dirview_line_style); - gtk_ctree_set_expander_style (GTK_CTREE (ctree), conf.dirview_expander_style); - gtk_clist_set_row_height (GTK_CLIST (ctree), 18); - - gtk_signal_connect (GTK_OBJECT (ctree), "key_press_event", - GTK_SIGNAL_FUNC (cb_ctree_key_press), NULL); - gtk_signal_connect (GTK_OBJECT (ctree), "select-row", - GTK_SIGNAL_FUNC (cb_ctree_select_row), NULL); - - /* create pages */ - for (lnode = get_page_entries_list(); lnode; lnode = g_list_next (lnode)) { - GimvPrefsWinPage *page = lnode->data; - const gchar *title; - GdkPixmap *pixmap = NULL, *opixmap = NULL; - GdkBitmap *mask = NULL, *omask = NULL; - GimvPrefsWinPagePrivate *priv; - - if (!page || !page->path) continue; - - /* translate page title */ - title = g_basename (_(page->path)); - - /* get node icon */ - get_icon (page->icon, &pixmap, &mask); - get_icon (page->icon_open, &opixmap, &omask); - - /* insert node */ - parent = prefs_win_navtree_get_parent (page); - node = gtk_ctree_insert_node (GTK_CTREE (ctree), parent, NULL, - (gchar **) &title, 4, - pixmap, mask, - opixmap, omask, - FALSE, FALSE); - - /* set private data */ - priv = g_new0 (GimvPrefsWinPagePrivate, 1); - priv->page = page; - priv->widget = NULL; - priv->node = node; - - priv_page_list = g_list_append (priv_page_list, priv); - - gtk_ctree_node_set_row_data (GTK_CTREE(ctree), node, priv); - } - - return ctree; -} - -#endif /* ENABLE_TREEVIEW */ - /******************************************************************************* @@ -722,8 +574,6 @@ } -#ifdef USE_GTK2 - static void cb_dialog_response (GtkDialog *dialog, gint arg, gpointer data) { @@ -744,32 +594,6 @@ } } -#else - -static void -cb_prefs_ok_button () -{ - prefs_win.ok_pressed = TRUE; - gtk_widget_destroy (prefs_window); -} - - -static void -cb_prefs_apply_button () -{ - memcpy (&conf, config_changed, sizeof(Config)); - prefs_win_apply_config (GIMV_PREFS_WIN_ACTION_APPLY); -} - - -static void -cb_prefs_cancel_button () -{ - gtk_widget_destroy (prefs_window); -} - -#endif - /******************************************************************************* @@ -808,11 +632,11 @@ gtk_window_set_wmclass(GTK_WINDOW(prefs_window), "prefs", GIMV_PROG_NAME); gtk_window_set_default_size (GTK_WINDOW(prefs_window), 600, 450); gtk_window_set_title (GTK_WINDOW (prefs_window), _("Preference")); - gtk_signal_connect (GTK_OBJECT(prefs_window), "destroy", - GTK_SIGNAL_FUNC(cb_prefs_win_destroy), NULL); + g_signal_connect (G_OBJECT(prefs_window), "destroy", + G_CALLBACK(cb_prefs_win_destroy), NULL); /* pane */ - pane = gimv_hpaned_new (); + pane = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (pane), 5); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_window)->vbox), pane, TRUE, TRUE, 0); @@ -830,11 +654,9 @@ scrolledwin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ - gtk_widget_set_usize (scrolledwin, 170, -1); + gtk_widget_set_size_request (scrolledwin, 170, -1); gtk_widget_show (scrolledwin); /* navigation tree */ @@ -842,54 +664,18 @@ gtk_container_add (GTK_CONTAINER (scrolledwin), navtree); gtk_widget_show (navtree); - gimv_paned_add1 (GIMV_PANED (pane), scrolledwin); - gimv_paned_add2 (GIMV_PANED (pane), notebook); + gtk_paned_add1 (GTK_PANED (pane), scrolledwin); + gtk_paned_add2 (GTK_PANED (pane), notebook); /* button */ -#ifdef USE_GTK2 gtk_dialog_add_buttons (GTK_DIALOG (prefs_window), GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - gtk_signal_connect_object (GTK_OBJECT (prefs_window), "response", - GTK_SIGNAL_FUNC (cb_dialog_response), - NULL); -#else -{ - GtkWidget *button; - - /* dialog buttons */ - button = gtk_button_new_with_label (_("OK")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_prefs_ok_button), - GTK_OBJECT (prefs_window)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_widget_show (button); - - gtk_widget_grab_focus (button); - - button = gtk_button_new_with_label (_("Apply")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_window)->action_area), - button, FALSE, TRUE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_prefs_apply_button), - GTK_OBJECT (prefs_window)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_widget_show (button); - - button = gtk_button_new_with_label (_("Cancel")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_window)->action_area), - button, FALSE, TRUE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_prefs_cancel_button), - GTK_OBJECT (prefs_window)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_widget_show (button); -} -#endif + g_signal_connect (G_OBJECT (prefs_window), "response", + G_CALLBACK (cb_dialog_response), + NULL); gtk_window_set_position (GTK_WINDOW (prefs_window), GTK_WIN_POS_CENTER); gtk_widget_show (prefs_window); diff -Nru gimageview-0.2.27/src/gimv_prefs_win.h gimageview-0.3.0-0.20101117/src/gimv_prefs_win.h --- gimageview-0.2.27/src/gimv_prefs_win.h 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_prefs_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_prefs_win.h,v 1.2 2003/06/13 09:43:33 makeinu Exp $ + * $Id: gimv_prefs_win.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_WIN_H__ diff -Nru gimageview-0.2.27/src/gimv_scrolled.c gimageview-0.3.0-0.20101117/src/gimv_scrolled.c --- gimageview-0.2.27/src/gimv_scrolled.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_scrolled.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_scrolled.c,v 1.3 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_scrolled.c 1215 2010-11-17 06:10:11Z makeinu $ */ /* @@ -32,9 +32,10 @@ # include "config.h" #endif -#include "gtk2-compat.h" #include "gimv_scrolled.h" +G_DEFINE_TYPE (GimvScrolled, gimv_scrolled, GTK_TYPE_CONTAINER) + /* for auto-scroll and auto-expand at drag */ #define AUTO_SCROLL_TIMEOUT 100 #define AUTO_SCROLL_EDGE_WIDTH 20 @@ -44,11 +45,7 @@ #define bw(widget) GTK_CONTAINER(widget)->border_width -#ifdef USE_GTK2 -# define WIDGET_DRAW(widget, area) gdk_window_invalidate_rect (widget->window, area, TRUE) -#else -# define WIDGET_DRAW(widget, area) (gtk_signal_emit_by_name (GTK_OBJECT(widget), "draw", area)) -#endif +#define WIDGET_DRAW(widget, area) gdk_window_invalidate_rect (widget->window, area, TRUE) #define adjustment_check_value(value, adj) \ { \ @@ -63,25 +60,23 @@ LAST_SIGNAL }; -static void gimv_scrolled_class_init (GimvScrolledClass *klass); -static void gimv_scrolled_init (GimvScrolled *scrolled); static void gimv_scrolled_set_scroll_adjustments (GtkWidget *widget, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); + GtkAdjustment *hadjustment, + GtkAdjustment *vadjustment); static gint gimv_scrolled_button_press (GtkWidget *widget, - GdkEventButton *event); + GdkEventButton *event); static gint gimv_scrolled_button_release (GtkWidget *widget, - GdkEventButton *event); + GdkEventButton *event); static gint gimv_scrolled_motion_notify (GtkWidget *widget, - GdkEventMotion *event); + GdkEventMotion *event); static gint gimv_scrolled_drag_motion (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time); + GdkDragContext *context, + gint x, + gint y, + guint time); static void gimv_scrolled_drag_leave (GtkWidget *dirtree, - GdkDragContext *context, - guint time); + GdkDragContext *context, + guint time); static void hadjustment_value_changed (GtkAdjustment *hadjustment, gpointer data); @@ -89,67 +84,38 @@ gpointer data); static gboolean horizontal_timeout (gpointer data); static gboolean vertical_timeout (gpointer data); -#ifndef USE_GTK2 -static void check_exposures (GtkWidget *widget); -#endif /* USE_GTK2 */ - - -static GtkWidgetClass *parent_class = NULL; -static guint gimv_scrolled_signals [LAST_SIGNAL] = {0}; - -GtkType -gimv_scrolled_get_type (void) -{ - static GtkType type = 0; - - if (!type) { - static const GtkTypeInfo type_info = { - "GimvScrolled", - sizeof (GimvScrolled), - sizeof (GimvScrolledClass), - (GtkClassInitFunc) gimv_scrolled_class_init, - (GtkObjectInitFunc) gimv_scrolled_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - type = gtk_type_unique (GTK_TYPE_CONTAINER, &type_info); - } - - return type; -} +static guint gimv_scrolled_signals [LAST_SIGNAL] = {0}; static void gimv_scrolled_class_init (GimvScrolledClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); - - object_class = (GtkObjectClass*) klass; + gobject_class = (GObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; widget_class->set_scroll_adjustments_signal = - gtk_signal_new ("set_scroll_adjustments", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvScrolledClass, set_scroll_adjustments), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER); + g_signal_new ("set_scroll_adjustments", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GimvScrolledClass, set_scroll_adjustments), + NULL, NULL, + gtk_marshal_NONE__POINTER_POINTER, + G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); gimv_scrolled_signals[ADJUST_ADJUSTMENTS] = - gtk_signal_new ("adjust_adjustments", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvScrolledClass, adjust_adjustments), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("adjust_adjustments", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GimvScrolledClass, adjust_adjustments), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); widget_class->button_press_event = gimv_scrolled_button_press; widget_class->button_release_event = gimv_scrolled_button_release; @@ -281,9 +247,6 @@ if (diff > 0) { scrolled->x_offset = value; -#ifndef USE_GTK2 - check_exposures (widget); -#endif /* USE_GTK2 */ /* WIDGET_DRAW(widget, &area); */ WIDGET_DRAW(widget, NULL); } @@ -365,9 +328,6 @@ if (diff > 0) { scrolled->y_offset = value; -#ifndef USE_GTK2 - check_exposures (widget); -#endif /* USE_GTK2 */ /* WIDGET_DRAW(widget, &area); */ WIDGET_DRAW(widget, NULL); } @@ -383,43 +343,47 @@ if (scrolled->h_adjustment != hadjustment) { if (scrolled->h_adjustment) { - gtk_signal_disconnect_by_data (GTK_OBJECT(scrolled->h_adjustment), - scrolled); - gtk_object_unref (GTK_OBJECT(scrolled->h_adjustment)); + g_signal_handlers_disconnect_matched ( + G_OBJECT (scrolled->h_adjustment), + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, scrolled); + g_object_unref (G_OBJECT(scrolled->h_adjustment)); } scrolled->h_adjustment = hadjustment; if (hadjustment) { - gtk_object_ref (GTK_OBJECT(hadjustment)); - gtk_signal_connect (GTK_OBJECT(hadjustment), - "value_changed", - (GtkSignalFunc) hadjustment_value_changed, - scrolled); + g_object_ref (G_OBJECT(hadjustment)); + g_signal_connect (G_OBJECT(hadjustment), + "value_changed", + G_CALLBACK (hadjustment_value_changed), + scrolled); } } if (scrolled->v_adjustment != vadjustment) { if (scrolled->v_adjustment) { - gtk_signal_disconnect_by_data (GTK_OBJECT(scrolled->v_adjustment), - scrolled); - gtk_object_unref (GTK_OBJECT(scrolled->v_adjustment)); + g_signal_handlers_disconnect_matched ( + G_OBJECT (scrolled->v_adjustment), + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, scrolled); + g_object_unref (G_OBJECT(scrolled->v_adjustment)); } scrolled->v_adjustment = vadjustment; if (vadjustment) { - gtk_object_ref (GTK_OBJECT(vadjustment)); - gtk_signal_connect (GTK_OBJECT(vadjustment), - "value_changed", - (GtkSignalFunc) vadjustment_value_changed, - scrolled); + g_object_ref (G_OBJECT(vadjustment)); + g_signal_connect (G_OBJECT(vadjustment), + "value_changed", + G_CALLBACK (vadjustment_value_changed), + scrolled); } } - gtk_signal_emit (GTK_OBJECT(scrolled), - gimv_scrolled_signals[ADJUST_ADJUSTMENTS]); + g_signal_emit (G_OBJECT(scrolled), + gimv_scrolled_signals[ADJUST_ADJUSTMENTS], 0); } void @@ -439,39 +403,13 @@ scrolled->freeze_count --; if (!scrolled->freeze_count) { - gtk_signal_emit (GTK_OBJECT(scrolled), - gimv_scrolled_signals [ADJUST_ADJUSTMENTS]); + g_signal_emit (G_OBJECT(scrolled), + gimv_scrolled_signals [ADJUST_ADJUSTMENTS], 0); gtk_widget_draw (GTK_WIDGET(scrolled), NULL); } } -#ifndef USE_GTK2 -/* from gtkclist.c */ -static void -check_exposures (GtkWidget *widget) -{ - GdkEvent *event; - - if (!GTK_WIDGET_REALIZED (widget)) - return; - - /* - * Make sure graphics expose events are processed before scrolling - * again - */ - while ((event = gdk_event_get_graphics_expose (widget->window)) != NULL) { - gtk_widget_event (widget, event); - if (event->expose.count == 0) { - gdk_event_free (event); - break; - } - gdk_event_free (event); - } -} -#endif /* USE_GTK2 */ - - void gimv_scrolled_page_up (GimvScrolled *scrolled) { @@ -485,7 +423,7 @@ vadj->value -= vadj->page_size; adjustment_check_value (vadj->value, vadj); - gtk_signal_emit_by_name (GTK_OBJECT(vadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(vadj), "value_changed"); } @@ -502,7 +440,7 @@ vadj->value += vadj->page_size; adjustment_check_value (vadj->value, vadj); - gtk_signal_emit_by_name (GTK_OBJECT(vadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(vadj), "value_changed"); } @@ -519,7 +457,7 @@ hadj->value -= hadj->page_size; adjustment_check_value (hadj->value, hadj); - gtk_signal_emit_by_name (GTK_OBJECT(hadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(hadj), "value_changed"); } @@ -537,7 +475,7 @@ hadj->value += hadj->page_size; adjustment_check_value (hadj->value, hadj); - gtk_signal_emit_by_name (GTK_OBJECT(hadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(hadj), "value_changed"); } @@ -644,7 +582,7 @@ vadj->value = vadj->value + step; adjustment_check_value (vadj->value, vadj); - gtk_signal_emit_by_name (GTK_OBJECT(vadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(vadj), "value_changed"); return TRUE; } @@ -672,7 +610,7 @@ hadj->value = hadj->value + step; adjustment_check_value (hadj->value, hadj); - gtk_signal_emit_by_name (GTK_OBJECT(hadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(hadj), "value_changed"); return TRUE; } diff -Nru gimageview-0.2.27/src/gimv_scrolled.h gimageview-0.3.0-0.20101117/src/gimv_scrolled.h --- gimageview-0.2.27/src/gimv_scrolled.h 2004-05-23 14:07:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_scrolled.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_scrolled.h,v 1.3 2003/07/05 16:41:11 makeinu Exp $ + * $Id: gimv_scrolled.h 1142 2007-10-17 13:02:27Z makeinu $ */ /* @@ -31,23 +31,20 @@ #ifndef _GIMV_SCROLLED_H_ #define _GIMV_SCROLLED_H_ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include +#define GIMV_TYPE_SCROLLED (gimv_scrolled_get_type ()) +#define GIMV_SCROLLED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_SCROLLED, GimvScrolled)) +#define GIMV_SCROLLED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_SCROLLED, GimvScrolledClass)) +#define GIMV_IS_SCROLLED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_SCROLLED)) +#define GIMV_IS_SCROLLED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_SCROLLED)) +#define GIMV_SCROLLED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_SCROLLED, GimvScrolledClass)) -#define GIMV_TYPE_SCROLLED gimv_scrolled_get_type () -#define GIMV_SCROLLED(obj) GTK_CHECK_CAST (obj, GIMV_TYPE_SCROLLED, GimvScrolled) -#define GIMV_SCROLLED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMV_TYPE_SCROLLED, GimvScrolledClass)) -#define GIMV_IS_SCROLLED(obj) GTK_CHECK_TYPE (obj, GIMV_TYPE_SCROLLED) #define GIMV_SCROLLED_X(scrolled, x) (-GIMV_SCROLLED(scrolled)->x_offset + (x)) #define GIMV_SCROLLED_Y(scrolled, y) (-GIMV_SCROLLED(scrolled)->y_offset + (y)) #define GIMV_SCROLLED_VX(scrolled, x) (GIMV_SCROLLED(scrolled)->x_offset + (x)) #define GIMV_SCROLLED_VY(scrolled, y) (GIMV_SCROLLED(scrolled)->y_offset + (y)) - typedef struct _GimvScrolled GimvScrolled; typedef struct _GimvScrolledClass GimvScrolledClass; @@ -91,7 +88,6 @@ gint vscroll_timer_id; }; - struct _GimvScrolledClass { GtkContainerClass parent_class; @@ -101,8 +97,7 @@ void (*adjust_adjustments) (GimvScrolled *scrolled); }; - -GtkType gimv_scrolled_get_type (void); +GType gimv_scrolled_get_type (void); void gimv_scrolled_realize (GimvScrolled *scrolled); void gimv_scrolled_unrealize (GimvScrolled *scrolled); diff -Nru gimageview-0.2.27/src/gimv_slideshow.c gimageview-0.3.0-0.20101117/src/gimv_slideshow.c --- gimageview-0.2.27/src/gimv_slideshow.c 2004-09-29 06:57:36.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_slideshow.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_slideshow.c,v 1.4 2004/09/22 14:26:22 makeinu Exp $ + * $Id: gimv_slideshow.c 1168 2007-10-20 17:21:57Z makeinu $ */ #include "gimageview.h" @@ -27,44 +27,49 @@ #include "prefs.h" #include "gimv_slideshow.h" +G_DEFINE_TYPE (GimvSlideshow, gimv_slideshow, G_TYPE_OBJECT) -gint idle_slideshow_delete (gpointer data); -static GList *next_image (GimvImageView *iv, - gpointer list_owner, - GList *current, - gpointer data); -static GList *prev_image (GimvImageView *iv, - gpointer list_owner, - GList *current, - gpointer data); -static void remove_list (GimvImageView *iv, - gpointer list_owner, - gpointer data); +#define GIMV_SLIDESHOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GIMV_TYPE_SLIDESHOW, GimvSlideshowPrivate)) - -/****************************************************************************** - * - * Other private functions - * - ******************************************************************************/ -gint -idle_slideshow_delete (gpointer data) +typedef struct GimvSlideshowPrivate_Tag { - GimvSlideShow *slideshow = data; - - gimv_slideshow_delete (slideshow); - - return 0; -} - + GimvImageWin *iw; + GList *filelist; + GList *current; + guint interval; + gboolean repeat; +} GimvSlideshowPrivate; typedef struct ChangeImageData_Tag { - GimvSlideShow *slideshow; + GimvSlideshow *slideshow; GimvImageWin *iw; GimvImageInfo *info; } ChangeImageData; +static void gimv_slideshow_dispose (GObject *object); +static gint idle_slideshow_unref (gpointer data); +static GList *next_image (GimvImageView *iv, + gpointer list_owner, + GList *current, + gpointer data); +static GList *prev_image (GimvImageView *iv, + gpointer list_owner, + GList *current, + gpointer data); +static void remove_list (GimvImageView *iv, + gpointer list_owner, + gpointer data); + +static gint +idle_slideshow_unref (gpointer data) +{ + GimvSlideshow *slideshow = data; + + g_object_unref (G_OBJECT (slideshow)); + + return 0; +} static gboolean change_image_idle (gpointer user_data) @@ -76,7 +81,6 @@ return FALSE; } - static GList * next_image (GimvImageView *iv, gpointer list_owner, @@ -85,16 +89,17 @@ { GimvImageWin *iw = data; GList *next, *node; - GimvSlideShow *slideshow = list_owner; + GimvSlideshow *slideshow = list_owner; + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); g_return_val_if_fail (iv, NULL); g_return_val_if_fail (current, NULL); - node = g_list_find (slideshow->filelist, current->data); + node = g_list_find (priv->filelist, current->data); g_return_val_if_fail (node, NULL); next = g_list_next (current); - if (!next && slideshow->repeat) + if (!next && priv->repeat) next = g_list_first (current); else if (!next) next = current; @@ -111,13 +116,12 @@ NULL, change_data, (GtkDestroyNotify) g_free); - slideshow->current = next; + priv->current = next; } return next; } - static GList * prev_image (GimvImageView *iv, gpointer list_owner, @@ -126,16 +130,17 @@ { GimvImageWin *iw = data; GList *prev, *node; - GimvSlideShow *slideshow = list_owner; + GimvSlideshow *slideshow = list_owner; + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); g_return_val_if_fail (iv, NULL); g_return_val_if_fail (current, NULL); - node = g_list_find (slideshow->filelist, current->data); + node = g_list_find (priv->filelist, current->data); g_return_val_if_fail (node, NULL); prev = g_list_previous (current); - if (!prev && slideshow->repeat) + if (!prev && priv->repeat) prev = g_list_last (current); else if (!prev) prev = current; @@ -152,13 +157,12 @@ NULL, change_data, (GtkDestroyNotify) g_free); - slideshow->current = prev; + priv->current = prev; } return prev; } - static GList * nth_image (GimvImageView *iv, gpointer list_owner, @@ -168,12 +172,13 @@ { GimvImageWin *iw = data; GList *node; - GimvSlideShow *slideshow = list_owner; + GimvSlideshow *slideshow = list_owner; + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); ChangeImageData *change_data; g_return_val_if_fail (iv, NULL); - node = g_list_nth (slideshow->filelist, nth); + node = g_list_nth (priv->filelist, nth); g_return_val_if_fail (node, NULL); change_data = g_new0 (ChangeImageData, 1); @@ -185,124 +190,121 @@ NULL, change_data, (GtkDestroyNotify) g_free); - slideshow->current = node; + priv->current = node; return node; } - static void remove_list (GimvImageView *iv, gpointer list_owner, gpointer data) { - GimvSlideShow *slideshow = list_owner; + GimvSlideshow *slideshow = list_owner; - g_return_if_fail (iv); - g_return_if_fail (slideshow); - - /* free slide show data safely */ - gtk_idle_add (idle_slideshow_delete, slideshow); + gtk_idle_add (idle_slideshow_unref, slideshow); } - static void -cb_show_fullscreen (GimvImageWin *iw, GimvSlideShow *slideshow) +cb_show_fullscreen (GimvImageWin *iw, GimvSlideshow *slideshow) { } - static void -cb_hide_fullscreen (GimvImageWin *iw, GimvSlideShow *slideshow) +cb_hide_fullscreen (GimvImageWin *iw, GimvSlideshow *slideshow) { gtk_widget_destroy (GTK_WIDGET (iw)); } - - -/****************************************************************************** - * - * Public functions - * - ******************************************************************************/ -GimvSlideShow * -gimv_slideshow_new (void) +static void +gimv_slideshow_class_init (GimvSlideshowClass *klass) { - GimvSlideShow *slideshow; + GObjectClass *gobject_class; - slideshow = g_new0 (GimvSlideShow, 1); + gobject_class = (GObjectClass *) klass; - slideshow->iw = NULL; - slideshow->filelist = NULL; - slideshow->repeat = conf.slideshow_repeat; + gobject_class->dispose = gimv_slideshow_dispose; - return slideshow; + g_type_class_add_private (gobject_class, sizeof (GimvSlideshowPrivate)); } - -void -gimv_slideshow_delete (GimvSlideShow *slideshow) +static void +gimv_slideshow_init (GimvSlideshow *slideshow) { - GimvImageWin *iw; - GimvImageView *iv; - - g_return_if_fail (slideshow); - - iw = slideshow->iw; - iv = iw->iv; - - g_list_foreach (slideshow->filelist, (GFunc) gimv_image_info_unref, NULL); - g_list_free (g_list_first (slideshow->filelist)); - - g_free (slideshow); + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); + priv->iw = NULL; + priv->filelist = NULL; + priv->interval = conf.slideshow_interval * 1000; + priv->repeat = conf.slideshow_repeat; } +GimvSlideshow * +gimv_slideshow_new (void) +{ + return GIMV_SLIDESHOW (g_object_new (GIMV_TYPE_SLIDESHOW, NULL)); +} -GimvSlideShow * +GimvSlideshow * gimv_slideshow_new_with_filelist (GList *filelist, GList *start) { - GimvSlideShow *slideshow; + GimvSlideshow *slideshow; + GimvSlideshowPrivate *priv; g_return_val_if_fail (filelist, NULL); - slideshow = gimv_slideshow_new (); - slideshow->filelist = g_list_first (filelist); - slideshow->current = start ? start : filelist; + slideshow = gimv_slideshow_new (); + priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); + priv->filelist = g_list_first (filelist); + priv->current = start ? start : filelist; return slideshow; } +static void +gimv_slideshow_dispose (GObject *object) +{ + GimvSlideshow *slideshow = GIMV_SLIDESHOW (object); + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); + GimvImageWin *iw; + GimvImageView *iv; + + iw = priv->iw; + iv = iw->iv; + + g_list_foreach (priv->filelist, (GFunc) gimv_image_info_unref, NULL); + g_list_free (g_list_first (priv->filelist)); +} -GimvImageWin * -gimv_slideshow_open_window (GimvSlideShow *slideshow) +static GimvImageWin * +gimv_slideshow_open_window (GimvSlideshow *slideshow) { + GimvSlideshowPrivate *priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); GimvImageWin *iw; GimvImageView *iv; GList *current; - g_return_val_if_fail (slideshow, NULL); - g_return_val_if_fail (slideshow->filelist, NULL); + g_return_val_if_fail (priv->filelist, NULL); - if (slideshow->iw) - return slideshow->iw; + if (priv->iw) + return priv->iw; /* current = g_list_first (slideshow->filelist); */ - current = slideshow->current ? slideshow->current - : slideshow->filelist; - g_return_val_if_fail (slideshow, NULL); + current = priv->current ? priv->current + : priv->filelist; + g_return_val_if_fail (current, NULL); - slideshow->iw = GIMV_IMAGE_WIN (gimv_image_win_new (NULL)); - g_return_val_if_fail (slideshow->iw, NULL); + priv->iw = GIMV_IMAGE_WIN (gimv_image_win_new (NULL)); + g_return_val_if_fail (priv->iw, NULL); - iw = slideshow->iw; + iw = priv->iw; iv = iw->iv; /* override some parameters */ - gtk_object_set(GTK_OBJECT(iv), - "x_scale", conf.slideshow_img_scale, - "y_scale", conf.slideshow_img_scale, - "default_zoom", conf.slideshow_zoom, - "default_rotation", conf.slideshow_rotation, - "keep_aspect", conf.slideshow_keep_aspect, - NULL); + g_object_set(G_OBJECT(iv), + "x_scale", conf.slideshow_img_scale, + "y_scale", conf.slideshow_img_scale, + "default_zoom", conf.slideshow_zoom, + "default_rotation", conf.slideshow_rotation, + "keep_aspect", conf.slideshow_keep_aspect, + NULL); gimv_image_win_change_image (GIMV_IMAGE_WIN (iw), current->data); @@ -311,10 +313,10 @@ gimv_image_win_show_player (iw, conf.slideshow_player); gimv_image_win_show_statusbar (iw, conf.slideshow_statusbar); switch (conf.slideshow_screen_mode) { - case GimvSlideShowWinModeFullScreen: + case GimvSlideshowWinModeFullScreen: gimv_image_win_set_fullscreen (iw, TRUE); break; - case GimvSlideShowWinModeMaximize: + case GimvSlideshowWinModeMaximize: gimv_image_win_set_maximize (iw, TRUE); break; default: @@ -330,7 +332,7 @@ | GimvImageWinNotSaveStateFlag); gimv_image_win_slideshow_set_repeat (iw, conf.slideshow_repeat); - gimv_image_win_slideshow_set_interval (iw, conf.slideshow_interval * 1000); + gimv_image_win_slideshow_set_interval (iw, priv->interval); /* set bg color */ if (conf.slideshow_set_bg) { @@ -341,7 +343,7 @@ } gimv_image_view_set_list (iv, - slideshow->filelist, + priv->filelist, current, (gpointer) slideshow, next_image, @@ -350,64 +352,65 @@ remove_list, iw); - gtk_signal_connect_after (GTK_OBJECT (iw), "show_fullscreen", - GTK_SIGNAL_FUNC (cb_show_fullscreen), slideshow); - gtk_signal_connect_after (GTK_OBJECT (iw), "hide_fullscreen", - GTK_SIGNAL_FUNC (cb_hide_fullscreen), slideshow); + g_signal_connect_after (G_OBJECT (iw), "show_fullscreen", + G_CALLBACK (cb_show_fullscreen), slideshow); + g_signal_connect_after (G_OBJECT (iw), "hide_fullscreen", + G_CALLBACK (cb_hide_fullscreen), slideshow); - gtk_widget_show (GTK_WIDGET (slideshow->iw)); + gtk_widget_show (GTK_WIDGET (priv->iw)); return iw; } - -/* - * gimv_slideshow_play: - * @ Execute slide show; - * - * slideshow : Poiter to GimvSlideShow struct. - */ void -gimv_slideshow_play (GimvSlideShow *slideshow) +gimv_slideshow_play (GimvSlideshow *slideshow) { + GimvSlideshowPrivate *priv; GimvImageWin *iw = NULL; - g_return_if_fail (slideshow); + g_return_if_fail (GIMV_IS_SLIDESHOW (slideshow)); + + priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); - if (!slideshow->iw) + if (!priv->iw) iw = gimv_slideshow_open_window (slideshow); else - iw = slideshow->iw; + iw = priv->iw; g_return_if_fail (iw); gimv_image_win_slideshow_play (iw); } - void -gimv_slideshow_stop (GimvSlideShow *slideshow) +gimv_slideshow_stop (GimvSlideshow *slideshow) { + GimvSlideshowPrivate *priv; GimvImageWin *iw; - g_return_if_fail (slideshow); + g_return_if_fail (GIMV_IS_SLIDESHOW (slideshow)); + + priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); - iw = slideshow->iw; + iw = priv->iw; g_return_if_fail (iw); gimv_image_win_slideshow_stop (iw); } - void -gimv_slideshow_set_interval (GimvSlideShow *slideshow, guint interval) +gimv_slideshow_set_interval (GimvSlideshow *slideshow, guint interval) { + GimvSlideshowPrivate *priv; GimvImageWin *iw; - g_return_if_fail (slideshow); + g_return_if_fail (GIMV_IS_SLIDESHOW (slideshow)); - iw = slideshow->iw; - g_return_if_fail (iw); + priv = GIMV_SLIDESHOW_GET_PRIVATE (slideshow); + + priv->interval = interval; - gimv_image_win_slideshow_set_interval (slideshow->iw, interval); + iw = priv->iw; + if (iw) + gimv_image_win_slideshow_set_interval (priv->iw, interval); } diff -Nru gimageview-0.2.27/src/gimv_slideshow.h gimageview-0.3.0-0.20101117/src/gimv_slideshow.h --- gimageview-0.2.27/src/gimv_slideshow.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_slideshow.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_slideshow.h,v 1.1 2003/06/26 15:46:06 makeinu Exp $ + * $Id: gimv_slideshow.h 1168 2007-10-20 17:21:57Z makeinu $ */ #ifndef __GIMV_SLIDESHOW_H__ @@ -26,31 +26,40 @@ #include "gimageview.h" +#define GIMV_TYPE_SLIDESHOW (gimv_slideshow_get_type ()) +#define GIMV_SLIDESHOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_SLIDESHOW, GimvSlideshow)) +#define GIMV_SLIDESHOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_SLIDESHOW, GimvSlideshowClass)) +#define GIMV_IS_SLIDESHOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_SLIDESHOW)) +#define GIMV_IS_SLIDESHOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_SLIDESHOW)) +#define GIMV_SLIDESHOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_SLIDESHOW, GimvSlideshowClass)) + +typedef struct GimvSlideshow_Tag GimvSlideshow; +typedef struct GimvSlideshowClass_Tag GimvSlideshowClass; typedef enum { - GimvSlideShowWinModeFullScreen, - GimvSlideShowWinModeMaximize, - GimvSlideShowWinModeNormal -} GimvSlideShowWinMode; + GimvSlideshowWinModeFullScreen, + GimvSlideshowWinModeMaximize, + GimvSlideshowWinModeNormal +} GimvSlideshowWinMode; +struct GimvSlideshow_Tag +{ + GObject parent; +}; -struct GimvSlideShow_Tag +struct GimvSlideshowClass_Tag { - GimvImageWin *iw; - GList *filelist; - GList *current; - gboolean repeat; + GObjectClass parent_class; }; +GType gimv_slideshow_get_type (void); -GimvSlideShow *gimv_slideshow_new (void); -GimvSlideShow *gimv_slideshow_new_with_filelist (GList *filelist, +GimvSlideshow *gimv_slideshow_new (void); +GimvSlideshow *gimv_slideshow_new_with_filelist (GList *filelist, GList *start); -void gimv_slideshow_delete (GimvSlideShow *slideshow); -GimvImageWin *gimv_slideshow_open_window (GimvSlideShow *slideshow); -void gimv_slideshow_play (GimvSlideShow *slideshow); -void gimv_slideshow_stop (GimvSlideShow *slideshow); -void gimv_slideshow_set_interval (GimvSlideShow *slideshow, +void gimv_slideshow_play (GimvSlideshow *slideshow); +void gimv_slideshow_stop (GimvSlideshow *slideshow); +void gimv_slideshow_set_interval (GimvSlideshow *slideshow, guint interval); /* [msec] */ #endif /* __GIMV_SLIDESHOW_H__ */ diff -Nru gimageview-0.2.27/src/gimv_text_win.c gimageview-0.3.0-0.20101117/src/gimv_text_win.c --- gimageview-0.2.27/src/gimv_text_win.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_text_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,167 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_text_win.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#include + +#include "gimageview.h" +#include "gimv_text_win.h" +#include "prefs.h" +#include "utils_char_code.h" + +G_DEFINE_TYPE (GimvTextWin, gimv_text_win, GTK_TYPE_WINDOW) + +#define GIMV_TEXT_WIN_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GIMV_TYPE_TEXT_WIN, GimvTextWinPrivate)) + +typedef struct GimvTextWinPrivate_Tag +{ + GtkWidget *textbox; + GtkWidget *menubar; + GtkWidget *statusbar; + gchar *filename; +} GimvTextWinPrivate; + +static void gimv_text_win_dispose (GObject *object); + +static void +gimv_text_win_class_init (GimvTextWinClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = (GObjectClass *) klass; + gobject_class->dispose = gimv_text_win_dispose; + + g_type_class_add_private (gobject_class, sizeof (GimvTextWinPrivate)); +} + +static void +gimv_text_win_init (GimvTextWin *text_win) +{ + GimvTextWinPrivate *priv = GIMV_TEXT_WIN_GET_PRIVATE (text_win); + GtkWidget *vbox; + GtkWidget *scrolledwin, *text; + GtkWidget *statusbar; + + priv->filename = NULL; + + /* window */ + gtk_window_set_title (GTK_WINDOW (text_win), GIMV_PROG_NAME" -Text Viewer-"); + gtk_window_set_default_size (GTK_WINDOW (text_win), 600, 500); + + /* main vbox */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (text_win), vbox); + gtk_widget_show (vbox); + + /* text box */ + scrolledwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + gtk_box_pack_start (GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0); + gtk_widget_show (scrolledwin); + + text = gtk_text_view_new (); + priv->textbox = text; + gtk_container_add (GTK_CONTAINER (scrolledwin), text); + gtk_widget_show (text); + + /* statusbar */ + priv->statusbar = statusbar = gtk_statusbar_new (); + gtk_container_border_width (GTK_CONTAINER (statusbar), 1); + gtk_box_pack_start (GTK_BOX (vbox), statusbar, FALSE, TRUE, 0); + gtk_statusbar_push(GTK_STATUSBAR (statusbar), 1, "New Window"); + gtk_widget_show (statusbar); +} + +GtkWidget * +gimv_text_win_new (void) +{ + return GTK_WIDGET (g_object_new (GIMV_TYPE_TEXT_WIN, NULL)); +} + +static void +gimv_text_win_dispose (GObject *object) +{ + GimvTextWin *text_win = GIMV_TEXT_WIN (object); + GimvTextWinPrivate *priv = GIMV_TEXT_WIN_GET_PRIVATE (text_win); + + if (priv->filename) { + g_free (priv->filename); + priv->filename = NULL; + } + + if (G_OBJECT_CLASS (gimv_text_win_parent_class)->dispose) + G_OBJECT_CLASS (gimv_text_win_parent_class)->dispose (object); +} + +gboolean +gimv_text_win_load_file (GimvTextWin *text_win, gchar *filename) +{ + GimvTextWinPrivate *priv; + FILE *textfile; + gchar *tmpstr; + gchar buf[BUF_SIZE]; + GtkTextBuffer *buffer; + gchar *text; + + g_return_val_if_fail (GIMV_IS_TEXT_WIN (text_win) && filename, FALSE); + + priv = GIMV_TEXT_WIN_GET_PRIVATE (text_win); + + if (priv->filename) { + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->textbox)); + gtk_text_buffer_set_text (buffer, "\0", -1); + g_free (priv->filename); + priv->filename = NULL; + } + + textfile = fopen (filename, "r"); + if (!textfile) { + g_warning (_("Can't open text file: %s\n"), filename); + return FALSE; + } + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->textbox)); + + text = g_strdup (""); + while (fgets (buf, sizeof(buf), textfile)) { + gchar *tmpstr, *prev; + tmpstr = charset_to_internal (buf, NULL, NULL, + CHARSET_TO_INTERNAL_LOCALE); + prev = text; + text = g_strconcat (text, tmpstr, NULL); + g_free (prev); + } + gtk_text_buffer_set_text (buffer, text, -1); + g_free (text); + + fclose (textfile); + + tmpstr = g_strconcat (_("File Name: "), filename, NULL); + gtk_statusbar_push(GTK_STATUSBAR (priv->statusbar), 1, tmpstr); + g_free (tmpstr); + + priv->filename = g_strdup (filename); + + return TRUE; +} diff -Nru gimageview-0.2.27/src/gimv_text_win.h gimageview-0.3.0-0.20101117/src/gimv_text_win.h --- gimageview-0.2.27/src/gimv_text_win.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_text_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,55 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_text_win.h 1174 2007-10-21 13:05:12Z makeinu $ + */ + + +#ifndef __GIMV_TEXT_WIN_H__ +#define __GIMV_TEXT_WIN_H__ + +#include + +#define GIMV_TYPE_TEXT_WIN (gimv_text_win_get_type ()) +#define GIMV_TEXT_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_TEXT_WIN, GimvTextWin)) +#define GIMV_TEXT_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_TEXT_WIN, GimvTextWinClass)) +#define GIMV_IS_TEXT_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_TEXT_WIN)) +#define GIMV_IS_TEXT_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_TEXT_WIN)) +#define GIMV_TEXT_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_TEXT_WIN, GimvTextWinClass)) + +typedef struct GimvTextWin_Tag GimvTextWin; +typedef struct GimvTextWinClass_Tag GimvTextWinClass; + +struct GimvTextWin_Tag +{ + GtkWindow parent; +}; + +struct GimvTextWinClass_Tag +{ + GtkWindowClass parent_class; +}; + +GType gimv_text_win_get_type (void); +GtkWidget *gimv_text_win_new (void); +gboolean gimv_text_win_load_file (GimvTextWin *text_viewer, + gchar *filename); + +#endif /* __GIMV_TEXT_WIN_H__ */ diff -Nru gimageview-0.2.27/src/gimv_thumb.c gimageview-0.3.0-0.20101117/src/gimv_thumb.c --- gimageview-0.2.27/src/gimv_thumb.c 2004-07-10 11:08:39.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,32 +18,29 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb.c,v 1.7 2004/04/08 14:11:28 makeinu Exp $ + * $Id: gimv_thumb.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" #include "fileload.h" -#include "fileutil.h" #include "fr-archive.h" -#include "gfileutil.h" #include "gimv_icon_stock.h" #include "gimv_image.h" #include "gimv_image_info.h" #include "gimv_image_loader.h" -#include "prefs.h" #include "gimv_thumb.h" #include "gimv_thumb_cache.h" #include "gimv_thumb_view.h" +#include "prefs.h" +#include "utils_file.h" +#include "utils_file_gtk.h" -static void gimv_thumb_class_init (GimvThumbClass *klass); -static void gimv_thumb_init (GimvThumb *thumb); -static void gimv_thumb_destroy (GtkObject *obj); +static void gimv_thumb_dispose (GObject *obj); -static GtkObjectClass *parent_class = NULL; static GHashTable *loader_table = NULL; @@ -67,40 +64,17 @@ static GList *cache_read_list = NULL; -GtkType -gimv_thumb_get_type (void) -{ - static GtkType gimv_thumb_type = 0; - - if (!gimv_thumb_type) { - static const GtkTypeInfo gimv_thumb_info = { - "GimvThumbLoader", - sizeof (GimvThumb), - sizeof (GimvThumbClass), - (GtkClassInitFunc) gimv_thumb_class_init, - (GtkObjectInitFunc) gimv_thumb_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_thumb_type = gtk_type_unique (gtk_object_get_type (), - &gimv_thumb_info); - } - - return gimv_thumb_type; -} +G_DEFINE_TYPE (GimvThumb, gimv_thumb, G_TYPE_OBJECT) static void gimv_thumb_class_init (GimvThumbClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; - object_class->destroy = gimv_thumb_destroy; + gobject_class->dispose = gimv_thumb_dispose; } @@ -119,16 +93,11 @@ /* will be removed! */ thumb->selected = FALSE; - -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (thumb)); - gtk_object_sink (GTK_OBJECT (thumb)); -#endif } static void -gimv_thumb_destroy (GtkObject *object) +gimv_thumb_dispose (GObject *object) { GimvThumb *thumb; @@ -159,8 +128,8 @@ thumb->info = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (gimv_thumb_parent_class)->dispose) + G_OBJECT_CLASS (gimv_thumb_parent_class)->dispose (object); } @@ -295,9 +264,9 @@ if (loader) { g_hash_table_insert (loader_table, thumb, loader); - gtk_signal_connect (GTK_OBJECT (loader), "progress_update", - GTK_SIGNAL_FUNC (cb_loader_progress_update), - thumb); + g_signal_connect (G_OBJECT (loader), "progress_update", + G_CALLBACK (cb_loader_progress_update), + thumb); gimv_image_loader_set_load_type (loader, GIMV_IMAGE_LOADER_LOAD_THUMBNAIL); gimv_image_loader_set_size_request (loader, thumbsize, thumbsize, @@ -306,8 +275,8 @@ gimv_image_loader_load (loader); image = gimv_image_loader_get_image (loader); if (image) - gimv_image_ref (image); - gimv_image_loader_unref (loader); + g_object_ref (G_OBJECT (image)); + g_object_unref (G_OBJECT (loader)); g_hash_table_remove (loader_table, thumb); } @@ -324,7 +293,7 @@ if (imcache) { has_cache = TRUE; imdisp = imcache; - gimv_image_unref (image); + g_object_unref (G_OBJECT (image)); image = NULL; } else { imdisp = image; @@ -345,7 +314,7 @@ NULL, NULL); - gimv_image_unref (imdisp); + g_object_unref (G_OBJECT (imdisp)); imdisp = NULL; } @@ -395,7 +364,7 @@ gimv_thumb_new (GimvImageInfo *info) { GimvThumb *thumb - = GIMV_THUMB (gtk_type_new (gimv_thumb_get_type ())); + = GIMV_THUMB (g_object_new (GIMV_TYPE_THUMB, NULL)); thumb->info = gimv_image_info_ref (info); @@ -525,11 +494,7 @@ g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); if (!thumb->thumbnail) return NULL; -#ifdef USE_GTK2 return gtk_image_new_from_pixmap (thumb->thumbnail, thumb->thumbnail_mask); -#else /* USE_GTK2 */ - return gtk_pixmap_new (thumb->thumbnail, thumb->thumbnail_mask); -#endif /* USE_GTK2 */ } @@ -550,11 +515,7 @@ g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); if (!thumb->icon) return NULL; -#ifdef USE_GTK2 return gtk_image_new_from_pixmap (thumb->thumbnail, thumb->thumbnail_mask); -#else /* USE_GTK2 */ - return gtk_pixmap_new (thumb->icon, thumb->icon_mask); -#endif /* USE_GTK2 */ } diff -Nru gimageview-0.2.27/src/gimv_thumb_cache.c gimageview-0.3.0-0.20101117/src/gimv_thumb_cache.c --- gimageview-0.2.27/src/gimv_thumb_cache.c 2004-09-18 12:51:30.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_cache.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_cache.c,v 1.1 2003/07/05 16:41:11 makeinu Exp $ + * $Id: gimv_thumb_cache.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -31,9 +31,9 @@ #include "gimv_image.h" #include "gimv_image_info.h" #include "gimv_thumb_cache.h" -#include "gtkutils.h" -#include "fileutil.h" #include "prefs.h" +#include "utils_gtk.h" +#include "utils_file.h" GHashTable *thumbnail_loaders = NULL; diff -Nru gimageview-0.2.27/src/gimv_thumb_cache.h gimageview-0.3.0-0.20101117/src/gimv_thumb_cache.h --- gimageview-0.2.27/src/gimv_thumb_cache.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_cache.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_cache.h,v 1.2 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_thumb_cache.h 1036 2004-09-21 08:44:33Z makeinu $ */ #ifndef __GIMV_THUMB_CACHE_H__ diff -Nru gimageview-0.2.27/src/gimv_thumb.h gimageview-0.3.0-0.20101117/src/gimv_thumb.h --- gimageview-0.2.27/src/gimv_thumb.h 2004-07-10 11:08:39.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb.h,v 1.4 2004/04/08 13:39:25 makeinu Exp $ + * $Id: gimv_thumb.h 1139 2007-10-17 09:08:44Z makeinu $ */ #ifndef __GIMV_THUMB_H__ @@ -27,24 +27,21 @@ #include "gimageview.h" #include "fileload.h" - #define GIMV_TYPE_THUMB (gimv_thumb_get_type ()) -#define GIMV_THUMB(obj) (GTK_CHECK_CAST (obj, gimv_thumb_get_type (), GimvThumb)) -#define GIMV_THUMB_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_thumb_get_type, GimvThumbClass)) -#define GIMV_IS_THUMB(obj) (GTK_CHECK_TYPE (obj, gimv_thumb_get_type ())) -#define GIMV_IS_THUMB_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB)) - +#define GIMV_THUMB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_THUMB, GimvThumb)) +#define GIMV_THUMB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_THUMB, GimvThumbClass)) +#define GIMV_IS_THUMB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_THUMB)) +#define GIMV_IS_THUMB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB)) +#define GIMV_THUMB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_THUMB, GimvThumbClass)) typedef struct GimvThumbPriv_Tag GimvThumbPriv; typedef struct GimvThumbClass_Tag GimvThumbClass; - #define ICON_SIZE 18 - struct GimvThumb_Tag { - GtkObject parent; + GObject parent; GimvImageInfo *info; @@ -62,14 +59,12 @@ gboolean selected; }; - struct GimvThumbClass_Tag { - GtkObjectClass parent_class; + GObjectClass parent_class; }; - -GtkType gimv_thumb_get_type (void); +GType gimv_thumb_get_type (void); GimvThumb *gimv_thumb_new (GimvImageInfo *info); gboolean gimv_thumb_load (GimvThumb *thumb, gint thumb_size, @@ -90,16 +85,9 @@ gchar *gimv_thumb_find_thumbcache (const gchar *filename, gchar **type); -#ifdef USE_GTK2 -# define gimv_thumb_get_parent_thumbview(thumb) \ +#define gimv_thumb_get_parent_thumbview(thumb) \ ((GimvThumbView *) g_object_get_data(G_OBJECT(thumb), "GimvThumbView")) -# define gimv_thumb_set_parent_thumbview(thumb, tv) \ +#define gimv_thumb_set_parent_thumbview(thumb, tv) \ g_object_set_data(G_OBJECT(thumb), "GimvThumbView", tv); -#else -# define gimv_thumb_get_parent_thumbview(thumb) \ - ((GimvThumbView *) gtk_object_get_data(GTK_OBJECT(thumb), "GimvThumbView")) -# define gimv_thumb_set_parent_thumbview(thumb, tv) \ - gtk_object_set_data(GTK_OBJECT(thumb), "GimvThumbView", tv); -#endif #endif /* __GIMV_THUMB_H__ */ diff -Nru gimageview-0.2.27/src/gimv_thumb_view_album.c gimageview-0.3.0-0.20101117/src/gimv_thumb_view_album.c --- gimageview-0.2.27/src/gimv_thumb_view_album.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_view_album.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,877 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: gimv_thumb_view_album.c 1213 2009-01-14 09:24:51Z makeinu $ + */ + +#include + +#include "gimageview.h" + +#include "gimv_thumb.h" +#include "gimv_thumb_view.h" +#include "gimv_thumb_win.h" +#include "gimv_zalbum.h" +#include "prefs.h" +#include "utils_dnd.h" +#include "utils_gtk.h" + + +#define THUMBALBUM_LABEL "Album" +#define THUMBALBUM2_LABEL "Album 2" +#define THUMBALBUM3_LABEL "Album 3" + + +static void thumbalbum_freeze (GimvThumbView *tv); +static void thumbalbum_thaw (GimvThumbView *tv); +static void thumbalbum_append_thumb_frame (GimvThumbView *tv, + GimvThumb *thumb, + const gchar *dest_mode); +static void thumbalbum_update_thumbnail (GimvThumbView *tv, + GimvThumb *thumb, + const gchar *dest_mode); +static GList *thumbalbum_get_load_list (GimvThumbView *tv); +static void thumbalbum_remove_thumbnail (GimvThumbView *tv, + GimvThumb *thumb); +static void thumbalbum_adjust (GimvThumbView *tv, + GimvThumb *thumb); +static GtkWidget *thumbalbum_create (GimvThumbView *tv, + const gchar *dest_mode); +static gboolean thumbalbum_set_selection (GimvThumbView *tv, + GimvThumb *thumb, + gboolean select); +static void thumbalbum_set_focus (GimvThumbView *tv, + GimvThumb *thumb); +static GimvThumb *thumbalbum_get_focus (GimvThumbView *tv); +static gboolean thumbalbum_thumbnail_is_in_viewport (GimvThumbView *tv, + GimvThumb *thumb); + +GimvThumbViewPlugin thumbalbum_modes[] = +{ + {GIMV_THUMBNAIL_VIEW_IF_VERSION, + N_("Album"), + 0, + thumbalbum_create, + thumbalbum_freeze, + thumbalbum_thaw, + thumbalbum_append_thumb_frame, + thumbalbum_update_thumbnail, + thumbalbum_remove_thumbnail, + thumbalbum_get_load_list, + thumbalbum_adjust, + thumbalbum_set_selection, + thumbalbum_set_focus, + thumbalbum_get_focus, + thumbalbum_thumbnail_is_in_viewport}, + + {GIMV_THUMBNAIL_VIEW_IF_VERSION, + N_("Album 2"), + 10, + thumbalbum_create, + thumbalbum_freeze, + thumbalbum_thaw, + thumbalbum_append_thumb_frame, + thumbalbum_update_thumbnail, + thumbalbum_remove_thumbnail, + thumbalbum_get_load_list, + thumbalbum_adjust, + thumbalbum_set_selection, + thumbalbum_set_focus, + thumbalbum_get_focus, + thumbalbum_thumbnail_is_in_viewport}, + + {GIMV_THUMBNAIL_VIEW_IF_VERSION, + N_("Album 3"), + 20, + thumbalbum_create, + thumbalbum_freeze, + thumbalbum_thaw, + thumbalbum_append_thumb_frame, + thumbalbum_update_thumbnail, + thumbalbum_remove_thumbnail, + thumbalbum_get_load_list, + thumbalbum_adjust, + thumbalbum_set_selection, + thumbalbum_set_focus, + thumbalbum_get_focus, + thumbalbum_thumbnail_is_in_viewport}, +}; +gint thumbalbum_modes_num + = sizeof (thumbalbum_modes) / sizeof (GimvThumbViewPlugin); + + +typedef struct ThumbViewData_Tag +{ + GtkWidget *album; +} ThumbViewData; + + +/* defined in thumbview_list.c */ +void album_create_title_idx_list (void); +gchar *album_create_label_str (GimvThumb *thumb); + + +/****************************************************************************** + * + * Callback functions. + * + ******************************************************************************/ +static gboolean +cb_album_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + GimvThumbView *tv = data; + gint row; + GimvThumb *thumb; + gboolean retval = event->button == 3 ? TRUE : FALSE; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), retval); + + row = gimv_zlist_cell_index_from_xy (GIMV_ZLIST (widget), event->x, event->y); + if (row < 0) { + gtk_drag_source_unset (widget); + g_object_set_data (G_OBJECT (widget), "drag-unset", GINT_TO_POINTER (1)); + return retval; + } + + thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), row); + if (!thumb) return retval; + + retval = gimv_thumb_view_thumb_button_press_cb (widget, event, thumb); + + return retval; +} + + +static gboolean +cb_album_button_release (GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + GimvThumbView *tv = data; + GimvThumb *thumb; + gint row; + gpointer dnd_unset; + gboolean retval; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + + dnd_unset = g_object_get_data (G_OBJECT (widget), "drag-unset"); + if (dnd_unset) + dnd_src_set (widget, dnd_types_uri, dnd_types_uri_num); + dnd_unset = FALSE; + + row = gimv_zlist_cell_index_from_xy (GIMV_ZLIST (widget), event->x, event->y); + if (row < 0) { + return FALSE; + } + + thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), row); + if (!thumb) return FALSE; + + retval = gimv_thumb_view_thumb_button_release_cb (widget, event, thumb); + + gtk_widget_grab_focus (widget); + thumbalbum_set_focus (tv, thumb); + + return retval; +} + + +static void +cb_select_cell (GimvZAlbum *album, gint idx, GimvThumbView *tv) +{ + GimvThumb *thumb; + + g_return_if_fail (GIMV_IS_ZALBUM (album)); + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (album), idx); + g_return_if_fail (GIMV_IS_THUMB (thumb)); + + thumb->selected = TRUE; +} + +static void +cb_unselect_cell (GimvZAlbum *album, gint idx, GimvThumbView *tv) +{ + GimvThumb *thumb; + + g_return_if_fail (GIMV_IS_ZALBUM (album)); + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (album), idx); + g_return_if_fail (GIMV_IS_THUMB (thumb)); + + thumb->selected = FALSE; +} + + +static gboolean +cb_album_key_press (GtkWidget *widget, + GdkEventKey *event, + GimvThumbView *tv) +{ + GimvThumb *thumb = NULL; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + + if (GIMV_ZLIST (widget)->focus >= 0) + thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), + GIMV_ZLIST (widget)->focus); + + if (gimv_thumb_view_thumb_key_press_cb(widget, event, thumb)) + return FALSE; + + { + switch (event->keyval) { + case GDK_Left: + case GDK_Right: + case GDK_Up: + case GDK_Down: + if (event->state & GDK_SHIFT_MASK) { + gimv_thumb_view_set_selection_all (tv, FALSE); + gimv_thumb_view_set_selection (thumb, TRUE); + gimv_thumb_view_open_image (tv, thumb, + GIMV_THUMB_VIEW_OPEN_IMAGE_PREVIEW); + } + return TRUE; + case GDK_Return: + if (!thumb) break; + if (event->state & GDK_SHIFT_MASK || event->state & GDK_CONTROL_MASK) { + /* is there somteing to do? */ + } else { + gimv_thumb_view_set_selection_all (tv, FALSE); + } + gimv_thumb_view_set_selection (thumb, TRUE); + gimv_thumb_view_open_image (tv, thumb, + GIMV_THUMB_VIEW_OPEN_IMAGE_AUTO); + break; + case GDK_space: + if (!thumb) break; + gimv_thumb_view_set_selection (thumb, !thumb->selected); + break; + case GDK_Delete: + gimv_thumb_view_delete_files (tv); + break; + default: + break; + } + } + + return FALSE; +} + + +/****************************************************************************** + * + * private functions. + * + ******************************************************************************/ +static ThumbViewData * +thumbalbum_new (GimvThumbView *tv) +{ + ThumbViewData *tv_data; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + if (!tv_data) { + tv_data = g_new0 (ThumbViewData, 1); + tv_data->album = NULL; + g_object_set_data_full (G_OBJECT (tv), THUMBALBUM_LABEL, tv_data, + (GtkDestroyNotify) g_free); + } + + return tv_data; +} + + + +/****************************************************************************** + * + * public functions. + * + ******************************************************************************/ +static void +thumbalbum_freeze (GimvThumbView *tv) +{ + ThumbViewData *tv_data; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data && GIMV_IS_ZALBUM (tv_data->album)); + + gimv_zalbum_freeze (tv_data->album); +} + + +static void +thumbalbum_thaw (GimvThumbView *tv) +{ + ThumbViewData *tv_data; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data && GIMV_IS_ZALBUM (tv_data->album)); + + gimv_zalbum_thawn (tv_data->album); +} + + +static void +thumbalbum_append_thumb_frame (GimvThumbView *tv, GimvThumb *thumb, + const gchar *dest_mode) +{ + ThumbViewData *tv_data; + const gchar *filename; + gchar *label; + GdkPixmap *pixmap = NULL; + GdkBitmap *mask = NULL; + gint pos; + guint idx; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + g_return_if_fail (GIMV_IS_THUMB (thumb)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data); + + pos = g_list_index (tv->thumblist, thumb); + + filename = g_basename(gimv_image_info_get_path (thumb->info)); + + if (!strcmp (dest_mode, THUMBALBUM3_LABEL)) { + label = album_create_label_str (thumb); + } else { + label = gimv_filename_to_internal (filename); + } + + idx = gimv_zalbum_insert (GIMV_ZALBUM (tv_data->album), pos, label); + g_free (label); + + gimv_zalbum_set_cell_data (GIMV_ZALBUM (tv_data->album), idx, thumb); + + thumbalbum_set_selection (tv, thumb, thumb->selected); + + if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { + gimv_thumb_get_icon (thumb, &pixmap, &mask); + } else { + gimv_thumb_get_thumb (thumb, &pixmap, &mask); + } + + if (pixmap) + gimv_zalbum_set_pixmap (GIMV_ZALBUM (tv_data->album), idx, pixmap, mask); +} + + +static void +thumbalbum_update_thumbnail (GimvThumbView *tv, GimvThumb *thumb, + const gchar *dest_mode) +{ + ThumbViewData *tv_data; + GdkPixmap *pixmap = NULL; + GdkBitmap *mask = NULL; + gint pos; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + g_return_if_fail (GIMV_IS_THUMB (thumb)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data && tv_data->album); + + pos = g_list_index (tv->thumblist, thumb); + + /* set thumbnail */ + if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { + gimv_thumb_get_icon (thumb, &pixmap, &mask); + } else { + gimv_thumb_get_thumb (thumb, &pixmap, &mask); + } + if (pixmap) + gimv_zalbum_set_pixmap (GIMV_ZALBUM (tv_data->album), pos, pixmap, mask); +} + + +static GList * +thumbalbum_get_load_list (GimvThumbView *tv) +{ + GList *loadlist = NULL, *node; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + + for (node = tv->thumblist; node; node = g_list_next (node)) { + GimvThumb *thumb = node->data; + GdkPixmap *pixmap = NULL; + GdkBitmap *mask = NULL; + + if (!strcmp (THUMBALBUM2_LABEL, tv->summary_mode)) { + gimv_thumb_get_icon (thumb, &pixmap, &mask); + } else { + gimv_thumb_get_thumb (thumb, &pixmap, &mask); + } + if (!pixmap) + loadlist = g_list_append (loadlist, thumb); + } + + return loadlist; +} + + +static void +thumbalbum_remove_thumbnail (GimvThumbView *tv, GimvThumb *thumb) +{ + ThumbViewData *tv_data; + gint pos; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + g_return_if_fail (GIMV_IS_THUMB (thumb)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data && tv_data->album); + + pos = g_list_index (tv->thumblist, thumb); + g_return_if_fail (pos >= 0); + + gimv_zalbum_remove (GIMV_ZALBUM (tv_data->album), pos); +} + + +static gboolean +thumbalbum_set_selection (GimvThumbView *tv, GimvThumb *thumb, gboolean select) +{ + ThumbViewData *tv_data; + gint pos; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); + + if (g_list_length (tv->thumblist) < 1) return FALSE; + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_val_if_fail (tv_data && tv_data->album, FALSE); + + pos = g_list_index (tv->thumblist, thumb); + + if (pos >= 0) { + thumb->selected = select; + if (thumb->selected) + gimv_zlist_cell_select (GIMV_ZLIST (tv_data->album), pos); + else + gimv_zlist_cell_unselect (GIMV_ZLIST (tv_data->album), pos); + } + + return TRUE; +} + + +static void +thumbalbum_set_focus (GimvThumbView *tv, GimvThumb *thumb) +{ + ThumbViewData *tv_data; + gint pos; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data && tv_data->album); + + pos = g_list_index (tv->thumblist, thumb); + + if (pos < 0) + gimv_zlist_cell_unset_focus (GIMV_ZLIST (tv_data->album)); + else + gimv_zlist_cell_set_focus (GIMV_ZLIST (tv_data->album), pos); +} + + +static GimvThumb * +thumbalbum_get_focus (GimvThumbView *tv) +{ + ThumbViewData *tv_data; + gint pos; + GList *node; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_val_if_fail (tv_data && tv_data->album, NULL); + + pos = GIMV_ZLIST (tv_data->album)->focus; + if (pos < 0) return NULL; + + node = g_list_nth (tv->thumblist, pos); + if (node) + return node->data; + + return NULL; +} + + +static gboolean +thumbalbum_thumbnail_is_in_viewport (GimvThumbView *tv, GimvThumb *thumb) +{ + ThumbViewData *tv_data; + GList *node; + gint index; + gboolean success; + GdkRectangle area, cell_area, intersect_area; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); + g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_val_if_fail (tv_data, FALSE); + + node = g_list_find (tv->thumblist, thumb); + index = g_list_position (tv->thumblist, node); + + /* widget area */ + gtkutil_get_widget_area (tv_data->album, &area); + + /* cell area */ + success = gimv_zlist_get_cell_area (GIMV_ZLIST (tv_data->album), index, &cell_area); + g_return_val_if_fail (success, FALSE); + + /* intersect? */ + if (gdk_rectangle_intersect (&area, &cell_area, &intersect_area)) + return TRUE; + else + return FALSE; +} + + +static void +thumbalbum_adjust (GimvThumbView *tv, GimvThumb *thumb) +{ + ThumbViewData *tv_data; + GList *node; + gint pos; + + g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); + + node = g_list_find (gimv_thumb_view_get_list(), tv); + if (!node) return; + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + g_return_if_fail (tv_data); + + pos = g_list_index (tv->thumblist, thumb); + + gimv_zlist_moveto (GIMV_ZLIST (tv_data->album), pos); + + return; +} + + +static GtkWidget * +thumbalbum_create (GimvThumbView *tv, const gchar *dest_mode) +{ + ThumbViewData *tv_data; + + g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); + + tv_data = g_object_get_data (G_OBJECT (tv), THUMBALBUM_LABEL); + if (!tv_data) { + tv_data = thumbalbum_new (tv); + g_return_val_if_fail (tv_data, NULL); + } + + /* create zalbum widget */ + tv_data->album = gimv_zalbum_new (); + + if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { + gtk_widget_set_name (tv_data->album, "List2IconMode"); + gimv_zlist_set_to_horizontal (GIMV_ZLIST (tv_data->album)); + gimv_zalbum_set_label_position (GIMV_ZALBUM (tv_data->album), + GIMV_ZALBUM_CELL_LABEL_RIGHT); + gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), + ICON_SIZE, ICON_SIZE); + } else if (!strcmp (THUMBALBUM3_LABEL, dest_mode)) { + gtk_widget_set_name (tv_data->album, "List2ThumbMode"); + album_create_title_idx_list (); + gimv_zlist_set_to_horizontal (GIMV_ZLIST (tv_data->album)); + gimv_zalbum_set_label_position (GIMV_ZALBUM (tv_data->album), + GIMV_ZALBUM_CELL_LABEL_RIGHT); + gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), + tv->thumb_size, + tv->thumb_size); + } else { + gtk_widget_set_name (tv_data->album, "Thumbnail2Mode"); + gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), + tv->thumb_size, + tv->thumb_size); + } + + gimv_scrolled_set_auto_scroll (GIMV_SCROLLED (tv_data->album), + GIMV_SCROLLED_AUTO_SCROLL_BOTH + | GIMV_SCROLLED_AUTO_SCROLL_DND + | GIMV_SCROLLED_AUTO_SCROLL_MOTION); + + gimv_scrolled_set_h_auto_scroll_resolution (GIMV_SCROLLED (tv_data->album), + 20, 10); + gimv_scrolled_set_v_auto_scroll_resolution (GIMV_SCROLLED (tv_data->album), + 20, 10); + + gimv_zlist_set_selection_mode (GIMV_ZLIST (tv_data->album), + GTK_SELECTION_EXTENDED); + + if (!strcmp (THUMBALBUM_LABEL, dest_mode)) { + gimv_zlist_set_cell_padding (GIMV_ZLIST (tv_data->album), + conf.thumbalbum_col_space, + conf.thumbalbum_row_space); + } else { + gimv_zlist_set_cell_padding (GIMV_ZLIST (tv_data->album), 5, 5); + } + + gtk_widget_show (tv_data->album); + + g_signal_connect_after (G_OBJECT (tv_data->album), "button_press_event", + G_CALLBACK (cb_album_button_press), tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "button_release_event", + G_CALLBACK (cb_album_button_release), tv); + SIGNAL_CONNECT_TRANSRATE_SCROLL (tv_data->album); + g_signal_connect_after (G_OBJECT (tv_data->album), "key-press-event", + G_CALLBACK (cb_album_key_press), tv); + + g_signal_connect_after (G_OBJECT (tv_data->album), "cell_select", + G_CALLBACK (cb_select_cell), tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "cell_unselect", + G_CALLBACK (cb_unselect_cell), tv); + + /* Drag and Drop */ + dnd_src_set (tv_data->album, dnd_types_uri, dnd_types_uri_num); + dnd_dest_set (tv_data->album, dnd_types_uri, dnd_types_uri_num); + g_object_set_data (G_OBJECT (tv_data->album), "gimv-tab", tv); + + g_signal_connect_after (G_OBJECT (tv_data->album), "drag_begin", + G_CALLBACK (gimv_thumb_view_drag_begin_cb), + tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "drag_data_get", + G_CALLBACK (gimv_thumb_view_drag_data_get_cb), + tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "drag_data_received", + G_CALLBACK (gimv_thumb_view_drag_data_received_cb), + tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "drag-data-delete", + G_CALLBACK (gimv_thumb_view_drag_data_delete_cb), + tv); + g_signal_connect_after (G_OBJECT (tv_data->album), "drag_end", + G_CALLBACK (gimv_thumb_view_drag_end_cb), tv); + + /* append thumbnail frames */ + if (tv->thumblist) { + GList *node; + + for (node = tv->thumblist; node; node = g_list_next (node)) + thumbalbum_append_thumb_frame (tv, node->data, dest_mode); + + gimv_zlist_cell_set_focus (GIMV_ZLIST (tv_data->album), 0); + } + + return tv_data->album; +} + + + + + +#include "utils_file.h" +#define DEFAULT_DATA_ORDER "Name,Size,Time" +static gboolean show_data_title = FALSE; +static const gchar *data_order = DEFAULT_DATA_ORDER; +static gchar * +label_filename (GimvThumb *thumb) +{ + const gchar *filename; + gchar *tmpstr; + gchar buf[BUF_SIZE]; + + g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); + + filename = g_basename(gimv_image_info_get_path (thumb->info)); + + tmpstr = gimv_filename_to_internal (filename); + + if (show_data_title) + g_snprintf (buf, BUF_SIZE, _("Name : %s"), tmpstr); + else + return tmpstr; + + g_free (tmpstr); + + return g_strdup (buf); +} + + +static gchar * +label_size (GimvThumb *thumb) +{ + gchar *size_str, buf[BUF_SIZE]; + + g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); + + size_str = fileutil_size2str (thumb->info->st.st_size, FALSE); + if (show_data_title) + g_snprintf (buf, BUF_SIZE, _("Size : %s bytes"), size_str); + else + g_snprintf (buf, BUF_SIZE, _("%s bytes"), size_str); + g_free (size_str); + + return g_strdup (buf); +} + + +static gchar * +label_mtime (GimvThumb *thumb) +{ + gchar *time_str, *str; + + g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); + + time_str = fileutil_time2str (thumb->info->st.st_mtime); + if (show_data_title) + str = g_strconcat (_("Time : "), time_str, NULL); + else + return time_str; + g_free (time_str); + + return str; +} + + +static gchar * +label_image_type (GimvThumb *thumb) +{ + gchar buf[BUF_SIZE]; + const gchar *filename; + + g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); + + filename = gimv_image_info_get_path (thumb->info); + if (show_data_title) + g_snprintf (buf, BUF_SIZE, _("Type: %s"), + gimv_image_detect_type_by_ext (filename)); + else + return g_strdup (gimv_image_detect_type_by_ext (filename)); + + return g_strdup (buf); +} +typedef gchar *(*AlbumDataStr) (GimvThumb *thumb); +typedef struct _AlbumDisplayData +{ + gchar *title; + AlbumDataStr func; +} AlbumDisplayData; +static const gchar *config_order_string = NULL; +static GList *album_title_idx_list = NULL; +static gint album_title_idx_list_num = 0; +static AlbumDisplayData album_display_data [] = +{ + {N_("Name"), label_filename}, + {N_("Size"), label_size}, + {N_("Time"), label_mtime}, + {N_("Type"), label_image_type}, +}; +static gint album_display_data_num += sizeof (album_display_data) / sizeof (AlbumDisplayData); +gchar * +album_create_label_str (GimvThumb *thumb) +{ + GList *node; + gchar *label; + + g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); + + /* create icon label string */ + node = album_title_idx_list; + label = NULL; + while (node) { + gchar *tmpstr, *oldstr; + gint idx = GPOINTER_TO_INT (node->data); + + if (!label) { + label = album_display_data[idx].func (thumb); + } else { + tmpstr = album_display_data[idx].func (thumb); + oldstr = label; + label = g_strconcat (label, "\n", tmpstr, NULL); + g_free (tmpstr); + g_free (oldstr); + } + + node = g_list_next (node); + } + + return label; +} +static gint +album_get_title_idx (const gchar *title) +{ + gint i; + + g_return_val_if_fail (title, -1); + + for (i = 0; i < album_display_data_num; i++) { + if (!album_display_data[i].title) continue; + if (!strcmp (album_display_data[i].title, title)) + return i; + } + + return -1; +} +void +album_create_title_idx_list (void) +{ + gchar **titles; + gint i = 0; + + if (!data_order) { + config_order_string = NULL; + if (album_title_idx_list) + g_list_free (album_title_idx_list); + album_title_idx_list_num = 0; + return; + } + + if (data_order == config_order_string) return; + + if (album_title_idx_list) g_list_free (album_title_idx_list); + album_title_idx_list = NULL; + + titles = g_strsplit (data_order, ",", -1); + + g_return_if_fail (titles); + + album_title_idx_list_num = 0; + config_order_string = data_order; + + while (titles[i]) { + gint idx; + idx = album_get_title_idx (titles[i]); + if (idx >= 0) { + album_title_idx_list = g_list_append (album_title_idx_list, + GINT_TO_POINTER (idx)); + album_title_idx_list_num++; + } + i++; + } + + g_strfreev (titles); +} diff -Nru gimageview-0.2.27/src/gimv_thumb_view.c gimageview-0.3.0-0.20101117/src/gimv_thumb_view.c --- gimageview-0.2.27/src/gimv_thumb_view.c 2004-12-20 11:07:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_view.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_view.c,v 1.17 2004/12/20 11:07:31 makeinu Exp $ + * $Id: gimv_thumb_view.c 1213 2009-01-14 09:24:51Z makeinu $ */ #include @@ -29,16 +29,9 @@ #include "gimageview.h" -#include "charset.h" -#include "dirview.h" -#include "dnd.h" #include "fileload.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "gtk2-compat.h" -#include "gtk_prop.h" -#include "gtkutils.h" #include "gimv_comment_view.h" +#include "gimv_dir_view.h" #include "gimv_dupl_finder.h" #include "gimv_dupl_win.h" #include "gimv_image.h" @@ -48,11 +41,17 @@ #include "gimv_thumb_cache.h" #include "gimv_thumb_view.h" #include "gimv_thumb_win.h" -#include "menu.h" +#include "gimv_file_prop_win.h" #include "prefs.h" +#include "utils_char_code.h" +#include "utils_dnd.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_gtk.h" +#include "utils_menu.h" #ifdef ENABLE_EXIF -# include "exif_view.h" +# include "gimv_exif_view.h" #endif /* ENABLE_EXIF */ @@ -85,9 +84,7 @@ }; -static void gimv_thumb_view_class_init (GimvThumbViewClass *klass); -static void gimv_thumb_view_init (GimvThumbView *tv); -static void gimv_thumb_view_destroy (GtkObject *object); +static void gimv_thumb_view_dispose (GObject *object); /* callback functions */ @@ -203,8 +200,6 @@ static GList *GimvThumbViewList = NULL; -static GtkObjectClass *parent_class = NULL; - static guint total_tab_count = 0; static guint button = 0; @@ -433,7 +428,7 @@ thumblist = node = gimv_thumb_view_get_selection_list (tv); if (!thumblist) return; - action = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem), "num")); + action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "num")); /* find command */ if (action < sizeof (conf.progs) / sizeof (conf.progs[0])) { @@ -514,7 +509,7 @@ thumblist = node = gimv_thumb_view_get_selection_list (tv); if (!thumblist) return; - script = gtk_object_get_data (GTK_OBJECT (menuitem), "script"); + script = g_object_get_data (G_OBJECT (menuitem), "script"); if (!script || !script || !isexecutable (script)) goto ERROR; cmd = g_strdup (script); @@ -628,7 +623,7 @@ tv->vfuncs->remove_thumb (tv, thumb); gimv_thumb_view_remove_thumb_data (tv, thumb); - gtk_object_unref (GTK_OBJECT(thumb)); + g_object_unref (G_OBJECT(thumb)); } if (tv->vfuncs->thaw) @@ -664,7 +659,7 @@ flags |= GTK_PROP_EDITABLE | GTK_PROP_NOT_DETECT_TYPE; } - if (dlg_prop_from_image_info (info, flags)) + if (gimv_file_prop_win_run (info, flags)) gimv_thumb_view_refresh_list (tv); gimv_image_info_unref (info); @@ -686,8 +681,8 @@ thumb = thumblist->data; if (!thumb) return; - exif_view_create_window (gimv_image_info_get_path (thumb->info), - GTK_WINDOW (tv->tw)); + gimv_exif_view_create_window (gimv_image_info_get_path (thumb->info), + GTK_WINDOW (tv->tw)); } #endif /* ENABLE_EXIF */ @@ -807,8 +802,6 @@ tw = tv->tw; g_return_val_if_fail (GIMV_IS_THUMB_WIN (tw), FALSE); - gimv_thumb_win_notebook_drag_src_unset (tw); /* FIXMEEEEEEEE!! */ - /* reset selection */ if (event->type == GDK_BUTTON_PRESS && (event->button == 2 || event->button == 3)) @@ -864,8 +857,6 @@ tw = tv->tw; g_return_val_if_fail (GIMV_IS_THUMB_WIN (tw), FALSE); - gimv_thumb_win_notebook_drag_src_reset (tw); /* FIXMEEEEEEEEE!!! */ - if(pressed && !dragging) { if (tv->priv->button_2pressed_queue) { num = tv->priv->button_2pressed_queue; @@ -1053,8 +1044,8 @@ if (src_widget == widget) return; if (src_widget) - src_tab = gtk_object_get_data (GTK_OBJECT (src_widget), "gimv-tab"); - dest_tab = gtk_object_get_data (GTK_OBJECT (widget), "gimv-tab"); + src_tab = g_object_get_data (G_OBJECT (src_widget), "gimv-tab"); + dest_tab = g_object_get_data (G_OBJECT (widget), "gimv-tab"); if (src_tab == dest_tab) return; if (tv->mode == GIMV_THUMB_VIEW_MODE_DIR) { @@ -1453,7 +1444,7 @@ tv->status = GIMV_THUMB_VIEW_STATUS_LOADING; files->archive = gimv_image_info_get_archive (thumb->info); if (files->archive) - fr_archive_ref (files->archive); + g_object_ref (G_OBJECT (files->archive)); /* set progress bar */ gtk_progress_set_activity_mode (GTK_PROGRESS (tw->progressbar), TRUE); @@ -1887,9 +1878,9 @@ g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - gtk_signal_disconnect_by_func ( - GTK_OBJECT (iv), - GTK_SIGNAL_FUNC (cb_imageview_thumbnail_created), + g_signal_handlers_disconnect_by_func ( + G_OBJECT (iv), + G_CALLBACK (cb_imageview_thumbnail_created), tv); node = g_list_find (GimvThumbViewList, tv); @@ -2013,9 +2004,9 @@ label = g_strdup (pair[0]); menu_item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (menu_item), "num", GINT_TO_POINTER (i)); - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - GTK_SIGNAL_FUNC (cb_open_image_by_external), tv); + g_object_set_data (G_OBJECT (menu_item), "num", GINT_TO_POINTER (i)); + g_signal_connect (G_OBJECT (menu_item), "activate", + G_CALLBACK (cb_open_image_by_external), tv); gtk_menu_append (GTK_MENU (menu), menu_item); gtk_widget_show (menu_item); @@ -2122,8 +2113,8 @@ nth_image, remove_list, iw); - gtk_signal_connect (GTK_OBJECT (iv), "thumbnail_created", - GTK_SIGNAL_FUNC (cb_imageview_thumbnail_created), tv); + g_signal_connect (G_OBJECT (iv), "thumbnail_created", + G_CALLBACK (cb_imageview_thumbnail_created), tv); node = g_list_find (tv->priv->related_image_view, iv); if (!node) { gint num; @@ -2293,10 +2284,8 @@ NULL, NULL, button, time); tv->popup_menu = popup_menu; -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (tv->popup_menu)); + g_object_ref (G_OBJECT (tv->popup_menu)); gtk_object_sink (GTK_OBJECT (tv->popup_menu)); -#endif g_list_free (thumblist); } @@ -2507,7 +2496,7 @@ if (retval) { gimv_thumb_view_refresh_list (tv); if (tw->show_dirview) - dirview_refresh_list (tw->dv); + gimv_dir_view_refresh_list (tw->dv); } g_list_free (filelist); @@ -2559,14 +2548,14 @@ label = g_strdup (g_basename (filename)); menu_item = gtk_menu_item_new_with_label (label); - gtk_object_set_data_full (GTK_OBJECT (menu_item), - "script", - g_strdup (filename), - (GtkDestroyNotify) g_free); - gtk_signal_connect (GTK_OBJECT (menu_item), - "activate", - GTK_SIGNAL_FUNC (cb_open_image_by_script), - tv); + g_object_set_data_full (G_OBJECT (menu_item), + "script", + g_strdup (filename), + (GtkDestroyNotify) g_free); + g_signal_connect (G_OBJECT (menu_item), + "activate", + G_CALLBACK (cb_open_image_by_script), + tv); gtk_menu_append (GTK_MENU (menu), menu_item); gtk_widget_show (menu_item); @@ -2622,14 +2611,14 @@ vadj = gtk_scrolled_window_get_vadjustment ( GTK_SCROLLED_WINDOW (tv->container)); - gtk_signal_connect (GTK_OBJECT (hadj), - "value_changed", - GTK_SIGNAL_FUNC (cb_thumbview_scrollbar_value_changed), - tv); - gtk_signal_connect (GTK_OBJECT (vadj), - "value_changed", - GTK_SIGNAL_FUNC (cb_thumbview_scrollbar_value_changed), - tv); + g_signal_connect (G_OBJECT (hadj), + "value_changed", + G_CALLBACK (cb_thumbview_scrollbar_value_changed), + tv); + g_signal_connect (G_OBJECT (vadj), + "value_changed", + G_CALLBACK (cb_thumbview_scrollbar_value_changed), + tv); } @@ -2643,12 +2632,14 @@ hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (tv->container)); vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (tv->container)); - gtk_signal_disconnect_by_func (GTK_OBJECT (hadj), - GTK_SIGNAL_FUNC (cb_thumbview_scrollbar_value_changed), - tv); - gtk_signal_disconnect_by_func (GTK_OBJECT (vadj), - GTK_SIGNAL_FUNC (cb_thumbview_scrollbar_value_changed), - tv); + g_signal_handlers_disconnect_by_func ( + G_OBJECT (hadj), + G_CALLBACK (cb_thumbview_scrollbar_value_changed), + tv); + g_signal_handlers_disconnect_by_func ( + G_OBJECT (vadj), + G_CALLBACK (cb_thumbview_scrollbar_value_changed), + tv); } @@ -2714,9 +2705,10 @@ g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); gimv_dupl_win_unset_relation (sw); - gtk_signal_disconnect_by_func (GTK_OBJECT (sw), - GTK_SIGNAL_FUNC (cb_dupl_win_destroy), - tv); + g_signal_handlers_disconnect_by_func ( + G_OBJECT (sw), + G_CALLBACK (cb_dupl_win_destroy), + tv); } @@ -2848,7 +2840,7 @@ if(files->status < 0) { GimvThumbViewList = g_list_remove (GimvThumbViewList, tv); - gtk_object_unref (GTK_OBJECT (tv)); + g_object_unref (G_OBJECT (tv)); break; } else { /* update progress info */ @@ -2937,7 +2929,7 @@ tv->vfuncs->remove_thumb (tv, thumb); gimv_thumb_view_remove_thumb_data (tv, thumb); - gtk_object_unref (GTK_OBJECT(thumb)); + g_object_unref (G_OBJECT(thumb)); } /* destroy relation */ @@ -3109,7 +3101,7 @@ if (!exist) { tv->vfuncs->remove_thumb (tv, thumb); gimv_thumb_view_remove_thumb_data (tv, thumb); - gtk_object_unref (GTK_OBJECT (thumb)); + g_object_unref (G_OBJECT (thumb)); } exist = FALSE; @@ -3410,9 +3402,9 @@ /* create window */ sw = gimv_dupl_win_new (tv->thumb_size); - gtk_signal_connect (GTK_OBJECT (sw), "destroy", - GTK_SIGNAL_FUNC (cb_dupl_win_destroy), - tv); + g_signal_connect (G_OBJECT (sw), "destroy", + G_CALLBACK (cb_dupl_win_destroy), + tv); gimv_dupl_win_set_relation (sw, tv); tv->priv->related_dupl_win = g_list_append (tv->priv->related_dupl_win, sw); @@ -3483,42 +3475,19 @@ } -GtkType -gimv_thumb_view_get_type (void) -{ - static GtkType gimv_thumb_view_type = 0; - - if (!gimv_thumb_view_type) { - static const GtkTypeInfo gimv_thumb_view_info = { - "GimvThumbView", - sizeof (GimvThumbView), - sizeof (GimvThumbViewClass), - (GtkClassInitFunc) gimv_thumb_view_class_init, - (GtkObjectInitFunc) gimv_thumb_view_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_thumb_view_type = gtk_type_unique (gtk_object_get_type (), - &gimv_thumb_view_info); - } - - return gimv_thumb_view_type; -} +G_DEFINE_TYPE (GimvThumbView, gimv_thumb_view, G_TYPE_OBJECT) static void gimv_thumb_view_class_init (GimvThumbViewClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; gimv_thumb_view_get_summary_mode_list (); - object_class = (GtkObjectClass *) klass; - parent_class = gtk_type_class (gtk_object_get_type ()); + gobject_class = (GObjectClass *) klass; - object_class->destroy = gimv_thumb_view_destroy; + gobject_class->dispose = gimv_thumb_view_dispose; } @@ -3557,11 +3526,6 @@ tv->priv->related_dupl_win = NULL; tv->priv->button_2pressed_queue = 0; -#ifdef USE_GTK2 - gtk_object_ref (GTK_OBJECT (tv)); - gtk_object_sink (GTK_OBJECT (tv)); -#endif - GimvThumbViewList = g_list_append (GimvThumbViewList, tv); total_tab_count++; } @@ -3572,7 +3536,7 @@ { GimvThumbView *tv; - tv = GIMV_THUMB_VIEW (gtk_type_new (gimv_thumb_view_get_type ())); + tv = GIMV_THUMB_VIEW (g_object_new (GIMV_TYPE_THUMB_VIEW, NULL)); return tv; } @@ -3603,8 +3567,8 @@ GTK_SCROLLED_WINDOW (tv->container)); hadj->value = 0.0; vadj->value = 0.0; - gtk_signal_emit_by_name (GTK_OBJECT(hadj), "value_changed"); - gtk_signal_emit_by_name (GTK_OBJECT(vadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(hadj), "value_changed"); + g_signal_emit_by_name (G_OBJECT(vadj), "value_changed"); /* sort thumbnail list */ gimv_thumb_view_sort_data (tv); @@ -3688,7 +3652,7 @@ g_free (tv->priv->dirname); tv->priv->dirname = NULL; if (tv->priv->archive) - fr_archive_unref (tv->priv->archive); + g_object_unref (G_OBJECT (tv->priv->archive)); tv->priv->archive = NULL; /* set mode specific data */ @@ -3701,7 +3665,7 @@ tv->priv->dirname = g_strdup (files->dirname); } else if (mode == GIMV_THUMB_VIEW_MODE_ARCHIVE) { - fr_archive_ref (FR_ARCHIVE (files->archive)); + g_object_ref (G_OBJECT (files->archive)); tv->priv->archive = files->archive; } else if (mode == GIMV_THUMB_VIEW_MODE_COLLECTION) { @@ -3760,7 +3724,7 @@ /* set window status */ if (tv->mode == GIMV_THUMB_VIEW_MODE_DIR && tv->priv->dirname) - dirview_set_opened_mark (tv->tw->dv, tv->priv->dirname); + gimv_dir_view_set_opened_mark (tv->tw->dv, tv->priv->dirname); current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (tv->tw->notebook)); this_page = gtk_notebook_page_num (GTK_NOTEBOOK (tv->tw->notebook), @@ -3770,7 +3734,7 @@ tv->tw->status = GIMV_THUMB_WIN_STATUS_LOADING; gimv_thumb_win_set_sensitive (tv->tw, GIMV_THUMB_WIN_STATUS_LOADING); if (tv->mode == GIMV_THUMB_VIEW_MODE_DIR && tv->priv->dirname) - dirview_change_dir (tv->tw->dv, tv->priv->dirname); + gimv_dir_view_change_dir (tv->tw->dv, tv->priv->dirname); } else { tv->tw->status = GIMV_THUMB_WIN_STATUS_LOADING_BG; @@ -3802,7 +3766,7 @@ static void -gimv_thumb_view_destroy (GtkObject *object) +gimv_thumb_view_dispose (GObject *object) { GimvThumbView *tv; GList *node; @@ -3823,7 +3787,7 @@ if (tv->priv) { if (tv->tw && tv->tw->dv && tv->mode == GIMV_THUMB_VIEW_MODE_DIR && tv->priv->dirname) { - dirview_unset_opened_mark (tv->tw->dv, tv->priv->dirname); + gimv_dir_view_unset_opened_mark (tv->tw->dv, tv->priv->dirname); } g_free (tv->priv->dirname); @@ -3831,7 +3795,7 @@ /* remove archive */ if (tv->mode == GIMV_THUMB_VIEW_MODE_ARCHIVE && tv->priv->archive) { - fr_archive_unref (FR_ARCHIVE (tv->priv->archive)); + g_object_unref (G_OBJECT (tv->priv->archive)); tv->priv->archive = NULL; } @@ -3867,7 +3831,7 @@ } /* remove thumbnails */ - g_list_foreach (tv->thumblist, (GFunc) gtk_object_unref, NULL); + g_list_foreach (tv->thumblist, (GFunc) g_object_unref, NULL); g_list_free(tv->thumblist); tv->thumblist = NULL; @@ -3879,4 +3843,8 @@ g_free (tv->tabtitle); tv->tabtitle = NULL; + + if (G_OBJECT_CLASS (gimv_thumb_view_parent_class)->dispose) + G_OBJECT_CLASS (gimv_thumb_view_parent_class)->dispose (object); } + diff -Nru gimageview-0.2.27/src/gimv_thumb_view.h gimageview-0.3.0-0.20101117/src/gimv_thumb_view.h --- gimageview-0.2.27/src/gimv_thumb_view.h 2004-09-29 06:13:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_view.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_view.h,v 1.13 2004/09/29 06:13:50 makeinu Exp $ + * $Id: gimv_thumb_view.h 1179 2007-10-23 02:18:13Z makeinu $ */ #ifndef __GIMV_THUMB_VIEW_H__ @@ -30,25 +30,22 @@ #include "gimageview.h" #include "fileload.h" -#include "gfileutil.h" +#include "utils_file_gtk.h" #include "gimv_thumb_cache.h" - #define GIMV_TYPE_THUMB_VIEW (gimv_thumb_view_get_type ()) -#define GIMV_THUMB_VIEW(obj) (GTK_CHECK_CAST (obj, gimv_thumb_view_get_type (), GimvThumbView)) -#define GIMV_THUMB_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_thumb_view_get_type, GimvThumbViewClass)) -#define GIMV_IS_THUMB_VIEW(obj) (GTK_CHECK_TYPE (obj, gimv_thumb_view_get_type ())) -#define GIMV_IS_THUMB_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB_VIEW)) - +#define GIMV_THUMB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_THUMB_VIEW, GimvThumbView)) +#define GIMV_THUMB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_THUMB_VIEW, GimvThumbViewClass)) +#define GIMV_IS_THUMB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_THUMB_VIEW)) +#define GIMV_IS_THUMB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB_VIEW)) +#define GIMV_THUMB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_THUMB_VIEW, GimvThumbViewClass)) #define GIMV_THUMB_VIEW_DEFAULT_SUMMARY_MODE "Album" - typedef struct GimvThumbViewPriv_Tag GimvThumbViewPriv; typedef struct GimvThumbViewClass_Tag GimvThumbViewClass; typedef struct GimvThumbViewPlugin_Tag GimvThumbViewPlugin; - typedef enum { GIMV_THUMB_VIEW_MODE_COLLECTION, @@ -58,7 +55,6 @@ GIMV_THUMB_VIEW_MODE_ARCHIVE } GimvThumbViewMode; - typedef enum { GIMV_THUMB_VIEW_STATUS_NORMAL, @@ -66,7 +62,6 @@ GIMV_THUMB_VIEW_STATUS_CHECK_DUPLICATE } GimvThumbViewStatus; - typedef enum { GIMV_THUMB_VIEW_OPEN_IMAGE_AUTO, @@ -76,10 +71,9 @@ GIMV_THUMB_VIEW_OPEN_IMAGE_EXTERNAL } GimvThumbViewOpenImageType; - struct GimvThumbView_Tag { - GtkObject parent; + GObject parent; GList *thumblist; @@ -112,16 +106,13 @@ GimvThumbViewPriv *priv; }; - struct GimvThumbViewClass_Tag { - GtkObjectClass parent_class; + GObjectClass parent_class; }; - #define GIMV_THUMBNAIL_VIEW_IF_VERSION 8 - struct GimvThumbViewPlugin_Tag { const guint32 if_version; /* plugin interface version */ @@ -155,7 +146,6 @@ GimvThumb *thumb); }; - gint gimv_thumb_view_label_to_num (const gchar *label); const gchar *gimv_thumb_view_num_to_label (gint num); gchar **gimv_thumb_view_get_summary_mode_labels @@ -163,7 +153,7 @@ GList *gimv_thumb_view_get_summary_mode_list (void); -GtkType gimv_thumb_view_get_type (void); +GType gimv_thumb_view_get_type (void); GimvThumbView *gimv_thumb_view_new (void); gboolean gimv_thumb_view_set_widget (GimvThumbView *tv, GimvThumbWin *tw, diff -Nru gimageview-0.2.27/src/gimv_thumb_win.c gimageview-0.3.0-0.20101117/src/gimv_thumb_win.c --- gimageview-0.2.27/src/gimv_thumb_win.c 2004-12-20 18:18:30.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_win.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_win.c,v 1.21 2004/12/20 18:18:30 makeinu Exp $ + * $Id: gimv_thumb_win.c 1213 2009-01-14 09:24:51Z makeinu $ */ #include @@ -28,16 +28,9 @@ #include "gimageview.h" -#include "auto_completion.h" -#include "charset.h" -#include "dirview.h" -#include "dnd.h" -#include "fileutil.h" -#include "gfileutil.h" #include "gimv_comment_view.h" +#include "gimv_dir_view.h" #include "gimv_dupl_finder.h" -#include "gimv_hpaned.h" -#include "gimv_vpaned.h" #include "gimv_icon_stock.h" #include "gimv_image_win.h" #include "gimv_prefs_win.h" @@ -45,10 +38,14 @@ #include "gimv_thumb.h" #include "gimv_thumb_view.h" #include "gimv_thumb_win.h" -#include "gtk2-compat.h" #include "help.h" -#include "menu.h" #include "prefs.h" +#include "utils_auto_comp.h" +#include "utils_char_code.h" +#include "utils_dnd.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_menu.h" typedef enum { @@ -135,26 +132,24 @@ SLIDESHOW_START_FROM_FIRST, SLIDESHOW_START_FROM_SELECTED, SLIDESHOW_RANDOM_ORDER, -} SlideShowOrder; +} SlideshowOrder; typedef enum { SLIDESHOW_IMAGES_AND_MOVIES, SLIDESHOW_IMAGES_ONLY, SLIDESHOW_MOVIES_ONLY -} SlideShowFileType; +} SlideshowFileType; struct GimvThumbWinPriv_Tag { - SlideShowOrder slideshow_order; + SlideshowOrder slideshow_order; gboolean slideshow_selected_only; - SlideShowFileType slideshow_file_type; + SlideshowFileType slideshow_file_type; }; -static void gimv_thumb_win_class_init (GimvThumbWinClass *klass); -static void gimv_thumb_win_init (GimvThumbWin *iw); -static void gimv_thumb_win_destroy (GtkObject *object); +static void gimv_thumb_win_dispose (GObject *object); static void gimv_thumb_win_realize (GtkWidget *widget); static gboolean gimv_thumb_win_delete_event (GtkWidget *widget, GdkEventAny *event); @@ -180,8 +175,6 @@ GdkEventButton *event, gpointer data); static GtkWidget *image_preview_new (GimvThumbWin *tw); -static void add_accel_label_to_disp_mode_menu (GtkWidget *widget, - GtkWidget *window); static void location_entry_set_text (GimvThumbWin *tw, GimvThumbView *tv, const gchar *location); @@ -228,13 +221,13 @@ guint action, GtkWidget *widget); static void cb_slideshow_order (GimvThumbWin *tw, - SlideShowOrder action, + SlideshowOrder action, GtkWidget *widget); static void cb_slideshow_selected (GimvThumbWin *tw, guint action, GtkWidget *widget); static void cb_slideshow_file_type (GimvThumbWin *tw, - SlideShowFileType action, + SlideshowFileType action, GtkWidget *widget); static void cb_switch_page (GimvThumbWin *tw, SwitchPage action, @@ -286,10 +279,8 @@ GimvThumbWin *tw); /* callback function for toolbar buttons */ -#ifdef USE_GTK2 static void cb_location_entry_enter (GtkEditable *entry, GimvThumbWin *tw); -#endif /* USE_GTK2 */ static void cb_location_entry_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y, @@ -329,15 +320,6 @@ GimvThumbWin *tw); static void cb_tab_close_button_clicked (GtkWidget *button, GimvThumbWin *tw); -static void cb_com_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data); -static void cb_com_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data); static void cb_notebook_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y, @@ -359,14 +341,14 @@ guint info, guint time, gpointer data); -#ifdef USE_GTK2 /* FIXME */ +#if 1 /* FIXME */ static gboolean cb_focus_in (GtkWidget *widget, GdkEventFocus *event, GimvThumbWin *tw); static gboolean cb_focus_out (GtkWidget *widget, GdkEventFocus *event, GimvThumbWin *tw); -#endif /* USE_GTK2 */ +#endif /****************************************************************************** @@ -442,10 +424,8 @@ {N_("/Too_l/_Clear all cache"), NULL, cb_clear_cache, CLEAR_CACHE_ALL, NULL}, {N_("/Too_l/---"), NULL, NULL, 0, ""}, {N_("/Too_l/_Find duplicates"), NULL, NULL, 0, ""}, - {N_("/Too_l/---"), NULL, NULL, 0, ""}, - {N_("/Too_l/_Wallpaper setting"), NULL, NULL, 0, ""}, - {N_("/_Help"), NULL, NULL, 0, ""}, + {N_("/_Help"), NULL, NULL, 0, ""}, {NULL, NULL, NULL, 0, NULL}, }; @@ -470,9 +450,7 @@ {N_("/Slideshow Opt_ions"), NULL, NULL, 0, ""}, {N_("/Slideshow Opt_ions/Start from the _first"), NULL, cb_slideshow_order, SLIDESHOW_START_FROM_FIRST, ""}, {N_("/Slideshow Opt_ions/Start from the se_lected"),NULL, cb_slideshow_order, SLIDESHOW_START_FROM_SELECTED, "/Slideshow Options/Start from the first"}, -#ifdef USE_GTK2 {N_("/Slideshow Opt_ions/_Random order"), NULL, cb_slideshow_order, SLIDESHOW_RANDOM_ORDER, "/Slideshow Options/Start from the selected"}, -#endif /* USE_GTK2 */ {N_("/Slideshow Opt_ions/---"), NULL, NULL, 0, ""}, {N_("/Slideshow Opt_ions/_Selected only"), NULL, cb_slideshow_selected, 0, ""}, {N_("/Slideshow Opt_ions/---"), NULL, NULL, 0, ""}, @@ -556,46 +534,22 @@ }; -static GtkWindowClass *parent_class = NULL; static GList *ThumbWinList = NULL; -GtkType -gimv_thumb_win_get_type (void) -{ - static GtkType gimv_thumb_win_type = 0; - - if (!gimv_thumb_win_type) { - static const GtkTypeInfo gimv_thumb_win_info = { - "GimvThumbWin", - sizeof (GimvThumbWin), - sizeof (GimvThumbWinClass), - (GtkClassInitFunc) gimv_thumb_win_class_init, - (GtkObjectInitFunc) gimv_thumb_win_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; - - gimv_thumb_win_type = gtk_type_unique (GTK_TYPE_WINDOW, - &gimv_thumb_win_info); - } - - return gimv_thumb_win_type; -} +G_DEFINE_TYPE (GimvThumbWin, gimv_thumb_win, GTK_TYPE_WINDOW) static void gimv_thumb_win_class_init (GimvThumbWinClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; - object_class = (GtkObjectClass *) klass; - widget_class = (GtkWidgetClass *) klass; - parent_class = gtk_type_class (GTK_TYPE_WINDOW); + gobject_class = (GObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; - object_class->destroy = gimv_thumb_win_destroy; + gobject_class->dispose = gimv_thumb_win_dispose; widget_class->realize = gimv_thumb_win_realize; widget_class->delete_event = gimv_thumb_win_delete_event; @@ -644,9 +598,7 @@ ThumbWinList = g_list_append (ThumbWinList, tw); -#ifdef USE_GTK2 tw->accel_group_list = NULL; -#endif /* USE_GTK2 */ /* window */ gtk_widget_set_name (GTK_WIDGET (tw), "ThumbWin"); @@ -690,21 +642,19 @@ tw->location_entry = entry = gtk_entry_new (); gtk_widget_set_name (tw->location_entry, "LocationEntry"); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_signal_connect_after (GTK_OBJECT(entry), "key-press-event", - GTK_SIGNAL_FUNC(cb_location_entry_key_press), tw); + g_signal_connect_after (G_OBJECT(entry), "key-press-event", + G_CALLBACK(cb_location_entry_key_press), tw); dnd_dest_set (tw->location_entry, dnd_types_uri, dnd_types_uri_num); - gtk_signal_connect(GTK_OBJECT (tw->location_entry), "drag_data_received", - GTK_SIGNAL_FUNC (cb_location_entry_drag_data_received), tw); -#ifdef USE_GTK2 - gtk_signal_connect(GTK_OBJECT (tw->location_entry), "activate", - GTK_SIGNAL_FUNC (cb_location_entry_enter), tw); -#endif /* USE_GTK2 */ -#ifdef USE_GTK2 /* FIXME */ - gtk_signal_connect(GTK_OBJECT (tw->location_entry), "focus_in_event", - GTK_SIGNAL_FUNC (cb_focus_in), tw); - gtk_signal_connect(GTK_OBJECT (tw->location_entry), "focus_out_event", - GTK_SIGNAL_FUNC (cb_focus_out), tw); -#endif /* USE_GTK2 */ + g_signal_connect(G_OBJECT (tw->location_entry), "drag_data_received", + G_CALLBACK (cb_location_entry_drag_data_received), tw); + g_signal_connect(G_OBJECT (tw->location_entry), "activate", + G_CALLBACK (cb_location_entry_enter), tw); +#if 1 /* FIXME */ + g_signal_connect(G_OBJECT (tw->location_entry), "focus_in_event", + G_CALLBACK (cb_focus_in), tw); + g_signal_connect(G_OBJECT (tw->location_entry), "focus_out_event", + G_CALLBACK (cb_focus_out), tw); +#endif gtk_widget_show (entry); /* option menu for display mode */ @@ -720,7 +670,6 @@ summary_mode, cb_display_mode_menu, tw); gtk_widget_set_name (tw->summary_mode_menu, "DispModeOptionMenu"); - add_accel_label_to_disp_mode_menu (tw->summary_mode_menu, GTK_WIDGET (tw)); gtk_box_pack_end (GTK_BOX (hbox), tw->summary_mode_menu, FALSE, FALSE, 0); gtk_widget_show (tw->summary_mode_menu); @@ -743,17 +692,19 @@ gtk_widget_show (hbox); tw->status_bar1 = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(tw->status_bar1), FALSE); gtk_widget_set_name (tw->status_bar1, "StatusBar1"); gtk_container_border_width (GTK_CONTAINER (tw->status_bar1), 1); - gtk_widget_set_usize(tw->status_bar1, 150, -1); + gtk_widget_set_size_request(tw->status_bar1, 150, -1); gtk_box_pack_start (GTK_BOX (hbox), tw->status_bar1, TRUE, TRUE, 0); gtk_widget_show (tw->status_bar1); gtk_statusbar_push(GTK_STATUSBAR (tw->status_bar1), 1, _("New Window")); tw->status_bar2 = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(tw->status_bar2), FALSE); gtk_widget_set_name (tw->status_bar2, "StatusBar2"); gtk_container_border_width (GTK_CONTAINER (tw->status_bar2), 1); - gtk_widget_set_usize(tw->status_bar2, 150, -1); + gtk_widget_set_size_request(tw->status_bar2, 150, -1); gtk_box_pack_start (GTK_BOX (hbox), tw->status_bar2, TRUE, TRUE, 0); gtk_widget_show (tw->status_bar2); @@ -772,20 +723,20 @@ loading = files_loader_query_loading (); if (loading) gimv_thumb_win_set_sensitive (tw, GIMV_THUMB_WIN_STATUS_LOADING); -#ifdef USE_GTK2 /* FIXME */ +#if 1 /* FIXME */ if (tw->accel_group_list) g_slist_free (tw->accel_group_list); tw->accel_group_list = g_slist_copy (gtk_accel_groups_from_object (G_OBJECT (tw))); tw->accel_group_list = g_slist_reverse (tw->accel_group_list); -#endif /* USE_GTK2 */ +#endif } GtkWidget * gimv_thumb_win_new (void) { - GimvThumbWin *tw = gtk_type_new (GIMV_TYPE_THUMB_WIN); + GimvThumbWin *tw = g_object_new (GIMV_TYPE_THUMB_WIN, NULL); return GTK_WIDGET (tw); } @@ -803,7 +754,7 @@ static void -gimv_thumb_win_destroy (GtkObject *object) +gimv_thumb_win_dispose (GObject *object) { GimvThumbWin *tw = GIMV_THUMB_WIN (object); GimvThumbView *tv; @@ -823,7 +774,7 @@ if (tv->progress) { tv->progress->status = WINDOW_DESTROYED; } else { - gtk_object_unref (GTK_OBJECT (tv)); + g_object_unref (G_OBJECT (tv)); } } @@ -836,8 +787,8 @@ tw->priv = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (gimv_thumb_win_parent_class)->dispose) + G_OBJECT_CLASS (gimv_thumb_win_parent_class)->dispose (object); /* quit when last window */ if (!gimv_image_win_get_list() && !gimv_thumb_win_get_list()) { @@ -851,8 +802,8 @@ { GimvThumbWin *tw = GIMV_THUMB_WIN (widget); - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); + if (GTK_WIDGET_CLASS (gimv_thumb_win_parent_class)->realize) + GTK_WIDGET_CLASS (gimv_thumb_win_parent_class)->realize (widget); gimv_icon_stock_set_window_icon (GTK_WIDGET(tw)->window, "gimv_icon"); gtk_widget_grab_focus (tw->dv->dirtree); @@ -866,8 +817,8 @@ GimvThumbView *tv; GList *node; - if (GTK_WIDGET_CLASS (parent_class)->delete_event) - if (GTK_WIDGET_CLASS (parent_class)->delete_event (widget, event)) + if (GTK_WIDGET_CLASS (gimv_thumb_win_parent_class)->delete_event) + if (GTK_WIDGET_CLASS (gimv_thumb_win_parent_class)->delete_event (widget, event)) return TRUE; if (tw->status == GIMV_THUMB_WIN_STATUS_CHECKING_DUPLICATE) return TRUE; @@ -912,7 +863,7 @@ else return NULL; - gtk_widget_set_usize (table, 24, 24); + gtk_widget_set_size_request (table, 24, 24); gtk_widget_show (table); hbox = gtk_hbox_new (FALSE, 0); @@ -954,12 +905,12 @@ for (i = 0; i < 6; i++) { /* item = gtk_menu_item_new (group); */ item = gtk_menu_item_new (); - gtk_object_set_data (GTK_OBJECT (item), "num", GINT_TO_POINTER (i)); + g_object_set_data (G_OBJECT (item), "num", GINT_TO_POINTER (i)); icon = create_composition_icon (i); gtk_container_add (GTK_CONTAINER (item), icon); - gtk_signal_connect (GTK_OBJECT (item), "activate", - GTK_SIGNAL_FUNC (cb_win_composition_menu), - tw); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (cb_win_composition_menu), + tw); /* group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item)); */ gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); @@ -1219,70 +1170,13 @@ } -#warning should be implemented as customizable launcher. -static void -cb_wallpaper_setting (GtkWidget *menuitem, GimvThumbWin *tw) -{ - const gchar *str; - gchar *cmd; - - str = gtk_object_get_data (GTK_OBJECT (menuitem), "command"); - if (!str) return; - - cmd = g_strconcat (str, " &", NULL); - system (cmd); - - g_free (cmd); -} - - -static GtkWidget * -create_wallpaper_submenu (GimvThumbWin *tw) -{ - GtkWidget *menu; - GtkWidget *menu_item; - gint i; - gchar **menus, **pair; - - menus = g_strsplit (conf.wallpaper_menu, ";", -1); - if (!menus) return NULL; - - menu = gtk_menu_new(); - - /* count items num */ - for (i = 0; menus[i]; i++) { - if (!menus[i] || !*menus[i]) continue; - - pair = g_strsplit (menus[i], ",", 2); - - if (pair && pair[0] && pair[1]) { - menu_item = gtk_menu_item_new_with_label (pair[0]); - gtk_object_set_data_full (GTK_OBJECT (menu_item), "command", - g_strdup (pair[1]), - (GtkDestroyNotify) g_free); - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - GTK_SIGNAL_FUNC (cb_wallpaper_setting), tw); - gtk_menu_append (GTK_MENU (menu), menu_item); - gtk_widget_show (menu_item); - } - - g_strfreev (pair); - } - - g_strfreev (menus); - - return menu; -} - - static void create_gimv_thumb_win_menus (GimvThumbWin *tw) { static GtkItemFactoryEntry *entries = NULL; - GtkWidget *item, *dupmenu; + GtkWidget *item, *dupmenu, *help; GtkItemFactory *ifactory; guint n_menu_items, layout; - GtkWidget *submenu, *help; const gchar **labels; gint i = 0; @@ -1293,9 +1187,6 @@ n_menu_items, "", tw); gtk_container_add(GTK_CONTAINER(tw->menubar_handle), tw->menubar); -#ifndef USE_GTK2 - gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(tw->menubar), GTK_SHADOW_NONE); -#endif /* USE_GTK2 */ gtk_widget_show (tw->menubar); /* sub menu */ @@ -1337,9 +1228,6 @@ menu_set_submenu (tw->menubar, "/Help", help); menu_set_submenu (tw->view_menu, "/Sort File List", tw->sort_menu); menu_set_submenu (tw->view_menu, "/Layout/Window Composition", tw->comp_menu); - submenu = create_wallpaper_submenu (tw); - if (submenu) - menu_set_submenu (tw->menubar, "/Tool/Wallpaper setting", submenu); ifactory = gtk_item_factory_from_widget (tw->menubar); tw->menuitem.file = gtk_item_factory_get_item (ifactory, "/File"); @@ -1394,26 +1282,26 @@ tw->menuitem.sort_case = gtk_item_factory_get_item (ifactory, "/Case insensitive"); tw->menuitem.sort_dir = gtk_item_factory_get_item (ifactory, "/Directory insensitive"); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.file)->submenu), - "show", GTK_SIGNAL_FUNC (cb_file_submenu_show), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.file)->submenu), - "hide", GTK_SIGNAL_FUNC (cb_file_submenu_hide), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.edit)->submenu), - "show", GTK_SIGNAL_FUNC (cb_edit_submenu_show), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.edit)->submenu), - "hide", GTK_SIGNAL_FUNC (cb_edit_submenu_hide), tw); - gtk_signal_connect (GTK_OBJECT (tw->view_menu), - "show", GTK_SIGNAL_FUNC (cb_view_submenu_show), tw); - gtk_signal_connect (GTK_OBJECT (tw->view_menu), - "hide", GTK_SIGNAL_FUNC (cb_view_submenu_hide), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (item)->submenu), - "show", GTK_SIGNAL_FUNC (cb_tab_submenu_show), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (item)->submenu), - "hide", GTK_SIGNAL_FUNC (cb_tab_submenu_hide), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.tool)->submenu), - "show", GTK_SIGNAL_FUNC (cb_tool_submenu_show), tw); - gtk_signal_connect (GTK_OBJECT (GTK_MENU_ITEM (tw->menuitem.tool)->submenu), - "hide", GTK_SIGNAL_FUNC (cb_tool_submenu_hide), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.file)->submenu), + "show", G_CALLBACK (cb_file_submenu_show), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.file)->submenu), + "hide", G_CALLBACK (cb_file_submenu_hide), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.edit)->submenu), + "show", G_CALLBACK (cb_edit_submenu_show), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.edit)->submenu), + "hide", G_CALLBACK (cb_edit_submenu_hide), tw); + g_signal_connect (G_OBJECT (tw->view_menu), + "show", G_CALLBACK (cb_view_submenu_show), tw); + g_signal_connect (G_OBJECT (tw->view_menu), + "hide", G_CALLBACK (cb_view_submenu_hide), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (item)->submenu), + "show", G_CALLBACK (cb_tab_submenu_show), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (item)->submenu), + "hide", G_CALLBACK (cb_tab_submenu_hide), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.tool)->submenu), + "show", G_CALLBACK (cb_tool_submenu_show), tw); + g_signal_connect (G_OBJECT (GTK_MENU_ITEM (tw->menuitem.tool)->submenu), + "hide", G_CALLBACK (cb_tool_submenu_hide), tw); /* initialize check menu items */ if (tw->layout_type < 0) @@ -1545,84 +1433,91 @@ toolbar = gtkutil_create_toolbar (); /* file open button */ - iconw = gimv_icon_stock_get_widget ("nfolder"); + iconw = gtk_image_new_from_stock(GTK_STOCK_OPEN, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Open"), _("File Open"), _("File Open"), iconw, - GTK_SIGNAL_FUNC (cb_open_button), + G_CALLBACK (cb_open_button), tw); tw->button.fileopen = button; /* preference button */ - iconw = gimv_icon_stock_get_widget ("prefs"); + iconw = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Prefs"), _("Preference"), _("Preference"), iconw, - GTK_SIGNAL_FUNC (cb_prefs_button), + G_CALLBACK (cb_prefs_button), tw); tw->button.prefs = button; gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); /* previous button */ - iconw = gimv_icon_stock_get_widget ("leftarrow"); + iconw = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Prev"), _("Go to previous page"), _("Go to previous page"), iconw, - GTK_SIGNAL_FUNC (cb_previous_button), + G_CALLBACK (cb_previous_button), tw); tw->button.prev = button; /* next button */ - iconw = gimv_icon_stock_get_widget ("rightarrow"); + iconw = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Next"), _("Go to next page"), _("Go to next page"), iconw, - GTK_SIGNAL_FUNC (cb_next_button), + G_CALLBACK (cb_next_button), tw); tw->button.next = button; gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); /* refresh button */ - iconw = gimv_icon_stock_get_widget ("refresh"); + iconw = gtk_image_new_from_stock(GTK_STOCK_REFRESH, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Reload"), _("Reload Cache"), _("Reload Cache"), iconw, - GTK_SIGNAL_FUNC (cb_refresh_button), + G_CALLBACK (cb_refresh_button), tw); tw->button.refresh = button; /* skip button */ - iconw = gimv_icon_stock_get_widget ("skip"); + iconw = gtk_image_new_from_stock(GTK_STOCK_GOTO_LAST, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Skip"), _("Skip creating current thumbnail table"), _("Skip creating current thumbnail table"), iconw, - GTK_SIGNAL_FUNC (cb_skip_button), + G_CALLBACK (cb_skip_button), tw); gtk_widget_set_sensitive (button, FALSE); tw->button.skip = button; /* stop button */ - iconw = gimv_icon_stock_get_widget ("stop"); + iconw = gtk_image_new_from_stock(GTK_STOCK_STOP, + GTK_ICON_SIZE_SMALL_TOOLBAR); button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), _("Stop"), _("Stop creating thumbnails"), _("Stop creating thumbnails"), iconw, - GTK_SIGNAL_FUNC (cb_stop_button), + G_CALLBACK (cb_stop_button), tw); gtk_widget_set_sensitive (button, FALSE); tw->button.stop = button; @@ -1637,8 +1532,8 @@ tw->button.size_spin = spinner; gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), spinner, _("Thumbnail Size"), _("Thumbnail Size")); - gtk_signal_connect (GTK_OBJECT(spinner), "key-press-event", - GTK_SIGNAL_FUNC(cb_size_spinner_key_press), tw); + g_signal_connect (G_OBJECT(spinner), "key-press-event", + G_CALLBACK(cb_size_spinner_key_press), tw); gtk_widget_show (spinner); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); @@ -1650,7 +1545,7 @@ _("Exit this program"), _("Exit this program"), iconw, - GTK_SIGNAL_FUNC (cb_quit_button), + G_CALLBACK (cb_quit_button), NULL); tw->button.quit = button; gtk_widget_hide (tw->button.quit); @@ -1732,33 +1627,34 @@ gpane = tw->pane1; size = &tw->pane_size1; } else { - gint pane1_hide_item = gimv_paned_which_hidden (GIMV_PANED(tw->pane1)); - gint pane2_hide_item = gimv_paned_which_hidden (GIMV_PANED(tw->pane2)); + gint pane1_hide_item = gtkutil_paned_which_is_hidden (GTK_PANED(tw->pane1)); + gint pane2_hide_item = gtkutil_paned_which_is_hidden (GTK_PANED(tw->pane2)); /* * directory view and preview are attach to same pane, * and one of them is hidden. */ if (compose.widget_type[0] == GIMV_COM_THUMB_VIEW - && gimv_paned_which_hidden (GIMV_PANED(tw->pane2)) != 0 + && gtkutil_paned_which_is_hidden (GTK_PANED(tw->pane2)) != 0 && ((pane1_hide_item == 0 && !show) || (pane1_hide_item != 0 && show))) { gpane = tw->pane1; size = &tw->pane_size1; - if (GIMV_PANED(tw->pane1)->child1 == tw->pane2) { + if (GTK_PANED(tw->pane1)->child1 == tw->pane2) { child = 1; - } else if (GIMV_PANED(tw->pane1)->child2 == tw->pane2) { + } else if (GTK_PANED(tw->pane1)->child2 == tw->pane2) { child = 2; } else { goto FUNC_END; } if (show && (val == pane2_hide_item)) { - gimv_paned_split (GIMV_PANED(tw->pane2)); + gtk_widget_show (GTK_PANED(tw->pane2)->child1); + gtk_widget_show (GTK_PANED(tw->pane2)->child2); if (pane2_hide_item == 1) - gimv_paned_hide_child2 (GIMV_PANED (tw->pane2)); + gtk_widget_hide (GTK_PANED (tw->pane2)->child2); else if (pane2_hide_item == 2) - gimv_paned_hide_child1 (GIMV_PANED (tw->pane2)); + gtk_widget_hide (GTK_PANED (tw->pane2)->child1); } } else { @@ -1768,14 +1664,15 @@ } if (show) { - gimv_paned_split (GIMV_PANED (gpane)); - gimv_paned_set_position (GIMV_PANED (gpane), *size); + gtk_widget_show (GTK_PANED (gpane)->child1); + gtk_widget_show (GTK_PANED (gpane)->child2); + gtk_paned_set_position (GTK_PANED (gpane), *size); } else { - *size = gimv_paned_get_position (GIMV_PANED (gpane)); + *size = gtk_paned_get_position (GTK_PANED (gpane)); if (child == 1) - gimv_paned_hide_child1 (GIMV_PANED (gpane)); + gtk_widget_hide (GTK_PANED (gpane)->child1); else - gimv_paned_hide_child2 (GIMV_PANED (gpane)); + gtk_widget_hide (GTK_PANED (gpane)->child2); } FUNC_END: @@ -1798,8 +1695,7 @@ /* create each widget */ dirname = g_get_current_dir (); - tw->dv = dirview_create (dirname, GTK_WIDGET (tw), tw); - tw->dirview = tw->dv->container; + tw->dv = GIMV_DIR_VIEW (gimv_dir_view_new (dirname, tw)); thumbview = thumbnail_view_new (tw); tw->preview = image_preview_new (tw); g_free (dirname); @@ -1807,7 +1703,7 @@ for (i = 0; i < 3; i++) { switch (compose.widget_type[i]) { case GIMV_COM_DIR_VIEW: - widget[i] = tw->dirview; + widget[i] = GTK_WIDGET (tw->dv); break; case GIMV_COM_THUMB_VIEW: widget[i] = thumbview; @@ -1822,27 +1718,27 @@ /* compose */ if (compose.pane2_horizontal) - tw->pane2 = gimv_hpaned_new (); + tw->pane2 = gtk_hpaned_new (); else - tw->pane2 = gimv_vpaned_new (); + tw->pane2 = gtk_vpaned_new (); if (compose.pane1_horizontal) - tw->pane1 = gimv_hpaned_new (); + tw->pane1 = gtk_hpaned_new (); else - tw->pane1 = gimv_vpaned_new (); + tw->pane1 = gtk_vpaned_new (); if (compose.pane2_attach_to_child1) { - gimv_paned_add1 (GIMV_PANED (tw->pane1), tw->pane2); - gimv_paned_add2 (GIMV_PANED (tw->pane1), widget[0]); + gtk_paned_add1 (GTK_PANED (tw->pane1), tw->pane2); + gtk_paned_add2 (GTK_PANED (tw->pane1), widget[0]); } else { - gimv_paned_add1 (GIMV_PANED (tw->pane1), widget[0]); - gimv_paned_add2 (GIMV_PANED (tw->pane1), tw->pane2); + gtk_paned_add1 (GTK_PANED (tw->pane1), widget[0]); + gtk_paned_add2 (GTK_PANED (tw->pane1), tw->pane2); } - gimv_paned_add1 (GIMV_PANED (tw->pane2), widget[1]); - gimv_paned_add2 (GIMV_PANED (tw->pane2), widget[2]); + gtk_paned_add1 (GTK_PANED (tw->pane2), widget[1]); + gtk_paned_add2 (GTK_PANED (tw->pane2), widget[2]); - gimv_paned_set_position (GIMV_PANED (tw->pane1), + gtk_paned_set_position (GTK_PANED (tw->pane1), tw->pane_size1); - gimv_paned_set_position (GIMV_PANED (tw->pane2), + gtk_paned_set_position (GTK_PANED (tw->pane2), tw->pane_size2); /* show widget */ @@ -1855,6 +1751,19 @@ } +static gboolean +cb_notebook_drag_motion (GtkWidget *widget) { + g_signal_stop_emission_by_name(G_OBJECT (widget), "drag-motion"); + return TRUE; +} + + +static void +cb_notebook_drag_drop (GtkWidget *widget) { + g_signal_stop_emission_by_name(G_OBJECT (widget), "drag-drop"); +} + + static GtkWidget * thumbnail_view_new (GimvThumbWin *tw) { @@ -1874,29 +1783,28 @@ gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook)); gtk_notebook_set_tab_hborder (GTK_NOTEBOOK (notebook), 0); gtk_notebook_set_tab_vborder (GTK_NOTEBOOK (notebook), 0); - gtk_signal_connect (GTK_OBJECT(notebook), "switch-page", - GTK_SIGNAL_FUNC(cb_thumb_notebook_switch_page), tw); + g_signal_connect (G_OBJECT(notebook), "switch-page", + G_CALLBACK(cb_thumb_notebook_switch_page), tw); - gtk_object_set_data (GTK_OBJECT (notebook), "thumbwin", tw); - dnd_src_set (notebook, dnd_types_tab_component, dnd_types_tab_component_num); - gtk_signal_connect (GTK_OBJECT (notebook), "drag_begin", - GTK_SIGNAL_FUNC (cb_com_drag_begin), tw); - gtk_signal_connect (GTK_OBJECT (notebook), "drag_data_get", - GTK_SIGNAL_FUNC (cb_com_drag_data_get), tw); + g_object_set_data (G_OBJECT (notebook), "thumbwin", tw); dnd_dest_set (notebook, dnd_types_all, dnd_types_all_num); - gtk_object_set_data (GTK_OBJECT (notebook), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); - gtk_signal_connect (GTK_OBJECT (notebook), "drag_data_received", - GTK_SIGNAL_FUNC (cb_notebook_drag_data_received), tw); + g_object_set_data (G_OBJECT (notebook), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); + g_signal_connect (G_OBJECT (notebook), "drag_motion", + G_CALLBACK (cb_notebook_drag_motion), tw); + g_signal_connect (G_OBJECT (notebook), "drag_drop", + G_CALLBACK (cb_notebook_drag_drop), tw); + g_signal_connect (G_OBJECT (notebook), "drag_data_received", + G_CALLBACK (cb_notebook_drag_data_received), tw); dnd_dest_set (vbox, dnd_types_all, dnd_types_all_num); - gtk_object_set_data (GTK_OBJECT (vbox), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); - gtk_signal_connect (GTK_OBJECT (vbox), "drag_data_received", - GTK_SIGNAL_FUNC (cb_notebook_drag_data_received), tw); + g_object_set_data (G_OBJECT (vbox), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); + g_signal_connect (G_OBJECT (vbox), "drag_data_received", + G_CALLBACK (cb_notebook_drag_data_received), tw); tw->notebook = notebook; @@ -2003,47 +1911,15 @@ static gboolean -cb_unset_com_dnd (GtkWidget *widget, - GdkEventButton *event, - GimvThumbWin *tw) -{ - g_return_val_if_fail (tw, FALSE); - g_return_val_if_fail (tw->cv, FALSE); - gtk_drag_source_unset (tw->cv->notebook); - - return FALSE; -} - - -static gboolean -cb_reset_com_dnd (GtkWidget *widget, - GdkEventButton *event, - GimvThumbWin *tw) -{ - g_return_val_if_fail (tw, FALSE); - g_return_val_if_fail (tw->cv, FALSE); - dnd_src_set (tw->cv->notebook, - dnd_types_component, - dnd_types_component_num); - return FALSE; -} - - -static gboolean cb_comment_view_delete (GtkWidget *widget, GdkEventAny *event, GimvThumbWin *tw) { if (tw->cv) { -#ifdef USE_GTK2 if (g_slist_find (tw->accel_group_list, tw->cv->accel_group)) tw->accel_group_list = g_slist_remove (tw->accel_group_list, tw->cv->accel_group); else gtk_window_remove_accel_group (GTK_WINDOW (tw), tw->cv->accel_group); -#else /* USE_GTK2 */ - gtk_window_remove_accel_group (GTK_WINDOW (tw), - tw->cv->accel_group); -#endif /* USE_GTK2 */ } return FALSE; } @@ -2061,18 +1937,18 @@ gtk_accel_group_ref (cv->accel_group); gtk_window_add_accel_group (GTK_WINDOW (tw), cv->accel_group); } - gtk_signal_connect (GTK_OBJECT (cv->main_vbox), "delete_event", - GTK_SIGNAL_FUNC (cb_comment_view_delete), tw); -#ifdef USE_GTK2 /* FIXME */ - gtk_signal_connect(GTK_OBJECT (cv->value_entry), "focus_in_event", - GTK_SIGNAL_FUNC (cb_focus_in), tw); - gtk_signal_connect(GTK_OBJECT (cv->value_entry), "focus_out_event", - GTK_SIGNAL_FUNC (cb_focus_out), tw); - gtk_signal_connect(GTK_OBJECT (cv->note_box), "focus_in_event", - GTK_SIGNAL_FUNC (cb_focus_in), tw); - gtk_signal_connect(GTK_OBJECT (cv->note_box), "focus_out_event", - GTK_SIGNAL_FUNC (cb_focus_out), tw); -#endif /* USE_GTK2 */ + g_signal_connect (G_OBJECT (cv->main_vbox), "delete_event", + G_CALLBACK (cb_comment_view_delete), tw); +#if 1 /* FIXME */ + g_signal_connect(G_OBJECT (cv->value_entry), "focus_in_event", + G_CALLBACK (cb_focus_in), tw); + g_signal_connect(G_OBJECT (cv->value_entry), "focus_out_event", + G_CALLBACK (cb_focus_out), tw); + g_signal_connect(G_OBJECT (cv->note_box), "focus_in_event", + G_CALLBACK (cb_focus_in), tw); + g_signal_connect(G_OBJECT (cv->note_box), "focus_out_event", + G_CALLBACK (cb_focus_out), tw); +#endif /* create image view and attach to comment view notebook */ label = gtk_label_new (_("Preview")); @@ -2080,112 +1956,57 @@ tw->iv = GIMV_IMAGE_VIEW (gimv_image_view_new (NULL)); - gtk_signal_connect (GTK_OBJECT (tw->iv), "image_pressed", - GTK_SIGNAL_FUNC (cb_image_preview_pressed), tw); - gtk_signal_connect (GTK_OBJECT (tw->iv), "image_clicked", - GTK_SIGNAL_FUNC (cb_image_preview_clicked), tw); + g_signal_connect (G_OBJECT (tw->iv), "image_pressed", + G_CALLBACK (cb_image_preview_pressed), tw); + g_signal_connect (G_OBJECT (tw->iv), "image_clicked", + G_CALLBACK (cb_image_preview_clicked), tw); /* override prefs */ gimv_image_view_set_player_visible (tw->iv, tw->player_visible); - gtk_object_set(GTK_OBJECT(tw->iv), - "x_scale", conf.preview_scale, - "y_scale", conf.preview_scale, - "default_zoom", conf.preview_zoom, - "default_rotation", conf.preview_rotation, - "keep_aspect", conf.preview_keep_aspect, - "keep_buffer", conf.preview_buffer, - "show_scrollbar", conf.preview_scrollbar, - NULL); + g_object_set(G_OBJECT(tw->iv), + "x_scale", conf.preview_scale, + "y_scale", conf.preview_scale, + "default_zoom", conf.preview_zoom, + "default_rotation", conf.preview_rotation, + "keep_aspect", conf.preview_keep_aspect, + "keep_buffer", conf.preview_buffer, + "show_scrollbar", conf.preview_scrollbar, + NULL); gimv_image_view_create_popup_menu (GTK_WIDGET (tw), tw->iv, ""); /* set component DnD */ - /* FIXME!! image view and comment view shuold be seperated */ - dnd_src_set (cv->notebook, dnd_types_component, dnd_types_component_num); - gtk_object_set_data (GTK_OBJECT (cv->notebook), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_IMAGE_VIEW)); - gtk_signal_connect (GTK_OBJECT (cv->notebook), "drag_begin", - GTK_SIGNAL_FUNC (cb_com_drag_begin), tw); - gtk_signal_connect (GTK_OBJECT (cv->notebook), "drag_data_get", - GTK_SIGNAL_FUNC (cb_com_drag_data_get), tw); - - dnd_dest_set (cv->main_vbox, dnd_types_component, dnd_types_component_num); - gtk_object_set_data (GTK_OBJECT (cv->main_vbox), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_IMAGE_VIEW)); - gtk_signal_connect (GTK_OBJECT (cv->main_vbox), "drag_data_received", - GTK_SIGNAL_FUNC (cb_com_swap_drag_data_received), tw); - /* END FIXME!! */ - - /* FIXME!! */ - /* for avoiding gtk's bug */ - gtk_signal_connect (GTK_OBJECT (tw->iv), "button_press_event", - GTK_SIGNAL_FUNC (cb_unset_com_dnd), tw); - gtk_signal_connect (GTK_OBJECT (tw->iv), "button_release_event", - GTK_SIGNAL_FUNC (cb_reset_com_dnd), tw); - gtk_signal_connect (GTK_OBJECT (tw->cv->comment_clist->parent), - "button_press_event", - GTK_SIGNAL_FUNC (cb_unset_com_dnd), tw); - gtk_signal_connect (GTK_OBJECT (tw->cv->comment_clist->parent), - "button_release_event", - GTK_SIGNAL_FUNC (cb_reset_com_dnd), tw); - gtk_signal_connect (GTK_OBJECT (tw->cv->note_box->parent), - "button_press_event", - GTK_SIGNAL_FUNC (cb_unset_com_dnd), tw); - gtk_signal_connect (GTK_OBJECT (tw->cv->note_box->parent), - "button_release_event", - GTK_SIGNAL_FUNC (cb_reset_com_dnd), tw); - /* END FIXME!! */ + dnd_dest_set (cv->notebook, + dnd_types_tab_component, dnd_types_tab_component_num); + g_object_set_data (G_OBJECT (cv->notebook), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_IMAGE_VIEW)); + g_signal_connect (G_OBJECT (cv->notebook), "drag_motion", + G_CALLBACK (cb_notebook_drag_motion), tw); + g_signal_connect (G_OBJECT (cv->notebook), "drag_drop", + G_CALLBACK (cb_notebook_drag_drop), tw); + g_signal_connect (G_OBJECT (cv->notebook), "drag_data_received", + G_CALLBACK (cb_com_swap_drag_data_received), tw); gtk_widget_show (GTK_WIDGET (tw->iv)); - gtk_object_get (GTK_OBJECT (tw->iv), - "show_scrollbar", &show_scrollbar, - NULL); + g_object_get (G_OBJECT (tw->iv), + "show_scrollbar", &show_scrollbar, + NULL); if (!show_scrollbar) gimv_image_view_hide_scrollbar (tw->iv); gtk_notebook_prepend_page (GTK_NOTEBOOK(cv->notebook), GTK_WIDGET (tw->iv), label); gtk_notebook_set_page (GTK_NOTEBOOK(cv->notebook), 0); - return cv->main_vbox; -} - - -static void -add_accel_label_to_disp_mode_menu (GtkWidget *widget, GtkWidget *window) -{ - GtkAccelGroup *accel_group; - GtkWidget *menu; - GList *list, *node; - gint i, num = sizeof (akey.thumbwin_disp_mode) / sizeof (gchar *); - - g_return_if_fail (widget); - - menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)); - if (!menu) return; - - accel_group = gtk_accel_group_new (); - gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); - gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); - - list = gtk_container_children (GTK_CONTAINER (menu)); - if (!list) return; - - for (node = list, i = 0; node && i < num; node = g_list_next (node), i++) { - GtkWidget *item = node->data; - guint keyval = 0; - GdkModifierType mod = 0; - - if (!item) continue; - - if (akey.thumbwin_disp_mode[i] && *akey.thumbwin_disp_mode[i]) { - gtk_accelerator_parse (akey.thumbwin_disp_mode[i], &keyval, &mod); - gtk_widget_add_accelerator (item, "activate", - accel_group, - keyval, mod, 0); - } + int i, num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (cv->notebook)); + for (i = 0; i < num; i++) { + GtkWidget *child; + child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (cv->notebook), i); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (cv->notebook), + child, TRUE); } + + return cv->main_vbox; } @@ -2445,7 +2266,6 @@ } -#ifdef USE_GTK2 static void g_list_randomize (GList **lix) { @@ -2461,7 +2281,6 @@ *lix = newlist; } -#endif /* USE_GTK2 */ static void @@ -2469,7 +2288,7 @@ { GimvThumbView *tv; GimvThumb *thumb; - GimvSlideShow *slideshow; + GimvSlideshow *slideshow; GList *filelist = NULL, *list, *selection, *node, *start = NULL; tv = gimv_thumb_win_find_thumbtable (tw, GIMV_THUMB_WIN_CURRENT_PAGE); @@ -2513,12 +2332,10 @@ } if (filelist) { -#ifdef USE_GTK2 if (tw->priv->slideshow_order == SLIDESHOW_RANDOM_ORDER) { g_list_randomize(&filelist); start = filelist; } -#endif /* USE_GTK2 */ slideshow = gimv_slideshow_new_with_filelist (filelist, start); if (slideshow) @@ -2530,7 +2347,7 @@ static void -cb_slideshow_order (GimvThumbWin *tw, SlideShowOrder action, GtkWidget *widget) +cb_slideshow_order (GimvThumbWin *tw, SlideshowOrder action, GtkWidget *widget) { if (tw && tw->priv) tw->priv->slideshow_order = action; @@ -2542,12 +2359,12 @@ { if (tw && tw->priv) tw->priv->slideshow_selected_only - = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)); + = GTK_CHECK_MENU_ITEM (widget)->active; } static void -cb_slideshow_file_type (GimvThumbWin *tw, SlideShowFileType action, +cb_slideshow_file_type (GimvThumbWin *tw, SlideshowFileType action, GtkWidget *widget) { if (tw && tw->priv) @@ -2640,9 +2457,9 @@ case DIR_TOOLBAR: if (!tw->dv) return; if (GTK_CHECK_MENU_ITEM(widget)->active) { - dirview_show_toolbar (tw->dv); + gimv_dir_view_show_toolbar (tw->dv); } else { - dirview_hide_toolbar (tw->dv); + gimv_dir_view_hide_toolbar (tw->dv); } return; case PREVIEW_TAB: @@ -2717,7 +2534,7 @@ g_return_if_fail (tw); - p = gtk_object_get_data (GTK_OBJECT (item), "num"); + p = g_object_get_data (G_OBJECT (item), "num"); num = GPOINTER_TO_INT (p); n_win_comps = sizeof (win_comp) / sizeof (gboolean) / 3; if (num < 0 || num > n_win_comps) return; @@ -2730,7 +2547,7 @@ active = menuitem->active; gtk_check_menu_item_set_active (menuitem, TRUE); if (active) - gtk_signal_emit_by_name (GTK_OBJECT (menuitem), "activate"); + g_signal_emit_by_name (G_OBJECT (menuitem), "activate"); } @@ -2740,7 +2557,6 @@ * Callback functions for toolbar buttons. * ******************************************************************************/ -#ifdef USE_GTK2 static void cb_location_entry_enter (GtkEditable *entry, GimvThumbWin *tw) { @@ -2768,7 +2584,6 @@ g_free (path); } -#endif /* USE_GTK2 */ static gboolean @@ -2832,19 +2647,17 @@ gtk_entry_set_text (GTK_ENTRY (widget), text); if (text[strlen(text) - 1] != '/') gtk_entry_append_text (GTK_ENTRY (widget), "/"); - dirview_change_dir (tw->dv, text); + gimv_dir_view_change_dir (tw->dv, text); } else { gtk_entry_set_text (GTK_ENTRY (widget), text); dirname = g_dirname (text); if (tw->show_dirview) - dirview_change_dir (tw->dv, dirname); + gimv_dir_view_change_dir (tw->dv, dirname); g_free (dirname); auto_compl_show_alternatives (widget); } -#ifdef USE_GTK2 gtk_editable_set_position (GTK_EDITABLE (widget), -1); -#endif /* USE_GTK2 */ g_free (text); @@ -2878,7 +2691,7 @@ switch (info) { case TARGET_URI_LIST: - list = dnd_get_file_list (seldata->data, seldata->length); + list = dnd_get_file_list ((const gchar*)seldata->data, seldata->length); gimv_thumb_win_location_entry_set_text (tw, list->data); g_list_foreach (list, (GFunc) g_free, NULL); g_list_free (list); @@ -2907,15 +2720,15 @@ if (!tw) return; - gtk_signal_handler_block_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (cb_refresh_button), - tw); + g_signal_handlers_block_by_func (G_OBJECT (widget), + G_CALLBACK (cb_refresh_button), + tw); gimv_thumb_win_reload_thumbnail (tw, LOAD_CACHE); - gtk_signal_handler_unblock_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (cb_refresh_button), - tw); + g_signal_handlers_unblock_by_func (G_OBJECT (widget), + G_CALLBACK (cb_refresh_button), + tw); } @@ -3006,21 +2819,21 @@ tv = gimv_thumb_win_find_thumbtable (tw, GIMV_THUMB_WIN_CURRENT_PAGE); if (!tv) return; - summary_mode = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + summary_mode = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); tw->thumbview_summary_mode = gimv_thumb_view_num_to_label (summary_mode); - gtk_signal_handler_block_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (cb_display_mode_menu), - tw); + g_signal_handlers_block_by_func (G_OBJECT (widget), + G_CALLBACK (cb_display_mode_menu), + tw); gimv_thumb_view_change_summary_mode ( tv, gimv_thumb_view_num_to_label (summary_mode)); gtk_option_menu_set_history (GTK_OPTION_MENU (tw->summary_mode_menu), summary_mode); - gtk_signal_handler_unblock_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC(cb_display_mode_menu), - tw); + g_signal_handlers_unblock_by_func (G_OBJECT (widget), + G_CALLBACK(cb_display_mode_menu), + tw); } @@ -3081,10 +2894,10 @@ path = gimv_thumb_view_get_path (tv); if (path && isdir (path)) { - dirview_change_dir (tw->dv, path); + gimv_dir_view_change_dir (tw->dv, path); } else if (path && isfile (path)) { gchar *dirname = g_dirname (path); - dirview_change_dir (tw->dv, dirname); + gimv_dir_view_change_dir (tw->dv, dirname); g_free(dirname); } } @@ -3123,7 +2936,7 @@ GtkWidget *container; gint num; - container = gtk_object_get_data (GTK_OBJECT (button), "page-container"); + container = g_object_get_data (G_OBJECT (button), "page-container"); num = gtk_notebook_page_num (GTK_NOTEBOOK (tw->notebook), container); gimv_thumb_win_close_tab (tw, num); @@ -3131,40 +2944,6 @@ } -static void -cb_com_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data) -{ - GdkColormap *colormap; - GimvIcon *icon; - - icon = gimv_icon_stock_get_icon ("paper"); - colormap = gdk_colormap_get_system (); - gtk_drag_set_icon_pixmap (context, colormap, - icon->pixmap, icon->mask, - 0, 0); -} - - -static void -cb_com_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *seldata, - guint info, - guint time, - gpointer data) -{ - switch (info) { - case TARGET_GIMV_TAB: - case TARGET_GIMV_COMPONENT: - gtk_selection_data_set(seldata, seldata->target, - 8, "dummy", strlen("dummy")); - break; - } -} - - typedef struct SwapCom_Tag { GimvThumbWin *tw; @@ -3200,7 +2979,7 @@ switch (info) { case TARGET_URI_LIST: - list = dnd_get_file_list (seldata->data, seldata->length); + list = dnd_get_file_list ((const gchar*)seldata->data, seldata->length); open_images_dirs (list, tw, LOAD_CACHE, FALSE); g_list_foreach (list, (GFunc) g_free, NULL); g_list_free (list); @@ -3208,38 +2987,42 @@ case TARGET_GIMV_TAB: src_widget = gtk_drag_get_source_widget (context); - if (src_widget && GTK_IS_NOTEBOOK (src_widget)) { + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); + src = GPOINTER_TO_INT (p); + if (src_widget && GTK_IS_NOTEBOOK (src_widget) && + src == GIMV_COM_THUMB_VIEW) + { GimvThumbWin *tw_src, *tw_dest = tw; - tw_src = gtk_object_get_data (GTK_OBJECT (src_widget), "thumbwin"); - if (!tw_src) return; + tw_src = g_object_get_data (G_OBJECT (src_widget), "thumbwin"); + if (!tw_src) break; /* if deferent window, detach tab */ if (tw_src != tw_dest) { tv = gimv_thumb_win_find_thumbtable (tw_src, GIMV_THUMB_WIN_CURRENT_PAGE); - if (!tv) return; + if (!tv) break; gimv_thumb_win_detach_tab (tw_dest, tw_src, tv); } + break; } - break; case TARGET_GIMV_COMPONENT: src_widget = gtk_drag_get_source_widget (context); - if (!src_widget) return; + if (!src_widget) break; if (gdk_window_get_toplevel (src_widget->window) != gdk_window_get_toplevel (widget->window)) { - return; + break; } - p = gtk_object_get_data (GTK_OBJECT (src_widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); src = GPOINTER_TO_INT (p); - if (!src) return; + if (!src) break; - p = gtk_object_get_data (GTK_OBJECT (widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (widget), "gimv-component"); dest = GPOINTER_TO_INT (p); - if (!dest) return; + if (!dest) break; /* to avoid gtk's bug, exec redraw after exit this callback function */ { @@ -3254,6 +3037,8 @@ break; } + + g_signal_stop_emission_by_name(G_OBJECT (widget), "drag-data-received"); } @@ -3276,7 +3061,7 @@ g_return_if_fail (widget && tw); - page_container = gtk_object_get_data (GTK_OBJECT (widget), "page-container"); + page_container = g_object_get_data (G_OBJECT (widget), "page-container"); if (!page_container) return; switch (info) { @@ -3293,13 +3078,17 @@ case TARGET_GIMV_TAB: src_widget = gtk_drag_get_source_widget (context); - if (src_widget && GTK_IS_NOTEBOOK (src_widget)) { + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); + src = GPOINTER_TO_INT (p); + if (src_widget && GTK_IS_NOTEBOOK (src_widget) && + src == GIMV_COM_THUMB_VIEW) + { GtkNotebook *notebook = GTK_NOTEBOOK (src_widget); GtkWidget *src_page, *newtab; GimvThumbWin *tw_src, *tw_dest = tw; gint src_pagenum, dest_pagenum; - tw_src = gtk_object_get_data (GTK_OBJECT (src_widget), "thumbwin"); + tw_src = g_object_get_data (G_OBJECT (src_widget), "thumbwin"); if (!tw_src) return; dest_pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (tw_dest->notebook), @@ -3326,8 +3115,8 @@ gtk_notebook_reorder_child (GTK_NOTEBOOK (tw_dest->notebook), newtab, dest_pagenum); } + break; } - break; case TARGET_GIMV_COMPONENT: src_widget = gtk_drag_get_source_widget (context); @@ -3338,11 +3127,11 @@ return; } - p = gtk_object_get_data (GTK_OBJECT (src_widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); src = GPOINTER_TO_INT (p); if (!src) return; - p = gtk_object_get_data (GTK_OBJECT (widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (widget), "gimv-component"); dest = GPOINTER_TO_INT (p); if (!dest) return; @@ -3377,21 +3166,22 @@ switch (info) { case TARGET_GIMV_COMPONENT: + case TARGET_GIMV_TAB: src_widget = gtk_drag_get_source_widget (context); - if (!src_widget) return; + if (!src_widget) break; if (gdk_window_get_toplevel (src_widget->window) != gdk_window_get_toplevel (widget->window)) - { - return; - } + { + break; + } - p = gtk_object_get_data (GTK_OBJECT (src_widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (src_widget), "gimv-component"); src = GPOINTER_TO_INT (p); - if (!src) return; + if (!src) break; - p = gtk_object_get_data (GTK_OBJECT (widget), "gimv-component"); + p = g_object_get_data (G_OBJECT (widget), "gimv-component"); dest = GPOINTER_TO_INT (p); - if (!dest) return; + if (!dest) break; { SwapCom *swap = g_new0 (SwapCom, 1); @@ -3408,10 +3198,12 @@ default: break; } + + g_signal_stop_emission_by_name(G_OBJECT (widget), "drag-data-received"); } -#ifdef USE_GTK2 /* FIXME */ +#if 1 /* FIXME */ void gimv_thumb_win_remove_key_accel (GimvThumbWin *tw) { @@ -3450,7 +3242,7 @@ gimv_thumb_win_reset_key_accel (tw); return FALSE; } -#endif /* USE_GTK2 */ +#endif @@ -3740,10 +3532,10 @@ { GtkWidget *tablabel, *button; - tablabel = gtk_object_get_data (GTK_OBJECT (page_container), "tab-label"); + tablabel = g_object_get_data (G_OBJECT (page_container), "tab-label"); if (tablabel) { - button = gtk_object_get_data (GTK_OBJECT (tablabel), "close-button"); + button = g_object_get_data (G_OBJECT (tablabel), "close-button"); gtk_label_set_text (GTK_LABEL (tablabel), title); if (conf.thumbwin_show_tab_close) { @@ -3764,7 +3556,7 @@ { GtkWidget *tablabel; - tablabel = gtk_object_get_data (GTK_OBJECT (page_container), "tab-label"); + tablabel = g_object_get_data (G_OBJECT (page_container), "tab-label"); if (tablabel) { gtk_widget_set_state (tablabel, state); @@ -3772,28 +3564,6 @@ } -static void -cb_pagecontainer_button_press (GtkWidget *widget, - GdkEventButton *event, - GimvThumbWin *tw) -{ - g_return_if_fail (tw); - - gimv_thumb_win_notebook_drag_src_unset (tw); /* FIXMEEEEEEEE!! */ -} - - -static void -cb_pagecontainer_thumb_button_release (GtkWidget *widget, - GdkEventButton *event, - GimvThumbWin *tw) -{ - g_return_if_fail (tw); - - gimv_thumb_win_notebook_drag_src_reset (tw); /* FIXMEEEEEEEEE!!! */ -} - - static GtkWidget * gimv_thumb_win_create_tab_container (GimvThumbWin *tw) { @@ -3810,22 +3580,10 @@ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show (scrolled_window); - gtk_signal_connect_after (GTK_OBJECT(scrolled_window), "button_press_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_button_press), tw); - gtk_signal_connect_after (GTK_OBJECT(scrolled_window), "button_release_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_thumb_button_release), tw); - gtk_signal_connect_after (GTK_OBJECT(scrollwin->hscrollbar), "button_press_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_button_press), tw); - gtk_signal_connect_after (GTK_OBJECT(scrollwin->hscrollbar), "button_release_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_thumb_button_release), tw); - gtk_signal_connect_after (GTK_OBJECT(scrollwin->vscrollbar), "button_press_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_button_press), tw); - gtk_signal_connect_after (GTK_OBJECT(scrollwin->vscrollbar), "button_release_event", - GTK_SIGNAL_FUNC(cb_pagecontainer_thumb_button_release), tw); /* page label widget */ hbox = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (hbox), "page-container", scrolled_window); + g_object_set_data (G_OBJECT (hbox), "page-container", scrolled_window); tablabel = gtk_label_new (_("New Tab")); gtk_widget_set_name (tablabel, "TabLabel"); @@ -3835,13 +3593,13 @@ button = gtk_button_new(); gtk_container_set_border_width (GTK_CONTAINER (button), 1); - gtk_widget_set_usize (button, 16, 16); + gtk_widget_set_size_request (button, 16, 16); gtk_button_set_relief((GtkButton *) button, GTK_RELIEF_NONE); pixmap = gimv_icon_stock_get_widget ("small_close"); - gtk_object_set_data (GTK_OBJECT (button), "page-container", scrolled_window); - gtk_object_set_data (GTK_OBJECT (tablabel), "close-button", button); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_tab_close_button_clicked), tw); + g_object_set_data (G_OBJECT (button), "page-container", scrolled_window); + g_object_set_data (G_OBJECT (tablabel), "close-button", button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_tab_close_button_clicked), tw); gtk_container_add(GTK_CONTAINER(button), pixmap); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); @@ -3855,15 +3613,19 @@ } dnd_dest_set (hbox, dnd_types_all, dnd_types_all_num); - gtk_object_set_data (GTK_OBJECT (hbox), - "gimv-component", - GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); - gtk_signal_connect (GTK_OBJECT (hbox), "drag_data_received", - GTK_SIGNAL_FUNC (cb_tab_drag_data_received), tw); + g_object_set_data (G_OBJECT (hbox), + "gimv-component", + GINT_TO_POINTER (GIMV_COM_THUMB_VIEW)); + g_signal_connect (G_OBJECT (hbox), "drag_data_received", + G_CALLBACK (cb_tab_drag_data_received), tw); /* create page */ gtk_notebook_append_page (GTK_NOTEBOOK(tw->notebook), scrolled_window, hbox); - gtk_object_set_data (GTK_OBJECT (scrolled_window), "tab-label", tablabel); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK(tw->notebook), + scrolled_window, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK(tw->notebook), + scrolled_window, TRUE); + g_object_set_data (G_OBJECT (scrolled_window), "tab-label", tablabel); tw->pagenum++; @@ -3941,10 +3703,10 @@ if (tv && tw_dest->show_dirview && path) { if (isdir(path)) { - dirview_change_dir (tw_dest->dv, path); + gimv_dir_view_change_dir (tw_dest->dv, path); } else if (isfile(path)) { gchar *dirname = g_dirname (path); - dirview_change_dir (tw_dest->dv, dirname); + gimv_dir_view_change_dir (tw_dest->dv, dirname); g_free(dirname); } } @@ -3966,7 +3728,7 @@ if (tv && (tv->status == GIMV_THUMB_VIEW_STATUS_CHECK_DUPLICATE)) return; if (tv) - gtk_object_unref (GTK_OBJECT (tv)); + g_object_unref (G_OBJECT (tv)); if (page == GIMV_THUMB_WIN_CURRENT_PAGE) page_tmp = gtk_notebook_get_current_page (GTK_NOTEBOOK(tw->notebook)); @@ -4096,9 +3858,7 @@ g_free (internal_str); -#ifdef USE_GTK2 gtk_editable_set_position (GTK_EDITABLE (tw->location_entry), -1); -#endif /* USE_GTK2 */ g_free (text); } @@ -4241,7 +4001,6 @@ } if (tw->dv) { tw->dv = NULL; - tw->dirview = NULL; } new_main_contents = thumbnail_window_contents_new (tw); @@ -4306,10 +4065,10 @@ /* adjust dirview */ if (tw->show_dirview && path) { if (path && isdir (path)) { - dirview_change_dir (tw->dv, path); + gimv_dir_view_change_dir (tw->dv, path); } else if (path && isfile (path)) { gchar *dirname = g_dirname (path); - dirview_change_dir (tw->dv, dirname); + gimv_dir_view_change_dir (tw->dv, dirname); g_free (dirname); } } @@ -4317,13 +4076,13 @@ gimv_thumb_win_set_sensitive (tw, GIMV_THUMB_WIN_STATUS_NORMAL); -#ifdef USE_GTK2 /* FIXME */ +#if 1 /* FIXME */ if (tw->accel_group_list) g_slist_free (tw->accel_group_list); tw->accel_group_list = g_slist_copy (gtk_accel_groups_from_object (G_OBJECT (tw))); tw->accel_group_list = g_slist_reverse (tw->accel_group_list); -#endif /* USE_GTK2 */ +#endif tw->changing_layout = FALSE; } @@ -4371,7 +4130,7 @@ active = menuitem->active; gtk_check_menu_item_set_active (menuitem, TRUE); if (active) - gtk_signal_emit_by_name (GTK_OBJECT (menuitem), "activate"); + g_signal_emit_by_name (G_OBJECT (menuitem), "activate"); } @@ -4390,10 +4149,10 @@ if (tw->show_preview) conf.thumbwin_pane_size2 - = gimv_paned_get_position (GIMV_PANED (tw->pane2)); + = gtk_paned_get_position (GTK_PANED (tw->pane2)); if (tw->show_dirview) conf.thumbwin_pane_size1 - = gimv_paned_get_position (GIMV_PANED (tw->pane1)); + = gtk_paned_get_position (GTK_PANED (tw->pane1)); conf.thumbwin_show_preview = tw->show_preview; conf.thumbwin_show_dir_view = tw->show_dirview; @@ -4409,10 +4168,10 @@ conf.thumbwin_show_preview_tab = GTK_CHECK_MENU_ITEM (tw->menuitem.preview_tab)->active; - gtk_object_get (GTK_OBJECT (tw->iv), - "show_scrollbar", &conf.preview_scrollbar, - "continuance_play", &conf.imgview_movie_continuance, - NULL); + g_object_get (G_OBJECT (tw->iv), + "show_scrollbar", &conf.preview_scrollbar, + "continuance_play", &conf.imgview_movie_continuance, + NULL); conf.preview_player_visible = tw->player_visible; conf.thumbwin_layout_type = tw->layout_type; @@ -4430,25 +4189,3 @@ g_free (conf.thumbwin_disp_mode); conf.thumbwin_disp_mode = g_strdup (tw->thumbview_summary_mode); } - - -/* FIXMEEEEEEEEEEE!!! (TOT */ -void -gimv_thumb_win_notebook_drag_src_unset (GimvThumbWin *tw) -{ - g_return_if_fail (tw); - - gtk_drag_source_unset (tw->notebook); -} - - -void -gimv_thumb_win_notebook_drag_src_reset (GimvThumbWin *tw) -{ - g_return_if_fail (tw); - - dnd_src_set (tw->notebook, - dnd_types_tab_component, - dnd_types_tab_component_num); -} -/* END FIXMEEEEEEEEEEE!!! (TOT */ diff -Nru gimageview-0.2.27/src/gimv_thumb_win.h gimageview-0.3.0-0.20101117/src/gimv_thumb_win.h --- gimageview-0.2.27/src/gimv_thumb_win.h 2004-12-20 18:15:42.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_thumb_win.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_thumb_win.h,v 1.10 2004/12/20 18:15:42 makeinu Exp $ + * $Id: gimv_thumb_win.h 1213 2009-01-14 09:24:51Z makeinu $ */ #ifndef __GIMV_THUMB_WIN_H__ @@ -29,13 +29,12 @@ #include "gimv_image_view.h" #include "gimv_thumb_view.h" - #define GIMV_TYPE_THUMB_WIN (gimv_thumb_win_get_type ()) -#define GIMV_THUMB_WIN(obj) (GTK_CHECK_CAST (obj, gimv_thumb_win_get_type (), GimvThumbWin)) -#define GIMV_THUMB_WIN_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gimv_thumb_win_get_type, GimvThumbWinClass)) -#define GIMV_IS_THUMB_WIN(obj) (GTK_CHECK_TYPE (obj, gimv_thumb_win_get_type ())) -#define GIMV_IS_THUMB_WIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB_WIN)) - +#define GIMV_THUMB_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_THUMB_WIN, GimvThumbWin)) +#define GIMV_THUMB_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_THUMB_WIN, GimvThumbWinClass)) +#define GIMV_IS_THUMB_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_THUMB_WIN)) +#define GIMV_IS_THUMB_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_THUMB_WIN)) +#define GIMV_THUMB_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_THUMB_WIN, GimvThumbWinClass)) #define GIMV_THUMB_WIN_MIN_THUMB_SIZE 4 #define GIMV_THUMB_WIN_MAX_THUMB_SIZE 640 @@ -106,14 +105,13 @@ /* middle of window (main contents) */ GtkWidget *main_contents; - GtkWidget *dirview; GtkWidget *notebook; GtkWidget *preview; GtkWidget *pane1; GtkWidget *pane2; /* dir view module */ - DirView *dv; + GimvDirView *dv; /* image view module */ GimvImageView *iv; @@ -219,9 +217,7 @@ /* File open dialog */ GtkWidget *open_dialog; -#ifdef USE_GTK2 GSList *accel_group_list; -#endif GimvThumbWinPriv *priv; }; @@ -234,7 +230,7 @@ GList *gimv_thumb_win_get_list (void); -GtkType gimv_thumb_win_get_type (void); +GType gimv_thumb_win_get_type (void); GtkWidget *gimv_thumb_win_new (void); GimvThumbWin @@ -283,12 +279,8 @@ void gimv_thumb_win_save_state (GimvThumbWin *tw); /* FIXMEEEEEEEEEEEEEEEEEE!! (TOT */ -void gimv_thumb_win_notebook_drag_src_unset (GimvThumbWin *tw); -void gimv_thumb_win_notebook_drag_src_reset (GimvThumbWin *tw); -#ifdef USE_GTK2 void gimv_thumb_win_remove_key_accel (GimvThumbWin *tw); void gimv_thumb_win_reset_key_accel (GimvThumbWin *tw); -#endif /* USE_GTK2 */ /* END FIXMEEEEEEEEEEEEEEEEEE!! (TOT */ #endif /* __GIMV_THUMB_WIN_H__ */ diff -Nru gimageview-0.2.27/src/gimv_vpaned.c gimageview-0.3.0-0.20101117/src/gimv_vpaned.c --- gimageview-0.2.27/src/gimv_vpaned.c 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_vpaned.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,416 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_vpaned.c,v 1.3 2004/03/07 11:53:31 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef USE_NORMAL_PANED - -#include "gimv_vpaned.h" -#include -#include - -static void gimv_vpaned_class_init (GimvVPanedClass *klass); -static void gimv_vpaned_init (GimvVPaned *vpaned); -static void gimv_vpaned_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gimv_vpaned_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gimv_vpaned_draw (GtkWidget *widget, - GdkRectangle *area); -static void gimv_vpaned_xor_line (GimvPaned *paned); -static gint gimv_vpaned_button_press (GtkWidget *widget, - GdkEventButton *event); -static gint gimv_vpaned_button_release (GtkWidget *widget, - GdkEventButton *event); - -GtkType -gimv_vpaned_get_type (void) -{ - static GtkType vpaned_type = 0; - - if (!vpaned_type) { - static const GtkTypeInfo vpaned_info = { - "GimvVPaned", - sizeof (GimvVPaned), - sizeof (GimvVPanedClass), - (GtkClassInitFunc) gimv_vpaned_class_init, - (GtkObjectInitFunc) gimv_vpaned_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - vpaned_type = gtk_type_unique (gimv_paned_get_type (), - &vpaned_info); - } - return vpaned_type; -} - - -static void -gimv_vpaned_class_init (GimvVPanedClass *class) -{ - GtkWidgetClass *widget_class; - GimvPanedClass *paned_class; - - widget_class = (GtkWidgetClass*) class; - paned_class = (GimvPanedClass*) class; - - widget_class->size_request = gimv_vpaned_size_request; - widget_class->size_allocate = gimv_vpaned_size_allocate; -#ifndef USE_GTK2 - widget_class->draw = gimv_vpaned_draw; -#endif - widget_class->button_press_event = gimv_vpaned_button_press; - widget_class->button_release_event = gimv_vpaned_button_release; - - paned_class->xor_line = gimv_vpaned_xor_line; -} - - -static void -gimv_vpaned_init (GimvVPaned *vpaned) -{ - GIMV_PANED (vpaned)->horizontal = FALSE; -} - - -GtkWidget* -gimv_vpaned_new (void) -{ - GimvVPaned *vpaned; - - vpaned = gtk_type_new (gimv_vpaned_get_type ()); - - return GTK_WIDGET (vpaned); -} - - -static void -gimv_vpaned_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GimvPaned *paned; - GtkRequisition child_requisition; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_VPANED (widget)); - g_return_if_fail (requisition != NULL); - - paned = GIMV_PANED (widget); - requisition->width = 0; - requisition->height = 0; - - if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) { - gtk_widget_size_request (paned->child1, &child_requisition); - - requisition->height = child_requisition.height; - requisition->width = child_requisition.width; - } - - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) { - gtk_widget_size_request (paned->child2, &child_requisition); - - requisition->width = MAX (requisition->width, - child_requisition.width); - requisition->height += child_requisition.height; - } - - requisition->height += (GTK_CONTAINER (paned)->border_width * 2 - + paned->gutter_size); - requisition->width += GTK_CONTAINER (paned)->border_width * 2; -} - - -static void -gimv_vpaned_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GimvPaned *paned; - GtkRequisition child1_requisition; - GtkRequisition child2_requisition; - GtkAllocation child1_allocation; - GtkAllocation child2_allocation; - gint border_width, gutter_size; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_VPANED (widget)); - g_return_if_fail (allocation != NULL); - - widget->allocation = *allocation; - paned = GIMV_PANED (widget); - border_width = GTK_CONTAINER (widget)->border_width; - gutter_size = paned->gutter_size; - - if (paned->child1) - gtk_widget_get_child_requisition (paned->child1, - &child1_requisition); - else - child1_requisition.height = 0; - - if (paned->child2) - gtk_widget_get_child_requisition (paned->child2, - &child2_requisition); - else - child2_requisition.height = 0; - - gimv_paned_compute_position (paned, - MAX (1, (gint) widget->allocation.height - - gutter_size - - 2 * border_width), - child1_requisition.height, - child2_requisition.height); - - if (paned->child_hidden != 0) { - gutter_size = 0; - if ((paned->child_hidden == 1) && paned->child1) { - /* hide child1 and show child2 if it exists. */ - gtk_widget_hide (paned->child1); - if (paned->child2 && !GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_show (paned->child2); - } - if ((paned->child_hidden == 2) && paned->child2) { - /* hide child2 and show child1 if it exists. */ - gtk_widget_hide (paned->child2); - if (paned->child1 && !GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_show (paned->child1); - } - } else { - /* Show both children. */ - if (paned->child1 && !GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_show (paned->child1); - if (paned->child2 && !GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_show (paned->child2); - } - - /* Move the handle before the children so we don't get extra expose - * events */ - - paned->handle_xpos = border_width; - paned->handle_ypos = paned->child1_size + border_width; - - if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, - allocation->width, allocation->height); - - if (paned->child_hidden == 0) { - gdk_window_move_resize (paned->handle, - paned->handle_xpos, - paned->handle_ypos, - allocation->width, - paned->gutter_size); - gdk_window_show (paned->handle); - } else - gdk_window_hide (paned->handle); - } - - child1_allocation.width = child2_allocation.width = MAX (1, (gint) allocation->width - border_width * 2); - child1_allocation.height = paned->child1_size; - child1_allocation.x = child2_allocation.x = border_width; - child1_allocation.y = border_width; - - child2_allocation.y = (child1_allocation.y + child1_allocation.height + gutter_size); - child2_allocation.height = MAX (1, (gint) allocation->height - - child2_allocation.y - border_width); - - /* Now allocate the childen, making sure, when resizing not to - * overlap the windows */ - if (GTK_WIDGET_MAPPED (widget) && - paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) && - paned->child1->allocation.height < child1_allocation.height) - { - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_size_allocate (paned->child2, - &child2_allocation); - gtk_widget_size_allocate (paned->child1, &child1_allocation); - - } else { - if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1)) - gtk_widget_size_allocate (paned->child1, - &child1_allocation); - if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) - gtk_widget_size_allocate (paned->child2, - &child2_allocation); - } -} - - -static void -gimv_vpaned_draw (GtkWidget *widget, - GdkRectangle *area) -{ - GimvPaned *paned; - GdkRectangle handle_area, child_area; - guint16 border_width; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GIMV_IS_PANED (widget)); - - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) { - gint width, height; - - paned = GIMV_PANED (widget); - border_width = GTK_CONTAINER (paned)->border_width; - - gdk_window_clear_area (widget->window, - area->x, area->y, - area->width, area->height); - - gdk_window_get_size (paned->handle, &width, &height); - - handle_area.x = paned->handle_xpos; - handle_area.y = paned->handle_ypos; - handle_area.width = width; - handle_area.height = height; - - if (gdk_rectangle_intersect (&handle_area, area, &child_area)){ - child_area.x -= handle_area.x; - child_area.y -= handle_area.y; - - gtk_paint_flat_box (widget->style, paned->handle, - GTK_WIDGET_STATE (widget), - GTK_SHADOW_NONE, - &child_area, widget, "paned", - 0, 0, - width, height); - } - - /* Redraw the children - */ - if (paned->child1 && - gtk_widget_intersect (paned->child1, area, &child_area)) - gtk_widget_draw (paned->child1, &child_area); - if (paned->child2 && - gtk_widget_intersect (paned->child2, area, &child_area)) - gtk_widget_draw (paned->child2, &child_area); - - } -} - - -static void -gimv_vpaned_xor_line (GimvPaned *paned) -{ - GtkWidget *widget; - GdkGCValues values; - guint16 ypos; - - widget = GTK_WIDGET(paned); - - if (!paned->xor_gc) { - GdkBitmap *stipple; - - stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, - gray50_width, - gray50_height); - - values.function = GDK_INVERT; - values.subwindow_mode = GDK_INCLUDE_INFERIORS; - values.fill = GDK_STIPPLED; - values.stipple = stipple; - - paned->xor_gc = gdk_gc_new_with_values (widget->window, - &values, - GDK_GC_FUNCTION | - GDK_GC_SUBWINDOW | - GDK_GC_FILL | - GDK_GC_STIPPLE); - gdk_bitmap_unref (stipple); - } - - ypos = paned->child1_size + GTK_CONTAINER (paned)->border_width; - - gdk_draw_rectangle (widget->window, paned->xor_gc, - TRUE, - 0, - ypos, - widget->allocation.width - 1, - paned->gutter_size); -} - - -static gint -gimv_vpaned_button_press (GtkWidget *widget, GdkEventButton *event) -{ - GimvPaned *paned; - - g_return_val_if_fail (widget != NULL,FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget),FALSE); - - paned = GIMV_PANED (widget); - - if (!paned->in_drag && - (event->window == paned->handle) && (event->button == 1)) - { - paned->in_drag = TRUE; - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - gdk_pointer_grab (paned->handle, FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK, - NULL, NULL, event->time); - paned->child1_size += event->y - paned->gutter_size / 2; - paned->child1_size = CLAMP (paned->child1_size, - 0, - widget->allocation.height - - paned->gutter_size - - 2 * GTK_CONTAINER (paned)->border_width); - gimv_vpaned_xor_line (paned); - } - - return TRUE; -} - - -static gint -gimv_vpaned_button_release (GtkWidget *widget, GdkEventButton *event) -{ - GimvPaned *paned; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GIMV_IS_PANED (widget), FALSE); - - paned = GIMV_PANED (widget); - - if (paned->in_drag && (event->button == 1)) { - gimv_vpaned_xor_line (paned); - paned->in_drag = FALSE; - paned->position_set = TRUE; - gdk_pointer_ungrab (event->time); - gtk_widget_queue_resize (GTK_WIDGET (paned)); - } - - return TRUE; -} - -#else -#endif /* USE_NORMAL_PANED */ diff -Nru gimageview-0.2.27/src/gimv_vpaned.h gimageview-0.3.0-0.20101117/src/gimv_vpaned.h --- gimageview-0.2.27/src/gimv_vpaned.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_vpaned.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gimv_vpaned.h,v 1.3 2004/03/07 11:53:31 makeinu Exp $ - */ - -/* - * These codes are taken from gThumb. - * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. - * gThumb author: Paolo Bacchilega - */ - -#ifndef __GIMV_VPANED_H__ -#define __GIMV_VPANED_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include "gimv_paned.h" - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#ifndef USE_NORMAL_PANED - -#define GIMV_VPANED(obj) GTK_CHECK_CAST (obj, gimv_vpaned_get_type (), GimvVPaned) -#define GIMV_VPANED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gimv_vpaned_get_type (), GimvVPanedClass) -#define GIMV_IS_VPANED(obj) GTK_CHECK_TYPE (obj, gimv_vpaned_get_type ()) - - -typedef struct _GimvVPaned GimvVPaned; -typedef struct _GimvVPanedClass GimvVPanedClass; - -struct _GimvVPaned -{ - GimvPaned paned; -}; - -struct _GimvVPanedClass -{ - GimvPanedClass parent_class; -}; - - -GtkType gimv_vpaned_get_type (void); -GtkWidget* gimv_vpaned_new (void); - -#else /* USE_NORMAL_PANED */ - -#include - -#define GimvVPaned GtkVPaned -#define gimv_vpaned_new() gtk_vpaned_new() - -#endif /* USE_NORMAL_PANED */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GIMV_VPANED_H__ */ diff -Nru gimageview-0.2.27/src/gimv_zalbum.c gimageview-0.3.0-0.20101117/src/gimv_zalbum.c --- gimageview-0.2.27/src/gimv_zalbum.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_zalbum.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_zalbum.c,v 1.5 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_zalbum.c 1141 2007-10-17 12:14:07Z makeinu $ */ /* @@ -38,7 +38,6 @@ #endif #include -#include "gtk2-compat.h" #include "gimv_zalbum.h" #define GIMV_ZALBUM_CELL(ptr) ((GimvZAlbumCell *) (ptr)) @@ -51,13 +50,7 @@ #define STRING_BUFFER_SIZE 1024 #define CELL_STATE(cell) (GIMV_ZALBUM_CELL (cell)->flags & GIMV_ZALBUM_CELL_SELECTED ? GTK_STATE_SELECTED : GTK_STATE_NORMAL) -static void gimv_zalbum_class_init (GimvZAlbumClass *klass); -static void gimv_zalbum_init (GimvZAlbum *album); -#ifdef USE_GTK2 static void gimv_zalbum_finalize (GObject *object); -#else -static void gimv_zalbum_finalize (GtkObject *object); -#endif static void gimv_zalbum_clear (GimvZList *list); static void gimv_zalbum_cell_size_request (GimvZList *list, gpointer cell, @@ -79,18 +72,10 @@ GimvZAlbumCell *cell, GdkRectangle *cell_area, GdkRectangle *area); -#ifdef USE_GTK2 static gint make_string (PangoLayout *layout, gint max_width, gchar *buffer, gint buffer_size); -#else -static gint make_string (GdkFont *font, - gint max_width, - GdkWChar *buffer, - gint src_len, - gint buffer_size); -#endif static void gimv_zalbum_draw_string (GtkWidget *widget, GimvZAlbumCell *cell, const gchar *string, @@ -117,68 +102,23 @@ int index); -static GtkWidgetClass *parent_class = NULL; - /* static GdkFont *album_font = NULL; */ -GtkType -gimv_zalbum_get_type (void) { - static GtkType type = 0; - -#ifdef USE_GTK2 - if (!type) { - static const GTypeInfo info = { - sizeof (GimvZAlbumClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_zalbum_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvZAlbum), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_zalbum_init, - }; - - type = g_type_register_static (GIMV_TYPE_ZLIST, - "GimvZAlbum", - &info, - 0); - } -#else /* USE_GTK2 */ - if (!type) { - static GtkTypeInfo info = { - "GimvZAlbum", - sizeof(GimvZAlbum), - sizeof(GimvZAlbumClass), - (GtkClassInitFunc)gimv_zalbum_class_init, - (GtkObjectInitFunc)gimv_zalbum_init, - NULL, - NULL, - (GtkClassInitFunc)NULL - }; - - type = gtk_type_unique(gimv_zlist_get_type(), &info); - } -#endif /* USE_GTK2 */ - - return type; -} +G_DEFINE_TYPE (GimvZAlbum, gimv_zalbum, GIMV_TYPE_ZLIST) static void gimv_zalbum_class_init (GimvZAlbumClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; GimvZListClass *zlist_class; - parent_class = gtk_type_class (gimv_zlist_get_type()); - - object_class = (GtkObjectClass *) klass; - widget_class = (GtkWidgetClass *) klass; - zlist_class = (GimvZListClass *) klass; + gobject_class = (GObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; + zlist_class = (GimvZListClass *) klass; - OBJECT_CLASS_SET_FINALIZE_FUNC (klass, gimv_zalbum_finalize); + gobject_class->finalize = gimv_zalbum_finalize; zlist_class->clear = gimv_zalbum_clear; zlist_class->cell_draw = gimv_zalbum_draw_cell; @@ -206,11 +146,7 @@ GtkRequisition requisition; gint flags = 0; -#ifdef USE_GTK2 album = g_object_new (gimv_zalbum_get_type (), NULL); -#else /* USE_GTK2 */ - album = gtk_type_new (gimv_zalbum_get_type()); -#endif /* USE_GTK2 */ g_return_val_if_fail (album != NULL, NULL); /* flags |= GIMV_ZLIST_HORIZONTAL; */ @@ -230,15 +166,12 @@ static void -#ifdef USE_GTK2 gimv_zalbum_finalize (GObject *object) -#else /* USE_GTK2 */ -gimv_zalbum_finalize (GtkObject *object) -#endif /* USE_GTK2 */ { gimv_zalbum_clear (GIMV_ZLIST (object)); - OBJECT_CLASS_FINALIZE_SUPER (parent_class, object); + if (G_OBJECT_CLASS(gimv_zalbum_parent_class)->finalize) + G_OBJECT_CLASS(gimv_zalbum_parent_class)->finalize (object); } @@ -548,7 +481,6 @@ /* FIXME */ -#if USE_GTK2 static void get_string_area_size (GimvZAlbum *album, const gchar *str, gint *width_ret, gint *height_ret, gint *lines_ret) @@ -612,72 +544,6 @@ return buffer_size; } } -#else -static void -get_string_area_size (GimvZAlbum *album, const gchar *str, - gint *width_ret, gint *height_ret, gint *lines_ret) -{ - gint i, strwidth = 0, maxwidth = 0, lines; - gchar **strs; - GdkFont *font = gtk_style_get_font (GTK_WIDGET (album)->style); - - g_return_if_fail (str); - g_return_if_fail (font); - - strs = g_strsplit (str, "\n", -1); - if (!strs) { - *lines_ret = 1; - return; - } - - for (i = 0; strs[i]; i++) { - strwidth = gdk_string_width (font, strs[i]); - maxwidth = MAX (maxwidth, strwidth); - } - - lines = i++; - - if (lines_ret) - *lines_ret = lines; - - g_strfreev (strs); - - if (width_ret) - *width_ret = maxwidth; - if (height_ret) - *height_ret = gdk_string_height (font, str) + LABEL_VPADDING * lines; -} - - -static gint -make_string (GdkFont *font, gint max_width, - GdkWChar buffer[], gint src_len, gint buffer_size) -{ - gint dots_width; - gint len = src_len; - - dots_width = gdk_text_width (font, "...", 3); - - while (len > 0) { - if (gdk_text_width_wc (font, buffer, len) + dots_width > max_width) { - len--; - } else { - break; - } - } - - if (len < src_len && len < buffer_size - 4) { - buffer[len] = '.'; - buffer[len + 1] = '.'; - buffer[len + 2] = '.'; - buffer[len + 3] = '\0'; - return len + 3; - } else { - buffer[buffer_size - 1] = '\0'; - return buffer_size; - } -} -#endif static void @@ -687,7 +553,6 @@ gint max_width, gint max_height, gint center) { -#ifdef USE_GTK2 gchar buffer[STRING_BUFFER_SIZE]; gint x_pad, y_pad; gint width = 0, height = 0, str_height, len; @@ -743,52 +608,6 @@ layout); g_object_unref (layout); -#else - GdkFont *font = gtk_style_get_font (widget->style); - gchar *str, **strs; - gint buffer[STRING_BUFFER_SIZE], lines; - gint x_pad, y_pad, len, str_height, i, width, height; - - get_string_area_size (GIMV_ZALBUM (widget), string, &width, &height, &lines); - x_pad = (max_width - width) / 2; - - if (x_pad < 0) { - len = gdk_mbstowcs (buffer, string, STRING_BUFFER_SIZE); - x_pad = (max_width - gdk_text_width_wc (font, buffer, len)) / 2; - len = make_string (gtk_style_get_font (widget->style), max_width, - buffer, len, STRING_BUFFER_SIZE); - str = gdk_wcstombs (buffer); - get_string_area_size (GIMV_ZALBUM (widget), string, &width, &height, &lines); - x_pad = (max_width - width) / 2; - } else { - str = g_strdup (string); - get_string_area_size (GIMV_ZALBUM (widget), string, &width, &height, &lines); - x_pad = (max_width - width) / 2; - } - - if (x_pad < 0 || !center) - x_pad = 0; - - strs = g_strsplit (str, "\n", -1); - - str_height = gdk_string_height (font, string); - if (str_height * lines < max_height) - y_pad = (max_height - str_height * lines) / 2; - else - y_pad = 0; - - for (i = 0; strs && strs[i]; i++) { - gdk_draw_string (widget->window, - font, - widget->style->fg_gc[CELL_STATE(widget)], - x + x_pad, - y + y_pad + (str_height + LABEL_VPADDING) * i, - strs[i]); - } - - g_strfreev (strs); - g_free (str); -#endif } /* END FIXME!! */ @@ -810,18 +629,11 @@ intersect_area.x, intersect_area.y, intersect_area.width, intersect_area.height); -#ifdef USE_GTK2 gtk_paint_shadow (widget->style, widget->window, CELL_STATE(cell), GTK_SHADOW_OUT, NULL, NULL, NULL, cell_area->x, cell_area->y, cell_area->width, cell_area->height); -#else /* USE_GTK2 */ - gtk_draw_shadow (widget->style, widget->window, - CELL_STATE(cell), GTK_SHADOW_OUT, - cell_area->x, cell_area->y, - cell_area->width, cell_area->height); -#endif /* USE_GTK2 */ cell_area->x += CELL_PADDING; cell_area->y += CELL_PADDING; @@ -838,11 +650,7 @@ album->label_pos = pos; if (GTK_WIDGET_VISIBLE (album)) { -#ifdef USE_GTK2 gtk_widget_queue_draw (GTK_WIDGET (album)); -#else /* USE_GTK2 */ - gtk_widget_draw (GTK_WIDGET (album), NULL); -#endif /* USE_GTK2 */ } } @@ -1011,18 +819,11 @@ if (!GTK_WIDGET_MAPPED (list)) return; -#ifdef USE_GTK2 gtk_paint_shadow(GTK_WIDGET(list)->style, GTK_WIDGET(list)->window, CELL_STATE(cell), GTK_SHADOW_IN, NULL, NULL, NULL, cell_area->x, cell_area->y, cell_area->width, cell_area->height); -#else /* USE_GTK2 */ - gtk_draw_shadow(GTK_WIDGET(list)->style, GTK_WIDGET(list)->window, - CELL_STATE(cell), GTK_SHADOW_IN, - cell_area->x, cell_area->y, - cell_area->width, cell_area->height); -#endif /* USE_GTK2 */ } @@ -1033,18 +834,11 @@ if (!GTK_WIDGET_MAPPED (list)) return; -#ifdef USE_GTK2 gtk_paint_shadow(GTK_WIDGET(list)->style, GTK_WIDGET(list)->window, CELL_STATE(cell), GTK_SHADOW_OUT, NULL, NULL, NULL, cell_area->x, cell_area->y, cell_area->width, cell_area->height); -#else /* USE_GTK2 */ - gtk_draw_shadow(GTK_WIDGET(list)->style, GTK_WIDGET (list)->window, - CELL_STATE(cell), GTK_SHADOW_OUT, - cell_area->x, cell_area->y, - cell_area->width, cell_area->height); -#endif /* USE_GTK2 */ } diff -Nru gimageview-0.2.27/src/gimv_zalbum.h gimageview-0.3.0-0.20101117/src/gimv_zalbum.h --- gimageview-0.2.27/src/gimv_zalbum.h 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_zalbum.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_zalbum.h,v 1.5 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_zalbum.h 1142 2007-10-17 13:02:27Z makeinu $ */ /* @@ -43,10 +43,11 @@ #include "gimv_zlist.h" #define GIMV_TYPE_ZALBUM (gimv_zalbum_get_type ()) -#define GIMV_ZALBUM(widget) (GTK_CHECK_CAST ((widget), GIMV_TYPE_ZALBUM, GimvZAlbum)) -#define GIMV_ZALBUM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ZALBUM, GimvZAlbumClass)) -#define GIMV_IS_ZALBUM(widget) (GTK_CHECK_TYPE ((widget), GIMV_TYPE_ZALBUM)) -#define GIMV_IS_ZALBUM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ZALBUM)) +#define GIMV_ZALBUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_ZALBUM, GimvZAlbum)) +#define GIMV_ZALBUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ZALBUM, GimvZAlbumClass)) +#define GIMV_IS_ZALBUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_ZALBUM)) +#define GIMV_IS_ZALBUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ZALBUM)) +#define GIMV_ZALBUM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_ZALBUM, GimvZAlbumClass)) typedef struct _GimvZAlbum GimvZAlbum; typedef struct _GimvZAlbumCell GimvZAlbumCell; @@ -99,7 +100,7 @@ }; -GtkType gimv_zalbum_get_type (void); +GType gimv_zalbum_get_type (void); GtkWidget *gimv_zalbum_new (void); guint gimv_zalbum_add (GimvZAlbum *album, const gchar *name); diff -Nru gimageview-0.2.27/src/gimv_zlist.c gimageview-0.3.0-0.20101117/src/gimv_zlist.c --- gimageview-0.2.27/src/gimv_zlist.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_zlist.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_zlist.c,v 1.5 2004/09/21 08:44:32 makeinu Exp $ + * $Id: gimv_zlist.c 1141 2007-10-17 12:14:07Z makeinu $ */ /* @@ -36,7 +36,6 @@ #include #include -#include "gtk2-compat.h" #include "gimv_zlist.h" #define bw(widget) ((gint) GTK_CONTAINER(widget)->border_width) @@ -56,28 +55,16 @@ #define HIGHLIGHT_SIZE 2 -#ifdef USE_GTK2 -# ifdef GTK_DISABLE_DEPRECATED -# include "gimv_marshal.h" -# endif -# define WIDGET_DRAW(widget) gtk_widget_queue_draw (widget) -# define WIDGET_DRAW_AREA(widget, area) \ - gtk_widget_queue_draw_area (widget, \ - (area)->x, (area)->y, \ - (area)->width, (area)->height) -#else /* USE_GTK2 */ -# define WIDGET_DRAW(widget) gtk_widget_draw (widget, NULL) -# define WIDGET_DRAW_AREA(widget, area) gtk_widget_draw (widget, area) -#endif /* USE_GTK2 */ - -static void gimv_zlist_class_init (GimvZListClass *klass); -static void gimv_zlist_init (GimvZList *list); +#ifdef GTK_DISABLE_DEPRECATED +# include "gimv_marshal.h" +#endif +#define WIDGET_DRAW(widget) gtk_widget_queue_draw (widget) +#define WIDGET_DRAW_AREA(widget, area) \ + gtk_widget_queue_draw_area (widget, \ + (area)->x, (area)->y, \ + (area)->width, (area)->height) -#ifdef USE_GTK2 static void gimv_zlist_finalize (GObject *object); -#else -static void gimv_zlist_finalize (GtkObject *object); -#endif static void gimv_zlist_map (GtkWidget *widget); static void gimv_zlist_unmap (GtkWidget *widget); static void gimv_zlist_realize (GtkWidget *widget); @@ -162,197 +149,91 @@ LAST_SIGNAL }; -static GtkWidgetClass *parent_class = NULL; - -static guint gimv_zlist_signals [LAST_SIGNAL] = { 0 }; - +static guint gimv_zlist_signals [LAST_SIGNAL] = { 0 }; -GtkType -gimv_zlist_get_type (void) -{ - static GtkType type = 0; - -#ifdef USE_GTK2 - if (!type) { - static const GTypeInfo gimv_zlist_type_info = { - sizeof (GimvZListClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gimv_zlist_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GimvZList), - 0, /* n_preallocs */ - (GInstanceInitFunc) gimv_zlist_init, - }; - - type = g_type_register_static (GIMV_TYPE_SCROLLED, - "GimvZList", - &gimv_zlist_type_info, - 0); - } -#else /* USE_GTK2 */ - if (!type) { - static const GtkTypeInfo gimv_zlist_type_info = { - "GimvZList", - sizeof (GimvZList), - sizeof (GimvZListClass), - (GtkClassInitFunc) gimv_zlist_class_init, - (GtkObjectInitFunc) gimv_zlist_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - type = gtk_type_unique (GIMV_TYPE_SCROLLED, &gimv_zlist_type_info); - } -#endif /* USE_GTK2 */ - - return type; -} +G_DEFINE_TYPE (GimvZList, gimv_zlist, GIMV_TYPE_SCROLLED) static void gimv_zlist_class_init (GimvZListClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; GimvScrolledClass *scrolled_class; - parent_class = gtk_type_class (GIMV_TYPE_SCROLLED); - - object_class = (GtkObjectClass*) klass; + gobject_class = (GObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; scrolled_class = (GimvScrolledClass*) klass; -#if (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) gimv_zlist_signals [CLEAR] = g_signal_new ("clear", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, clear), + G_STRUCT_OFFSET(GimvZListClass, clear), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); gimv_zlist_signals [CELL_DRAW] = g_signal_new ("cell_draw", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_draw), + G_STRUCT_OFFSET(GimvZListClass, cell_draw), NULL, NULL, - gimv_marshal_VOID__POINTER_POINTER_POINTER, - G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); + gtk_marshal_NONE__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, + G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); gimv_zlist_signals [CELL_SIZE_REQUEST] = g_signal_new ("cell_size_request", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_size_request), + G_STRUCT_OFFSET(GimvZListClass, cell_size_request), NULL, NULL, - gimv_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); + gtk_marshal_NONE__POINTER_POINTER, + G_TYPE_NONE, 2, + G_TYPE_POINTER, G_TYPE_POINTER); gimv_zlist_signals [CELL_DRAW_FOCUS] = g_signal_new ("cell_draw_focus", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_draw_focus), + G_STRUCT_OFFSET(GimvZListClass, cell_draw_focus), NULL, NULL, - gimv_marshal_VOID__POINTER_POINTER, + gtk_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); gimv_zlist_signals [CELL_DRAW_DEFAULT] = g_signal_new ("cell_draw_default", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_draw_default), + G_STRUCT_OFFSET(GimvZListClass, cell_draw_default), NULL, NULL, - gimv_marshal_VOID__POINTER_POINTER, + gtk_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); gimv_zlist_signals [CELL_SELECT] = g_signal_new ("cell_select", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_select), + G_STRUCT_OFFSET(GimvZListClass, cell_select), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); gimv_zlist_signals [CELL_UNSELECT] = g_signal_new ("cell_unselect", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GimvZListClass, cell_unselect), + G_STRUCT_OFFSET(GimvZListClass, cell_unselect), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); -#else /* (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) */ - gimv_zlist_signals [CLEAR] = - gtk_signal_new ("clear", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, clear), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - - gimv_zlist_signals [CELL_DRAW] = - gtk_signal_new ("cell_draw", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_draw), - gtk_marshal_NONE__POINTER_POINTER_POINTER, - GTK_TYPE_NONE, 3, - GTK_TYPE_POINTER, GTK_TYPE_POINTER, GTK_TYPE_POINTER); - - gimv_zlist_signals [CELL_SIZE_REQUEST] = - gtk_signal_new ("cell_size_request", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_size_request), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, GTK_TYPE_POINTER); - - gimv_zlist_signals [CELL_DRAW_FOCUS] = - gtk_signal_new ("cell_draw_focus", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_draw_focus), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER); - - gimv_zlist_signals [CELL_DRAW_DEFAULT] = - gtk_signal_new ("cell_draw_default", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_draw_default), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER); - gimv_zlist_signals [CELL_SELECT] = - gtk_signal_new ("cell_select", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_select), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, GTK_TYPE_INT); - - gimv_zlist_signals [CELL_UNSELECT] = - gtk_signal_new ("cell_unselect", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GimvZListClass, cell_unselect), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, GTK_TYPE_INT); - - gtk_object_class_add_signals (object_class, gimv_zlist_signals, LAST_SIGNAL); -#endif /* (defined USE_GTK2) && (defined GTK_DISABLE_DEPRECATED) */ - - OBJECT_CLASS_SET_FINALIZE_FUNC (klass, gimv_zlist_finalize); + gobject_class->finalize = gimv_zlist_finalize; widget_class->map = gimv_zlist_map; widget_class->unmap = gimv_zlist_unmap; @@ -361,9 +242,6 @@ widget_class->size_request = gimv_zlist_size_request; widget_class->size_allocate = gimv_zlist_size_allocate; widget_class->expose_event = gimv_zlist_expose; -#ifndef USE_GTK2 - widget_class->draw = gimv_zlist_draw; -#endif widget_class->button_press_event = gimv_zlist_button_press; widget_class->button_release_event = gimv_zlist_button_release; @@ -432,11 +310,7 @@ { GimvZList *list; -#ifdef USE_GTK2 list = g_object_new (gimv_zlist_get_type (), NULL); -#else /* USE_GTK2 */ - list = (GimvZList*) gtk_type_new (gimv_zlist_get_type()); -#endif /* USE_GTK2 */ g_return_val_if_fail (list, NULL); gimv_zlist_construct (list, flags); @@ -472,16 +346,13 @@ static void -#ifdef USE_GTK2 gimv_zlist_finalize (GObject *object) -#else /* USE_GTK2 */ -gimv_zlist_finalize (GtkObject *object) -#endif /* USE_GTK2 */ { if (GIMV_ZLIST (object)->region_line_gc) gdk_gc_destroy (GIMV_ZLIST (object)->region_line_gc); - OBJECT_CLASS_FINALIZE_SUPER (parent_class, object); + if (G_OBJECT_CLASS(gimv_zlist_parent_class)->finalize) + G_OBJECT_CLASS(gimv_zlist_parent_class)->finalize (object); } @@ -543,8 +414,8 @@ { gimv_scrolled_unrealize (GIMV_SCROLLED(widget)); - if (parent_class->unrealize) - (* parent_class->unrealize) (widget); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->unrealize) + (* GTK_WIDGET_CLASS(gimv_zlist_parent_class)->unrealize) (widget); } @@ -605,11 +476,7 @@ && adj->value > adj->upper - adj->page_size) { adj->value = adj->upper - adj->page_size; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed", NULL); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed", NULL); -#endif /* USE_GTK2 */ } } else { @@ -631,11 +498,7 @@ && adj->value > adj->upper - adj->page_size) { adj->value = adj->upper - adj->page_size; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed", NULL); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed", NULL); -#endif /* USE_GTK2 */ } } } @@ -739,13 +602,8 @@ if (idx < list->cell_count) { cell = GIMV_ZLIST_CELL_FROM_INDEX (list, idx); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW], 0, cell, &cell_area, &intersect_area); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_DRAW], - cell, &cell_area, &intersect_area); -#endif /* USE_GTK2 */ } else { gdk_window_clear_area (widget->window, intersect_area.x, intersect_area.y, @@ -831,13 +689,8 @@ if (idx < list->cell_count) { cell = GIMV_ZLIST_CELL_FROM_INDEX (list, idx); -#ifdef USE_GTK2 - g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW], 0, + g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW], 0, cell, &cell_area, &intersect_area); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_DRAW], - cell, &cell_area, &intersect_area); -#endif /* USE_GTK2 */ } else { gdk_window_clear_area (widget->window, intersect_area.x, intersect_area.y, @@ -1021,8 +874,8 @@ gtk_widget_grab_focus (widget); /* call parent method */ - if (parent_class->button_press_event) - retval = parent_class->button_press_event (widget, event); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->button_press_event) + retval = GTK_WIDGET_CLASS(gimv_zlist_parent_class)->button_press_event (widget, event); list->region_select = GIMV_ZLIST_REGION_SELECT_OFF; @@ -1072,9 +925,6 @@ /* set selection */ switch (list->selection_mode) { case GTK_SELECTION_SINGLE: -#ifndef USE_GTK2 - case GTK_SELECTION_MULTIPLE: -#endif list->anchor = idx; gimv_zlist_cell_draw_focus (list, idx); break; @@ -1128,8 +978,8 @@ list = GIMV_ZLIST(widget); /* call parent class callback */ - if (parent_class->button_release_event) - retval = parent_class->button_release_event (widget, event); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->button_release_event) + retval = GTK_WIDGET_CLASS(gimv_zlist_parent_class)->button_release_event (widget, event); if (GTK_WIDGET_HAS_GRAB(widget)) gtk_grab_remove (widget); @@ -1152,16 +1002,6 @@ list->anchor = index; break; -#ifndef USE_GTK2 - case GTK_SELECTION_MULTIPLE: - if (list->anchor == index) { - list->focus = index; - gimv_zlist_cell_toggle (list, index); - } - list->anchor = index; - break; -#endif - case GTK_SELECTION_EXTENDED: if (event->state & GDK_CONTROL_MASK) { } else if (event->state & GDK_SHIFT_MASK) { @@ -1230,8 +1070,8 @@ } /* call parent class callback */ - if (parent_class->motion_notify_event) - retval = parent_class->motion_notify_event (widget, event); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->motion_notify_event) + retval = GTK_WIDGET_CLASS(gimv_zlist_parent_class)->motion_notify_event (widget, event); if (list->region_select) { if ((pressed && (flags & GIMV_SCROLLED_AUTO_SCROLL_MOTION)) @@ -1271,9 +1111,6 @@ switch (list->selection_mode) { case GTK_SELECTION_SINGLE: -#ifndef USE_GTK2 - case GTK_SELECTION_MULTIPLE: -#endif gimv_zlist_cell_draw_focus (list, index); break; @@ -1354,8 +1191,8 @@ return FALSE; } - if (parent_class->key_press_event && - (* parent_class->key_press_event) (widget, event)) + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->key_press_event && + (* GTK_WIDGET_CLASS(gimv_zlist_parent_class)->key_press_event) (widget, event)) return TRUE; return FALSE; @@ -1367,10 +1204,6 @@ { GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); -#ifndef USE_GTK2 - gtk_widget_draw_focus (widget); -#endif - return FALSE; } @@ -1380,10 +1213,6 @@ { GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); -#ifndef USE_GTK2 - gtk_widget_draw_default (widget); -#endif - return FALSE; } @@ -1400,8 +1229,8 @@ g_return_val_if_fail (widget, FALSE); - if (parent_class->button_press_event) - retval = parent_class->drag_motion (widget, context, x, y, time); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->button_press_event) + retval = GTK_WIDGET_CLASS(gimv_zlist_parent_class)->drag_motion (widget, context, x, y, time); list = GIMV_ZLIST(widget); @@ -1449,8 +1278,8 @@ { GimvZList *list; - if (parent_class->drag_leave) - parent_class->drag_leave (widget, context, time); + if (GTK_WIDGET_CLASS(gimv_zlist_parent_class)->drag_leave) + GTK_WIDGET_CLASS(gimv_zlist_parent_class)->drag_leave (widget, context, time); list = GIMV_ZLIST(widget); if (list->flags & GIMV_ZLIST_HIGHLIGHTED) { @@ -1462,7 +1291,6 @@ static void gimv_zlist_highlight (GtkWidget *widget) { -#ifdef USE_GTK2 gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, @@ -1470,14 +1298,6 @@ 0, 0, widget->allocation.width - 2 * bw (widget), widget->allocation.height - 2 * bw (widget)); -#else /* USE_GTK2 */ - gtk_draw_shadow (widget->style, - widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - 0, 0, - widget->allocation.width - 2 * bw (widget), - widget->allocation.height - 2 * bw (widget)); -#endif /* USE_GTK2 */ gdk_draw_rectangle (widget->window, widget->style->black_gc, @@ -1598,13 +1418,8 @@ pos = list->cells->len; list->cells = g_array_insert_val (list->cells, pos, cell); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_SIZE_REQUEST], 0, cell, &requisition); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_SIZE_REQUEST], - cell, &requisition); -#endif /* USE_GTK2 */ if (list->flags & GIMV_ZLIST_HORIZONTAL) { if (list->cell_count && list->cell_count % list->rows == 0) { @@ -1732,11 +1547,7 @@ adj->lower = 0; adj->upper = LIST_WIDTH(list) + 2 * list->x_pad + list->cell_x_pad; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "changed"); -#endif /* USE_GTK2 */ } if (scrolled->v_adjustment) { @@ -1748,11 +1559,7 @@ adj->lower = 0; adj->upper = LIST_HEIGHT(list) + 2 * list->y_pad + list->cell_y_pad; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "changed"); -#endif /* USE_GTK2 */ } } @@ -1766,11 +1573,7 @@ gimv_zlist_unselect_all (list); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CLEAR], 0); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CLEAR]); -#endif /* USE_GTK2 */ g_array_set_size (list->cells, 0); list->cell_count = 0; @@ -1787,13 +1590,8 @@ gimv_zlist_adjust_adjustments (GIMV_SCROLLED(list)); scrolled->h_adjustment->value = 0; scrolled->v_adjustment->value = 0; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(scrolled->h_adjustment), "value_changed"); g_signal_emit_by_name (G_OBJECT(scrolled->v_adjustment), "value_changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(scrolled->h_adjustment), "value_changed"); - gtk_signal_emit_by_name (GTK_OBJECT(scrolled->v_adjustment), "value_changed"); -#endif /* USE_GTK2 */ gimv_zlist_draw (GTK_WIDGET(list), NULL); } @@ -1917,7 +1715,7 @@ static void gimv_zlist_cell_area (GimvZList *list, gint index, GdkRectangle *cell_area) { - gint row, col; + gint row = 0, col = 0; g_return_if_fail (list && index != -1 && cell_area); gimv_zlist_cell_pos (list, index, &row, &col); @@ -1944,13 +1742,8 @@ gimv_zlist_cell_area (list, index, &cell_area); cell = GIMV_ZLIST_CELL_FROM_INDEX (list, index); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW], 0, cell, &cell_area, &cell_area); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_DRAW], - cell, &cell_area, &cell_area); -#endif /* USE_GTK2 */ if (index == list->focus) gimv_zlist_cell_draw_focus (list, index); @@ -1981,13 +1774,8 @@ if (list->flags & GIMV_ZLIST_1) return FALSE; -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_SIZE_REQUEST], 0, cell, &requisition); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_SIZE_REQUEST], - cell, &requisition); -#endif /* USE_GTK2 */ if (requisition.width + list->cell_x_pad > list->cell_width || requisition.height + list->cell_y_pad > list->cell_height) { @@ -2018,13 +1806,8 @@ gimv_zlist_cell_area (list, index, &cell_area); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW_FOCUS], 0, GIMV_ZLIST_CELL_FROM_INDEX (list, index), &cell_area); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_DRAW_FOCUS], - GIMV_ZLIST_CELL_FROM_INDEX (list, index), &cell_area); -#endif /* USE_GTK2 */ } @@ -2039,13 +1822,8 @@ gimv_zlist_cell_area (list, index, &cell_area); -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_DRAW_DEFAULT], 0, GIMV_ZLIST_CELL_FROM_INDEX (list, index), &cell_area); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_DRAW_DEFAULT], - GIMV_ZLIST_CELL_FROM_INDEX (list, index), &cell_area); -#endif /* USE_GTK2 */ } @@ -2058,11 +1836,7 @@ node = g_list_find (list->selection, GUINT_TO_POINTER(index)); if (!node) { -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_SELECT], 0, index); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_SELECT], index); -#endif /* USE_GTK2 */ list->selection = g_list_prepend (list->selection, GUINT_TO_POINTER(index)); gimv_zlist_draw_cell (list, index); } @@ -2078,11 +1852,7 @@ node = g_list_find (list->selection, GUINT_TO_POINTER(index)); if (node) { -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_UNSELECT], 0, index); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_UNSELECT], index); -#endif /* USE_GTK2 */ list->selection = g_list_remove (list->selection, GUINT_TO_POINTER(index)); gimv_zlist_draw_cell (list, index); } @@ -2108,13 +1878,8 @@ item = list->selection; while (item) { -#ifdef USE_GTK2 g_signal_emit (G_OBJECT(list), gimv_zlist_signals [CELL_UNSELECT], 0, GPOINTER_TO_UINT(item->data)); -#else /* USE_GTK2 */ - gtk_signal_emit (GTK_OBJECT(list), gimv_zlist_signals [CELL_UNSELECT], - GPOINTER_TO_UINT(item->data)); -#endif /* USE_GTK2 */ gimv_zlist_draw_cell (list, GPOINTER_TO_UINT(item->data)); item = item->next; @@ -2356,20 +2121,12 @@ if (cell_area.x < 0) { adj->value += cell_area.x; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed"); -#endif /* USE_GTK2 */ } if (cell_area.x + cell_area.width > GTK_WIDGET(list)->allocation.width) { adj->value += (cell_area.x - adj->page_size) + cell_area.width; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed"); -#endif /* USE_GTK2 */ } } else { /* vertical list */ @@ -2378,20 +2135,12 @@ if (cell_area.y < 0) { adj->value += cell_area.y; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed"); -#endif /* USE_GTK2 */ } if (cell_area.y + cell_area.height > GTK_WIDGET(list)->allocation.height) { adj->value += (cell_area.y - adj->page_size) + cell_area.height; -#ifdef USE_GTK2 g_signal_emit_by_name (G_OBJECT(adj), "value_changed"); -#else /* USE_GTK2 */ - gtk_signal_emit_by_name (GTK_OBJECT(adj), "value_changed"); -#endif /* USE_GTK2 */ } } } diff -Nru gimageview-0.2.27/src/gimv_zlist.h gimageview-0.3.0-0.20101117/src/gimv_zlist.h --- gimageview-0.2.27/src/gimv_zlist.h 2004-05-23 14:07:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gimv_zlist.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gimv_zlist.h,v 1.4 2004/04/11 05:07:28 makeinu Exp $ + * $Id: gimv_zlist.h 1142 2007-10-17 13:02:27Z makeinu $ */ /* @@ -39,10 +39,11 @@ #include "gimv_scrolled.h" #define GIMV_TYPE_ZLIST (gimv_zlist_get_type ()) -#define GIMV_ZLIST(widget) (GTK_CHECK_CAST ((widget), GIMV_TYPE_ZLIST, GimvZList)) -#define GIMV_ZLIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ZLIST, GimvZListClass)) -#define GIMV_IS_ZLIST(widget) (GTK_CHECK_TYPE ((widget), GIMV_TYPE_ZLIST)) -#define GIMV_IS_ZLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ZLIST)) +#define GIMV_ZLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMV_TYPE_ZLIST, GimvZList)) +#define GIMV_ZLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMV_TYPE_ZLIST, GimvZListClass)) +#define GIMV_IS_ZLIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMV_TYPE_ZLIST)) +#define GIMV_IS_ZLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMV_TYPE_ZLIST)) +#define GIMV_ZLIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMV_TYPE_ZLIST, GimvZListClass)) enum { GIMV_ZLIST_HORIZONTAL = 1 << 1, @@ -117,7 +118,7 @@ }; -GtkType gimv_zlist_get_type (void); +GType gimv_zlist_get_type (void); void gimv_zlist_construct (GimvZList *list, gint flags); diff -Nru gimageview-0.2.27/src/gtk2-compat.c gimageview-0.3.0-0.20101117/src/gtk2-compat.c --- gimageview-0.2.27/src/gtk2-compat.c 2004-05-23 14:07:48.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtk2-compat.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001-2003 Takuro Ashie - * - * 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: gtk2-compat.c,v 1.4 2003/06/13 10:29:29 makeinu Exp $ - */ - -#include "gtk2-compat.h" -#include - - -#ifdef USE_GTK2 - -gboolean -gtk2compat_scroll_to_button_cb (GtkWidget *widget, - GdkEventScroll *se, - gpointer data) -{ - GdkEventButton be; - gboolean retval; - - g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); - - be.type = GDK_BUTTON_PRESS; - be.window = se->window; - be.send_event = se->send_event; - be.time = se->time; - be.x = se->x; - be.y = se->y; - be.axes = NULL; - be.state = se->state; - be.device = se->device; - be.x_root = se->x_root; - be.y_root = se->y_root; - switch ((se)->direction) { - case GDK_SCROLL_UP: - be.button = 4; - break; - case GDK_SCROLL_DOWN: - be.button = 5; - break; - case GDK_SCROLL_LEFT: - be.button = 6; - break; - case GDK_SCROLL_RIGHT: - be.button = 7; - break; - default: - g_warning ("invalid scroll direction!"); - be.button = 0; - break; - } - - g_signal_emit_by_name (G_OBJECT(widget), "button-press-event", - &be, &retval); - be.type = GDK_BUTTON_RELEASE; - g_signal_emit_by_name (G_OBJECT(widget), "button-release-event", - &be, &retval); - - return retval; -} - -#else /* USE_GTK2 */ - -#include -#include -void -gdk_window_focus (GdkWindow *window, - guint32 timestamp) -{ - XRaiseWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XWINDOW (window)); - - gdk_error_trap_push (); - XSetInputFocus (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), - RevertToParent, - timestamp); - XSync (GDK_WINDOW_XDISPLAY (window), False); - gdk_error_trap_pop (); -} - -#endif /* USE_GTK2 */ diff -Nru gimageview-0.2.27/src/gtk2-compat.h gimageview-0.3.0-0.20101117/src/gtk2-compat.h --- gimageview-0.2.27/src/gtk2-compat.h 2004-09-22 15:15:10.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtk2-compat.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gtk2-compat.h,v 1.7 2003/06/13 09:43:34 makeinu Exp $ - */ - -#ifndef __GTK2_COMPAT_H__ -#define __GTK2_COMPAT_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include - -#ifdef USE_GTK2 - -# define gtk_object_class_add_signals(class, func, type) -# -# define OBJECT_CLASS_SET_FINALIZE_FUNC(klass, func) \ - G_OBJECT_CLASS(klass)->finalize = func -# -# define OBJECT_CLASS_FINALIZE_SUPER(parent_class, object) \ - if (G_OBJECT_CLASS(parent_class)->finalize) \ - G_OBJECT_CLASS(parent_class)->finalize (object); - -gboolean gtk2compat_scroll_to_button_cb (GtkWidget *widget, - GdkEventScroll *event, - gpointer data); - -# define SIGNAL_CONNECT_TRANSRATE_SCROLL(obj) \ - g_signal_connect (G_OBJECT(obj), "scroll-event", \ - G_CALLBACK(gtk2compat_scroll_to_button_cb), \ - NULL); - - - - - -#else /* USE_GTK2 */ - - - - - -# define gtk_style_get_font(style) style->font -# -# ifndef GTK_OBJECT_GET_CLASS -# define GTK_OBJECT_GET_CLASS(object) GTK_OBJECT (object)->klass -# endif -# -# define OBJECT_CLASS_SET_FINALIZE_FUNC(klass, func) \ - GTK_OBJECT_CLASS(klass)->finalize = func -# -# define OBJECT_CLASS_FINALIZE_SUPER(parent_class, object)\ - if (GTK_OBJECT_CLASS(parent_class)->finalize) \ - GTK_OBJECT_CLASS(parent_class)->finalize (object); -# -# ifndef GTK_WIDGET_GET_CLASS -# define GTK_WIDGET_GET_CLASS(widget) GTK_WIDGET_CLASS (GTK_OBJECT (widget)->klass) -# endif -# -# ifndef GTK_CLASS_TYPE -# define GTK_CLASS_TYPE(object_class) object_class->type -# endif - -# define SIGNAL_CONNECT_TRANSRATE_SCROLL(obj) - -void gdk_window_focus (GdkWindow *window, - guint32 timestamp); - -#endif /* USE_GTK2 */ - -#endif /* __GTK2_COMPAT_H__ */ diff -Nru gimageview-0.2.27/src/gtk_prop.c gimageview-0.3.0-0.20101117/src/gtk_prop.c --- gimageview-0.2.27/src/gtk_prop.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtk_prop.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,568 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * gtk_prop.c - * - * Copyright (C) 1999 Rasca, Berlin - * EMail: thron@gmx.de - * - * Olivier Fourdan (fourdan@xfce.org) - * Heavily modified as part of the Xfce project (http://www.xfce.org) - * - * 2001/11/13 - * Takuro Ashie (ashie@homa.ne.jp) - * Modified as part of GImageView project - * (http://gtkmmviewer.sourceforge.net) - * - * 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. - * - * $Id: gtk_prop.c,v 1.12 2004/09/21 08:44:32 makeinu Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "intl.h" -#include "gtk_prop.h" - -#ifdef DMALLOC -# include "dmalloc.h" -#endif - -/* FIXME? */ -#include "prefs.h" -#include "charset.h" -/* END FIXME? */ - - -#define box_pack_start(box,w) \ - gtk_box_pack_start(GTK_BOX(box),w,TRUE,FALSE,0) -#define box_pack_end(box,w) \ - gtk_box_pack_end(GTK_BOX(box),w,TRUE,FALSE,0) - -#define X_PAD 8 -#define Y_PAD 1 -#define TBL_XOPT GTK_EXPAND - -typedef struct -{ - GtkWidget *top; - GtkWidget *user; - GtkWidget *group; - fprop *prop; - int result; - int type; -} dlg; - -static dlg dl; - - -/* - */ -static GtkWidget * -label_new (const char *text, GtkJustification j_type) -{ - GtkWidget *label; - label = gtk_label_new (text); - gtk_label_set_justify (GTK_LABEL (label), j_type); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - /* j_type == GTK_JUSTIFY_RIGHT? 1.0 : 0.0, 0.5); */ - return (label); -} - - -/* - */ -static void -on_cancel (GtkWidget * btn, gpointer * data) -{ - if ((int) ((long) data) != DLG_RC_DESTROY) { - dl.result = (int) ((long) data); - gtk_widget_destroy (dl.top); - } - gtk_main_quit (); -} - - -/* - */ -static void -on_ok (GtkWidget * ok, gpointer * data) -{ - const char *val; - struct passwd *pw; - struct group *gr; - - val = gtk_entry_get_text (GTK_ENTRY (dl.user)); - if (val) { - pw = getpwnam (val); - if (pw) { - dl.prop->uid = pw->pw_uid; - } - } - val = gtk_entry_get_text (GTK_ENTRY (dl.group)); - if (val) { - gr = getgrnam (val); - if (gr) { - dl.prop->gid = gr->gr_gid; - } - } - gtk_widget_destroy (dl.top); - - dl.result = (int) ((long) data); - gtk_main_quit (); -} - - -/* - */ -static void -cb_perm (GtkWidget * toggle, void *data) -{ - int bit = (int) ((long) data); - if (GTK_TOGGLE_BUTTON (toggle)->active) - dl.prop->mode |= (mode_t) bit; - else - dl.prop->mode &= (mode_t) ~ bit; -} - - -/* - */ -static gint -on_key_press (GtkWidget * w, GdkEventKey * event, void *data) -{ - if (event->keyval == GDK_Escape) { - on_cancel ((GtkWidget *) data, (gpointer) ((long) DLG_RC_CANCEL)); - return (TRUE); - } - return (FALSE); -} - - -/* - * create a modal dialog for properties and handle it - */ -gint -dlg_prop (const gchar *path, fprop * prop, gint flags) -{ - GtkWidget *ok = NULL, *cancel = NULL, *label, *skip, *all, *notebook, *table; - GtkWidget *owner[4], *perm[15], *info[12]; - struct tm *t; - struct passwd *pw; - struct group *gr; - char buf[PATH_MAX + 1]; - GList *g_user = NULL; - GList *g_group = NULL, *g_tmp; - int n, len; -#ifndef LINE_MAX -#define LINE_MAX 1024 -#endif - char line[LINE_MAX + 1]; - - - dl.result = 0; - dl.prop = prop; - dl.top = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dl.top), _("Properties")); - gtk_signal_connect (GTK_OBJECT (dl.top), "destroy", - GTK_SIGNAL_FUNC (on_cancel), - (gpointer) ((long) DLG_RC_DESTROY)); - gtk_window_set_modal (GTK_WINDOW (dl.top), TRUE); - gtk_window_set_position (GTK_WINDOW (dl.top), GTK_WIN_POS_MOUSE); - - notebook = gtk_notebook_new (); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->vbox), notebook, - TRUE, TRUE, 0); - - /* ok and cancel buttons */ - ok = gtk_button_new_with_label (_("Ok")); - cancel = gtk_button_new_with_label (_("Cancel")); - - GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT); - GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), ok, - TRUE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), - cancel, TRUE, FALSE, 0); - - gtk_signal_connect (GTK_OBJECT (ok), "clicked", - GTK_SIGNAL_FUNC (on_ok), - (gpointer) ((long) DLG_RC_OK)); - gtk_signal_connect (GTK_OBJECT (cancel), "clicked", - GTK_SIGNAL_FUNC (on_cancel), - (gpointer) ((long) DLG_RC_CANCEL)); - gtk_widget_grab_default (ok); - - if (flags & GTK_PROP_MULTI) { - skip = gtk_button_new_with_label (_("Skip")); - all = gtk_button_new_with_label (_("All")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), skip, - TRUE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dl.top)->action_area), all, - TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (skip), "clicked", - GTK_SIGNAL_FUNC (on_cancel), - (gpointer) ((long) DLG_RC_SKIP)); - gtk_signal_connect (GTK_OBJECT (all), "clicked", - GTK_SIGNAL_FUNC (on_ok), - (gpointer) ((long) DLG_RC_ALL)); - GTK_WIDGET_SET_FLAGS (skip, GTK_CAN_DEFAULT); - GTK_WIDGET_SET_FLAGS (all, GTK_CAN_DEFAULT); - } - - - /* date and size page */ - label = gtk_label_new (_("Info")); - table = gtk_table_new (6, 2, FALSE); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); - - n = 0; - info[n] = label_new (_("Name :"), GTK_JUSTIFY_RIGHT); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, TBL_XOPT, 0, X_PAD, Y_PAD); - { - gchar *path_internal; - path_internal = charset_to_internal (path, - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - info[n + 1] = label_new (path_internal, GTK_JUSTIFY_LEFT); - g_free (path_internal); - } - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, TBL_XOPT, 0, 0, 0); - n += 2; - - if (!(flags & GTK_PROP_NOT_DETECT_TYPE)) { - pid_t pid; - int out_fd[2]; - - if (pipe (out_fd) == 0) { - pid = fork (); - if (pid > 0) { - char *p; - - close (out_fd[1]); - len = read (out_fd[0], line, LINE_MAX); - if (n > 0) { - line[len] = '\0'; - len = strlen(line); - if (line[len - 1] == '\n') - line[len - 1] = '\0'; - } - waitpid (pid, NULL, WUNTRACED); - close (out_fd[0]); - - if ((p = strstr (line, ": ")) != NULL) { - p += 2; - info[n + 1] = label_new (p, GTK_JUSTIFY_LEFT); - info[n] = label_new (_("Type :"), GTK_JUSTIFY_RIGHT); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, - TBL_XOPT, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, - TBL_XOPT, 0, 0, 0); - n += 2; - } - } else if (pid == 0) { - gchar **argv = g_new0 (gchar *, 1); - - argv[0] = g_strdup ("file"); - argv[1] = g_strdup (path); - argv[2] = NULL; - - close (out_fd[0]); - dup2 (out_fd[1], STDOUT_FILENO); - - execvp (argv[0], argv); - } - } - } - - sprintf (buf, _("%ld Bytes"), (unsigned long) prop->size); - info[n + 1] = label_new (buf, GTK_JUSTIFY_LEFT); - info[n] = label_new (_("Size :"), GTK_JUSTIFY_RIGHT); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, - TBL_XOPT, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, - TBL_XOPT, 0, 0, 0); - n += 2; - - t = localtime (&prop->atime); - sprintf (buf, "%04d/%02d/%02d %02d:%02d", - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min); - info[n + 1] = gtk_label_new (buf); - info[n] = gtk_label_new (_("Access Time :")); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, - TBL_XOPT, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, - TBL_XOPT, 0, 0, 0); - n += 2; - - t = localtime (&prop->mtime); - sprintf (buf, "%02d/%02d/%02d %02d:%02d", - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min); - info[n + 1] = gtk_label_new (buf); - info[n] = gtk_label_new (_("Modification Time :")); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, - TBL_XOPT, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, - TBL_XOPT, 0, 0, 0); - n += 2; - - t = localtime (&prop->ctime); - sprintf (buf, "%04d/%02d/%02d %02d:%02d", - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min); - info[n + 1] = gtk_label_new (buf); - info[n] = gtk_label_new (_("Change Time :")); - gtk_table_attach (GTK_TABLE (table), info[n], 0, 1, n, n + 1, - TBL_XOPT, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), info[n + 1], 1, 2, n, n + 1, - TBL_XOPT, 0, 0, 0); - n += 2; - - /* permissions page */ - if (!(flags & GTK_PROP_STALE_LINK)) { - label = gtk_label_new (_("Permissions")); - table = gtk_table_new (3, 5, FALSE); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); - - perm[0] = gtk_label_new (_("Owner :")); - perm[1] = gtk_check_button_new_with_label (_("Read")); - if (prop->mode & S_IRUSR) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[1]), 1); - gtk_signal_connect (GTK_OBJECT (perm[1]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IRUSR)); - perm[2] = gtk_check_button_new_with_label (_("Write")); - if (prop->mode & S_IWUSR) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[2]), 1); - gtk_signal_connect (GTK_OBJECT (perm[2]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IWUSR)); - perm[3] = gtk_check_button_new_with_label (_("Execute")); - if (prop->mode & S_IXUSR) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[3]), 1); - gtk_signal_connect (GTK_OBJECT (perm[3]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IXUSR)); - perm[4] = gtk_check_button_new_with_label (_("Set UID")); - if (prop->mode & S_ISUID) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[4]), 1); - gtk_signal_connect (GTK_OBJECT (perm[4]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_ISUID)); - - gtk_table_attach (GTK_TABLE (table), perm[0], 0, 1, 0, 1, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[1], 1, 2, 0, 1, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[2], 2, 3, 0, 1, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[3], 3, 4, 0, 1, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[4], 4, 5, 0, 1, 0, 0, X_PAD, 0); - - perm[5] = gtk_label_new (_("Group :")); - perm[6] = gtk_check_button_new_with_label (_("Read")); - if (prop->mode & S_IRGRP) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[6]), 1); - gtk_signal_connect (GTK_OBJECT (perm[6]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IRGRP)); - perm[7] = gtk_check_button_new_with_label (_("Write")); - if (prop->mode & S_IWGRP) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[7]), 1); - gtk_signal_connect (GTK_OBJECT (perm[7]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IWGRP)); - perm[8] = gtk_check_button_new_with_label (_("Execute")); - if (prop->mode & S_IXGRP) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[8]), 1); - gtk_signal_connect (GTK_OBJECT (perm[8]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IXGRP)); - perm[9] = gtk_check_button_new_with_label (_("Set GID")); - if (prop->mode & S_ISGID) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[9]), 1); - gtk_signal_connect (GTK_OBJECT (perm[9]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_ISGID)); - gtk_table_attach (GTK_TABLE (table), perm[5], 0, 1, 1, 2, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[6], 1, 2, 1, 2, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[7], 2, 3, 1, 2, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[8], 3, 4, 1, 2, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[9], 4, 5, 1, 2, 0, 0, X_PAD, 0); - - perm[10] = gtk_label_new (_("Other :")); - perm[11] = gtk_check_button_new_with_label (_("Read")); - if (prop->mode & S_IROTH) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[11]), 1); - gtk_signal_connect (GTK_OBJECT (perm[11]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IROTH)); - perm[12] = gtk_check_button_new_with_label (_("Write")); - if (prop->mode & S_IWOTH) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[12]), 1); - gtk_signal_connect (GTK_OBJECT (perm[12]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IWOTH)); - perm[13] = gtk_check_button_new_with_label (_("Execute")); - if (prop->mode & S_IXOTH) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[13]), 1); - gtk_signal_connect (GTK_OBJECT (perm[13]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_IXOTH)); - perm[14] = gtk_check_button_new_with_label (_("Sticky")); - if (prop->mode & S_ISVTX) - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (perm[14]), 1); - gtk_signal_connect (GTK_OBJECT (perm[14]), "clicked", - GTK_SIGNAL_FUNC (cb_perm), - (gpointer) ((long) S_ISVTX)); - gtk_table_attach (GTK_TABLE (table), perm[10], 0, 1, 2, 3, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[11], 1, 2, 2, 3, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[12], 2, 3, 2, 3, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[13], 3, 4, 2, 3, 0, 0, X_PAD, 0); - gtk_table_attach (GTK_TABLE (table), perm[14], 4, 5, 2, 3, 0, 0, X_PAD, 0); - } - - if (flags & GTK_PROP_EDITABLE) { - gint i, n_perms; - n_perms = sizeof (perm) / sizeof (GtkWidget *); - for (i = 0; i < n_perms; i++) { - gtk_widget_set_sensitive (perm[i], FALSE); - } - } - - /* owner/group page */ - while ((pw = getpwent ()) != NULL) { - g_user = g_list_append (g_user, g_strdup (pw->pw_name)); - } - g_user = g_list_sort (g_user, (GCompareFunc) strcmp); - endpwent (); - - while ((gr = getgrent ()) != NULL) { - g_group = g_list_append (g_group, g_strdup (gr->gr_name)); - } - endgrent (); - g_group = g_list_sort (g_group, (GCompareFunc) strcmp); - - label = gtk_label_new (_("Owner")); - table = gtk_table_new (2, 2, FALSE); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); - - pw = getpwuid (prop->uid); - sprintf (buf, "%s", pw ? pw->pw_name : _("unknown")); - owner[1] = gtk_combo_new (); - dl.user = GTK_WIDGET (GTK_COMBO (owner[1])->entry); - if (g_user) - gtk_combo_set_popdown_strings (GTK_COMBO (owner[1]), g_user); - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (owner[1])->entry), buf); - owner[0] = label_new (_("Owner :"), GTK_JUSTIFY_RIGHT); - gtk_table_attach (GTK_TABLE (table), owner[0], 0, 1, 0, 1, 0, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), owner[1], 1, 2, 0, 1, 0, 0, X_PAD, 0); - - gr = getgrgid (prop->gid); - sprintf (buf, "%s", gr ? gr->gr_name : _("unknown")); - owner[3] = gtk_combo_new (); - dl.group = GTK_WIDGET (GTK_COMBO (owner[3])->entry); - if (g_group) - gtk_combo_set_popdown_strings (GTK_COMBO (owner[3]), g_group); - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (owner[3])->entry), buf); - owner[2] = label_new (_("Group :"), GTK_JUSTIFY_RIGHT); - gtk_table_attach (GTK_TABLE (table), owner[2], 0, 1, 1, 2, 0, 0, X_PAD, Y_PAD); - gtk_table_attach (GTK_TABLE (table), owner[3], 1, 2, 1, 2, 0, 0, X_PAD, 0); - - if (flags & GTK_PROP_EDITABLE) { - gint i, n_owners; - n_owners = sizeof (owner) / sizeof (GtkWidget *); - for (i = 0; i < n_owners; i++) { - gtk_widget_set_sensitive (owner[i], FALSE); - } - } - - gtk_signal_connect (GTK_OBJECT (dl.top), "key_press_event", - GTK_SIGNAL_FUNC (on_key_press), - (gpointer) cancel); - gtk_widget_show_all (dl.top); - - gtk_main (); - - /* free the lists */ - g_tmp = g_user; - while (g_tmp) { - g_free (g_tmp->data); - g_tmp = g_tmp->next; - } - g_list_free (g_user); - g_tmp = g_group; - while (g_tmp) { - g_free (g_tmp->data); - g_tmp = g_tmp->next; - } - g_list_free (g_group); - return (dl.result); -} - - -gboolean -dlg_prop_from_image_info (GimvImageInfo *info, gint flags) -{ - fprop prop; - gint rc = DLG_RC_CANCEL; - const gchar *path; - gboolean retval = FALSE; - - g_return_val_if_fail (info, FALSE); - - path = gimv_image_info_get_path (info); - - prop.mode = info->st.st_mode; - prop.uid = info->st.st_uid; - prop.gid = info->st.st_gid; - prop.ctime = info->st.st_ctime; - prop.mtime = info->st.st_mtime; - prop.atime = info->st.st_atime; - prop.size = info->st.st_size; - - rc = dlg_prop (path, &prop, 0); - - switch (rc) { - case DLG_RC_OK: - case DLG_RC_ALL: - if (prop.mode != info->st.st_mode) { - chmod (path, prop.mode); - retval = TRUE; - } - if ((prop.uid != info->st.st_uid) || (prop.gid != info->st.st_gid)) { - chown (path, prop.uid, prop.gid); - retval = TRUE; - } - default: - break; - } - - return retval; -} diff -Nru gimageview-0.2.27/src/gtk_prop.h gimageview-0.3.0-0.20101117/src/gtk_prop.h --- gimageview-0.2.27/src/gtk_prop.h 2004-05-23 14:07:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtk_prop.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * gtk_prop.h - * - * Copyright (C) 1999 Rasca, Berlin - * EMail: thron@gmx.de - * - * Olivier Fourdan (fourdan@xfce.org) - * Heavily modified as part of the Xfce project (http://www.xfce.org) - * - * 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. - * - * $Id: gtk_prop.h,v 1.6 2003/06/18 09:26:56 makeinu Exp $ - */ - -#ifndef __GTK_PROP_H__ -#define __GTK_PROP_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include - -#include "gimv_image_info.h" - -/* - * flags - */ -enum { - GTK_PROP_MULTI = 1 << 0, - GTK_PROP_STALE_LINK = 1 << 1, - GTK_PROP_EDITABLE = 1 << 2, - GTK_PROP_NOT_DETECT_TYPE = 1 << 3 -}; - -#define DLG_OK (1<<0) -#define DLG_CANCEL (1<<1) -#define DLG_YES (1<<2) -#define DLG_NO (1<<3) -#define DLG_CONTINUE (1<<4) -#define DLG_CLOSE (1<<5) -#define DLG_ALL (1<<6) -#define DLG_SKIP (1<<7) -/* */ -#define DLG_OK_CANCEL (DLG_OK|DLG_CANCEL) -#define DLG_YES_NO (DLG_YES|DLG_NO) -/* */ -#define DLG_ENTRY_VIEW (1<<8) -#define DLG_ENTRY_EDIT (1<<9) -#define DLG_COMBO (1<<10) -/* */ -#define DLG_INFO (1<<11) -#define DLG_WARN (1<<12) -#define DLG_ERROR (1<<13) -#define DLG_QUESTION (1<<14) - -#define DLG_RC_CANCEL 0 -#define DLG_RC_OK 1 -#define DLG_RC_ALL 2 -#define DLG_RC_CONTINUE 3 -#define DLG_RC_SKIP 4 -#define DLG_RC_DESTROY 5 - -typedef struct -{ - mode_t mode; - uid_t uid; - gid_t gid; - time_t ctime; - time_t mtime; - time_t atime; - off_t size; -} fprop; - -gint dlg_prop (const gchar *path, - fprop *prop, - gint flags); -gboolean dlg_prop_from_image_info (GimvImageInfo *info, - gint flags); - -#endif /* __GTK_PROP_H__ */ diff -Nru gimageview-0.2.27/src/gtkutils.c gimageview-0.3.0-0.20101117/src/gtkutils.c --- gimageview-0.2.27/src/gtkutils.c 2004-10-03 19:21:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtkutils.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1312 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gtkutils.c,v 1.30 2004/10/03 14:53:55 makeinu Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -#include "auto_completion.h" -#include "charset.h" -#include "fileutil.h" -#include "gtkutils.h" -#include "gimv_icon_stock.h" -#include "intl.h" -#include "prefs.h" - -#ifndef BUF_SIZE -#define BUF_SIZE 4096 -#endif - -/* callback functions for confirm dialog */ -static gint cb_dummy (GtkWidget *button, - gpointer data); -static void cb_confirm_yes (GtkWidget *button, - ConfirmType *type); -static void cb_confirm_yes_to_all (GtkWidget *button, - ConfirmType *type); -static void cb_confirm_no (GtkWidget *button, - ConfirmType *type); -static void cb_confirm_cancel (GtkWidget *button, - ConfirmType *type); - -/* callback functions for message dialog */ -static void cb_message_dialog_quit (GtkWidget *button, - gpointer data); - -/* callback functions for progress bar window */ -static void cb_progress_win_cancel (GtkWidget *button, - gboolean *cancel_pressed); - -/* callback functions for text entry window */ -static void cb_textpop_enter (GtkWidget *button, - gboolean *ok_pressd); -static void cb_textpop_ok_button (GtkWidget *button, - gboolean *ok_pressd); -static void cb_textpop_cancel_button (GtkWidget *button, - gboolean *ok_pressd); - - - -/****************************************************************************** - * - * misc - * - ******************************************************************************/ -const gchar * -boolean_to_text (gboolean boolval) -{ - if (boolval) - return "TRUE"; - else - return "FALSE"; -} - - -gboolean -text_to_boolean (gchar *text) -{ - g_return_val_if_fail (text && *text, FALSE); - - if (!g_strcasecmp (text, "TRUE") || !g_strcasecmp (text, "ENABLE")) - return TRUE; - else - return FALSE; -} - - -void -gtkutil_get_widget_area (GtkWidget *widget, - GdkRectangle *area) -{ - g_return_if_fail (widget); - g_return_if_fail (area); - - area->x = widget->allocation.x; - area->y = widget->allocation.y; - area->width = widget->allocation.width; - area->height = widget->allocation.height; - - /* FIXME? */ - area->x = 0; - area->y = 0; - /* END FIXME? */ -} - - -/* - * create_toggle_button: - * @ Create toggle button widget. - * - * label : Label text for toggle button. - * def_val : Default value. - * Return : Toggle button widget. - */ -GtkWidget * -gtkutil_create_check_button (const gchar *label_text, gboolean def_val, - gpointer func, gpointer data) -{ - GtkWidget *toggle; - - toggle = gtk_check_button_new_with_label (_(label_text)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(toggle), def_val); - - if (func) - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (func), data); - - return toggle; -} - - -GtkWidget * -gtkutil_create_toolbar (void) -{ - GtkWidget *toolbar; - -#ifdef USE_GTK2 - toolbar = gtk_toolbar_new (); -#else /* USE_GTK2 */ - toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); - gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE); - gtk_toolbar_set_space_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_SPACE_LINE); - gtk_toolbar_set_space_size (GTK_TOOLBAR(toolbar), 16); -#endif /* USE_GTK2 */ - - return toolbar; -} - - -GtkWidget * -gtkutil_create_spin_button (GtkAdjustment *adj) -{ - GtkWidget *spinner = gtk_spin_button_new (adj, 0, 0); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); -#ifndef USE_GTK2 - gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner), - GTK_SHADOW_NONE); -#endif /* USE_GTK2 */ - - return spinner; -} - - -GtkWidget * -gtkutil_option_menu_get_current (GtkWidget *option_menu) -{ - g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), NULL); - -#ifdef USE_GTK2 - { - GtkWidget *menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu)); - gint nth = gtk_option_menu_get_history (GTK_OPTION_MENU (option_menu)); - GList *node = g_list_nth (GTK_MENU_SHELL (menu)->children, nth); - if (!node) return NULL; - return node->data; - } -#else /* USE_GTK2 */ - return GTK_OPTION_MENU (option_menu)->menu_item; -#endif /* USE_GTK2 */ -} - - -GList * -gtkutil_list_insert_sorted (GList *list, - gpointer data, - GCompareFunc func, - gboolean reverse) -{ - GList *tmp_list = list; - GList *new_list; - gint cmp; - - g_return_val_if_fail (func != NULL, list); - - if (!list) { - new_list = g_list_alloc(); - new_list->data = data; - return new_list; - } - - cmp = (*func) (data, tmp_list->data); - - while ((tmp_list->next) && - ((!reverse && cmp > 0) || (reverse && cmp <= 0))) - { - tmp_list = tmp_list->next; - cmp = (*func) (data, tmp_list->data); - } - - new_list = g_list_alloc(); - new_list->data = data; - - if ((!tmp_list->next) && (cmp > 0)) { - tmp_list->next = new_list; - new_list->prev = tmp_list; - return list; - } - - if (tmp_list->prev) { - tmp_list->prev->next = new_list; - new_list->prev = tmp_list->prev; - } - new_list->next = tmp_list; - tmp_list->prev = new_list; - - if (tmp_list == list) - return new_list; - else - return list; -} - - - -/****************************************************************************** - * - * Confirm Dialog Window - * - ******************************************************************************/ -static gint -cb_dummy (GtkWidget *button, gpointer data) -{ - return TRUE; -} - - -static void -cb_confirm_yes (GtkWidget *button, ConfirmType *type) -{ - *type = CONFIRM_YES; - gtk_main_quit (); -} - - -static void -cb_confirm_yes_to_all (GtkWidget *button, ConfirmType *type) -{ - *type = CONFIRM_YES_TO_ALL; - gtk_main_quit (); -} - - -static void -cb_confirm_no (GtkWidget *button, ConfirmType *type) -{ - *type = CONFIRM_NO; - gtk_main_quit (); -} - - -static void -cb_confirm_no_to_all (GtkWidget *button, ConfirmType *type) -{ - *type = CONFIRM_NO_TO_ALL; - gtk_main_quit (); -} - - -static void -cb_confirm_cancel (GtkWidget *button, ConfirmType *type) -{ - *type = CONFIRM_CANCEL; - gtk_main_quit (); -} - - -ConfirmType -gtkutil_confirm_dialog (const gchar *title, const gchar *message, - ConfirmDialogFlags flags, GtkWindow *parent) -{ - ConfirmType retval = CONFIRM_NO; - GtkWidget *window; - GtkWidget *vbox, *hbox, *button, *label; - GtkWidget *icon; - - window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (window), parent); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_default_size (GTK_WINDOW (window), 300, 120); - /* gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->vbox), 5); */ - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - /* message area */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); - gtk_widget_show (vbox); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_widget_show (hbox); - - /* icon */ - icon = gimv_icon_stock_get_widget ("question"); - gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, TRUE, 0); - gtk_widget_show (icon); - - /* message */ - label = gtk_label_new (message); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - - /* buttons */ - button = gtk_button_new_with_label (_("Yes")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_yes), - &retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - gtk_widget_grab_focus (button); - - if (flags & ConfirmDialogMultipleFlag) { - button = gtk_button_new_with_label (_("Yes to All")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_yes_to_all), - &retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - } - - button = gtk_button_new_with_label (_("No")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_no), - &retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - if (flags & ConfirmDialogMultipleFlag) { - button = gtk_button_new_with_label (_("Cancel")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_cancel), - &retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - } - - gtk_widget_show (window); - - gtk_grab_add (window); - gtk_main (); - gtk_grab_remove (window); - gtk_widget_destroy (window); - - return retval; -} - - -#include "gimv_image_view.h" - -typedef struct OverWriteDialog_Tag -{ - GimvImageInfo *info1, *info2; - GtkWidget *window, *iv1, *iv2, *show_compare_button, *compare_area, *entry; - gchar *new_path; - gint new_path_len; - ConfirmType retval; -} OverWriteDialog; - - -static void -cb_show_compare (GtkButton *button, OverWriteDialog *dialog) -{ - gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv1), dialog->info1); - gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv2), dialog->info2); -} - - -static void -cb_show_image1 (GtkButton *button, OverWriteDialog *dialog) -{ - gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv1), dialog->info1); -} - - - -static void -cb_show_image2 (GtkButton *button, OverWriteDialog *dialog) -{ - gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv2), dialog->info2); -} - - -static void -overwrite_confirm_rename (OverWriteDialog *dialog) -{ - const gchar *filename_internal - = g_basename (gtk_entry_get_text (GTK_ENTRY (dialog->entry))); - gchar *dirname, *filename; - - if (!filename_internal && *filename_internal) return; - g_return_if_fail (dialog->new_path && dialog->new_path_len > 0); - - dirname = g_dirname (gimv_image_info_get_path (dialog->info1)); - g_return_if_fail (dirname); - if (!*dirname) g_free (dirname); - g_return_if_fail (*dirname); - - filename = charset_internal_to_locale (filename_internal); - g_return_if_fail (filename); - if (!*filename) g_free (filename); - g_return_if_fail (*filename); - - g_snprintf (dialog->new_path, dialog->new_path_len, "%s/%s", - dirname, filename); - - /* check the new path */ - if (file_exists (dialog->new_path)) { - gchar error_message[BUF_SIZE]; - g_snprintf (error_message, BUF_SIZE, - _("The file exists : %s"), - dialog->new_path); - gtkutil_message_dialog (_("Error!!"), error_message, - GTK_WINDOW (dialog->window)); - g_free (dirname); - g_free (filename); - return; - } - - g_free (dirname); - g_free (filename); - - dialog->retval = CONFIRM_NO; - - gtk_main_quit (); -} - - -static void -cb_confirm_rename (GtkButton *button, OverWriteDialog *dialog) -{ - overwrite_confirm_rename (dialog); -} - - -static void -cb_confirm_rename_enter (GtkEntry *entry, OverWriteDialog *dialog) -{ - overwrite_confirm_rename (dialog); -} - - -ConfirmType -gtkutil_overwrite_confirm_dialog (const gchar *title, const gchar *message, - const gchar *dest_file, const gchar *src_file, - gchar *new_path, gint new_path_len, - ConfirmDialogFlags flags, - GtkWindow *parent) -{ - OverWriteDialog dialog; - GtkWidget *window; - GtkWidget *vbox, *hbox, *button, *label, *entry; - GtkWidget *icon; - GtkWidget *vbox2; - gchar *filename; - - dialog.retval = CONFIRM_NO; - dialog.info1 = gimv_image_info_get (dest_file); - dialog.info2 = gimv_image_info_get (src_file); - dialog.new_path = new_path; - dialog.new_path_len = new_path_len; - - dialog.window = window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (window), parent); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_default_size (GTK_WINDOW (window), 300, 120); - /* gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->vbox), 5); */ - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - /* message area */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); - gtk_widget_show (vbox); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_widget_show (hbox); - - /* icon */ - icon = gimv_icon_stock_get_widget ("question"); - gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, TRUE, 0); - gtk_widget_show (icon); - - /* message */ - label = gtk_label_new (message); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - - /* compare area */ - { - /* show image buttons */ - hbox = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), - hbox, FALSE, FALSE, 2); - gtk_widget_show (hbox); - - label = gtk_button_new_with_label (_("Show destination")); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2); - gtk_signal_connect (GTK_OBJECT (label), "clicked", - GTK_SIGNAL_FUNC (cb_show_image1), - &dialog); - gtk_widget_show (label); - - button = gtk_button_new_with_label (_("Show both images")); - dialog.show_compare_button = button; - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 2); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_show_compare), - &dialog); - gtk_widget_show (button); - - label = gtk_button_new_with_label (_("Show source")); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2); - gtk_signal_connect (GTK_OBJECT (label), "clicked", - GTK_SIGNAL_FUNC (cb_show_image2), - &dialog); - gtk_widget_show (label); - - /* view */ - dialog.compare_area = hbox = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_widget_show (hbox); - - /* destination */ - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 2); - gtk_widget_show (vbox2); - - dialog.iv1 = gimv_image_view_new (NULL); - gtk_object_set (GTK_OBJECT (dialog.iv1), - "default_zoom", 3, - "default_rotation", 0, - "keep_aspect", TRUE, - NULL); - gimv_image_view_hide_scrollbar (GIMV_IMAGE_VIEW (dialog.iv1)); - gtk_widget_set_usize (dialog.iv1, -1, 150); - gtk_box_pack_start (GTK_BOX (vbox2), dialog.iv1, TRUE, TRUE, 0); - gtk_widget_show (dialog.iv1); - - /* gimv_image_view_set_text (dialog.iv1, information) */ - - - /* source */ - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 2); - gtk_widget_show (vbox2); - - dialog.iv2 = gimv_image_view_new (NULL); - gtk_object_set (GTK_OBJECT (dialog.iv2), - "default_zoom", 3, - "default_rotation", 0, - "keep_aspect", TRUE, - NULL); - gimv_image_view_hide_scrollbar (GIMV_IMAGE_VIEW (dialog.iv2)); - gtk_widget_set_usize (dialog.iv2, -1, 150); - gtk_box_pack_start (GTK_BOX (vbox2), dialog.iv2, TRUE, TRUE, 0); - gtk_widget_show (dialog.iv2); - - /* gimv_image_view_set_text (dialog.iv2, information) */ - } - - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - vbox, FALSE, FALSE, 0); - gtk_widget_show (vbox); - - /* rename entry */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_widget_show (hbox); - - dialog.entry = entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (entry), "activate", - GTK_SIGNAL_FUNC (cb_confirm_rename_enter), &dialog); - filename = charset_to_internal (g_basename (src_file), - conf.charset_filename, - conf.charset_auto_detect_fn, - conf.charset_filename_mode); - gtk_entry_set_text (GTK_ENTRY (entry), filename); - g_free (filename); - filename = NULL; - gtk_widget_show (entry); - - button = gtk_button_new_with_label (_("Rename")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_rename), - &dialog); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - /* buttons */ - hbox = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), - hbox, TRUE, TRUE, 0); - gtk_widget_show (hbox); - - button = gtk_button_new_with_label (_("Yes")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_yes), - &dialog.retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - gtk_widget_grab_focus (button); - - if (flags & ConfirmDialogMultipleFlag) { - button = gtk_button_new_with_label (_("Yes to All")); - gtk_box_pack_start (GTK_BOX (hbox),button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_yes_to_all), - &dialog.retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - } - - button = gtk_button_new_with_label (_("Skip")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_no), - &dialog.retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - button = gtk_button_new_with_label (_("Skip all")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_no_to_all), - &dialog.retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - if (flags & ConfirmDialogMultipleFlag) { - button = gtk_button_new_with_label (_("Cancel")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_confirm_cancel), - &dialog.retval); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - } - - gtk_widget_show (window); - - gtk_grab_add (window); - gtk_main (); - gtk_grab_remove (window); - gtk_widget_destroy (window); - - if (dialog.info1) gimv_image_info_unref (dialog.info1); - if (dialog.info2) gimv_image_info_unref (dialog.info2); - - return dialog.retval; -} - - - -/****************************************************************************** - * - * Message Dialog Window - * - ******************************************************************************/ -static void -cb_message_dialog_quit (GtkWidget *button, gpointer data) -{ - gtk_main_quit (); -} - - -void -gtkutil_message_dialog (const gchar *title, const gchar *message, GtkWindow *parent) -{ - GtkWidget *window; - GtkWidget *button, *label, *vbox, *hbox; - GtkWidget *alert_icon; - - window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (window), parent); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - /* message area */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, - TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); - gtk_widget_show (vbox); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_widget_show (hbox); - - /* icon */ - alert_icon = gimv_icon_stock_get_widget ("alert"); - gtk_box_pack_start (GTK_BOX (hbox), alert_icon, TRUE, TRUE, 0); - gtk_widget_show (alert_icon); - - /* message */ - label = gtk_label_new (message); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - - /* button */ - button = gtk_button_new_with_label (_("OK")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_message_dialog_quit), NULL); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - gtk_widget_grab_focus (button); - - gtk_widget_show (window); - - gtk_grab_add (window); - gtk_main (); - gtk_grab_remove (window); - gtk_widget_destroy (window); -} - - - -/****************************************************************************** - * - * Progress Bar Window - * - ******************************************************************************/ -static void -cb_progress_win_cancel (GtkWidget *button, gboolean *cancel_pressed) -{ - *cancel_pressed = TRUE; -} - - -void -gtkutil_progress_window_update (GtkWidget *window, - gchar *title, gchar *message, - gchar *progress_text, gfloat progress) -{ - GtkWidget *label; - GtkWidget *progressbar; - - g_return_if_fail (window); - - label = gtk_object_get_data (GTK_OBJECT (window), "label"); - progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar"); - - g_return_if_fail (label && progressbar); - - if (title) - gtk_window_set_title (GTK_WINDOW (window), _(title)); - if (message) - gtk_label_set_text (GTK_LABEL (label), message); - if (progress_text) - gtk_progress_set_format_string(GTK_PROGRESS (progressbar), - progress_text); - if (progress > 0.0 && progress < 1.0) - gtk_progress_bar_update (GTK_PROGRESS_BAR (progressbar), progress); -} - - -GtkWidget * -gtkutil_create_progress_window (gchar *title, gchar *initial_message, - gboolean *cancel_pressed, - gint width, gint height, GtkWindow *parent) -{ - GtkWidget *window; - GtkWidget *vbox; - GtkWidget *label; - GtkWidget *progressbar; - GtkWidget *button; - - g_return_val_if_fail (title && initial_message && cancel_pressed, NULL); - - *cancel_pressed = FALSE; - - /* create dialog window */ - window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (window), parent); - gtk_container_border_width (GTK_CONTAINER (window), 3); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - gtk_window_set_default_size (GTK_WINDOW (window), width, height); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - /* message area */ - vbox = gtk_vbox_new (FALSE, 5); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, - TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_widget_show (vbox); - - /* label */ - label = gtk_label_new (initial_message); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - - /* progress bar */ - progressbar = gtk_progress_bar_new(); - gtk_progress_set_show_text(GTK_PROGRESS(progressbar), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), progressbar, FALSE, FALSE, 0); - - /* cancel button */ - button = gtk_button_new_with_label (_("Cancel")); - gtk_container_border_width (GTK_CONTAINER (button), 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button, - TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(cb_progress_win_cancel), cancel_pressed); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - - gtk_object_set_data (GTK_OBJECT (window), "label", label); - gtk_object_set_data (GTK_OBJECT (window), "progressbar", progressbar); - - gtk_widget_show_all (window); - - return window; -} - - - -/****************************************************************************** - * - * Text Entry Window - * - ******************************************************************************/ -static void -cb_textpop_enter (GtkWidget *button, gboolean *ok_pressd) -{ - *ok_pressd = TRUE; - gtk_main_quit (); -} - - -static void -cb_textpop_ok_button (GtkWidget *button, gboolean *ok_pressd) -{ - *ok_pressd = TRUE; - gtk_main_quit (); -} - - -static void -cb_textpop_cancel_button (GtkWidget *button, gboolean *ok_pressd) -{ - *ok_pressd = FALSE; - gtk_main_quit (); -} - - -static gint -cb_textpop_key_press (GtkWidget *widget, - GdkEventKey *event, - gboolean *ok_pressd) -{ - const gchar *path; - gchar *text; - gint n, len; - guint comp_key1, comp_key2; - GdkModifierType comp_mods1, comp_mods2; - - if (akey.common_auto_completion1) - gtk_accelerator_parse (akey.common_auto_completion1, - &comp_key1, &comp_mods1); - if (akey.common_auto_completion2) - gtk_accelerator_parse (akey.common_auto_completion2, - &comp_key2, &comp_mods2); - - if (event->keyval == GDK_Tab - || (event->keyval == comp_key1 && (!comp_mods1 || (event->state & comp_mods1))) - || (event->keyval == comp_key2 && (!comp_mods1 || (event->state & comp_mods2)))) - { - path = gtk_entry_get_text (GTK_ENTRY (widget)); - n = auto_compl_get_n_alternatives (path); - - if (n < 1) return TRUE; - - text = auto_compl_get_common_prefix (); - - if (n == 1) { - auto_compl_hide_alternatives (); - gtk_entry_set_text (GTK_ENTRY (widget), text); - if (text[strlen(text) - 1] != '/') - gtk_entry_append_text (GTK_ENTRY (widget), "/"); - } else { - gtk_entry_set_text (GTK_ENTRY (widget), text); - auto_compl_show_alternatives (widget); - } - - if (text) - g_free (text); - return TRUE; - - } else { - switch (event->keyval) { - case GDK_Return: - case GDK_KP_Enter: - path = gtk_entry_get_text (GTK_ENTRY (widget)); - - if (!isdir (path)) return FALSE; - - len = strlen (path); - if (path[len - 1] != '/') { - text = g_strconcat (path, "/", NULL); - } else { - text = g_strdup (path); - } - g_free (text); - break; - case GDK_Right: - case GDK_Left: - case GDK_Up: - case GDK_Down: - break; - case GDK_Escape: - *ok_pressd = FALSE; - gtk_main_quit (); - break; - default: - break; - } - } - - return FALSE; -} - - -gchar * -gtkutil_popup_textentry (const gchar *title, - const gchar *label_text, - const gchar *entry_text, - GList *text_list, - gint entry_width, - TextEntryFlags flags, - GtkWindow *parent) -{ - GtkWidget *window, *box, *hbox, *vbox, *button, *label, *combo, *entry; - gboolean ok_pressed = FALSE; - gchar *str = NULL; - - /* dialog window */ - window = gtk_dialog_new (); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (window), parent); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - /* main area */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_widget_show (vbox); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_widget_show (hbox); - - /* label */ - label = gtk_label_new (label_text); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - /* entry */ - if (flags & TEXT_ENTRY_WRAP_ENTRY) - box = vbox; - else - box = hbox; - - combo = gtk_combo_new(); - entry = GTK_COMBO (combo)->entry; - - if (text_list) - gtk_combo_set_popdown_strings (GTK_COMBO (combo), text_list); - else - gtk_widget_hide (GTK_COMBO (combo)->button); - - gtk_box_pack_start (GTK_BOX (box), combo, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (entry), "activate", - GTK_SIGNAL_FUNC (cb_textpop_enter), &ok_pressed); - if (entry_text) - gtk_entry_set_text (GTK_ENTRY (entry), entry_text); - if (flags & TEXT_ENTRY_CURSOR_TOP) - gtk_entry_set_position (GTK_ENTRY (entry), 0); - if (entry_width > 0) - gtk_widget_set_usize (combo, entry_width, -1); - if (flags & TEXT_ENTRY_AUTOCOMP_PATH) - gtk_signal_connect_after (GTK_OBJECT(entry), "key-press-event", - GTK_SIGNAL_FUNC(cb_textpop_key_press), - &ok_pressed); - gtk_widget_show (combo); - - if (flags & TEXT_ENTRY_NO_EDITABLE) - gtk_entry_set_editable (GTK_ENTRY (entry), FALSE); - - gtk_widget_grab_focus (entry); - - /* button */ - button = gtk_button_new_with_label (_("OK")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(cb_textpop_ok_button), &ok_pressed); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - button = gtk_button_new_with_label (_("Cancel")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), - button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(cb_textpop_cancel_button), &ok_pressed); - GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); - gtk_widget_show (button); - - gtk_widget_show (window); - - gtk_grab_add (window); - gtk_main (); - gtk_grab_remove (window); - - if (ok_pressed) - str = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); - - gtk_widget_destroy (window); - - return str; -} - - -/****************************************************************************** - * - * modal file dialog - * - ******************************************************************************/ -static void -cb_filesel_ok (GtkWidget *button, gboolean *retval) -{ - *retval = TRUE; - gtk_main_quit (); -} - - -static void -cb_filesel_cancel (GtkWidget *button, gboolean *retval) -{ - *retval = FALSE; - gtk_main_quit (); -} - - -gchar * -gtkutil_modal_file_dialog (const gchar *title, - const gchar *default_path, - ModalFileDialogFlags flags, - GtkWindow *parent) -{ - GtkWidget *filesel = gtk_file_selection_new (title); - GtkWidget *button; - gchar *filename = NULL; - gboolean retval = FALSE; - - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (filesel), parent); - - gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_CENTER); - gtk_signal_connect (GTK_OBJECT (filesel), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - button = GTK_FILE_SELECTION (filesel)->ok_button; - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_filesel_ok), - &retval); - button = GTK_FILE_SELECTION (filesel)->cancel_button; - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_filesel_cancel), - &retval); - - if (default_path && *default_path) - gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), - default_path); - - if (flags & MODAL_FILE_DIALOG_DIR_ONLY) - gtk_widget_hide (GTK_FILE_SELECTION (filesel)->file_list->parent); - - if (flags & MODAL_FILE_DIALOG_HIDE_FILEOP) - gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); - - gtk_widget_show (filesel); - - gtk_grab_add (filesel); - gtk_main (); - - if (retval) { - const gchar *tmpstr; - tmpstr = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); - filename = g_strdup (tmpstr); - } - - gtk_grab_remove (filesel); - gtk_widget_destroy (filesel); - - return filename; -} - - - -/****************************************************************************** - * - * Color selection button - * - ******************************************************************************/ -static void -cb_colorsel_ok (GtkWidget *button, gboolean *retval) -{ - *retval = TRUE; - gtk_main_quit (); -} - - -static void -cb_colorsel_cancel (GtkWidget *button, gboolean *retval) -{ - *retval = FALSE; - gtk_main_quit (); -} - - -static void -cb_choose_color (GtkWidget *widget, gint color[3]) -{ - GtkWidget *dialog, *button, *csel; - gboolean retval = FALSE; - gdouble selcol[4]; - - g_return_if_fail (color); - - dialog = gtk_color_selection_dialog_new (_("Choose Color")); - selcol[0] = (gdouble) color[0] / 0xffff; - selcol[1] = (gdouble) color[1] / 0xffff; - selcol[2] = (gdouble) color[2] / 0xffff; - selcol[3] = 0.0; - csel = GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel; - gtk_color_selection_set_color (GTK_COLOR_SELECTION (csel), selcol); - gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); - - button = GTK_COLOR_SELECTION_DIALOG (dialog)->ok_button; - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_colorsel_ok), - &retval); - button = GTK_COLOR_SELECTION_DIALOG (dialog)->cancel_button; - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_colorsel_cancel), - &retval); - button = GTK_COLOR_SELECTION_DIALOG (dialog)->help_button; - gtk_widget_hide (button); - gtk_widget_show (dialog); - - gtk_grab_add (dialog); - gtk_main (); - if (retval) { - gtk_color_selection_get_color (GTK_COLOR_SELECTION (csel), selcol); - color[0] = selcol[0] * 0xffff; - color[1] = selcol[1] * 0xffff; - color[2] = selcol[2] * 0xffff; - } - gtk_grab_remove (dialog); - gtk_widget_destroy (dialog); -} - - -GtkWidget * -gtkutil_color_sel_button (const gchar *label, gint color[3]) -{ - GtkWidget *button; - - button = gtk_button_new_with_label (label); - gtk_signal_connect (GTK_OBJECT (button),"clicked", - GTK_SIGNAL_FUNC (cb_choose_color), - color); - - return button; -} - - -/****************************************************************************** - * - * Compare functions - * - ******************************************************************************/ -gint -gtkutil_comp_spel (gconstpointer data1, gconstpointer data2) -{ - const gchar *str1 = data1; - const gchar *str2 = data2; - - return strcmp (str1, str2); -} - - -gint -gtkutil_comp_casespel (gconstpointer data1, gconstpointer data2) -{ - const gchar *str1 = data1; - const gchar *str2 = data2; - - return g_strcasecmp (str1, str2); -} - - -/****************************************************************************** - * - * simple callback functions - * - ******************************************************************************/ -void -gtkutil_get_data_from_toggle_cb (GtkWidget *toggle, gboolean *data) -{ - g_return_if_fail (data); - - *data = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(toggle)); -} - - -void -gtkutil_get_data_from_toggle_negative_cb (GtkWidget *toggle, gboolean *data) -{ - g_return_if_fail (data); - - *data = !(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(toggle))); -} - - -void -gtkutil_get_data_from_adjustment_by_int_cb (GtkWidget *widget, gint *data) -{ - g_return_if_fail (data); - - *data = GTK_ADJUSTMENT(widget)->value; -} - - -void -gtkutil_get_data_from_adjustment_by_float_cb (GtkWidget *widget, gfloat *data) -{ - g_return_if_fail (data); - - *data = GTK_ADJUSTMENT(widget)->value; -} diff -Nru gimageview-0.2.27/src/gtkutils.h gimageview-0.3.0-0.20101117/src/gtkutils.h --- gimageview-0.2.27/src/gtkutils.h 2004-05-23 14:07:58.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/gtkutils.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: gtkutils.h,v 1.17 2004/04/11 05:07:28 makeinu Exp $ - */ - -#ifndef __GTKUTILS_H__ -#define __GTKUTILS_H__ - -#ifdef HAVE_CONFIG_H -# include -#endif /* HAVE_CONFIG_H */ - -#include - - -typedef enum { - CONFIRM_ERROR = -1, - CONFIRM_YES, - CONFIRM_YES_TO_ALL, - CONFIRM_NO, - CONFIRM_NO_TO_ALL, - CONFIRM_CANCEL, - CONFIRM_ASK -} ConfirmType; - - -typedef enum { - ConfirmDialogMultipleFlag = 1 << 0 -} ConfirmDialogFlags; - - -typedef enum { - TEXT_ENTRY_AUTOCOMP_PATH = 1 << 1, - TEXT_ENTRY_WRAP_ENTRY = 1 << 2, - TEXT_ENTRY_CURSOR_TOP = 1 << 3, - TEXT_ENTRY_NO_EDITABLE = 1 << 4 -} TextEntryFlags; - - -typedef enum { - MODAL_FILE_DIALOG_DIR_ONLY = 1 << 0, - MODAL_FILE_DIALOG_HIDE_FILEOP = 1 << 1 -} ModalFileDialogFlags; - - -const gchar *boolean_to_text (gboolean boolval); -gboolean text_to_boolean (gchar *text); -void gtkutil_get_widget_area (GtkWidget *widget, - GdkRectangle *area); - -GtkWidget *gtkutil_create_check_button (const gchar *lebel_text, - gboolean def_val, - gpointer func, - gpointer data); -GtkWidget *gtkutil_create_toolbar (void); -GtkWidget *gtkutil_create_spin_button (GtkAdjustment *adj); -GtkWidget *gtkutil_option_menu_get_current(GtkWidget *option_menu); -GList *gtkutil_list_insert_sorted (GList *list, - gpointer data, - GCompareFunc func, - gboolean reverse); - -/* confirm dialog window */ -ConfirmType gtkutil_confirm_dialog (const gchar *title, - const gchar *message, - ConfirmDialogFlags flags, - GtkWindow *parent); -ConfirmType -gtkutil_overwrite_confirm_dialog (const gchar *title, const gchar *message, - const gchar *dest_file, const gchar *src_file, - gchar *new_path, gint new_path_len, - ConfirmDialogFlags flags, - GtkWindow *parent); - -/* message dialog window */ -void gtkutil_message_dialog (const gchar *title, - const gchar *message, - GtkWindow *parent); - -/* progress bar window */ -GtkWidget *gtkutil_create_progress_window (gchar *title, - gchar *initial_message, - gboolean *cancel_pressed, - gint width, - gint height, - GtkWindow *parent); -void gtkutil_progress_window_update (GtkWidget *window, - gchar *title, - gchar *message, - gchar *progress_text, - gfloat progress); - -/* text entry window */ -gchar *gtkutil_popup_textentry (const gchar *title, - const gchar *label_text, - const gchar *entry_text, - GList *text_list, - gint entry_width, - TextEntryFlags flags, - GtkWindow *parent); - -/* modal file selection */ -gchar *gtkutil_modal_file_dialog (const gchar *title, - const gchar *default_path, - ModalFileDialogFlags flags, - GtkWindow *parent); - -/* color selection button */ -GtkWidget *gtkutil_color_sel_button (const gchar *label, - gint color[3]); - -/* compare functions */ -gint gtkutil_comp_spel (gconstpointer data1, - gconstpointer data2); -gint gtkutil_comp_casespel (gconstpointer data1, - gconstpointer data2); - -/* simple callback functions */ -void gtkutil_get_data_from_toggle_cb (GtkWidget *toggle, - gboolean *data); -void gtkutil_get_data_from_toggle_negative_cb (GtkWidget *toggle, - gboolean *data); -void gtkutil_get_data_from_adjustment_by_int_cb (GtkWidget *widget, - gint *data); -void gtkutil_get_data_from_adjustment_by_float_cb (GtkWidget *widget, - gfloat *data); - -#endif /* __GTKUTILS_H__ */ diff -Nru gimageview-0.2.27/src/help.c gimageview-0.3.0-0.20101117/src/help.c --- gimageview-0.2.27/src/help.c 2004-12-28 04:27:42.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/help.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: help.c,v 1.45 2004/12/28 04:27:42 makeinu Exp $ + * $Id: help.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include "gimageview.h" @@ -26,19 +26,17 @@ #include #include #include -#if HAVE_GDK_PIXBUF -# include -#endif +#include -#include "charset.h" -#include "fileutil.h" -#include "gfileutil.h" -#include "help.h" #include "gimv_icon_stock.h" -#include "menu.h" #include "gimv_plugin.h" +#include "gimv_text_win.h" #include "prefs.h" -#include "text_viewer.h" +#include "help.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_menu.h" #define DOC_HTML_DIR "html" #define DOC_TEXT_DIR "text" @@ -170,7 +168,9 @@ cmd = g_strconcat (conf.text_viewer, " ", filename, " &", NULL); system (cmd); } else { - text_viewer_create (filename); + GtkWidget *text_win = gimv_text_win_new (); + gimv_text_win_load_file (GIMV_TEXT_WIN (text_win), filename); + gtk_widget_show (text_win); } g_free (cmd); @@ -212,64 +212,25 @@ static void set_copyleft_str (void) { + GtkTextBuffer *buffer; gchar buf[BUF_SIZE]; g_snprintf (buf, BUF_SIZE, _(license), GIMV_PROG_AUTHOR, GIMV_PROG_ADDRESS); -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); - gtk_text_buffer_set_text (buffer, "\0", -1); - } -#else - { - gint len; - - gtk_text_set_point (GTK_TEXT (info_win.text_box), 0); - len = gtk_text_get_length (GTK_TEXT (info_win.text_box)); - - if (len > 0) { - gtk_text_forward_delete (GTK_TEXT (info_win.text_box), len); - } - } -#endif - - if (buf && *buf) { -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); - gtk_text_buffer_set_text (buffer, buf, -1); - } -#else - { - GdkFont *font; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); + gtk_text_buffer_set_text (buffer, "\0", -1); - if (conf.textentry_font && *conf.textentry_font) - font = gdk_fontset_load (conf.textentry_font); - else - font = NULL; - - gtk_text_freeze (GTK_TEXT (info_win.text_box)); - gtk_text_insert (GTK_TEXT (info_win.text_box), - font, NULL, NULL, buf, strlen (buf)); - gtk_text_thaw (GTK_TEXT (info_win.text_box)); - - if (font) - gdk_font_unref (font); - } -#endif - } + if (buf && *buf) + gtk_text_buffer_set_text (buffer, buf, -1); } static void cb_gimv_info_change_text (GtkWidget *widget, gchar *text) { + GtkTextBuffer *buffer; + g_return_if_fail (info_win.text_box); if (!text) { @@ -277,54 +238,11 @@ return; } -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); + gtk_text_buffer_set_text (buffer, "\0", -1); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); - gtk_text_buffer_set_text (buffer, "\0", -1); - } -#else - { - guint len; - - gtk_text_set_point (GTK_TEXT (info_win.text_box), 0); - len = gtk_text_get_length (GTK_TEXT (info_win.text_box)); - - if (len > 0) { - gtk_text_forward_delete (GTK_TEXT (info_win.text_box), len); - } - } -#endif - - if (text && *text) { -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (info_win.text_box)); + if (text && *text) gtk_text_buffer_set_text (buffer, text, -1); - } -#else - { /********** convert charset **********/ - GdkFont *font; - - if (conf.textentry_font && *conf.textentry_font) - font = gdk_fontset_load (conf.textentry_font); - else - font = NULL; - - gtk_text_freeze (GTK_TEXT (info_win.text_box)); - gtk_text_insert (GTK_TEXT (info_win.text_box), - font, NULL, NULL, _(text), strlen (text)); - gtk_text_thaw (GTK_TEXT (info_win.text_box)); - - if (font) - gdk_font_unref (font); - - } -#endif - } } @@ -414,8 +332,8 @@ if (!filename) continue; menuitem = gtk_menu_item_new_with_label (g_basename(filename)); - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (func), filename); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (func), filename); gtk_menu_append (GTK_MENU (menu), menuitem); gtk_widget_show (menuitem); @@ -534,12 +452,10 @@ mng_version_text ()); strncat (buf, alt_string, BUF_SIZE - strlen (buf)); #endif -#ifdef HAVE_GDK_PIXBUF g_snprintf (alt_string, sizeof (alt_string) / sizeof (gchar), _("gdk-pixbuf version : %s\n"), gdk_pixbuf_version); strncat (buf, alt_string, BUF_SIZE - strlen (buf)); -#endif #ifdef ENABLE_SVG g_snprintf (alt_string, sizeof (alt_string) / sizeof (gchar), _("librsvg version : %s\n"), @@ -626,9 +542,9 @@ label = gtk_label_new (GIMV_PROG_URI); gtk_container_add (GTK_CONTAINER (button), label); gtk_widget_show (label); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_progurl_clicked), - GIMV_PROG_URI); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_progurl_clicked), + GIMV_PROG_URI); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_widget_show (button); @@ -638,23 +554,14 @@ info_win.scrolled_win = scrolledwin; gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_box_pack_start (GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (scrolledwin), 5); gtk_widget_show (scrolledwin); -#ifdef USE_GTK2 text = gtk_text_view_new (); -#else - text = gtk_text_new (gtk_scrolled_window_get_hadjustment - (GTK_SCROLLED_WINDOW (scrolledwin)), - gtk_scrolled_window_get_vadjustment - (GTK_SCROLLED_WINDOW (scrolledwin))); -#endif gtk_container_add (GTK_CONTAINER (scrolledwin), text); info_win.text_box = text; set_copyleft_str (); @@ -671,30 +578,30 @@ gtk_widget_show (hbox2); radio = gtk_radio_button_new_with_label (NULL, _("License")); - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_info_change_text), NULL); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_gimv_info_change_text), NULL); gtk_box_pack_start (GTK_BOX (hbox2), radio, FALSE, FALSE, 0); gtk_widget_show (radio); radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), _("Authors")); - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_info_change_text), - _(authors)); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_gimv_info_change_text), + _(authors)); gtk_box_pack_start (GTK_BOX (hbox2), radio, FALSE, FALSE, 0); gtk_widget_show (radio); radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), _("System Info")); - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_info_change_text), system_info); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_gimv_info_change_text), system_info); gtk_box_pack_start (GTK_BOX (hbox2), radio, FALSE, FALSE, 0); gtk_widget_show (radio); radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), _("Plugin Info")); - gtk_signal_connect (GTK_OBJECT (radio), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_info_change_text), plugin_info); + g_signal_connect (G_OBJECT (radio), "clicked", + G_CALLBACK (cb_gimv_info_change_text), plugin_info); gtk_box_pack_start (GTK_BOX (hbox2), radio, FALSE, FALSE, 0); gtk_widget_show (radio); @@ -728,9 +635,9 @@ button = gtk_button_new_with_label (_("OK")); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_gimv_info_win_ok_button), - window); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_gimv_info_win_ok_button), + window); GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); gtk_widget_show (button); diff -Nru gimageview-0.2.27/src/help.h gimageview-0.3.0-0.20101117/src/help.h --- gimageview-0.2.27/src/help.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/help.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: help.h,v 1.4 2002/10/23 21:42:24 makeinu Exp $ + * $Id: help.h 602 2002-10-23 21:42:25Z makeinu $ */ #ifndef __HELP_H__ diff -Nru gimageview-0.2.27/src/image_view_draw.c gimageview-0.3.0-0.20101117/src/image_view_draw.c --- gimageview-0.2.27/src/image_view_draw.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/image_view_draw.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,450 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: image_view_draw.c,v 1.5 2003/07/20 14:38:10 makeinu Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include "cursors.h" -#include "gimv_anim.h" -#include "gimv_image_view.h" -#include "gimv_thumb_cache.h" -#include "prefs.h" - - -static gboolean cb_image_configure (GtkWidget *widget, - GdkEventConfigure *event, - GimvImageView *iv); -static gboolean cb_image_expose (GtkWidget *widget, - GdkEventExpose *event, - GimvImageView *iv); - -/* virtual functions */ -static GtkWidget *imageview_draw_create (GimvImageView *iv); -static void imageview_draw_create_thumbnail (GimvImageView *iv, - const gchar *type); - -static gboolean imageview_draw_is_playable (GimvImageView *iv, - GimvImageInfo *info); -static void imageview_animation_play (GimvImageView *iv); -static void imageview_animation_stop (GimvImageView *iv); -#if 0 -static void imageview_animation_pause (GimvImageView *iv); -#endif -static GimvImageViewPlayableStatus - imageview_draw_get_status (GimvImageView *iv); - - -static GimvImageViewPlayableIF imageview_draw_playable_table = { - is_playable_fn: imageview_draw_is_playable, - is_seekable_fn: NULL, - play_fn: imageview_animation_play, - stop_fn: imageview_animation_stop, -#if 0 - pause_fn: imageview_animation_pause, -#else - pause_fn: NULL, -#endif - forward_fn: NULL, - reverse_fn: NULL, - seek_fn: NULL, - eject_fn: NULL, - get_status_fn: imageview_draw_get_status, - get_length_fn: NULL, - get_position_fn: NULL, -}; - - -GimvImageViewPlugin imageview_draw_vfunc_table = { - label: GIMV_IMAGE_VIEW_DEFAULT_VIEW_MODE, - priority_hint: G_PRIORITY_LOW, - is_supported_fn: NULL, - create_fn: imageview_draw_create, - create_thumbnail_fn: imageview_draw_create_thumbnail, - fullscreen_fn: NULL, - - scalable: NULL, - rotatable: NULL, - playable: &imageview_draw_playable_table, -}; - - -static GHashTable *animation_id_table = NULL; -static GHashTable *create_thumbnail_id_table = NULL; - - -/***************************************************************************** - * - * callback functions - * - *****************************************************************************/ -static void -cb_destroy (GtkWidget *widget, GimvImageView *iv) -{ - g_return_if_fail (iv); - - imageview_animation_stop (iv); -} - - -static void -cb_load_end_create_thumbnail (GimvImageView *iv, GimvImageInfo *info, - gboolean cancel, gpointer data) -{ - GimvImage *imcache; - gchar *filename; - gboolean free_buf = GPOINTER_TO_INT (data); - gpointer id_p; - guint id; - - g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); - - id_p = g_hash_table_lookup (create_thumbnail_id_table, iv); - id = GPOINTER_TO_UINT (id_p); - if (id > 0) - gtk_signal_disconnect (GTK_OBJECT (iv), id); - g_hash_table_remove (create_thumbnail_id_table, iv); - - if (cancel) return; - if (!iv->image) return; - if (iv->info != iv->loader->info) return; - - filename = gimv_image_info_get_path_with_archive (iv->info); - - /* FIXME: conf.cache_write_type is hard coded */ - imcache = gimv_thumb_cache_save (filename, - conf.cache_write_type, - iv->image, - iv->info); - - g_free (filename); - - if (free_buf) - gimv_image_view_free_image_buf (iv); - - if (imcache) { - gimv_image_unref (imcache); - gtk_signal_emit_by_name (GTK_OBJECT (iv), - "thumbnail_created", - iv->info); - } -} - - -static void -cb_draw_area_map (GtkWidget *widget, GimvImageView *iv) -{ - if (iv->bg_color) { - gimv_image_view_set_bg_color (iv, - iv->bg_color->red, - iv->bg_color->green, - iv->bg_color->blue); - } - - /* set cursor */ - if (!iv->cursor) - iv->cursor = cursor_get (iv->draw_area->window, CURSOR_HAND_OPEN); - gdk_window_set_cursor (iv->draw_area->window, iv->cursor); -} - - -static gboolean -cb_image_configure (GtkWidget *widget, GdkEventConfigure *event, GimvImageView *iv) -{ - gint width, height; - gint fwidth, fheight; - gint x_pos, y_pos; - - gimv_image_view_get_view_position (iv, &x_pos, &y_pos); - gimv_image_view_get_image_size (iv, &width, &height); - gimv_image_view_get_image_frame_size (iv, &fwidth, &fheight); - - if (fwidth < width) { - if (x_pos < 0 || x_pos < 0 - fwidth || x_pos > width) - x_pos = 0; - } else { - x_pos = (width - fwidth) / 2; - } - - if (fheight < height) { - if (y_pos < 0 || y_pos < 0 - fheight || y_pos > height) - y_pos = 0; - } else { - - y_pos = (height - fheight) / 2; - } - - gimv_image_view_set_view_position (iv, x_pos, y_pos); - gimv_image_view_draw_image (iv); - - return TRUE; -} - - -static gboolean -cb_image_expose (GtkWidget *widget, GdkEventExpose *event, GimvImageView *iv) -{ - gimv_image_view_draw_image (iv); - return TRUE; -} - - - -/***************************************************************************** - * - * other private functions - * - *****************************************************************************/ -static gboolean -timeout_animation (gpointer data) -{ - GimvImageView *iv = data; - gint idx, interval; - - if (!iv->image) goto END; - if (!GIMV_IS_ANIM (iv->image)) goto END; - - idx = gimv_anim_iterate ((GimvAnim *) iv->image); - - /* repeat */ - if (idx < 0) { - if (!gimv_anim_seek ((GimvAnim *) iv->image, 0)) - goto END; - } - - gimv_image_view_show_image (iv); - - interval = gimv_anim_get_interval ((GimvAnim *) iv->image); - if (interval > 0) { - guint timer = gtk_timeout_add (interval, timeout_animation, iv); - g_hash_table_insert (animation_id_table, - iv, GUINT_TO_POINTER (timer)); - } else { - goto END; - } - - return FALSE; - -END: - g_hash_table_remove (animation_id_table, iv); - gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); - return FALSE; -} - - -static gboolean -idle_animation_play (gpointer data) -{ - GimvImageView *iv = data; - gint interval; - - if (!GIMV_IS_IMAGE_VIEW (iv)) goto END; - if (!iv->info) goto END; - - if (!gimv_image_info_is_animation (iv->info)) goto END; - - imageview_animation_stop (iv); - - interval = gimv_anim_get_interval ((GimvAnim *) iv->image); - if (interval > 0) { - guint timer = gtk_timeout_add (interval, timeout_animation, iv); - g_hash_table_insert (animation_id_table, - iv, GUINT_TO_POINTER (timer)); - gimv_image_view_playable_set_status (iv, GimvImageViewPlayablePlay); - } else { - goto END; - } - - return FALSE; - -END: - g_hash_table_remove (animation_id_table, iv); - gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); - return FALSE; -} - - - -/***************************************************************************** - * - * Virtual functions - * - *****************************************************************************/ -static GtkWidget * -imageview_draw_create (GimvImageView *iv) -{ - GtkWidget *widget; - - if (!animation_id_table) - animation_id_table - = g_hash_table_new (g_direct_hash, g_direct_equal); - - if (!create_thumbnail_id_table) - create_thumbnail_id_table - = g_hash_table_new (g_direct_hash, g_direct_equal); - - widget = gtk_drawing_area_new (); - - gtk_signal_connect (GTK_OBJECT (widget), "destroy", - GTK_SIGNAL_FUNC (cb_destroy), iv); - gtk_signal_connect_after (GTK_OBJECT (widget), "map", - GTK_SIGNAL_FUNC (cb_draw_area_map), iv); - gtk_signal_connect (GTK_OBJECT (widget), "configure_event", - GTK_SIGNAL_FUNC (cb_image_configure), iv); - gtk_signal_connect (GTK_OBJECT (widget), "expose_event", - GTK_SIGNAL_FUNC (cb_image_expose), iv); - - gtk_widget_add_events (widget, - GDK_FOCUS_CHANGE - | GDK_BUTTON_PRESS_MASK | GDK_2BUTTON_PRESS - | GDK_KEY_PRESS | GDK_KEY_RELEASE - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK); - - return widget; -} - - -static void -imageview_draw_create_thumbnail (GimvImageView *iv, const gchar *cache_write_type) -{ - if (!iv->image) { - gpointer id_p; - guint id; - - id_p = g_hash_table_lookup (create_thumbnail_id_table, iv); - id = GPOINTER_TO_UINT (id_p); - if (id > 0) - gtk_signal_disconnect (GTK_OBJECT (iv), id); - id = gtk_signal_connect (GTK_OBJECT (iv), "load_end", - GTK_SIGNAL_FUNC (cb_load_end_create_thumbnail), - GINT_TO_POINTER (TRUE)); - g_hash_table_insert (create_thumbnail_id_table, - iv, GUINT_TO_POINTER (id)); - gimv_image_view_load_image_buf (iv); - } else { - cb_load_end_create_thumbnail (iv, iv->info, - FALSE, GINT_TO_POINTER (FALSE)); - } -} - - -static gboolean -imageview_draw_is_playable (GimvImageView *iv, GimvImageInfo *info) -{ - g_return_val_if_fail (GIMV_IS_IMAGE_VIEW (iv), FALSE); - if (!info) return FALSE; - - return gimv_image_info_is_animation (info); -} - - -static void -imageview_animation_play (GimvImageView *iv) -{ - g_return_if_fail (GIMV_IS_IMAGE_VIEW (iv)); - gtk_idle_add (idle_animation_play, iv); -} - - -#if 0 -static void -imageview_animation_stop (GimvImageView *iv) -{ - g_return_if_fail (iv); - - imageview_animation_pause (iv); - - if (!iv->info) return; - if (!gimv_image_info_is_animation (iv->info)) return; - - gimv_anim_seek ((GimvAnim *) iv->image, 0); - - imageview_show_image (iv); - - imageview_playable_set_status (iv, GimvImageViewPlayableStop); -} - - -static void -imageview_animation_pause (GimvImageView *iv) -{ - gpointer id_p; - guint id; - - g_return_if_fail (iv); - - if (!animation_id_table) return; - - id_p = g_hash_table_lookup (animation_id_table, iv); - id = GPOINTER_TO_UINT (id_p); - if (id > 0) - gtk_timeout_remove (id); - g_hash_table_remove (animation_id_table, iv); - - imageview_playable_set_status (iv, GimvImageViewPlayablePause); -} - -#else - -static void -imageview_animation_stop (GimvImageView *iv) -{ - gpointer id_p; - guint id; - - g_return_if_fail (iv); - - if (!animation_id_table) return; - - id_p = g_hash_table_lookup (animation_id_table, iv); - id = GPOINTER_TO_UINT (id_p); - if (id > 0) - gtk_timeout_remove (id); - g_hash_table_remove (animation_id_table, iv); - - gimv_image_view_playable_set_status (iv, GimvImageViewPlayableStop); -} - -#endif - - -static GimvImageViewPlayableStatus -imageview_draw_get_status (GimvImageView *iv) -{ - gpointer timer_p; - guint timer; - - g_return_val_if_fail (GIMV_IS_IMAGE_VIEW (iv), GimvImageViewPlayableDisable); - - if (!iv->info || !gimv_image_info_is_animation (iv->info)) - return GimvImageViewPlayableDisable; - - timer_p = g_hash_table_lookup (animation_id_table, iv); - timer = GPOINTER_TO_UINT (timer_p); - if (timer > 0) - return GimvImageViewPlayablePlay; - else - return GimvImageViewPlayableStop; -} diff -Nru gimageview-0.2.27/src/intl.h gimageview-0.3.0-0.20101117/src/intl.h --- gimageview-0.2.27/src/intl.h 2004-05-23 14:07:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/intl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: intl.h,v 1.5 2003/06/13 09:43:37 makeinu Exp $ - */ - -#ifndef __INTL_H__ -#define __INTL_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef ENABLE_NLS -# include -# define _(String) dgettext(PACKAGE,String) -# ifdef gettext_noop -# define N_(String) gettext_noop(String) -# else -# define N_(String) (String) -# endif /* gettext_noop */ -# ifndef HAVE_BIND_TEXTDOMAIN_CODESET -# define bind_textdomain_codeset(Domain, Codeset) (Domain) -# endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ -#else -# define _(String) (String) -# define N_(String) (String) -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,String) (String) -# define dcgettext(Domain,String,Type) (String) -# define bindtextdomain(Domain,Directory) (Domain) -# define bind_textdomain_codeset(Domain,Codeset) (Domain) -#endif /* ENABLE_NLS */ - -#endif /* __INTL_H__ */ diff -Nru gimageview-0.2.27/src/japanese.c gimageview-0.3.0-0.20101117/src/japanese.c --- gimageview-0.2.27/src/japanese.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/japanese.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,852 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: japanese.c,v 1.9 2004/09/21 08:44:32 makeinu Exp $ - */ - -#include -#include -#include - -#include "charset.h" -#include "japanese.h" - -/* force convert hankaku SJIS character to zenkaku */ -#undef NO_HANKAKU_SJIS - -#define NUL 0 -#define LF 10 -#define FF 12 -#define CR 13 -#define ESC 27 -#define SS2 142 - -#ifndef FALSE -#define FALSE (0) -#endif - -#ifndef TRUE -#define TRUE (!FALSE) -#endif - -enum -{ - KC_ASCII, - KC_EUC, - KC_JIS, - KC_SJIS, - KC_EUCORSJIS, - KC_UTF8 -}; - - -#ifndef USE_GTK2 -#ifndef HAVE_ICONV - -/* See lib/encodings.def in libiconv */ -extern gchar *charset_ascii_defs[]; -extern gint charset_ascii_defs_num; - -static gchar *charset_euc_defs[] = { - CHARSET_EUC_JP, - "EUCJP", - "Extended_UNIX_Code_Packed_Format_for_Japanese", - "csEUCPkdFmtJapanese", -}; - -static gchar *charset_jis_defs[] = { - CHARSET_JIS, - "csISO2022JP", - "csISO2022JP-1", -}; - -static gchar *charset_sjis_defs[] = { - CHARSET_SJIS, - "SJIS", - "SHIFT-JIS", - "MS_KANJI", - "csShiftJIS", -}; - -#endif /* HAVE_ICONV */ -#endif /* USE_GTK2 */ - - -static const gchar *locale_euc[] = { - "ja", "ja_JP", "ja_JP.ujis", "ja_JP.EUC", "ja_JP.eucJP", "ja_JP.eucjp", -}; -static const gchar *locale_jis[] = { - "ja_JP.JIS", "ja_JP.jis", "ja_JP.iso-2022-jp", -}; -static const gchar *locale_sjis[] = { - "ja_JP.SJIS", "ja_JP.sjis", "ja_JP.Shift_JIS", -}; - - -const gchar * -japanese_locale_charset (const gchar *locale) -{ - gint i, n_locale_euc, n_locale_jis, n_locale_sjis; - - if (!locale || !*locale) return NULL; - - n_locale_euc = sizeof (locale_euc) / sizeof (gchar*); - for (i = 0; i < n_locale_euc; i++) - if (!g_strcasecmp (locale_euc[i], locale)) - return CHARSET_EUC_JP; - - n_locale_jis = sizeof (locale_jis) / sizeof (gchar*); - for (i = 0; i < n_locale_jis; i++) - if (!g_strcasecmp (locale_jis[i], locale)) - return CHARSET_JIS; - - n_locale_sjis = sizeof (locale_sjis) / sizeof (gchar*); - for (i = 0; i < n_locale_sjis; i++) - if (!g_strcasecmp (locale_sjis[i], locale)) - return CHARSET_SJIS; - - return NULL; -}; - - - -/****************************************************************************** - * - * these codes are mostly taken from kanji_conv.c - * - * Copyright (C) 2000 Takuo Kitame - * - *****************************************************************************/ -static int -detect_kanji (const guchar *str) -{ - int expected = KC_ASCII; - register int c; - int c1, c2; - int euc_c = 0, sjis_c = 0; - const guchar *ptr = str; - - g_return_val_if_fail (str && *str, 0); - - while ((c = *ptr)!= '\0') { - if (c == ESC) { - if ((c = *(++ptr)) == '\0') - break; - if (c == '$') { - if ((c = *(++ptr)) == '\0') - break; - if (c == 'B' || c == '@') - return KC_JIS; - } - ptr++; - continue; - } - - if ((c >= 0x81 && c <= 0x8d) || (c >= 0x8f && c <= 0x9f)) - return KC_SJIS; - - if (c == SS2) { - if ((c = *(++ptr)) == '\0') - break; - if ((c >= 0x40 && c <= 0x7e) - || (c >= 0x80 && c <= 0xa0) - || (c >= 0xe0 && c <= 0xfc)) - { - return KC_SJIS; - } - if (c >= 0xa1 && c <= 0xdf) - break; - - ptr++; - continue; - } - - if (c >= 0xa1 && c <= 0xdf) { - if ((c = *(++ptr)) == '\0') - break; - - if (c >= 0xe0 && c <= 0xfe) - return KC_EUC; - if (c >= 0xa1 && c <= 0xdf) { - expected = KC_EUCORSJIS; - ptr++; - continue; - } -#if 1 - if (c == 0xa0 || (0xe0 <= c && c <= 0xfe)) { - return KC_EUC; - } else { - expected = KC_EUCORSJIS; - ptr++; - continue; - } -#else - if (c <= 0x9f) - return KC_SJIS; - if (c >= 0xf0 && c <= 0xfe) - return KC_EUC; -#endif - - if (c >= 0xe0 && c <= 0xef) { - expected = KC_EUCORSJIS; - while(c >= 0x40) { - if(c >= 0x81) { - if(c <= 0x8d || (c >= 0x8f && c <= 0x9f)) { - return KC_SJIS; - } else if(c >= 0xfd && c <= 0xfe) { - return KC_EUC; - } - } - if((c = *(++ptr)) == '\0') - break; - } - ptr++; - continue; - } - - if (c >= 0xe0 && c <= 0xef) { - if ((c = *(++ptr)) == '\0') - break; - if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xa0)) - return KC_SJIS; - if (c >= 0xfd && c <= 0xfe) - return KC_EUC; - if (c >= 0xa1 && c <= 0xfc) - expected = KC_EUCORSJIS; - } - } -#if 1 - if (0xf0 <= c && c <= 0xfe) - return KC_EUC; -#endif - ptr++; - } - - ptr = str; - c2 = 0; - while ((c1 = *ptr++) != '\0') { - if (((c2 > 0x80 && c2 < 0xa0) || (c2 >= 0xe0 && c2 < 0xfd)) && - ((c1 >= 0x40 && c1 < 0x7f) || (c1 >= 0x80 && c1 < 0xfd))) - { - sjis_c++, c1 = *ptr++; - } - c2 = c1; - if (c1 == '\0') break; - } - -/* - if(sjis_c == 0) - expected = KC_EUC; - else { -*/ - { - ptr = str, c2 = 0; - while((c1 = *ptr++) != '\0') { - if((c2 > 0xa0 && c2 < 0xff) && - (c1 > 0xa0 && c1 < 0xff)) - { - euc_c++, c1 = *ptr++; - } - c2 = c1; - if (c1 == '\0') break; - } - if(sjis_c > euc_c) - expected = KC_SJIS; - else if (euc_c > 0) - expected = KC_EUC; - else - expected = KC_ASCII; - } - - /* FIXME!! nnnnm */ - if (g_utf8_validate (str, strlen (str), NULL)) - return KC_UTF8; - else - return expected; -} - - -const gchar * -japanese_detect_charset (const gchar *str) -{ - gint detected; - -#if defined (USE_GTK2) || defined (HAVE_ICONV) - if (g_utf8_validate (str, strlen (str), NULL)) - return CHARSET_UTF8; -#endif - - detected = detect_kanji (str); - - switch (detected) { - case KC_EUC: - return CHARSET_EUC_JP; - case KC_JIS: - return CHARSET_JIS; - case KC_SJIS: - return CHARSET_SJIS; - case KC_UTF8: - return CHARSET_UTF8; - default: - return CHARSET_ASCII; - } - - return NULL; -} - - - -#ifndef USE_GTK2 -#ifndef HAVE_ICONV - -/****************************************************************************** - * - * Convert methods - * - * These codes are mostly taken from libjcode. - * Copy right (C) Kuramitsu Kimio, Tokyo Univ. 1996-97 - * - *****************************************************************************/ - -#define CHAROUT(ch) *str2 = (unsigned char)(ch); str2++; - -static unsigned char *_to_jis(unsigned char *str) { - *str = (unsigned char)ESC; str++; - *str = (unsigned char)'$'; str++; - *str = (unsigned char)'B'; str++; - return str; -} - -static unsigned char *_to_ascii(unsigned char *str) { - *str = (unsigned char)ESC; str++; - *str = (unsigned char)'('; str++; - *str = (unsigned char)'B'; str++; - return str; -} - -/*-- shift JIS code to SJIS code -- */ - -static void _jis_shift(int *p1, int *p2) -{ - unsigned char c1 = *p1; - unsigned char c2 = *p2; - int rowOffset = c1 < 95 ? 112 : 176; - int cellOffset = c1 % 2 ? (c2 > 95 ? 32 : 31) : 126; - - *p1 = ((c1 + 1) >> 1) + rowOffset; - *p2 += cellOffset; -} - -/*-- shift SJIS code to JIS code -- */ - -static void _sjis_shift(int *p1, int *p2) -{ - unsigned char c1 = *p1; - unsigned char c2 = *p2; - int adjust = c2 < 159; - int rowOffset = c1 < 160 ? 112 : 176; - int cellOffset = adjust ? (c2 > 127 ? 32 : 31) : 126; - - *p1 = ((c1 - rowOffset) << 1) - adjust; - *p2 -= cellOffset; -} - -/* -- convert hankaku SJIS code to zenkaku -- */ -#ifdef NO_HANKAKU_SJIS -#define HANKATA(a) (a >= 161 && a <= 223) -#define ISMARU(a) (a >= 202 && a <= 206) -#define ISNIGORI(a) ((a >= 182 && a <= 196) || (a >= 202 && a <= 206) || (a == 179)) - -static int stable[][2] = { - {129,66},{129,117},{129,118},{129,65},{129,69},{131,146},{131,64}, - {131,66},{131,68},{131,70},{131,72},{131,131},{131,133},{131,135}, - {131,98},{129,91},{131,65},{131,67},{131,69},{131,71},{131,73}, - {131,74},{131,76},{131,78},{131,80},{131,82},{131,84},{131,86}, - {131,88},{131,90},{131,92},{131,94},{131,96},{131,99},{131,101}, - {131,103},{131,105},{131,106},{131,107},{131,108},{131,109}, - {131,110},{131,113},{131,116},{131,119},{131,122},{131,125}, - {131,126},{131,128},{131,129},{131,130},{131,132},{131,134}, - {131,136},{131,137},{131,138},{131,139},{131,140},{131,141}, - {131,143},{131,147},{129,74},{129,75}}; - -static unsigned char *_sjis_han2zen(unsigned char *str, int *p1, int *p2) -{ - register int c1, c2; - - c1 = (int)*str; str++; - *p1 = stable[c1 - 161][0]; - *p2 = stable[c1 - 161][1]; - - /* Âù²»¡¢È¾Âù²»¤Î½èÍý */ - c2 = (int)*str; - if (c2 == 222 && ISNIGORI(c1)) { - if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122)) - (*p2)++; - else if (*p1 == 131 && *p2 == 69) - *p2 = 148; - str++; - } - - if (c2 == 223 && ISMARU(c1) && (*p2 >= 110 && *p2 <= 122) ) { - *p2 += 2; - str++; - } - return str++; -} -#endif /* NO_HANKAKU_SJIS */ - - -/* -- convert SJIS code -- */ - -#define SJIS1(A) ((A >= 129 && A <= 159) || (A >= 224 && A <= 239)) -#define SJIS2(A) (A >= 64 && A <= 252) - -static void -_shift2seven(const unsigned char *str, unsigned char *str2) -{ - int p1,p2,esc_in = FALSE; - - while ((p1 = (int)*str) != '\0') { - - if (SJIS1(p1)) { - if((p2 = (int)*(++str)) == '\0') break; - if (SJIS2(p2)) { - _sjis_shift(&p1,&p2); - if (!esc_in) { - esc_in = TRUE; - str2 = _to_jis(str2); - } - } - CHAROUT(p1); - CHAROUT(p2); - str++; - continue; - } - -#ifdef NO_HANKAKU_SJIS - /* force convert hankaku SJIS code to zenkaku */ - if (HANKATA(p1)) { - str = _sjis_han2zen(str, &p1, &p2); - _sjis_shift(&p1,&p2); - if (!esc_in) { - esc_in = TRUE; - str2 = _to_jis(str2); - } - CHAROUT(p1); - CHAROUT(p2); - continue; - } -#endif /* NO_HANKAKU_SJIS */ - - if (esc_in) { - /* LF / CR ¤Î¾ì¹ç¤Ï¡¢Àµ¾ï¤Ë¥¨¥¹¥±¡¼¥×¥¢¥¦¥È¤µ¤ì¤ë */ - esc_in = FALSE; - str2 = _to_ascii(str2); - } - CHAROUT(p1); - str++; - } - - if (esc_in) - str2 = _to_ascii(str2); - *str2='\0'; -} - - -/* -- convert SJIS to EUC -- */ - -static void -_shift2euc(const unsigned char *str, unsigned char *str2) -{ - int p1,p2; - - while ((p1 = (int)*str) != '\0') { - if (SJIS1(p1)) { - if((p2 = (int)*(++str)) == '\0') break; - if (SJIS2(p2)) { - _sjis_shift(&p1,&p2); - p1 += 128; - p2 += 128; - } - CHAROUT(p1); - CHAROUT(p2); - str++; - continue; - } - -#ifdef NO_HANKAKU_SJIS - /* force convert hankaku SJIS code to zenkaku */ - if (HANKATA(p1)) { - str = _sjis_han2zen(str,&p1,&p2); - _sjis_shift(&p1,&p2); - p1 += 128; - p2 += 128; - CHAROUT(p1); - CHAROUT(p2); - continue; - } -#endif /* NO_HANKAKU_SJIS */ - CHAROUT(p1); - str++; - } - *str2='\0'; -} - - -/* -- convert hankaku SJIS code -- */ - -static void -_shift_self(const unsigned char *str, unsigned char *str2) -{ - int p1; -#ifdef NO_HANKAKU_SJIS - int p2; -#endif /* NO_HANKAKU_SJIS */ - - while ((p1 = (int)*str) != '\0') { -#ifdef NO_HANKAKU_SJIS - /* force convert hankaku SJIS code to zenkaku */ - if (HANKATA(p1)) { - str = _sjis_han2zen(str, &p1, &p2); - CHAROUT(p1); - CHAROUT(p2); - continue; - } -#endif /* NO_HANKAKU_SJIS */ - CHAROUT(p1); - str++; - } - *str2='\0'; -} - - -/* -- convert EUC to JIS -- */ - -#define ISEUC(A) (A >= 161 && A <= 254) - -static void -_euc2seven(const unsigned char *str, unsigned char *str2) -{ - int p1, p2, esc_in = FALSE; - - while ((p1 = (int)*str) != '\0') { - - if (p1 == LF || p1 == CR) { - if (esc_in) { - esc_in = FALSE; - str2 = _to_ascii(str2); - } - CHAROUT(p1); - str++; - continue; - } - - if (ISEUC(p1)) { - if((p2 = (int)*(++str)) == '\0') break; - if (ISEUC(p2)) { - - if (!esc_in) { - esc_in = TRUE; - str2 =_to_jis(str2); - } - - CHAROUT(p1-128); - CHAROUT(p2-128); - str++; - continue; - } - } - - if (esc_in) { - esc_in = FALSE; - str2 = _to_ascii(str2); - } - CHAROUT(p1); - str++; - } - - if (esc_in) - str2 = _to_ascii(str2); - *str2='\0'; -} - - -/*-- convert EUC to SJIS -- */ - -static void -_euc2shift(const unsigned char *str, unsigned char *str2) -{ - int p1,p2; - - while ((p1 = (int)*str) != '\0') { - if (ISEUC(p1)) { - if((p2 = (int)*(++str)) == '\0') break; - if (ISEUC(p2)) { - p1 -= 128; - p2 -= 128; - _jis_shift(&p1,&p2); - } - CHAROUT(p1); - CHAROUT(p2); - str++; - continue; - } - - CHAROUT(p1); - str++; - } - *str2='\0'; -} - - -/* -- skip ESC sequence -- */ - -static const unsigned char * -_skip_esc(const unsigned char *str, int *esc_in) -{ - int c; - - c = *(++str); - if ((c == '$') || (c == '(')) str++; - if ((c == 'K') || (c == '$')) *esc_in = TRUE; - else *esc_in = FALSE; - - if(*str != '\0') str++; - return str; -} - - -/* -- convert JIS to SJIS -- */ - -static void -_seven2shift(const unsigned char *str, unsigned char *str2) -{ - int p1, p2, esc_in = FALSE; - - while ((p1 = (int)*str) != '\0') { - - /* skip ESC sequence */ - if (p1 == ESC) { - str = _skip_esc(str, &esc_in); - continue; - } - - if (p1 == LF || p1 == CR) { - if (esc_in) esc_in = FALSE; - } - - if(esc_in) { /* ISO-2022-JP code */ - if((p2 = (int)*(++str)) == '\0') break; - - _jis_shift(&p1, &p2); - - CHAROUT(p1); - CHAROUT(p2); - }else{ /* ASCII code */ - CHAROUT(p1); - } - str++; - } - *str2 = '\0'; -} - -/* -- convert JIS to EUC -- */ - -static void _seven2euc(const unsigned char *str, unsigned char *str2) -{ - int p1, esc_in = FALSE; - - while ((p1 = (int)*str) != '\0') { - - /* skip ESC sequence */ - if (p1 == ESC) { - str = _skip_esc(str, &esc_in); - continue; - } - - if (p1 == LF || p1 == CR) { - if (esc_in) esc_in = FALSE; - } - - if(esc_in) { /* ISO-2022-JP code */ - CHAROUT(p1 + 128); - - if((p1 = (int)*(++str)) == '\0') break; - CHAROUT(p1 + 128); - }else{ /* ASCII code */ - CHAROUT(p1); - } - str++; - } - *str2 = '\0'; -} - - -/* wrapper */ -static char * -toStringJIS(const char *str, int detected) -{ - unsigned char *buf, *ret; - - if (detected == KC_ASCII || detected == KC_JIS) - return g_strdup (str); - - buf = g_malloc (strlen (str) * 2); - if (!buf) return NULL; - - switch (detected) { - case KC_SJIS : - _shift2seven (str, buf); - break; - case KC_EUC : - _euc2seven (str, buf); - break; - default: - g_free (buf); - return NULL; - break; - } - - ret = g_strdup(buf); - g_free(buf); - return ret; -} - -static char * -toStringEUC (const char *str, int detected) -{ - unsigned char *buf, *ret; - - if (detected == KC_ASCII || detected == KC_EUC) - return g_strdup(str); - - buf = g_malloc (strlen (str) * 2); - if (!buf) return NULL; - - switch (detected) { - case KC_SJIS : - _shift2euc (str, buf); - break; - case KC_JIS : - _seven2euc (str, buf); - break; - default: - g_free (buf); - return NULL; - break; - } - - ret = g_strdup (buf); - g_free(buf); - return ret; -} - -static char * -toStringSJIS(const char *str, int detected) -{ - unsigned char *buf, *ret; - - if (detected == KC_ASCII) - return g_strdup(str); - - buf = g_malloc (strlen (str) * 2); - if (!buf) return NULL; - - switch (detected) { - case KC_JIS : - _seven2shift (str, buf); - break; - case KC_EUC : - _euc2shift (str, buf); - break; - case KC_SJIS : - _shift_self (str, buf); - break; - default: - g_free (buf); - return NULL; - break; - } - - ret = g_strdup (buf); - g_free(buf); - return ret; -} - - -static gint -japanese_charset_to_int (const gchar *charset) -{ - gint i; - - if (!charset || !*charset) return -1; - - for (i = 0; i < charset_ascii_defs_num; i++) - if (!strcasecmp (charset_ascii_defs[i], charset)) - return KC_ASCII; - for (i = 0; i < sizeof (charset_euc_defs) / sizeof (gchar*); i++) - if (!strcasecmp (charset_euc_defs[i], charset)) - return KC_EUC; - for (i = 0; i < sizeof (charset_jis_defs) / sizeof (gchar*); i++) - if (!strcasecmp (charset_jis_defs[i], charset)) - return KC_JIS; - for (i = 0; i < sizeof (charset_sjis_defs) / sizeof (gchar*); i++) - if (!strcasecmp (charset_sjis_defs[i], charset)) - return KC_SJIS; - - return -1; -} - - -gchar * -japanese_conv (const gchar *src, - const gchar *src_codeset, - const gchar *dest_codeset) -{ - gint isrc, idest; - - g_return_val_if_fail (src, NULL); - - isrc = japanese_charset_to_int (src_codeset); - if (isrc < 0) return NULL; - - idest = japanese_charset_to_int (dest_codeset); - if (isrc < 0) return NULL; - - switch (idest) { - case KC_ASCII: - return g_strdup (src); - break; - case KC_EUC: - return toStringEUC(src, isrc); - break; - case KC_JIS: - return toStringJIS(src, isrc); - break; - case KC_SJIS: - return toStringSJIS(src, isrc); - break; - } - - return NULL; -} - -#endif /* HAVE_ICONV */ -#endif /* USE_GTK2 */ diff -Nru gimageview-0.2.27/src/japanese.h gimageview-0.3.0-0.20101117/src/japanese.h --- gimageview-0.2.27/src/japanese.h 2004-10-03 12:13:11.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/japanese.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: japanese.h,v 1.1 2004/10/03 12:13:11 makeinu Exp $ - */ - -#ifndef __JAPANESE_H__ -#define __JAPANESE_H__ - -const gchar *japanese_locale_charset (const gchar *locale); -const gchar *japanese_detect_charset (const gchar *str); -gchar *japanese_conv (const gchar *src, - const gchar *src_codeset, - const gchar *dest_codeset); - -#endif /* __JAPANESE_H__ */ diff -Nru gimageview-0.2.27/src/jpeg-data.c gimageview-0.3.0-0.20101117/src/jpeg-data.c --- gimageview-0.2.27/src/jpeg-data.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/jpeg-data.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,425 @@ +/* jpeg-data.c + * + * Copyright .AŽ© 2001 Lutz MŽüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" +#include "jpeg-data.h" + +#include +#include +#include +#include + +/* #define DEBUG */ + +struct _JPEGDataPrivate +{ + unsigned int ref_count; +}; + +JPEGData * +jpeg_data_new (void) +{ + JPEGData *data; + + data = malloc (sizeof (JPEGData)); + if (!data) + return (NULL); + memset (data, 0, sizeof (JPEGData)); + data->priv = malloc (sizeof (JPEGDataPrivate)); + if (!data->priv) { + free (data); + return (NULL); + } + memset (data->priv, 0, sizeof (JPEGDataPrivate)); + data->priv->ref_count = 1; + + return (data); +} + +static void +jpeg_data_append_section (JPEGData *data) +{ + JPEGSection *s; + + if (!data->count) + s = malloc (sizeof (JPEGSection)); + else + s = realloc (data->sections, + sizeof (JPEGSection) * (data->count + 1)); + if (!s) + return; + + data->sections = s; + data->count++; +} + +void +jpeg_data_save_file (JPEGData *data, const char *path) +{ + FILE *f; + unsigned char *d = NULL; + unsigned int size = 0; + + jpeg_data_save_data (data, &d, &size); + if (!d) + return; + + unlink (path); + f = fopen (path, "wb"); + if (!f) { + free (d); + return; + } + fwrite (d, sizeof (char), size, f); + fclose (f); + free (d); +} + +void +jpeg_data_save_data (JPEGData *data, unsigned char **d, unsigned int *ds) +{ + unsigned int i, eds = 0; + JPEGSection s; + unsigned char *ed = NULL; + + if (!data) + return; + if (!d) + return; + if (!ds) + return; + + for (*ds = i = 0; i < data->count; i++) { + s = data->sections[i]; +#ifdef DEBUG + printf ("Writing marker 0x%x at position %i...\n", + s.marker, *ds); +#endif + + /* Write the marker */ + *d = realloc (*d, sizeof (char) * (*ds + 2)); + (*d)[*ds + 0] = 0xff; + (*d)[*ds + 1] = s.marker; + *ds += 2; + + switch (s.marker) { + case JPEG_MARKER_SOI: + case JPEG_MARKER_EOI: + break; + case JPEG_MARKER_APP1: + exif_data_save_data (s.content.app1, &ed, &eds); + *d = realloc (*d, sizeof (char) * (*ds + 2)); + (*d)[*ds + 0] = (eds + 2) >> 8; + (*d)[*ds + 1] = (eds + 2) >> 0; + *ds += 2; + *d = realloc (*d, sizeof (char) * (*ds + eds)); + memcpy (*d + *ds, ed, eds); + *ds += eds; + break; + default: + *d = realloc (*d, sizeof (char) * + (*ds + s.content.generic.size + 2)); + (*d)[*ds + 0] = (s.content.generic.size + 2) >> 8; + (*d)[*ds + 1] = (s.content.generic.size + 2) >> 0; + *ds += 2; + memcpy (*d + *ds, s.content.generic.data, + s.content.generic.size); + *ds += s.content.generic.size; + + /* In case of SOS, we need to write the data. */ + if (s.marker == JPEG_MARKER_SOS) { + *d = realloc (*d, *ds + data->size); + memcpy (*d + *ds, data->data, data->size); + *ds += data->size; + } + break; + } + } +} + +JPEGData * +jpeg_data_new_from_data (const unsigned char *d, + unsigned int size) +{ + JPEGData *data; + + data = jpeg_data_new (); + jpeg_data_load_data (data, d, size); + return (data); +} + +void +jpeg_data_load_data (JPEGData *data, const unsigned char *d, + unsigned int size) +{ + unsigned int i, o, len; + JPEGSection *s; + JPEGMarker marker; + + if (!data) + return; + if (!d) + return; + +#ifdef DEBUG + printf ("Parsing %i bytes...\n", size); +#endif + + for (o = 0; o < size;) { + + /* + * JPEG sections start with 0xff. The first byte that is + * not 0xff is a marker (hopefully). + */ + for (i = 0; i < 7; i++) + if (d[o + i] != 0xff) + break; + if (!JPEG_IS_MARKER (d[o + i])) + return; + marker = d[o + i]; + +#ifdef DEBUG + printf ("Found marker 0x%x ('%s') at %i.\n", marker, + jpeg_marker_get_name (marker), o + i); +#endif + + /* Append this section */ + jpeg_data_append_section (data); + s = &data->sections[data->count - 1]; + s->marker = marker; + o += i + 1; + + switch (s->marker) { + case JPEG_MARKER_SOI: + case JPEG_MARKER_EOI: + break; + default: + + /* Read the length of the section */ + len = ((d[o] << 8) | d[o + 1]) - 2; + o += 2; + + switch (s->marker) { + case JPEG_MARKER_APP1: + s->content.app1 = exif_data_new_from_data ( + d + o - 4, len + 4); + break; + default: + s->content.generic.size = len; + s->content.generic.data = + malloc (sizeof (char) * len); + memcpy (s->content.generic.data, &d[o], len); + + /* In case of SOS, image data will follow. */ + if (s->marker == JPEG_MARKER_SOS) { + data->size = size - 2 - o - len; + data->data = malloc ( + sizeof (char) * data->size); + memcpy (data->data, d + o + len, + data->size); + o += data->size; + } + break; + } + o += len; + break; + } + } +} + +JPEGData * +jpeg_data_new_from_file (const char *path) +{ + JPEGData *data; + + data = jpeg_data_new (); + jpeg_data_load_file (data, path); + return (data); +} + +void +jpeg_data_load_file (JPEGData *data, const char *path) +{ + FILE *f; + unsigned char *d; + unsigned int size; + + if (!data) + return; + if (!path) + return; + + f = fopen (path, "rb"); + if (!f) + return; + + /* For now, we read the data into memory. Patches welcome... */ + fseek (f, 0, SEEK_END); + size = ftell (f); + fseek (f, 0, SEEK_SET); + d = malloc (sizeof (char) * size); + if (!d) { + fclose (f); + return; + } + if (fread (d, 1, size, f) != size) { + free (d); + fclose (f); + return; + } + fclose (f); + + jpeg_data_load_data (data, d, size); + free (d); +} + +void +jpeg_data_ref (JPEGData *data) +{ + if (!data) + return; + + data->priv->ref_count++; +} + +void +jpeg_data_unref (JPEGData *data) +{ + if (!data) + return; + + data->priv->ref_count--; + if (!data->priv->ref_count) + jpeg_data_free (data); +} + +void +jpeg_data_free (JPEGData *data) +{ + unsigned int i; + JPEGSection s; + + if (!data) + return; + + if (data->count) { + for (i = 0; i < data->count; i++) { + s = data->sections[i]; + switch (s.marker) { + case JPEG_MARKER_SOI: + case JPEG_MARKER_EOI: + break; + case JPEG_MARKER_APP1: + exif_data_unref (s.content.app1); + break; + default: + free (s.content.generic.data); + break; + } + } + free (data->sections); + } + + if (data->data) + free (data->data); + free (data->priv); + free (data); +} + +void +jpeg_data_dump (JPEGData *data) +{ + unsigned int i; + JPEGContent content; + JPEGMarker marker; + + if (!data) + return; + + printf ("Dumping JPEG data (%i bytes of data)...\n", data->size); + for (i = 0; i < data->count; i++) { + marker = data->sections[i].marker; + content = data->sections[i].content; + printf ("Section %i (marker 0x%x - %s):\n", i, marker, + jpeg_marker_get_name (marker)); + printf (" Description: %s\n", + jpeg_marker_get_description (marker)); + switch (marker) { + case JPEG_MARKER_SOI: + case JPEG_MARKER_EOI: + break; + case JPEG_MARKER_APP1: + exif_data_dump (content.app1); + break; + default: + printf (" Size: %i\n", content.generic.size); + printf (" Unknown content.\n"); + break; + } + } +} + +static JPEGSection * +jpeg_data_get_section (JPEGData *data, JPEGMarker marker) +{ + unsigned int i; + + if (!data) + return (NULL); + + for (i = 0; i < data->count; i++) + if (data->sections[i].marker == marker) + return (&data->sections[i]); + return (NULL); +} + +ExifData * +jpeg_data_get_exif_data (JPEGData *data) +{ + JPEGSection *section; + + if (!data) + return NULL; + + section = jpeg_data_get_section (data, JPEG_MARKER_APP1); + if (section) { + exif_data_ref (section->content.app1); + return (section->content.app1); + } + + return (NULL); +} + +void +jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data) +{ + JPEGSection *section; + + section = jpeg_data_get_section (data, JPEG_MARKER_APP1); + if (!section) { + jpeg_data_append_section (data); + memmove (&data->sections[2], &data->sections[1], + sizeof (JPEGSection) * (data->count - 2)); + section = &data->sections[1]; + } + section->marker = JPEG_MARKER_APP1; + section->content.app1 = exif_data; + exif_data_ref (exif_data); +} diff -Nru gimageview-0.2.27/src/jpeg-data.h gimageview-0.3.0-0.20101117/src/jpeg-data.h --- gimageview-0.2.27/src/jpeg-data.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/jpeg-data.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,86 @@ +/* jpeg-data.h + * + * Copyright © 2001 Lutz Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __JPEG_DATA_H__ +#define __JPEG_DATA_H__ + +#include "jpeg-marker.h" +#include + +typedef ExifData * JPEGContentAPP1; + +typedef struct _JPEGContentGeneric JPEGContentGeneric; +struct _JPEGContentGeneric +{ + unsigned char *data; + unsigned int size; +}; + +typedef union _JPEGContent JPEGContent; +union _JPEGContent +{ + JPEGContentGeneric generic; + JPEGContentAPP1 app1; +}; + +typedef struct _JPEGSection JPEGSection; +struct _JPEGSection +{ + JPEGMarker marker; + JPEGContent content; +}; + +typedef struct _JPEGData JPEGData; +typedef struct _JPEGDataPrivate JPEGDataPrivate; + +struct _JPEGData +{ + JPEGSection *sections; + unsigned int count; + + unsigned char *data; + unsigned int size; + + JPEGDataPrivate *priv; +}; + +JPEGData *jpeg_data_new (void); +JPEGData *jpeg_data_new_from_file (const char *path); +JPEGData *jpeg_data_new_from_data (const unsigned char *data, + unsigned int size); + +void jpeg_data_ref (JPEGData *data); +void jpeg_data_unref (JPEGData *data); +void jpeg_data_free (JPEGData *data); + +void jpeg_data_load_data (JPEGData *data, const unsigned char *d, + unsigned int size); +void jpeg_data_save_data (JPEGData *data, unsigned char **d, + unsigned int *size); + +void jpeg_data_load_file (JPEGData *data, const char *path); +void jpeg_data_save_file (JPEGData *data, const char *path); + +void jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data); +ExifData *jpeg_data_get_exif_data (JPEGData *data); + +void jpeg_data_dump (JPEGData *data); + +#endif /* __JPEG_DATA_H__ */ diff -Nru gimageview-0.2.27/src/jpeg-marker.c gimageview-0.3.0-0.20101117/src/jpeg-marker.c --- gimageview-0.2.27/src/jpeg-marker.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/jpeg-marker.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,122 @@ +/* jpeg-marker.c + * + * Copyright © 2001 Lutz Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#include "config.h" +#include "jpeg-marker.h" + +#include + +static struct { + JPEGMarker marker; + const char *name; + const char *description; +} JPEGMarkerTable[] = { + {JPEG_MARKER_SOF0, "SOF0", "Encoding (baseline)"}, + {JPEG_MARKER_SOF1, "SOF1", "Encoding (extended sequential)"}, + {JPEG_MARKER_SOF2, "SOF2", "Encoding (progressive)"}, + {JPEG_MARKER_SOF3, "SOF3", "Encoding (lossless)"}, + {JPEG_MARKER_SOF5, "SOF5", "Encoding (differential sequential)"}, + {JPEG_MARKER_SOF6, "SOF6", "Encoding (differential progressive)"}, + {JPEG_MARKER_SOF7, "SOF7", "Encoding (differential lossless)"}, + {JPEG_MARKER_SOF9, "SOF9", + "Encoding (extended sequential, arithmetic)"}, + {JPEG_MARKER_SOF10, "SOF10", "Encoding (progressive, arithmetic)"}, + {JPEG_MARKER_SOF11, "SOF11", "Encoding (lossless, arithmetic)"}, + {JPEG_MARKER_SOF13, "SOF13", + "Encoding (differential sequential, arithmetic)"}, + {JPEG_MARKER_SOF14, "SOF14", + "Encoding (differential progressive, arithmetic)"}, + {JPEG_MARKER_SOF15, "SOF15", + "Encoding (differential lossless, arithmetic)"}, + {JPEG_MARKER_SOI, "SOI", "Start of image"}, + {JPEG_MARKER_EOI, "EOI", "End of image"}, + {JPEG_MARKER_SOS, "SOS", "Start of scan"}, + {JPEG_MARKER_COM, "COM", "Comment"}, + {JPEG_MARKER_DHT, "DHT", "Define Huffman table"}, + {JPEG_MARKER_JPG, "JPG", "Extension"}, + {JPEG_MARKER_DAC, "DAC", "Define arithmetic coding conditioning"}, + {JPEG_MARKER_RST1, "RST1", "Restart 1"}, + {JPEG_MARKER_RST2, "RST2", "Restart 2"}, + {JPEG_MARKER_RST3, "RST3", "Restart 3"}, + {JPEG_MARKER_RST4, "RST4", "Restart 4"}, + {JPEG_MARKER_RST5, "RST5", "Restart 5"}, + {JPEG_MARKER_RST6, "RST6", "Restart 6"}, + {JPEG_MARKER_RST7, "RST7", "Restart 7"}, + {JPEG_MARKER_DQT, "DQT", "Define quantization table"}, + {JPEG_MARKER_DNL, "DNL", "Define number of lines"}, + {JPEG_MARKER_DRI, "DRI", "Define restart interval"}, + {JPEG_MARKER_DHP, "DHP", "Define hierarchical progression"}, + {JPEG_MARKER_EXP, "EXP", "Expand reference component"}, + {JPEG_MARKER_APP0, "APP0", "Application segment 0"}, + {JPEG_MARKER_APP1, "APP1", "Application segment 1"}, + {JPEG_MARKER_APP2, "APP2", "Application segment 2"}, + {JPEG_MARKER_APP3, "APP3", "Application segment 3"}, + {JPEG_MARKER_APP4, "APP4", "Application segment 4"}, + {JPEG_MARKER_APP5, "APP5", "Application segment 5"}, + {JPEG_MARKER_APP6, "APP6", "Application segment 6"}, + {JPEG_MARKER_APP7, "APP7", "Application segment 7"}, + {JPEG_MARKER_APP8, "APP8", "Application segment 8"}, + {JPEG_MARKER_APP9, "APP9", "Application segment 9"}, + {JPEG_MARKER_APP10, "APP10", "Application segment 10"}, + {JPEG_MARKER_APP11, "APP11", "Application segment 11"}, + {JPEG_MARKER_APP12, "APP12", "Application segment 12"}, + {JPEG_MARKER_APP13, "APP13", "Application segment 13"}, + {JPEG_MARKER_APP14, "APP14", "Application segment 14"}, + {JPEG_MARKER_APP15, "APP15", "Application segment 15"}, + {JPEG_MARKER_JPG0, "JPG0", "Extension 0"}, + {JPEG_MARKER_JPG1, "JPG1", "Extension 1"}, + {JPEG_MARKER_JPG2, "JPG2", "Extension 2"}, + {JPEG_MARKER_JPG3, "JPG3", "Extension 3"}, + {JPEG_MARKER_JPG4, "JPG4", "Extension 4"}, + {JPEG_MARKER_JPG5, "JPG5", "Extension 5"}, + {JPEG_MARKER_JPG6, "JPG6", "Extension 6"}, + {JPEG_MARKER_JPG7, "JPG7", "Extension 7"}, + {JPEG_MARKER_JPG8, "JPG8", "Extension 8"}, + {JPEG_MARKER_JPG9, "JPG9", "Extension 9"}, + {JPEG_MARKER_JPG10, "JPG10", "Extension 10"}, + {JPEG_MARKER_JPG11, "JPG11", "Extension 11"}, + {JPEG_MARKER_JPG12, "JPG12", "Extension 12"}, + {JPEG_MARKER_JPG13, "JPG13", "Extension 13"}, + {0, NULL, NULL} +}; + +const char * +jpeg_marker_get_name (JPEGMarker marker) +{ + unsigned int i; + + for (i = 0; JPEGMarkerTable[i].name; i++) + if (JPEGMarkerTable[i].marker == marker) + break; + + return (JPEGMarkerTable[i].name); +} + +const char * +jpeg_marker_get_description (JPEGMarker marker) +{ + unsigned int i; + + for (i = 0; JPEGMarkerTable[i].description; i++) + if (JPEGMarkerTable[i].marker == marker) + break; + + return (JPEGMarkerTable[i].description); +} + diff -Nru gimageview-0.2.27/src/jpeg-marker.h gimageview-0.3.0-0.20101117/src/jpeg-marker.h --- gimageview-0.2.27/src/jpeg-marker.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/jpeg-marker.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,104 @@ +/* jpeg-marker.h + * + * Copyright © 2001 Lutz Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#ifndef __JPEG_MARKER_H__ +#define __JPEG_MARKER_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef enum _JPEGMarker JPEGMarker; +enum _JPEGMarker { + JPEG_MARKER_SOF0 = 0xc0, + JPEG_MARKER_SOF1 = 0xc1, + JPEG_MARKER_SOF2 = 0xc2, + JPEG_MARKER_SOF3 = 0xc3, + JPEG_MARKER_DHT = 0xc4, + JPEG_MARKER_SOF5 = 0xc5, + JPEG_MARKER_SOF6 = 0xc6, + JPEG_MARKER_SOF7 = 0xc7, + JPEG_MARKER_JPG = 0xc8, + JPEG_MARKER_SOF9 = 0xc9, + JPEG_MARKER_SOF10 = 0xca, + JPEG_MARKER_SOF11 = 0xcb, + JPEG_MARKER_DAC = 0xcc, + JPEG_MARKER_SOF13 = 0xcd, + JPEG_MARKER_SOF14 = 0xce, + JPEG_MARKER_SOF15 = 0xcf, + JPEG_MARKER_RST0 = 0xd0, + JPEG_MARKER_RST1 = 0xd1, + JPEG_MARKER_RST2 = 0xd2, + JPEG_MARKER_RST3 = 0xd3, + JPEG_MARKER_RST4 = 0xd4, + JPEG_MARKER_RST5 = 0xd5, + JPEG_MARKER_RST6 = 0xd6, + JPEG_MARKER_RST7 = 0xd7, + JPEG_MARKER_SOI = 0xd8, + JPEG_MARKER_EOI = 0xd9, + JPEG_MARKER_SOS = 0xda, + JPEG_MARKER_DQT = 0xdb, + JPEG_MARKER_DNL = 0xdc, + JPEG_MARKER_DRI = 0xdd, + JPEG_MARKER_DHP = 0xde, + JPEG_MARKER_EXP = 0xdf, + JPEG_MARKER_APP0 = 0xe0, + JPEG_MARKER_APP1 = 0xe1, + JPEG_MARKER_APP2 = 0xe2, + JPEG_MARKER_APP3 = 0xe3, + JPEG_MARKER_APP4 = 0xe4, + JPEG_MARKER_APP5 = 0xe5, + JPEG_MARKER_APP6 = 0xe6, + JPEG_MARKER_APP7 = 0xe7, + JPEG_MARKER_APP8 = 0xe8, + JPEG_MARKER_APP9 = 0xe9, + JPEG_MARKER_APP10 = 0xea, + JPEG_MARKER_APP11 = 0xeb, + JPEG_MARKER_APP12 = 0xec, + JPEG_MARKER_APP13 = 0xed, + JPEG_MARKER_APP14 = 0xee, + JPEG_MARKER_APP15 = 0xef, + JPEG_MARKER_JPG0 = 0xf0, + JPEG_MARKER_JPG1 = 0xf1, + JPEG_MARKER_JPG2 = 0xf2, + JPEG_MARKER_JPG3 = 0xf3, + JPEG_MARKER_JPG4 = 0xf4, + JPEG_MARKER_JPG5 = 0xf5, + JPEG_MARKER_JPG6 = 0xf6, + JPEG_MARKER_JPG7 = 0xf7, + JPEG_MARKER_JPG8 = 0xf8, + JPEG_MARKER_JPG9 = 0xf9, + JPEG_MARKER_JPG10 = 0xfa, + JPEG_MARKER_JPG11 = 0xfb, + JPEG_MARKER_JPG12 = 0xfc, + JPEG_MARKER_JPG13 = 0xfd, + JPEG_MARKER_COM = 0xfe +}; + +#define JPEG_IS_MARKER(m) (((m) >= JPEG_MARKER_SOF0) && \ + ((m) <= JPEG_MARKER_COM)) + +const char *jpeg_marker_get_name (JPEGMarker marker); +const char *jpeg_marker_get_description (JPEGMarker marker); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __JPEG_MARKER_H__ */ diff -Nru gimageview-0.2.27/src/Makefile.am gimageview-0.3.0-0.20101117/src/Makefile.am --- gimageview-0.2.27/src/Makefile.am 2004-12-20 15:19:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,17 +1,13 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -SUBDIRS = cursors pixmaps prefs_ui -DIST_SUBDIRS = cursors pixmaps prefs_ui +SUBDIRS = pixmaps prefs_ui -CLEANFILES = *~ .deps/* .*.swp .*.swo gimv.exp gimv.def gimv.res gimv.rc +CLEANFILES = *~ .*.swp .*.swo gimv.exp gimv.def gimv.res gimv.rc bin_PROGRAMS = gimv gimv_SOURCES = \ gimv_dlist.c gimv_dlist.h \ gimv_elist.c gimv_elist.h \ - gimv_paned.c gimv_paned.h \ - gimv_hpaned.c gimv_hpaned.h \ - gimv_vpaned.c gimv_vpaned.h \ gimv_cell_pixmap.c gimv_cell_pixmap.h \ gimv_marshal.c gimv_marshal.h \ gimv_scrolled.c gimv_scrolled.h \ @@ -19,23 +15,18 @@ gimv_zlist.c gimv_zlist.h \ \ argparse.c argparse.h \ - auto_completion.c auto_completion.h \ - charset.c charset.h \ - cursors.c cursors.h \ - dirview.c dirview2.c dirview.h dirview_priv.h \ - dither.c dither.h \ - dnd.c dnd.h \ - exif_view.c exif_view.h \ + compare_filesize.c \ + compare_md5.c \ + compare_similar.c \ fileload.c fileload.h \ - fileutil.c fileutil.h \ fr-archive.c fr-archive.h \ fr-command.c fr-command.h \ fr-process.c fr-process.h \ - gfileutil.c gfileutil.h \ gimageview.c gimageview.h \ gimv_anim.c gimv_anim.h \ gimv_comment.c gimv_comment.h \ gimv_comment_view.c gimv_comment_view.h \ + gimv_dir_view.c gimv_dir_view.h \ gimv_dupl_finder.c gimv_dupl_finder.h \ gimv_dupl_win.c gimv_dupl_win.h \ gimv_icon_stock.c gimv_icon_stock.h \ @@ -44,6 +35,7 @@ gimv_image_loader.c gimv_image_loader.h \ gimv_image_saver.c gimv_image_saver.h \ gimv_image_view.c gimv_image_view.h \ + gimv_image_view_draw.c \ gimv_image_win.c gimv_image_win.h \ gimv_io.c gimv_io.h \ gimv_io_file.c gimv_io_file.h \ @@ -51,38 +43,40 @@ gimv_mime_types.c gimv_mime_types.h \ gimv_nav_win.c gimv_nav_win.h \ gimv_plugin.c gimv_plugin.h \ - gimv_prefs.c gimv_prefs.h \ gimv_prefs_ui_utils.c gimv_prefs_ui_utils.h \ gimv_prefs_win.c gimv_prefs_win.h \ gimv_slideshow.c gimv_slideshow.h \ + gimv_text_win.c gimv_text_win.h \ gimv_thumb.c gimv_thumb.h \ gimv_thumb_cache.c gimv_thumb_cache.h \ gimv_thumb_view.c gimv_thumb_view.h \ + gimv_thumb_view_album.c \ gimv_thumb_win.c gimv_thumb_win.h \ - gtk2-compat.c gtk2-compat.h \ - gtk_prop.c gtk_prop.h \ - gtkutils.c gtkutils.h \ + gimv_file_prop_win.c gimv_file_prop_win.h \ help.c help.h \ - intl.h \ - md5.c md5.h \ - menu.c menu.h \ - pixbuf_utils.c pixbuf_utils.h \ prefs.c prefs.h \ - text_viewer.c text_viewer.h \ utils.c utils.h \ -\ - compare_filesize.c \ - compare_md5.c \ - compare_similar.c \ - image_view_draw.c \ - japanese.c japanese.h \ - thumbnail_view_album.c + utils_auto_comp.c utils_auto_comp.h \ + utils_char_code.c utils_char_code.h \ + utils_dnd.c utils_dnd.h \ + utils_file.c utils_file.h \ + utils_file_gtk.c utils_file_gtk.h \ + utils_gtk.c utils_gtk.h \ + utils_japanese.c utils_japanese.h \ + utils_md5.c utils_md5.h \ + utils_menu.c utils_menu.h + +if ENABLE_EXIF +gimv_SOURCES += \ + gimv_exif_view.c gimv_exif_view.h \ + jpeg-data.c jpeg-data.h \ + jpeg-marker.c jpeg-marker.h +endif EXTRA_gimv_SOURCES = \ gimv.ico CPPFLAGS= \ - -DLOCALEDIR=\""$(localedir)"\" \ -DDATADIR=\""$(gimv_datadir)"\" \ -DDOCDIR=\""$(gimv_docdir)"\" \ -DICONDIR=\""$(gimv_icondir)"\" \ @@ -98,7 +92,6 @@ INCLUDES = \ $(GTK_CFLAGS) \ - $(GIMV_IMAGELIB_CFLAGS) \ $(EXIF_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/libs @@ -132,10 +125,6 @@ gimv_LDADD = \ $(gimv_res) \ $(gimv_exp) \ - $(INTLLIBS) \ - $(LIBICONV) \ - $(LIBCHARSET) \ - $(GIMV_IMAGELIB_LIBS) \ $(GTK_LIBS) \ $(EXIF_LIBS) \ $(XINERAMA_LIBS) \ diff -Nru gimageview-0.2.27/src/Makefile.in gimageview-0.3.0-0.20101117/src/Makefile.in --- gimageview-0.2.27/src/Makefile.in 2004-12-28 04:01:31.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,985 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(gimv_SOURCES) $(EXTRA_gimv_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -bin_PROGRAMS = gimv$(EXEEXT) -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_gimv_OBJECTS = gimv_dlist.$(OBJEXT) gimv_elist.$(OBJEXT) \ - gimv_paned.$(OBJEXT) gimv_hpaned.$(OBJEXT) \ - gimv_vpaned.$(OBJEXT) gimv_cell_pixmap.$(OBJEXT) \ - gimv_marshal.$(OBJEXT) gimv_scrolled.$(OBJEXT) \ - gimv_zalbum.$(OBJEXT) gimv_zlist.$(OBJEXT) argparse.$(OBJEXT) \ - auto_completion.$(OBJEXT) charset.$(OBJEXT) cursors.$(OBJEXT) \ - dirview.$(OBJEXT) dirview2.$(OBJEXT) dither.$(OBJEXT) \ - dnd.$(OBJEXT) exif_view.$(OBJEXT) fileload.$(OBJEXT) \ - fileutil.$(OBJEXT) fr-archive.$(OBJEXT) fr-command.$(OBJEXT) \ - fr-process.$(OBJEXT) gfileutil.$(OBJEXT) gimageview.$(OBJEXT) \ - gimv_anim.$(OBJEXT) gimv_comment.$(OBJEXT) \ - gimv_comment_view.$(OBJEXT) gimv_dupl_finder.$(OBJEXT) \ - gimv_dupl_win.$(OBJEXT) gimv_icon_stock.$(OBJEXT) \ - gimv_image.$(OBJEXT) gimv_image_info.$(OBJEXT) \ - gimv_image_loader.$(OBJEXT) gimv_image_saver.$(OBJEXT) \ - gimv_image_view.$(OBJEXT) gimv_image_win.$(OBJEXT) \ - gimv_io.$(OBJEXT) gimv_io_file.$(OBJEXT) gimv_io_mem.$(OBJEXT) \ - gimv_mime_types.$(OBJEXT) gimv_nav_win.$(OBJEXT) \ - gimv_plugin.$(OBJEXT) gimv_prefs.$(OBJEXT) \ - gimv_prefs_ui_utils.$(OBJEXT) gimv_prefs_win.$(OBJEXT) \ - gimv_slideshow.$(OBJEXT) gimv_thumb.$(OBJEXT) \ - gimv_thumb_cache.$(OBJEXT) gimv_thumb_view.$(OBJEXT) \ - gimv_thumb_win.$(OBJEXT) gtk2-compat.$(OBJEXT) \ - gtk_prop.$(OBJEXT) gtkutils.$(OBJEXT) help.$(OBJEXT) \ - md5.$(OBJEXT) menu.$(OBJEXT) pixbuf_utils.$(OBJEXT) \ - prefs.$(OBJEXT) text_viewer.$(OBJEXT) utils.$(OBJEXT) \ - compare_filesize.$(OBJEXT) compare_md5.$(OBJEXT) \ - compare_similar.$(OBJEXT) image_view_draw.$(OBJEXT) \ - japanese.$(OBJEXT) thumbnail_view_album.$(OBJEXT) -gimv_OBJECTS = $(am_gimv_OBJECTS) -@PLATFORM_WIN32_TRUE@am__DEPENDENCIES_1 = gimv.res -@PLATFORM_WIN32_TRUE@am__DEPENDENCIES_2 = gimv.exp -am__DEPENDENCIES_3 = -gimv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(top_builddir)/src/prefs_ui/libgimv_prefs_ui.la -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/argparse.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/auto_completion.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/charset.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/compare_filesize.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/compare_md5.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/compare_similar.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/cursors.Po ./$(DEPDIR)/dirview.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dirview2.Po ./$(DEPDIR)/dither.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dnd.Po ./$(DEPDIR)/exif_view.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fileload.Po ./$(DEPDIR)/fileutil.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fr-archive.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fr-command.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fr-process.Po ./$(DEPDIR)/gfileutil.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimageview.Po ./$(DEPDIR)/gimv_anim.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_cell_pixmap.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_comment.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_comment_view.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_dlist.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_dupl_finder.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_dupl_win.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_elist.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_hpaned.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_icon_stock.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image_info.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image_loader.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image_saver.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image_view.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_image_win.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_io.Po ./$(DEPDIR)/gimv_io_file.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_io_mem.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_marshal.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_mime_types.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_nav_win.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_paned.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_plugin.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_prefs.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_prefs_ui_utils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_prefs_win.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_scrolled.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_slideshow.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_thumb.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_thumb_cache.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_thumb_view.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_thumb_win.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_vpaned.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_zalbum.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gimv_zlist.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtk2-compat.Po ./$(DEPDIR)/gtk_prop.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkutils.Po ./$(DEPDIR)/help.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/image_view_draw.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/japanese.Po ./$(DEPDIR)/md5.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/pixbuf_utils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs.Po ./$(DEPDIR)/text_viewer.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/thumbnail_view_album.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/utils.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(gimv_SOURCES) $(EXTRA_gimv_SOURCES) -DIST_SOURCES = $(gimv_SOURCES) $(EXTRA_gimv_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = \ - -DLOCALEDIR=\""$(localedir)"\" \ - -DDATADIR=\""$(gimv_datadir)"\" \ - -DDOCDIR=\""$(gimv_docdir)"\" \ - -DICONDIR=\""$(gimv_icondir)"\" \ - -DPLUGINDIR=\""$(plugindir)"\" \ - -DARCHIVER_PLUGIN_DIR=\""$(ARCHIVER_PLUGIN_DIR)"\" \ - -DIMAGE_LOADER_PLUGIN_DIR=\""$(IMAGE_LOADER_PLUGIN_DIR)"\" \ - -DIMAGE_SAVER_PLUGIN_DIR=\""$(IMAGE_SAVER_PLUGIN_DIR)"\" \ - -DIMAGE_VIEW_PLUGIN_DIR=\""$(IMAGE_VIEW_PLUGIN_DIR)"\" \ - -DIO_STREAM_PLUGIN_DIR=\""$(IO_STREAM_PLUGIN_DIR)"\" \ - -DTHUMBNAIL_PLUGIN_DIR=\""$(THUMBNAIL_PLUGIN_DIR)"\" \ - -DIMAGE_VIEW_PLUGIN_DIR=\""$(IMAGE_VIEW_PLUGIN_DIR)"\" \ - -DTHUMBNAIL_VIEW_PLUGIN_DIR=\""$(THUMBNAIL_VIEW_PLUGIN_DIR)"\" - -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = cursors pixmaps prefs_ui -DIST_SUBDIRS = cursors pixmaps prefs_ui -CLEANFILES = *~ .deps/* .*.swp .*.swo gimv.exp gimv.def gimv.res gimv.rc -gimv_SOURCES = \ - gimv_dlist.c gimv_dlist.h \ - gimv_elist.c gimv_elist.h \ - gimv_paned.c gimv_paned.h \ - gimv_hpaned.c gimv_hpaned.h \ - gimv_vpaned.c gimv_vpaned.h \ - gimv_cell_pixmap.c gimv_cell_pixmap.h \ - gimv_marshal.c gimv_marshal.h \ - gimv_scrolled.c gimv_scrolled.h \ - gimv_zalbum.c gimv_zalbum.h \ - gimv_zlist.c gimv_zlist.h \ -\ - argparse.c argparse.h \ - auto_completion.c auto_completion.h \ - charset.c charset.h \ - cursors.c cursors.h \ - dirview.c dirview2.c dirview.h dirview_priv.h \ - dither.c dither.h \ - dnd.c dnd.h \ - exif_view.c exif_view.h \ - fileload.c fileload.h \ - fileutil.c fileutil.h \ - fr-archive.c fr-archive.h \ - fr-command.c fr-command.h \ - fr-process.c fr-process.h \ - gfileutil.c gfileutil.h \ - gimageview.c gimageview.h \ - gimv_anim.c gimv_anim.h \ - gimv_comment.c gimv_comment.h \ - gimv_comment_view.c gimv_comment_view.h \ - gimv_dupl_finder.c gimv_dupl_finder.h \ - gimv_dupl_win.c gimv_dupl_win.h \ - gimv_icon_stock.c gimv_icon_stock.h \ - gimv_image.c gimv_image.h \ - gimv_image_info.c gimv_image_info.h \ - gimv_image_loader.c gimv_image_loader.h \ - gimv_image_saver.c gimv_image_saver.h \ - gimv_image_view.c gimv_image_view.h \ - gimv_image_win.c gimv_image_win.h \ - gimv_io.c gimv_io.h \ - gimv_io_file.c gimv_io_file.h \ - gimv_io_mem.c gimv_io_mem.h \ - gimv_mime_types.c gimv_mime_types.h \ - gimv_nav_win.c gimv_nav_win.h \ - gimv_plugin.c gimv_plugin.h \ - gimv_prefs.c gimv_prefs.h \ - gimv_prefs_ui_utils.c gimv_prefs_ui_utils.h \ - gimv_prefs_win.c gimv_prefs_win.h \ - gimv_slideshow.c gimv_slideshow.h \ - gimv_thumb.c gimv_thumb.h \ - gimv_thumb_cache.c gimv_thumb_cache.h \ - gimv_thumb_view.c gimv_thumb_view.h \ - gimv_thumb_win.c gimv_thumb_win.h \ - gtk2-compat.c gtk2-compat.h \ - gtk_prop.c gtk_prop.h \ - gtkutils.c gtkutils.h \ - help.c help.h \ - intl.h \ - md5.c md5.h \ - menu.c menu.h \ - pixbuf_utils.c pixbuf_utils.h \ - prefs.c prefs.h \ - text_viewer.c text_viewer.h \ - utils.c utils.h \ -\ - compare_filesize.c \ - compare_md5.c \ - compare_similar.c \ - image_view_draw.c \ - japanese.c japanese.h \ - thumbnail_view_album.c - -EXTRA_gimv_SOURCES = \ - gimv.ico - -INCLUDES = \ - $(GTK_CFLAGS) \ - $(GIMV_IMAGELIB_CFLAGS) \ - $(EXIF_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libs - -@PLATFORM_WIN32_TRUE@gimv_exp = gimv.exp -@PLATFORM_WIN32_TRUE@gimv_res = gimv.res -gimv_LDFLAGS = \ - -export-dynamic - -gimv_LDADD = \ - $(gimv_res) \ - $(gimv_exp) \ - $(INTLLIBS) \ - $(LIBICONV) \ - $(LIBCHARSET) \ - $(GIMV_IMAGELIB_LIBS) \ - $(GTK_LIBS) \ - $(EXIF_LIBS) \ - $(XINERAMA_LIBS) \ - $(X_LIBS) \ - $(top_builddir)/src/prefs_ui/libgimv_prefs_ui.la - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -gimv$(EXEEXT): $(gimv_OBJECTS) $(gimv_DEPENDENCIES) - @rm -f gimv$(EXEEXT) - $(LINK) $(gimv_LDFLAGS) $(gimv_OBJECTS) $(gimv_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argparse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auto_completion.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare_filesize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare_md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare_similar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirview.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirview2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif_view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileload.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileutil.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr-archive.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr-command.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr-process.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfileutil.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimageview.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_anim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_cell_pixmap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_comment.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_comment_view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_dlist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_dupl_finder.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_dupl_win.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_elist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_hpaned.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_icon_stock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image_info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image_loader.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image_saver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image_view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_image_win.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_io_file.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_io_mem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_marshal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_mime_types.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_nav_win.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_paned.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_plugin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_prefs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_prefs_ui_utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_prefs_win.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_scrolled.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_slideshow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_thumb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_thumb_cache.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_thumb_view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_thumb_win.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_vpaned.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_zalbum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimv_zlist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk2-compat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_prop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkutils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image_view_draw.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/japanese.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf_utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_viewer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnail_view_album.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# 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. -$(RECURSIVE_TARGETS): - @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; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - 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 -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-libtool \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am - - -@PLATFORM_WIN32_TRUE@gimv.exp: gimv.def -@PLATFORM_WIN32_TRUE@ $(DLLTOOL) --dllname gimv$(EXEEXT) --input-def gimv.def \ -@PLATFORM_WIN32_TRUE@ --output-exp $@ --output-lib libgimv.a - -@PLATFORM_WIN32_TRUE@gimv.def: $(gimv_OBJECTS) -@PLATFORM_WIN32_TRUE@ echo EXPORTS > gimv.def -@PLATFORM_WIN32_TRUE@ nm $(gimv_OBJECTS) | grep ' T _' | sed 's/.* T _//' >> gimv.def -@PLATFORM_WIN32_TRUE@ nm $(gimv_OBJECTS) | grep ' D _' | sed 's/.* D _//' | sed "s/\$$/ DATA/" >> gimv.def - -@PLATFORM_WIN32_TRUE@gimv.rc: -@PLATFORM_WIN32_TRUE@ echo "1 ICON gimv.ico" > gimv.rc - -@PLATFORM_WIN32_TRUE@gimv.res: gimv.rc -@PLATFORM_WIN32_TRUE@ $(WINDRES) $< -O coff -o $@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/src/md5.c gimageview-0.3.0-0.20101117/src/md5.c --- gimageview-0.2.27/src/md5.c 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/md5.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,370 +0,0 @@ -/* md5.c - Functions to compute MD5 message digest of files or memory blocks - according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995 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., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: md5.c,v 1.2 2002/10/02 19:05:02 makeinu Exp $ - -*/ - -/* Written by Ulrich Drepper . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#if STDC_HEADERS -# include -# include -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif - -#include "md5.h" - -#ifdef WORDS_BIGENDIAN -# define SWAP(n) \ - (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -#else -# define SWAP(n) (n) -#endif - - -/* This array contains the bytes used to pad the buffer to the next - 64-byte boundary. (RFC 1321, 3.1: Step 1) */ -static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; - - -/* Initialize structure containing state of computation. - (RFC 1321, 3.3: Step 3) */ -void -md5_init_ctx (ctx) - struct md5_ctx *ctx; -{ - ctx->A = 0x67452301; - ctx->B = 0xefcdab89; - ctx->C = 0x98badcfe; - ctx->D = 0x10325476; -} - -/* Put result from CTX in first 16 bytes following RESBUF. The result must - be in little endian byte order. */ -void * -md5_read_ctx (ctx, resbuf) - const struct md5_ctx *ctx; - void *resbuf; -{ - ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A); - ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B); - ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C); - ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D); - - return resbuf; -} - -/* Compute MD5 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 16 bytes - beginning at RESBLOCK. */ -int -md5_stream (stream, resblock) - FILE *stream; - void *resblock; -{ - /* Important: BLOCKSIZE must be a multiple of 64. */ -#define BLOCKSIZE 4096 - struct md5_ctx ctx; - md5_uint32 len[2]; - char buffer[BLOCKSIZE + 72]; - size_t pad, sum; - - /* Initialize the computation context. */ - md5_init_ctx (&ctx); - - len[0] = 0; - len[1] = 0; - - /* Iterate over full file contents. */ - while (1) - { - /* We read the file in blocks of BLOCKSIZE bytes. One call of the - computation function processes the whole buffer so that with the - next round of the loop another block can be read. */ - size_t n; - sum = 0; - - /* Read block. Take care for partial reads. */ - do - { - n = fread (buffer, 1, BLOCKSIZE - sum, stream); - - sum += n; - } - while (sum < BLOCKSIZE && n != 0); - if (n == 0 && ferror (stream)) - return 1; - - /* RFC 1321 specifies the possible length of the file up to 2^64 bits. - Here we only compute the number of bytes. Do a double word - increment. */ - len[0] += sum; - if (len[0] < sum) - ++len[1]; - - /* If end of file is reached, end the loop. */ - if (n == 0) - break; - - /* Process buffer with BLOCKSIZE bytes. Note that - BLOCKSIZE % 64 == 0 - */ - md5_process_block (buffer, BLOCKSIZE, &ctx); - } - - /* We can copy 64 byte because the buffer is always big enough. FILLBUF - contains the needed bits. */ - memcpy (&buffer[sum], fillbuf, 64); - - /* Compute amount of padding bytes needed. Alignment is done to - (N + PAD) % 64 == 56 - There is always at least one byte padded. I.e. even the alignment - is correctly aligned 64 padding bytes are added. */ - pad = sum & 63; - pad = pad >= 56 ? 64 + 56 - pad : 56 - pad; - - /* Put the 64-bit file length in *bits* at the end of the buffer. */ - *(md5_uint32 *) &buffer[sum + pad] = SWAP (len[0] << 3); - *(md5_uint32 *) &buffer[sum + pad + 4] = SWAP ((len[1] << 3) - | (len[0] >> 29)); - - /* Process last bytes. */ - md5_process_block (buffer, sum + pad + 8, &ctx); - - /* Construct result in desired memory. */ - md5_read_ctx (&ctx, resblock); - return 0; -} - -/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The - result is always in little endian byte order, so that a byte-wise - output yields to the wanted ASCII representation of the message - digest. */ -void * -md5_buffer (buffer, len, resblock) - const char *buffer; - size_t len; - void *resblock; -{ - struct md5_ctx ctx; - char restbuf[64 + 72]; - size_t blocks = len & ~63; - size_t pad, rest; - - /* Initialize the computation context. */ - md5_init_ctx (&ctx); - - /* Process whole buffer but last len % 64 bytes. */ - md5_process_block (buffer, blocks, &ctx); - - /* REST bytes are not processed yet. */ - rest = len - blocks; - /* Copy to own buffer. */ - memcpy (restbuf, &buffer[blocks], rest); - /* Append needed fill bytes at end of buffer. We can copy 64 byte - because the buffer is always big enough. */ - memcpy (&restbuf[rest], fillbuf, 64); - - /* PAD bytes are used for padding to correct alignment. Note that - always at least one byte is padded. */ - pad = rest >= 56 ? 64 + 56 - rest : 56 - rest; - - /* Put length of buffer in *bits* in last eight bytes. */ - *(md5_uint32 *) &restbuf[rest + pad] = (md5_uint32) SWAP (len << 3); - *(md5_uint32 *) &restbuf[rest + pad + 4] = (md5_uint32) SWAP (len >> 29); - - /* Process last bytes. */ - md5_process_block (restbuf, rest + pad + 8, &ctx); - - /* Put result in desired memory area. */ - return md5_read_ctx (&ctx, resblock); -} - - -/* These are the four functions used in the four steps of the MD5 algorithm - and defined in the RFC 1321. The first function is a little bit optimized - (as found in Colin Plumbs public domain implementation). */ -/* #define FF(b, c, d) ((b & c) | (~b & d)) */ -#define FF(b, c, d) (d ^ (b & (c ^ d))) -#define FG(b, c, d) FF (d, b, c) -#define FH(b, c, d) (b ^ c ^ d) -#define FI(b, c, d) (c ^ (b | ~d)) - -/* Process LEN bytes of BUFFER, accumulating context into CTX. - It is assumed that LEN % 64 == 0. */ - -void -md5_process_block (buffer, len, ctx) - const void *buffer; - size_t len; - struct md5_ctx *ctx; -{ - md5_uint32 correct_words[16]; - const md5_uint32 *words = buffer; - size_t nwords = len / sizeof (md5_uint32); - const md5_uint32 *endp = words + nwords; - md5_uint32 A = ctx->A; - md5_uint32 B = ctx->B; - md5_uint32 C = ctx->C; - md5_uint32 D = ctx->D; - - /* Process all bytes in the buffer with 64 bytes in each round of - the loop. */ - while (words < endp) - { - md5_uint32 *cwp = correct_words; - md5_uint32 A_save = A; - md5_uint32 B_save = B; - md5_uint32 C_save = C; - md5_uint32 D_save = D; - - /* First round: using the given function, the context and a constant - the next context is computed. Because the algorithms processing - unit is a 32-bit word and it is determined to work on words in - little endian byte order we perhaps have to change the byte order - before the computation. To reduce the work for the next steps - we store the swapped words in the array CORRECT_WORDS. */ - -#define OP(a, b, c, d, s, T) \ - do \ - { \ - a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ - ++words; \ - CYCLIC (a, s); \ - a += b; \ - } \ - while (0) - - /* It is unfortunate that C does not provide an operator for - cyclic rotation. Hope the C compiler is smart enough. */ -#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s))) - - /* Before we start, one word to the strange constants. - They are defined in RFC 1321 as - - T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 - */ - - /* Round 1. */ - OP (A, B, C, D, 7, 0xd76aa478); - OP (D, A, B, C, 12, 0xe8c7b756); - OP (C, D, A, B, 17, 0x242070db); - OP (B, C, D, A, 22, 0xc1bdceee); - OP (A, B, C, D, 7, 0xf57c0faf); - OP (D, A, B, C, 12, 0x4787c62a); - OP (C, D, A, B, 17, 0xa8304613); - OP (B, C, D, A, 22, 0xfd469501); - OP (A, B, C, D, 7, 0x698098d8); - OP (D, A, B, C, 12, 0x8b44f7af); - OP (C, D, A, B, 17, 0xffff5bb1); - OP (B, C, D, A, 22, 0x895cd7be); - OP (A, B, C, D, 7, 0x6b901122); - OP (D, A, B, C, 12, 0xfd987193); - OP (C, D, A, B, 17, 0xa679438e); - OP (B, C, D, A, 22, 0x49b40821); - - /* For the second to fourth round we have the possibly swapped words - in CORRECT_WORDS. Redefine the macro to take an additional first - argument specifying the function to use. */ -#undef OP -#define OP(f, a, b, c, d, k, s, T) \ - do \ - { \ - a += f (b, c, d) + correct_words[k] + T; \ - CYCLIC (a, s); \ - a += b; \ - } \ - while (0) - - /* Round 2. */ - OP (FG, A, B, C, D, 1, 5, 0xf61e2562); - OP (FG, D, A, B, C, 6, 9, 0xc040b340); - OP (FG, C, D, A, B, 11, 14, 0x265e5a51); - OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa); - OP (FG, A, B, C, D, 5, 5, 0xd62f105d); - OP (FG, D, A, B, C, 10, 9, 0x02441453); - OP (FG, C, D, A, B, 15, 14, 0xd8a1e681); - OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8); - OP (FG, A, B, C, D, 9, 5, 0x21e1cde6); - OP (FG, D, A, B, C, 14, 9, 0xc33707d6); - OP (FG, C, D, A, B, 3, 14, 0xf4d50d87); - OP (FG, B, C, D, A, 8, 20, 0x455a14ed); - OP (FG, A, B, C, D, 13, 5, 0xa9e3e905); - OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8); - OP (FG, C, D, A, B, 7, 14, 0x676f02d9); - OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a); - - /* Round 3. */ - OP (FH, A, B, C, D, 5, 4, 0xfffa3942); - OP (FH, D, A, B, C, 8, 11, 0x8771f681); - OP (FH, C, D, A, B, 11, 16, 0x6d9d6122); - OP (FH, B, C, D, A, 14, 23, 0xfde5380c); - OP (FH, A, B, C, D, 1, 4, 0xa4beea44); - OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9); - OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60); - OP (FH, B, C, D, A, 10, 23, 0xbebfbc70); - OP (FH, A, B, C, D, 13, 4, 0x289b7ec6); - OP (FH, D, A, B, C, 0, 11, 0xeaa127fa); - OP (FH, C, D, A, B, 3, 16, 0xd4ef3085); - OP (FH, B, C, D, A, 6, 23, 0x04881d05); - OP (FH, A, B, C, D, 9, 4, 0xd9d4d039); - OP (FH, D, A, B, C, 12, 11, 0xe6db99e5); - OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8); - OP (FH, B, C, D, A, 2, 23, 0xc4ac5665); - - /* Round 4. */ - OP (FI, A, B, C, D, 0, 6, 0xf4292244); - OP (FI, D, A, B, C, 7, 10, 0x432aff97); - OP (FI, C, D, A, B, 14, 15, 0xab9423a7); - OP (FI, B, C, D, A, 5, 21, 0xfc93a039); - OP (FI, A, B, C, D, 12, 6, 0x655b59c3); - OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92); - OP (FI, C, D, A, B, 10, 15, 0xffeff47d); - OP (FI, B, C, D, A, 1, 21, 0x85845dd1); - OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f); - OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0); - OP (FI, C, D, A, B, 6, 15, 0xa3014314); - OP (FI, B, C, D, A, 13, 21, 0x4e0811a1); - OP (FI, A, B, C, D, 4, 6, 0xf7537e82); - OP (FI, D, A, B, C, 11, 10, 0xbd3af235); - OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb); - OP (FI, B, C, D, A, 9, 21, 0xeb86d391); - - /* Add the starting values of the context. */ - A += A_save; - B += B_save; - C += C_save; - D += D_save; - } - - /* Put checksum in context given as argument. */ - ctx->A = A; - ctx->B = B; - ctx->C = C; - ctx->D = D; -} diff -Nru gimageview-0.2.27/src/md5.h gimageview-0.3.0-0.20101117/src/md5.h --- gimageview-0.2.27/src/md5.h 2004-05-23 14:07:47.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/md5.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -/* md5.h - Declaration of functions and data types used for MD5 sum - computing library functions. - Copyright (C) 1995 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 02111-1307, USA. - -$Id: md5.h,v 1.2 2002/10/02 19:05:02 makeinu Exp $ -*/ - -#ifndef _MD5_H -#define _MD5_H - -#include - -#if defined HAVE_LIMITS_H || _LIBC -# include -#endif - -/* The following contortions are an attempt to use the C preprocessor - to determine an unsigned integral type that is 32 bits wide. An - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but - doing that would require that the configure script compile and *run* - the resulting executable. Locally running cross-compiled executables - is usually not possible. */ - -#if defined __STDC__ && __STDC__ -# define UINT_MAX_32_BITS 4294967295U -#else -# define UINT_MAX_32_BITS 0xFFFFFFFF -#endif - -/* If UINT_MAX isn't defined, assume it's a 32-bit type. - This should be valid for all systems GNU cares about because - that doesn't include 16-bit systems, and only modern systems - (that certainly have ) have 64+-bit integral types. */ - -#ifndef UINT_MAX -# define UINT_MAX UINT_MAX_32_BITS -#endif - -#if UINT_MAX == UINT_MAX_32_BITS - typedef unsigned int md5_uint32; -#else -# if USHRT_MAX == UINT_MAX_32_BITS - typedef unsigned short md5_uint32; -# else -# if ULONG_MAX == UINT_MAX_32_BITS - typedef unsigned long md5_uint32; -# else - /* The following line is intended to evoke an error. - Using #error is not portable enough. */ - "Cannot determine unsigned 32-bit data type." -# endif -# endif -#endif - -#undef __P -#if defined (__STDC__) && __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif - -/* Structure to save state of computation between the single steps. */ -struct md5_ctx -{ - md5_uint32 A; - md5_uint32 B; - md5_uint32 C; - md5_uint32 D; -}; - -/* - * The following three functions are build up the low level used in - * the functions `md5_stream' and `md5_buffer'. - */ - -/* Initialize structure containing state of computation. - (RFC 1321, 3.3: Step 3) */ -void md5_init_ctx __P ((struct md5_ctx *ctx)); - -/* Starting with the result of former calls of this function (or the - initialzation function update the context for the next LEN bytes - starting at BUFFER. - It is necessary that LEN is a multiple of 64!!! */ -void md5_process_block __P ((const void *buffer, size_t len, - struct md5_ctx *ctx)); - -/* Put result from CTX in first 16 bytes following RESBUF. The result is - always in little endian byte order, so that a byte-wise output yields - to the wanted ASCII representation of the message digest. */ -void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf)); - - -/* Compute MD5 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 16 bytes - beginning at RESBLOCK. */ -int md5_stream __P ((FILE *stream, void *resblock)); - -/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The - result is always in little endian byte order, so that a byte-wise - output yields to the wanted ASCII representation of the message - digest. */ -void *md5_buffer __P ((const char *buffer, size_t len, void *resblock)); - -#endif diff -Nru gimageview-0.2.27/src/menu.c gimageview-0.3.0-0.20101117/src/menu.c --- gimageview-0.2.27/src/menu.c 2004-05-23 14:07:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/menu.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,448 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: menu.c,v 1.19 2003/06/13 09:43:37 makeinu Exp $ - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -#include "intl.h" -#include "menu.h" - - -static void cb_get_data_from_menuitem (GtkWidget *widget, - gint *conf); -static void menu_shell_deactivated (GtkMenuShell *menu_shell, - gpointer data); - - - -/* - * menu_count_ifactory_entry_num: - * @ Count NULL terminated GtkItemFactoryEntry array length. - * - * Return : length of array. - */ -gint -menu_count_ifactory_entry_num (GtkItemFactoryEntry *entries) -{ - gint i; - - if (!entries) return -1; - - for (i = 0; entries[i].path; i++) {continue;} - return i; -} - - -static void -cb_menu_destroy (GtkWidget *widget, GtkItemFactory *factory) -{ - g_return_if_fail (factory); - g_return_if_fail (GTK_IS_ITEM_FACTORY (factory)); - - gtk_object_unref (GTK_OBJECT (factory)); -} - - -/* - * menu_create: - * @ Create menu bar widget. - * - * window : Window widget that attach accel group. - * entries : Menu item entries. - * n_entries : Number of menu items. - * path : Root menu path. - * data : User data for menu callback. - * Return : Menubar widget. - */ -GtkWidget * -menubar_create (GtkWidget *window, - GtkItemFactoryEntry *entries, - guint n_entries, - const gchar *path, - gpointer data) -{ - GtkItemFactory *factory; - GtkAccelGroup *accel_group; - GtkWidget *widget; - - accel_group = gtk_accel_group_new (); - factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, path, accel_group); -#ifdef ENABLE_NLS - gtk_item_factory_set_translate_func (factory, (GtkTranslateFunc) gettext, - NULL, NULL); -#endif /* ENABLE_NLS */ - gtk_item_factory_create_items (factory, n_entries, entries, data); - gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); - - widget = gtk_item_factory_get_widget (factory, path); - gtk_signal_connect (GTK_OBJECT (widget), "destroy", - GTK_SIGNAL_FUNC (cb_menu_destroy), factory); - - return widget; -} - - -/* - * menu_create_items: - * @ Create menu item for menu widget (like a popup menu). - * - * window : Window widget that attach accel group. - * entries : Menu item entries. - * n_entries : Number of menu items. - * path : Root menu path. - * data : User data for menu callback. - * Return : menu widget. - */ -GtkWidget * -menu_create_items (GtkWidget *window, - GtkItemFactoryEntry *entries, - guint n_entries, - const gchar *path, - gpointer data) -{ - GtkItemFactory *factory; - GtkAccelGroup *accel_group = NULL; - GtkWidget *widget; - - if (window) - accel_group = gtk_accel_group_new (); - - factory = gtk_item_factory_new (GTK_TYPE_MENU, path, accel_group); -#ifdef ENABLE_NLS - gtk_item_factory_set_translate_func (factory, (GtkTranslateFunc) gettext, - NULL, NULL); -#endif /* ENABLE_NLS */ - gtk_item_factory_create_items (factory, n_entries, entries, data); - - if (window) - gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); - - widget = gtk_item_factory_get_widget (factory, path); - gtk_signal_connect (GTK_OBJECT (widget), "destroy", - GTK_SIGNAL_FUNC (cb_menu_destroy), factory); - - return widget; -} - - -void -menu_item_set_sensitive (GtkWidget *widget, gchar *path, gboolean sensitive) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - gtk_widget_set_sensitive (menuitem, sensitive); -} - - -/* - * menu_set_check_item: - * @ Set check menu item's value (TRUE or FALSE). - * - * widget : Menu widget that contains check menu item. - * path : Menu path to check menu item. - * active : Value for set. - */ -void -menu_check_item_set_active (GtkWidget *widget, gchar *path, gboolean active) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menuitem), active); -} - - -/* - * menu_set_check_item: - * @ Set check menu item's value (TRUE or FALSE). - * - * widget : Menu widget that contains check menu item. - * path : Menu path to check menu item. - * active : Value for set. - */ -gboolean -menu_check_item_get_active (GtkWidget *widget, gchar *path) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - return GTK_CHECK_MENU_ITEM(menuitem)->active; -} - - -/* - * menu_set_submenu: - * @ Set sub menu. - * - * widget : Menu widget to set sub menu. - * path : Menu path to check menu item. - * submenu : Submenu widget. - */ -void -menu_set_submenu (GtkWidget *widget, const gchar *path, GtkWidget *submenu) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - gtk_menu_item_set_submenu (GTK_MENU_ITEM(menuitem), submenu); -} - - -GtkWidget * -menu_get_submenu (GtkWidget *widget, const gchar *path) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - g_return_val_if_fail (menuitem, NULL); - return GTK_MENU_ITEM(menuitem)->submenu; -} - - -/* - * menu_remove_submenu: - * @ Set sub menu. - * - * widget : Menu widget to set sub menu. - * path : Menu path to check menu item. - * submenu : Submenu widget. - */ -void -menu_remove_submenu (GtkWidget *widget, const gchar *path, GtkWidget *submenu) -{ - GtkWidget *menuitem; - GtkItemFactory *ifactory; - - ifactory = gtk_item_factory_from_widget (widget); - menuitem = gtk_item_factory_get_item (ifactory, path); - gtk_menu_item_remove_submenu (GTK_MENU_ITEM (menuitem)); -} - - - -/****************************************************************************** - * - * option menu - * - ******************************************************************************/ -/* - * create_option_menu_simple: - * @ Create option menu widget. Return val will store to data. - * - * menu_items : Menu entries. - * def_val : Default value. - * data : Pointer to gint for store return value when a menuitem has been - * selected. - * Return : Option menu widget. - */ -GtkWidget * -create_option_menu_simple (const gchar **menu_items, gint def_val, gint *data) -{ - GtkWidget *option_menu; - GtkWidget *menu_item; - GtkWidget *menu; - gint i; - - option_menu = gtk_option_menu_new(); - menu = gtk_menu_new(); - - for (i = 0; menu_items[i]; i++) { - menu_item = gtk_menu_item_new_with_label (_(menu_items[i])); - gtk_object_set_data (GTK_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(cb_get_data_from_menuitem), - data); - gtk_menu_append (GTK_MENU(menu), menu_item); - gtk_widget_show (menu_item); - } - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); - gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), def_val); - - return option_menu; -} - - -/* - * create_option_menu: - * @ Create option menu widget. - * - * menu_items : Menu entries. - * def_val : Default value. - * func : Callback function for each menu items. - * data : Pointer to user data for callback function. - * Return : Option menu widget. - */ -GtkWidget * -create_option_menu (const gchar **menu_items, gint def_val, - gpointer func, gpointer data) -{ - GtkWidget *option_menu; - GtkWidget *menu_item; - GtkWidget *menu; - gint i; - - option_menu = gtk_option_menu_new(); - gtk_widget_set_name (option_menu, "/ThumbWin/DispModeOptionMenu"); - menu = gtk_menu_new(); - - for (i = 0; menu_items[i]; i++) { - menu_item = gtk_menu_item_new_with_label (_(menu_items[i])); - gtk_object_set_data (GTK_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(func), - data); - gtk_menu_append (GTK_MENU(menu), menu_item); - gtk_widget_show (menu_item); - } - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); - gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), def_val); - - return option_menu; -} - - - -/****************************************************************************** - * - * modal popup menu - * - ******************************************************************************/ -static void -cb_get_data_from_menuitem (GtkWidget *widget, gint *conf) -{ - *conf = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); -} - - -void -menu_modal_cb (gpointer data, guint action, GtkWidget *menuitem) -{ - gtk_object_set_data (GTK_OBJECT (menuitem->parent), "return_val", - GINT_TO_POINTER (action)); -} - - -static void -menu_shell_deactivated (GtkMenuShell *menu_shell, gpointer data) -{ - gtk_main_quit (); -} - - -/* - * menu_popup_modal: - * @runs the popup menu modally and returns the callback_action value of the - * selected item entry, or -1 if none.. - * - * popup : GtkMenu widget to popup. - * pos_func : - * pos_data : - * event : - * user_data : not used yet. - * Return : selected value. - */ -gint -menu_popup_modal (GtkWidget *popup, - GtkMenuPositionFunc pos_func, - gpointer pos_data, - GdkEventButton *event, - gpointer user_data) -{ - guint id; - guint button; - guint32 timestamp; - gint retval; - - g_return_val_if_fail (popup != NULL, -1); - g_return_val_if_fail (GTK_IS_WIDGET (popup), -1); - - gtk_object_set_data (GTK_OBJECT (popup), "return_val", GINT_TO_POINTER (-1)); - - id = gtk_signal_connect (GTK_OBJECT (popup), "deactivate", - (GtkSignalFunc) menu_shell_deactivated, - NULL); - - if (event) { - button = event->button; - timestamp = event->time; - } else { - button = 0; - timestamp = GDK_CURRENT_TIME; - } - - gtk_menu_popup (GTK_MENU (popup), NULL, NULL, - pos_func, pos_data, button, timestamp); - gtk_grab_add (popup); - gtk_main (); - gtk_grab_remove (popup); - - gtk_signal_disconnect (GTK_OBJECT (popup), id); - - retval = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (popup), - "return_val")); - return retval; -} - - -void -menu_calc_popup_position (GtkMenu *menu, gint *x_ret, gint *y_ret, -#ifdef USE_GTK2 - gboolean *push_in, -#endif - gpointer data) -{ - GdkWindow *window = data; - gint x = 0, y = 0, w = 0, h = 0, cursor_x = 0, cursor_y = 0; - GdkModifierType mask; - - g_return_if_fail (x_ret && y_ret); - g_return_if_fail (window); - - gdk_window_get_pointer (window, &cursor_x, &cursor_y, &mask); - - gdk_window_get_origin (window, &x, &y); - gdk_window_get_size (window, &w, &h); - - if (cursor_x < 0 || cursor_x > w || cursor_y < 0 || cursor_y > h) - { - *x_ret = x + w / 2; - *y_ret = y + h / 2; - } else { - *x_ret = x + cursor_x; - *y_ret = y + cursor_y; - } -} diff -Nru gimageview-0.2.27/src/menu.h gimageview-0.3.0-0.20101117/src/menu.h --- gimageview-0.2.27/src/menu.h 2004-05-23 14:07:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/menu.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: menu.h,v 1.10 2003/06/13 09:43:37 makeinu Exp $ - */ - - -#ifndef __MENU_H__ -#define __MENU_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -gint menu_count_ifactory_entry_num (GtkItemFactoryEntry *entries); -GtkWidget *menubar_create (GtkWidget *window, - GtkItemFactoryEntry *entries, - guint n_entries, - const gchar *path, - gpointer data); - -GtkWidget *menu_create_items (GtkWidget *window, - GtkItemFactoryEntry *entries, - guint n_entries, - const gchar *path, - gpointer data); - -void menu_item_set_sensitive (GtkWidget *widget, - gchar *path, - gboolean sensitive); -void menu_check_item_set_active (GtkWidget *widget, - gchar *path, - gboolean active); -gboolean menu_check_item_get_active (GtkWidget *widget, - gchar *path); -void menu_set_submenu (GtkWidget *widget, - const gchar *path, - GtkWidget *submenu); -GtkWidget *menu_get_submenu (GtkWidget *widget, - const gchar *path); -void menu_remove_submenu (GtkWidget *widget, - const gchar *path, - GtkWidget *submenu); -GtkWidget *create_option_menu_simple (const gchar **menu_items, - gint def_val, - gint *data); -GtkWidget *create_option_menu (const gchar **menu_items, - gint def_val, - gpointer func, - gpointer data); - - -void menu_modal_cb (gpointer data, - guint action, - GtkWidget *menuitem); -gint menu_popup_modal (GtkWidget *popup, - GtkMenuPositionFunc pos_func, - gpointer pos_data, - GdkEventButton *event, - gpointer user_data); -void menu_calc_popup_position (GtkMenu *menu, - gint *x_ret, - gint *y_ret, -#ifdef USE_GTK2 - gboolean *push_in, -#endif - gpointer data); - -#endif /* __MENU_H__ */ diff -Nru gimageview-0.2.27/src/pixbuf_utils.c gimageview-0.3.0-0.20101117/src/pixbuf_utils.c --- gimageview-0.2.27/src/pixbuf_utils.c 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixbuf_utils.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Copyright (C) 2001 The Free Software Foundation - * - * This program is released under the terms of the GNU General Public - * License version 2, you can find a copy of the lincense in the file - * COPYING. * - * - * $Id: pixbuf_utils.c,v 1.12 2003/06/13 09:43:37 makeinu Exp $ - */ - -#include "pixbuf_utils.h" - -#if HAVE_GDK_PIXBUF - -#include - - -/* - * Returns a copy of pixbuf src rotated 90 degrees clockwise or 90 - * counterclockwise. - */ -GdkPixbuf * -pixbuf_copy_rotate_90 (GdkPixbuf *src, - gboolean counter_clockwise) -{ - GdkPixbuf *dest; - gint has_alpha; - gint src_w, src_h, src_rs; - gint dest_w, dest_h, dest_rs; - guchar *src_pix, *src_p; - guchar *dest_pix, *dest_p; - gint i, j; - gint a; - - if (!src) return NULL; - - src_w = gdk_pixbuf_get_width (src); - src_h = gdk_pixbuf_get_height (src); - has_alpha = gdk_pixbuf_get_has_alpha (src); - src_rs = gdk_pixbuf_get_rowstride (src); - src_pix = gdk_pixbuf_get_pixels (src); - - dest_w = src_h; - dest_h = src_w; - dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, dest_w, dest_h); - dest_rs = gdk_pixbuf_get_rowstride (dest); - dest_pix = gdk_pixbuf_get_pixels (dest); - - a = (has_alpha ? 4 : 3); - - for (i = 0; i < src_h; i++) { - src_p = src_pix + (i * src_rs); - for (j = 0; j < src_w; j++) { - if (counter_clockwise) - dest_p = dest_pix + ((dest_h - j - 1) * dest_rs) + (i * a); - else - dest_p = dest_pix + (j * dest_rs) + ((dest_w - i - 1) * a); - - *(dest_p++) = *(src_p++); /* r */ - *(dest_p++) = *(src_p++); /* g */ - *(dest_p++) = *(src_p++); /* b */ - if (has_alpha) *(dest_p) = *(src_p++); /* a */ - } - } - - return dest; -} - - -/* - * Returns a copy of pixbuf mirrored and or flipped. - * TO do a 180 degree rotations set both mirror and flipped TRUE - * if mirror and flip are FALSE, result is a simple copy. - */ -GdkPixbuf * -pixbuf_copy_mirror (GdkPixbuf *src, - gboolean mirror, - gboolean flip) -{ - GdkPixbuf *dest; - gint has_alpha; - gint w, h; - gint src_rs, dest_rs; - guchar *src_pix, *dest_pix; - guchar *src_p, *dest_p; - gint i, j; - gint a; - - if (!src) return NULL; - - w = gdk_pixbuf_get_width (src); - h = gdk_pixbuf_get_height (src); - has_alpha = gdk_pixbuf_get_has_alpha (src); - src_rs = gdk_pixbuf_get_rowstride (src); - src_pix = gdk_pixbuf_get_pixels (src); - - dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, w, h); - dest_rs = gdk_pixbuf_get_rowstride (dest); - dest_pix = gdk_pixbuf_get_pixels (dest); - - a = has_alpha ? 4 : 3; - - for (i = 0; i < h; i++) { - src_p = src_pix + (i * src_rs); - if (flip) - dest_p = dest_pix + ((h - i - 1) * dest_rs); - else - dest_p = dest_pix + (i * dest_rs); - - if (mirror) { - dest_p += (w - 1) * a; - for (j = 0; j < w; j++) { - *(dest_p++) = *(src_p++); /* r */ - *(dest_p++) = *(src_p++); /* g */ - *(dest_p++) = *(src_p++); /* b */ - if (has_alpha) *(dest_p) = *(src_p++); /* a */ - dest_p -= (a + 3); - } - } else { - for (j = 0; j < w; j++) { - *(dest_p++) = *(src_p++); /* r */ - *(dest_p++) = *(src_p++); /* g */ - *(dest_p++) = *(src_p++); /* b */ - if (has_alpha) *(dest_p++) = *(src_p++); /* a */ - } - } - } - - return dest; -} - - -void -pixmap_from_xpm (const char **data, - GdkPixmap **pixmap, - GdkBitmap **mask) -{ - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_xpm_data (data); - gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, 127); - gdk_pixbuf_unref (pixbuf); -} - -#endif /* HAVE_GDK_PIXBUF */ diff -Nru gimageview-0.2.27/src/pixbuf_utils.h gimageview-0.3.0-0.20101117/src/pixbuf_utils.h --- gimageview-0.2.27/src/pixbuf_utils.h 2004-05-23 14:07:49.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixbuf_utils.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * Copyright (C) 2001 The Free Software Foundation - * - * This program is released under the terms of the GNU General Public - * License version 2, you can find a copy of the lincense in the file - * COPYING. - * - * $Id: pixbuf_utils.h,v 1.10 2003/06/13 09:43:37 makeinu Exp $ - */ - -#ifndef PIXBUF_UTILS_H -#define PIXBUF_UTILS_H - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HAVE_GDK_PIXBUF - -#include -#include -#include - -GdkPixbuf *pixbuf_copy_rotate_90 (GdkPixbuf *src, - gboolean counter_clockwise); - -GdkPixbuf *pixbuf_copy_mirror (GdkPixbuf *src, - gboolean mirror, - gboolean flip); - -void pixmap_from_xpm (const char **data, - GdkPixmap **pixmap, - GdkBitmap **mask); - -#endif /* HAVE_GDK_PIXBUF */ -#endif /* PIXBUF_UTILS_H */ diff -Nru gimageview-0.2.27/src/pixmaps/folder24.xpm gimageview-0.3.0-0.20101117/src/pixmaps/folder24.xpm --- gimageview-0.2.27/src/pixmaps/folder24.xpm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/folder24.xpm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,185 @@ +/* XPM */ +static char * folder24_xpm[] = { +"24 24 158 2", +" c None", +". c #868C86", +"+ c #828481", +"@ c #5A5A5A", +"# c #545454", +"$ c #424741", +"% c #98A397", +"& c #B3BDB2", +"* c #9C9F9C", +"= c #606260", +"- c #949A94", +"; c #646764", +"> c #939393", +", c #E9E9E9", +"' c #767975", +") c #7E877D", +"! c #95A194", +"~ c #98A697", +"{ c #606A5F", +"] c #8C958B", +"^ c #B1B9B1", +"/ c #6B6B6B", +"( c #848284", +"_ c #D4D4D4", +": c #DCDDDC", +"< c #999C99", +"[ c #737972", +"} c #848F83", +"| c #909B8F", +"1 c #7E827E", +"2 c #474847", +"3 c #747C73", +"4 c #A9B6A8", +"5 c #B6BEB6", +"6 c #BABCBA", +"7 c #A4A4A4", +"8 c #CCCCCC", +"9 c #C0C1C0", +"0 c #676D66", +"a c #7A8379", +"b c #A9B4A8", +"c c #979B97", +"d c #515251", +"e c #0A0A0A", +"f c #5C635B", +"g c #9AA699", +"h c #ABB9AA", +"i c #B3BFB2", +"j c #CED6CD", +"k c #ACACAC", +"l c #A8A9A8", +"m c #D8D9D8", +"n c #E8E8E7", +"o c #9FA19E", +"p c #6E736E", +"q c #939D92", +"r c #B5BDB4", +"s c #909590", +"t c #2A2B2A", +"u c #626A62", +"v c #929E91", +"w c #AEBBAD", +"x c #BEC7BE", +"y c #AFB4AF", +"z c #A9AAA8", +"A c #CDCDCD", +"B c #E2E3E2", +"C c #BFC0BF", +"D c #787E77", +"E c #858E83", +"F c #535753", +"G c #5E665E", +"H c #B6C1B5", +"I c #BCC2BB", +"J c #AEAFAE", +"K c #E3E3E3", +"L c #CACBCA", +"M c #818580", +"N c #7D867B", +"O c #9FAA9D", +"P c #687167", +"Q c #383D37", +"R c #778076", +"S c #ADBBAC", +"T c #BFC8BE", +"U c #A1A8A1", +"V c #6F726E", +"W c #BCBDBC", +"X c #7A7C7A", +"Y c #5D635C", +"Z c #737D72", +"` c #485147", +" . c #616960", +".. c #A6B4A5", +"+. c #9FAC9E", +"@. c #495148", +"#. c #919191", +"$. c #626462", +"%. c #5A6159", +"&. c #6F7A6E", +"*. c #394238", +"=. c #7F8B7E", +"-. c #9DAB9C", +";. c #505A4E", +">. c #767776", +",. c #5A5D5A", +"'. c #5A6059", +"). c #6D796C", +"!. c #333C32", +"~. c #6C776A", +"{. c #95A293", +"]. c #AAB8A9", +"^. c #A0AE9F", +"/. c #5F6B5D", +"(. c #484948", +"_. c #4F524E", +":. c #656D64", +"<. c #556053", +"[. c #5A6358", +"}. c #96A495", +"|. c #A8B6A7", +"1. c #A2B0A0", +"2. c #647162", +"3. c #3B3C3A", +"4. c #4B4F4A", +"5. c #697368", +"6. c #333D32", +"7. c #515C50", +"8. c #899787", +"9. c #A6B5A5", +"0. c #A4B2A2", +"a. c #6A7768", +"b. c #282B27", +"c. c #404540", +"d. c #576255", +"e. c #0B0E0B", +"f. c #000000", +"g. c #363E35", +"h. c #5F6C5D", +"i. c #93A291", +"j. c #A0AE9E", +"k. c #768574", +"l. c #212520", +"m. c #323832", +"n. c #202520", +"o. c #3A4538", +"p. c #596657", +"q. c #798877", +"r. c #6C7C6A", +"s. c #323731", +"t. c #242823", +"u. c #0C0D0B", +"v. c #495548", +"w. c #4B5A49", +"x. c #333A33", +"y. c #141714", +"z. c #030403", +"A. c #191C18", +" ", +" ", +" ", +" ", +" . + @ ", +" # $ % & * = ", +" - ; > , ' ) ! ~ { ", +" ] ^ / ( _ : < [ } | 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 h h w x y z A B C D E b . F ", +" G | h h h w H I l J K L M N O P ", +" Q R h h h h h S T U V W X Y Z ` ", +" ...h h h h h w +.@.#.$.%.&.*. ", +" =...h h h h h -.;.>.,.'.).!. ", +" ~.{.].h h h ^./.(._.:.<. ", +" [.}.|.h h 1.2.3.4.5.6. ", +" 7.8.9.h 0.a.b.c.d.e.f. ", +" g.h.i.j.k.l.m.n.f.f.f. ", +" o.p.q.r.s.t.u.f.f.f. ", +" v.w.x.y.z.f. ", +" A.f.f.f. ", +" ", +" "}; diff -Nru gimageview-0.2.27/src/pixmaps/folder32.xpm gimageview-0.3.0-0.20101117/src/pixmaps/folder32.xpm --- gimageview-0.2.27/src/pixmaps/folder32.xpm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/folder32.xpm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,296 @@ +/* XPM */ +static char * folder32_xpm[] = { +"32 32 261 2", +" c None", +". c #696E69", +"+ c #747774", +"@ c #4B4B4B", +"# c #848D83", +"$ c #B7C0B6", +"% c #ABAEAA", +"& c #696969", +"* c #2C2B2C", +"= c #0E0F0E", +"- c #8C8C8C", +"; c #414141", +"> c #262926", +", c #7E887D", +"' c #AEBCAD", +") c #B7C2B6", +"! c #BCC2BC", +"~ c #929592", +"{ c #3F423F", +"] c #828782", +"^ c #A4A7A4", +"/ c #2F302F", +"( c #5E5E5E", +"_ c #D6D6D6", +": c #EFEFEF", +"< c #555755", +"[ c #70796F", +"} c #95A193", +"| c #A5B2A4", +"1 c #A5B3A4", +"2 c #727E71", +"3 c #394038", +"4 c #6F776E", +"5 c #C3CCC3", +"6 c #A5A9A5", +"7 c #2C2A2C", +"8 c #413F41", +"9 c #BEBDBE", +"0 c #FBFBFB", +"a c #DADBDA", +"b c #818380", +"c c #636A63", +"d c #788277", +"e c #9DAA9B", +"f c #8B988A", +"g c #747B73", +"h c #434443", +"i c #5D655C", +"j c #A0AC9F", +"k c #BCC8BC", +"l c #AFB2AF", +"m c #878487", +"n c #898889", +"o c #CDCECD", +"p c #E0E1E0", +"q c #A1A3A1", +"r c #646863", +"s c #646D63", +"t c #929E91", +"u c #B0BAAF", +"v c #ACB1AC", +"w c #585958", +"x c #131313", +"y c #4F554E", +"z c #919C90", +"A c #ACBAAB", +"B c #CCD1CC", +"C c #CACBCA", +"D c #ABABAB", +"E c #FAFAFA", +"F c #F2F3F2", +"G c #D1D2D1", +"H c #6B6F6A", +"I c #50564F", +"J c #8A9589", +"K c #B2BEB1", +"L c #BDC3BD", +"M c #929392", +"N c #252525", +"O c #010101", +"P c #3A3E39", +"Q c #7A8479", +"R c #A7B5A6", +"S c #ABB9AA", +"T c #BEC9BD", +"U c #E0E5E0", +"V c #ABA9AC", +"W c #8A8A8A", +"X c #CBCBCB", +"Y c #F3F3F3", +"Z c #F5F6F5", +"` c #B7B8B6", +" . c #5B5E5A", +".. c #646B64", +"+. c #99A598", +"@. c #BCC5BB", +"#. c #C1C6C1", +"$. c #6D6F6D", +"%. c #111111", +"&. c #666E65", +"*. c #A3B0A2", +"=. c #B3BFB2", +"-. c #CED4CD", +";. c #B2B5B2", +">. c #8F918F", +",. c #AEAFAE", +"'. c #EBEBEB", +"). c #F7F7F7", +"!. c #CDCFCD", +"~. c #7F827F", +"{. c #5B625A", +"]. c #848E83", +"^. c #ACB8AB", +"/. c #C1C9C0", +"(. c #717571", +"_. c #353735", +":. c #5F675F", +"<. c #A1AEA0", +"[. c #C0CAC0", +"}. c #BDC1BC", +"|. c #A5A6A4", +"1. c #9FA09F", +"2. c #F4F4F4", +"3. c #E8E9E8", +"4. c #979A96", +"5. c #696E68", +"6. c #798277", +"7. c #A1AD9F", +"8. c #B4BEB3", +"9. c #8C938C", +"0. c #373B37", +"a. c #5E655E", +"b. c #A0AD9F", +"c. c #AEBBAD", +"d. c #B7C3B6", +"e. c #C5CCC5", +"f. c #B0B2B0", +"g. c #898A89", +"h. c #B0B0B0", +"i. c #F0F0F0", +"j. c #ABADAB", +"k. c #616660", +"l. c #7A8478", +"m. c #9FAB9D", +"n. c #909C8E", +"o. c #444C43", +"p. c #3F443E", +"q. c #C4CDC3", +"r. c #C5CAC5", +"s. c #7C807C", +"t. c #797B78", +"u. c #ACADAC", +"v. c #545753", +"w. c #616860", +"x. c #768075", +"y. c #6D7A6C", +"z. c #292F28", +"A. c #232622", +"B. c #909C8F", +"C. c #373D36", +"D. c #A0A0A0", +"E. c #878787", +"F. c #494C49", +"G. c #757F74", +"H. c #5E695C", +"I. c #20261F", +"J. c #596158", +"K. c #9EAC9D", +"L. c #8A9989", +"M. c #2E342D", +"N. c #8F8F8F", +"O. c #767776", +"P. c #424641", +"Q. c #616960", +"R. c #7B877A", +"S. c #4B564A", +"T. c #1C221B", +"U. c #657064", +"V. c #9EAB9D", +"W. c #909F8F", +"X. c #3F483D", +"Y. c #707070", +"Z. c #717271", +"`. c #626961", +" + c #808D7F", +".+ c #323C31", +"++ c #555F53", +"@+ c #8D9A8B", +"#+ c #A6B4A5", +"$+ c #94A393", +"%+ c #4C574A", +"&+ c #454645", +"*+ c #5A5B5A", +"=+ c #444A43", +"-+ c #6D756C", +";+ c #6A7768", +">+ c #242B22", +",+ c #4B544A", +"'+ c #808C7E", +")+ c #96A495", +"!+ c #515D4F", +"~+ c #3C3C3B", +"{+ c #4E4F4D", +"]+ c #4E544E", +"^+ c #768074", +"/+ c #455143", +"(+ c #384037", +"_+ c #7C8A7B", +":+ c #A1AF9F", +"<+ c #AAB8A9", +"[+ c #9AA898", +"}+ c #546153", +"|+ c #333533", +"1+ c #3C3F3C", +"2+ c #535A53", +"3+ c #6D796C", +"4+ c #212920", +"5+ c #323A31", +"6+ c #687666", +"7+ c #96A594", +"8+ c #AAB8A8", +"9+ c #9EAC9C", +"0+ c #5A6758", +"a+ c #252825", +"b+ c #565D56", +"c+ c #505C4E", +"d+ c #070907", +"e+ c #000000", +"f+ c #242A23", +"g+ c #4B5649", +"h+ c #768574", +"i+ c #9CAB9B", +"j+ c #A2B0A1", +"k+ c #677665", +"l+ c #1B1F1A", +"m+ c #242724", +"n+ c #464E45", +"o+ c #2E352D", +"p+ c #3E4A3C", +"q+ c #657564", +"r+ c #889786", +"s+ c #99A797", +"t+ c #6A7A68", +"u+ c #2D322C", +"v+ c #292D29", +"w+ c #2B302A", +"x+ c #3E493D", +"y+ c #536151", +"z+ c #71806F", +"A+ c #5D6D5B", +"B+ c #3E453E", +"C+ c #252924", +"D+ c #161A16", +"E+ c #020202", +"F+ c #3C453B", +"G+ c #465345", +"H+ c #425140", +"I+ c #394139", +"J+ c #1A1E1A", +"K+ c #070807", +"L+ c #191C18", +" ", +" ", +" ", +" ", +" ", +" . + @ ", +" # $ % & * ", +" = - ; > , ' ) ! ~ { ", +" ] ^ / ( _ : < [ } | 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 0 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 A T U V W X Y Z ` ...+.@.#.$.%. ", +" &.*.S S S =.-.;.>.,.'.).!.~.{.].^./.(._. ", +" :.<.S S S S K [.}.|.1.G 2.3.4.5.6.7.8.9.0. ", +" a.b.S S S S S c.d.e.f.g.h.i.i.j.k.l.m.n.o. ", +" p.z S S S S S S S ' q.r.s.t.G u.v.w.x.y.z. ", +" A., S S S S S S S S c.d.B.C.D.E.F.w.G.H.I. ", +" J.K.S S S S S S S S S L.M.N.O.P.Q.R.S.T. ", +" U.V.S S S S S S S S W.X.Y.Z.P.`. +.+ ", +" ++@+#+S S S S S S $+%+&+*+=+-+;+>+ ", +" ,+'+#+S S S S S )+!+~+{+]+^+/+ ", +" (+_+:+<+S S S [+}+|+1+2+3+4+ ", +" 5+6+7+8+S S 9+0+A.a+b+c+d+e+e+ ", +" f+g+h+i+R j+k+l+m+n+l+e+e+e+e+ ", +" o+p+q+r+s+t+u+v+w+d+e+e+e+e+ ", +" x+y+z+A+B+C+D+E+e+e+e+ ", +" F+G+H+I+J+K+e+e+ ", +" L+e+e+e+e+ ", +" ", +" ", +" "}; diff -Nru gimageview-0.2.27/src/pixmaps/gimageview.xpm gimageview-0.3.0-0.20101117/src/pixmaps/gimageview.xpm --- gimageview-0.2.27/src/pixmaps/gimageview.xpm 2004-05-23 14:07:57.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/gimageview.xpm 2010-11-17 06:10:11.000000000 +0000 @@ -1,5957 +1,13610 @@ /* XPM */ static char * gimageview_xpm[] = { -"360 150 5804 2", -" c None", -". c #F8FEC9", -"+ c #F1DEC8", -"@ c #F2D7C9", -"# c #F8FEB1", -"$ c #F7FE83", -"% c #F9FE6B", -"& c #F0E5C9", -"* c #F9FEBD", -"= c #F7FE8F", -"- c #F4F1C9", -"; c #F8FE9F", -"> c #F9FE6D", -", c #F7FE7F", -"' c #F0E8C9", -") c #F8FE95", -"! c #F8FCC9", -"~ c #F2D9C9", -"{ c #F7FEAF", -"] c #F6FE7B", -"^ c #F8FE97", -"/ c #F2DAC9", -"( c #F8FEB7", -"_ c #F6FE81", -": c #F2EDC9", -"< c #F9FEA3", -"[ c #F1E0C8", -"} c #F7FE91", -"| c #F8FAC9", -"1 c #F8FEB9", -"2 c #F1EBC8", -"3 c #F7FEAB", -"4 c #F6FE6F", -"5 c #F1E1C8", -"6 c #F8FE9D", -"7 c #F2D8C9", -"8 c #F7F6C8", -"9 c #F8FEC5", -"0 c #F7FE87", -"a c #F7FEBD", -"b c #F6FE7D", -"c c #F9FE77", -"d c #F9FE71", -"e c #F9FEAD", -"f c #E8EEB3", -"g c #B8BC70", -"h c #989A43", -"i c #686800", -"j c #D8DD9D", -"k c #989A24", -"l c #D9DD54", -"m c #A8AB5A", -"n c #C8CC86", -"o c #787917", -"p c #888A2D", -"q c #C9CC47", -"r c #C8CC76", -"s c #787915", -"t c #A9AB35", -"u c #E9EE5F", -"v c #B4AB6F", -"w c #787517", -"x c #A69A5A", -"y c #E3CBB3", -"z c #B5A670", -"A c #968D43", -"B c #D4BF9D", -"C c #87812D", -"D c #888A18", -"E c #A9AB30", -"F c #B9BC3C", -"G c #C4B286", -"H c #78790C", -"I c #C3BF85", -"J c #E3CCB3", -"K c #888A20", -"L c #E9EE91", -"M c #A8AB44", -"N c #78750E", -"O c #E5CF6F", -"P c #F4E083", -"Q c #F4E18B", -"R c #F6E993", -"S c #F7EB9E", -"T c #F9F2AA", -"U c #B4AA6F", -"V c #999940", -"W c #78750D", -"X c #E6CE65", -"Y c #F5DB72", -"Z c #C9C471", -"` c #FAFCBF", -" . c #FBFAB6", -".. c #F7EB9C", -"+. c #F4E085", -"@. c #C6B54C", -"#. c #A79B33", -"$. c #99993D", -"%. c #959243", -"&. c #FAFCBD", -"*. c #F4E081", -"=. c #B7A83F", -"-. c #888219", -";. c #978E26", -">. c #FAF7AF", -",. c #F5E58C", -"'. c #F7F8C9", -"). c #C4B386", -"!. c #C7C886", -"~. c #F9F2A8", -"{. c #FAF7B3", -"]. c #F4E189", -"^. c #F9FEA7", -"/. c #FAFDC4", -"(. c #F6EA97", -"_. c #F9F3AC", -":. c #F4DC7D", -"<. c #FBFAB8", -"[. c #F8FEA1", -"}. c #F5DC76", -"|. c #F8EE9F", -"1. c #F7FEA9", -"2. c #F5E692", -"3. c #F8FEB3", -"4. c #F7FEC1", -"5. c #F6FE71", -"6. c #F7FE8B", -"7. c #F8FEC7", -"8. c #F7FE8D", -"9. c #F9FE73", -"0. c #F8FE93", -"a. c #F8FEC3", -"b. c #DAE674", -"c. c #8E9A50", -"d. c #6E8449", -"e. c #4B5C32", -"f. c #788B49", -"g. c #9BA84F", -"h. c #DAE264", -"i. c #F3F256", -"j. c #ECE13E", -"k. c #DBAC37", -"l. c #AE7634", -"m. c #9B6336", -"n. c #9A743B", -"o. c #A98D45", -"p. c #C5B753", -"q. c #EEEF66", -"r. c #F2F675", -"s. c #E6E787", -"t. c #DEDD94", -"u. c #DAD49F", -"v. c #D2D09C", -"w. c #8C926B", -"x. c #778062", -"y. c #8E9562", -"z. c #D2D581", -"A. c #ECEE7D", -"B. c #F7FC6D", -"C. c #EBF086", -"D. c #DCE39E", -"E. c #D4DBB1", -"F. c #D0D7BC", -"G. c #CFD5BD", -"H. c #D0D6B6", -"I. c #D7DEAA", -"J. c #E3E895", -"K. c #F2F779", -"L. c #E7E992", -"M. c #DCDDA9", -"N. c #DDDEB3", -"O. c #CACA92", -"P. c #D8DA7A", -"Q. c #EEFCD5", -"R. c #6E7D4E", -"S. c #849763", -"T. c #B7DBAE", -"U. c #C5DDB0", -"V. c #6A824B", -"W. c #667748", -"X. c #5D6A36", -"Y. c #626F37", -"Z. c #697B47", -"`. c #68784B", -" + c #505C33", -".+ c #4C572D", -"++ c #5C6D3E", -"@+ c #7A8D48", -"#+ c #F8FD69", -"$+ c #F0EA48", -"%+ c #E7D72A", -"&+ c #E2D01A", -"*+ c #E1CF1C", -"=+ c #E2CE1D", -"-+ c #E2CF1A", -";+ c #E2CC23", -">+ c #D49D34", -",+ c #B26D30", -"'+ c #99693A", -")+ c #8D6536", -"!+ c #886638", -"~+ c #866536", -"{+ c #886433", -"]+ c #8F6A37", -"^+ c #AE9546", -"/+ c #DED75E", -"(+ c #F4F872", -"_+ c #E2E18D", -":+ c #DAD69D", -"<+ c #D6D2A1", -"[+ c #D4CFA3", -"}+ c #D3CFA5", -"|+ c #D3CFA3", -"1+ c #D5CEA5", -"2+ c #D5D3A2", -"3+ c #8F956E", -"4+ c #6C765F", -"5+ c #72795C", -"6+ c #B7B88E", -"7+ c #D3CFA4", -"8+ c #D4D0A3", -"9+ c #D7D49F", -"0+ c #DBD897", -"a+ c #EBED7F", -"b+ c #F9FE6C", -"c+ c #F5FA73", -"d+ c #E6EC8D", -"e+ c #D0D7B0", -"f+ c #CDD4BE", -"g+ c #CDD5BF", -"h+ c #CCD3BD", -"i+ c #CED4BD", -"j+ c #D0D5BF", -"k+ c #CFD4BE", -"l+ c #CED3BD", -"m+ c #DDE2A4", -"n+ c #EFF480", -"o+ c #F8FD6D", -"p+ c #B3B278", -"q+ c #B6B488", -"r+ c #A8A77A", -"s+ c #B5B588", -"t+ c #B4B388", -"u+ c #CAC99F", -"v+ c #D9DBB2", -"w+ c #CACCA4", -"x+ c #CCCEA3", -"y+ c #DBDDB3", -"z+ c #E5E7BC", -"A+ c #79784E", -"B+ c #9A9A6D", -"C+ c #66643D", -"D+ c #878749", -"E+ c #F8FE9B", -"F+ c #879754", -"G+ c #F4FCD0", -"H+ c #EFF7D2", -"I+ c #EBF3CD", -"J+ c #818D5C", -"K+ c #708B54", -"L+ c #C1E1C2", -"M+ c #BDDEB6", -"N+ c #687A48", -"O+ c #6E7C4E", -"P+ c #A1A964", -"Q+ c #77804B", -"R+ c #65773F", -"S+ c #475529", -"T+ c #475227", -"U+ c #505D2F", -"V+ c #627441", -"W+ c #4C5E34", -"X+ c #475226", -"Y+ c #A1AD55", -"Z+ c #CED763", -"`+ c #F8FB66", -" @ c #E9DE38", -".@ c #E2D221", -"+@ c #E2CE1A", -"@@ c #E3CC1A", -"#@ c #E3CC1B", -"$@ c #E4CC1A", -"%@ c #E3CE20", -"&@ c #DFCD1A", -"*@ c #E0CC1A", -"=@ c #E9C629", -"-@ c #D29D26", -";@ c #BB703F", -">@ c #986436", -",@ c #845E36", -"'@ c #826432", -")@ c #886631", -"!@ c #8B653B", -"~@ c #886536", -"{@ c #8A6734", -"]@ c #906735", -"^@ c #C5B04D", -"/@ c #F7FA6A", -"(@ c #EBED80", -"_@ c #DCD997", -":@ c #D3CFA6", -"<@ c #D4CDA4", -"[@ c #D1CF9E", -"}@ c #6E7760", -"|@ c #747B5D", -"1@ c #B8B98F", -"2@ c #D2CFA3", -"3@ c #D4D0A4", -"4@ c #D5D1A5", -"5@ c #D7D49E", -"6@ c #E3E38D", -"7@ c #F5F972", -"8@ c #F0F57C", -"9@ c #D5DCAC", -"0@ c #CBD2BC", -"a@ c #CED5BF", -"b@ c #D2D7BA", -"c@ c #E1E69B", -"d@ c #C6C575", -"e@ c #959366", -"f@ c #A9A87D", -"g@ c #9F9E73", -"h@ c #9C9B70", -"i@ c #AFAE83", -"j@ c #B7B68B", -"k@ c #D0D0A7", -"l@ c #C9CBA3", -"m@ c #DADCB4", -"n@ c #E0E1BB", -"o@ c #E1E2BD", -"p@ c #B9BB90", -"q@ c #DCDCB3", -"r@ c #E2E5BD", -"s@ c #8D8F63", -"t@ c #99996C", -"u@ c #6B6A42", -"v@ c #676542", -"w@ c #66643F", -"x@ c #BFC15A", -"y@ c #F7FE89", -"z@ c #EBF8CC", -"A@ c #D6E9B6", -"B@ c #7A8C54", -"C@ c #F1F8CE", -"D@ c #EEF9D1", -"E@ c #F7FFD7", -"F@ c #667745", -"G@ c #D6EDC2", -"H@ c #D7F0CB", -"I@ c #536D42", -"J@ c #687944", -"K@ c #97A465", -"L@ c #AEB873", -"M@ c #717F51", -"N@ c #687C41", -"O@ c #4B5830", -"P@ c #4D5C2F", -"Q@ c #647643", -"R@ c #627642", -"S@ c #546136", -"T@ c #4D5C29", -"U@ c #A7B957", -"V@ c #68783C", -"W@ c #596F38", -"X@ c #C0C959", -"Y@ c #F7F962", -"Z@ c #E7D92A", -"`@ c #E4D524", -" # c #E2D526", -".# c #DFCF1D", -"+# c #E2C91A", -"@# c #DFCA1A", -"## c #E1CC1B", -"$# c #E3CE1D", -"%# c #E1CF1A", -"&# c #E0CF1A", -"*# c #E0C91C", -"=# c #E7C629", -"-# c #D19F2B", -";# c #AE6932", -"># c #98623C", -",# c #896133", -"'# c #836833", -")# c #826433", -"!# c #856535", -"~# c #866434", -"{# c #8A6534", -"]# c #906734", -"^# c #946934", -"/# c #C2AC4C", -"(# c #EEF07B", -"_# c #D9D797", -":# c #D3CFA2", -"<# c #D3CEA2", -"[# c #D3CEA1", -"}# c #D3CFA1", -"|# c #D5D0A4", -"1# c #D1CFA3", -"2# c #D3D0A2", -"3# c #D2CF9E", -"4# c #90956E", -"5# c #6D765D", -"6# c #727A5D", -"7# c #B8BA92", -"8# c #D1CEA2", -"9# c #D3D1A4", -"0# c #D5D2A1", -"a# c #E5E68B", -"b# c #F6FA6F", -"c# c #F7FC6E", -"d# c #D1D8B5", -"e# c #CFD5BF", -"f# c #D1D6C0", -"g# c #E3E898", -"h# c #DADC92", -"i# c #9C9B72", -"j# c #8F8E63", -"k# c #A8A77C", -"l# c #929166", -"m# c #BCBB90", -"n# c #BEBC91", -"o# c #D0D2A7", -"p# c #E0E2B9", -"q# c #E1E3BB", -"r# c #E1E2BC", -"s# c #E2E4BD", -"t# c #D9DBB0", -"u# c #9B9C71", -"v# c #E2E4BE", -"w# c #E2E4BC", -"x# c #CDCFA5", -"y# c #828356", -"z# c #67663F", -"A# c #676540", -"B# c #67643F", -"C# c #BFC159", -"D# c #F4FB81", -"E# c #B4CA87", -"F# c #F1F9D7", -"G# c #E9F4C9", -"H# c #77864B", -"I# c #F4FBD1", -"J# c #F0F9D4", -"K# c #F5FFD4", -"L# c #6D7E4B", -"M# c #D9F2CD", -"N# c #D5EFC5", -"O# c #637145", -"P# c #7A8F54", -"Q# c #A7B26D", -"R# c #5C6730", -"S# c #627447", -"T# c #627341", -"U# c #4E5831", -"V# c #5C6F40", -"W# c #5F733F", -"X# c #5D6C3F", -"Y# c #475228", -"Z# c #5F7042", -"`# c #77874E", -" $ c #647342", -".$ c #A0AC5A", -"+$ c #BEC65B", -"@$ c #74874F", -"#$ c #F9FE6A", -"$$ c #EDE540", -"%$ c #E4D01D", -"&$ c #E3D01A", -"*$ c #E1D11B", -"=$ c #DFD11D", -"-$ c #E2D11B", -";$ c #E3CF1A", -">$ c #E0CC1C", -",$ c #E1CD1C", -"'$ c #E2CD1A", -")$ c #E4CF1A", -"!$ c #E2D21B", -"~$ c #DFCC1A", -"{$ c #E5CA23", -"]$ c #DBA130", -"^$ c #B16733", -"/$ c #996839", -"($ c #876434", -"_$ c #866638", -":$ c #816435", -"<$ c #806233", -"[$ c #846435", -"}$ c #8A6636", -"|$ c #8E6735", -"1$ c #8F6633", -"2$ c #936833", -"3$ c #EEED65", -"4$ c #F6FA70", -"5$ c #DFDF8F", -"6$ c #D2CFA1", -"7$ c #D2CDA0", -"8$ c #D3CDA1", -"9$ c #D2CCA0", -"0$ c #D3D0A3", -"a$ c #D2D0A3", -"b$ c #D4CFA4", -"c$ c #D1D0A3", -"d$ c #D1D09D", -"e$ c #D4CEA2", -"f$ c #D3CF9F", -"g$ c #90946C", -"h$ c #6D765B", -"i$ c #727B5D", -"j$ c #B6B993", -"k$ c #D0CFA3", -"l$ c #D3D2A5", -"m$ c #D3D2A0", -"n$ c #F0F378", -"o$ c #E0E699", -"p$ c #D0D7C1", -"q$ c #D0D7C0", -"r$ c #D0D6BF", -"s$ c #CDD4BD", -"t$ c #CED5BE", -"u$ c #F0F57D", -"v$ c #F7FB73", -"w$ c #E2E4BB", -"x$ c #D5D5AC", -"y$ c #BBBA8E", -"z$ c #BEBD90", -"A$ c #B0B082", -"B$ c #AFAF82", -"C$ c #BBBA8D", -"D$ c #C7C89D", -"E$ c #DCDEB6", -"F$ c #D6D8B0", -"G$ c #E2E3BD", -"H$ c #DCDCB5", -"I$ c #E0E2B8", -"J$ c #E5E7BF", -"K$ c #A5A67C", -"L$ c #66643E", -"M$ c #686440", -"N$ c #66633F", -"O$ c #F8FD6B", -"P$ c #F2F8D1", -"Q$ c #C1CFA3", -"R$ c #E5F3C6", -"S$ c #F0F9CF", -"T$ c #EBF8D3", -"U$ c #6D8257", -"V$ c #EFFCD4", -"W$ c #EFFBD9", -"X$ c #CED8B0", -"Y$ c #707F51", -"Z$ c #6B7D57", -"`$ c #4A5F34", -" % c #657749", -".% c #667C3D", -"+% c #ABBC7A", -"@% c #62713C", -"#% c #667948", -"$% c #4F5E30", -"%% c #505D31", -"&% c #697D4B", -"*% c #617342", -"=% c #515C31", -"-% c #505D36", -";% c #6A7D48", -">% c #74874E", -",% c #4A5930", -"'% c #A2B351", -")% c #61702C", -"!% c #5F723A", -"~% c #6A7A3A", -"{% c #CDDA63", -"]% c #E6D723", -"^% c #E5D21D", -"/% c #E6D21A", -"(% c #E2D11A", -"_% c #E2D21C", -":% c #E4D11B", -"<% c #E6CF1A", -"[% c #E5CE1B", -"}% c #E3CF1D", -"|% c #E3CE1B", -"1% c #E5CC1A", -"2% c #E5CC1B", -"3% c #E2CE20", -"4% c #DFCF1B", -"5% c #E3C920", -"6% c #DBA02A", -"7% c #AB6C2E", -"8% c #97673A", -"9% c #8E643A", -"0% c #826234", -"a% c #816434", -"b% c #7E6133", -"c% c #816436", -"d% c #876736", -"e% c #8A6936", -"f% c #8B6531", -"g% c #956B38", -"h% c #BEA74B", -"i% c #F1F476", -"j% c #D1CEA0", -"k% c #D1CFA2", -"l% c #D1CDA0", -"m% c #D1CFA1", -"n% c #D3CEA4", -"o% c #D0CF9D", -"p% c #D2CE9F", -"q% c #92956D", -"r% c #71795D", -"s% c #B4B690", -"t% c #D0CFA2", -"u% c #E3E48B", -"v% c #F8FD6C", -"w% c #D2D9B5", -"x% c #CFD6C0", -"y% c #E3E89C", -"z% c #E5E6BF", -"A% c #E2E3BC", -"B% c #E0E2BA", -"C% c #D5D6AA", -"D% c #C3C498", -"E% c #CDCCA3", -"F% c #C4C599", -"G% c #C1C397", -"H% c #B3B488", -"I% c #BBB990", -"J% c #DBDBB3", -"K% c #E2E5BF", -"L% c #E4E6BE", -"M% c #E3E4BC", -"N% c #D7D8B0", -"O% c #E3E4BA", -"P% c #7F8058", -"Q% c #6E6C45", -"R% c #65643F", -"S% c #A1A150", -"T% c #ECF6CF", -"U% c #F0F8D0", -"V% c #D3DFB6", -"W% c #E2F3C1", -"X% c #F2FBD7", -"Y% c #F1F9D4", -"Z% c #798452", -"`% c #6E7C4F", -" & c #62754C", -".& c #677448", -"+& c #647143", -"@& c #4D562B", -"#& c #536135", -"$& c #657945", -"%& c #A6BC7C", -"&& c #6E864C", -"*& c #647843", -"=& c #637443", -"-& c #4E5B30", -";& c #62703D", -">& c #6A7E49", -",& c #657445", -"'& c #4A552B", -")& c #556436", -"!& c #6B8045", -"~& c #536433", -"{& c #627539", -"]& c #8C9D6A", -"^& c #667C4C", -"/& c #7E8F4E", -"(& c #9EAF60", -"_& c #6E814B", -":& c #687B45", -"<& c #F5F65D", -"[& c #E2D21A", -"}& c #E2CB1A", -"|& c #E1CC1A", -"1& c #E3CA1A", -"2& c #E5CD1D", -"3& c #E3CF20", -"4& c #E2CF1D", -"5& c #E1CE1C", -"6& c #DACC1B", -"7& c #E2CF21", -"8& c #D9A62D", -"9& c #AE6E2D", -"0& c #9A6733", -"a& c #8D6837", -"b& c #846434", -"c& c #7E6134", -"d& c #7F6637", -"e& c #7D6434", -"f& c #816736", -"g& c #846433", -"h& c #896434", -"i& c #916B39", -"j& c #A2813D", -"k& c #F6FA6A", -"l& c #EBED7D", -"m& c #D1CE9E", -"n& c #D0CDA0", -"o& c #D2CEA1", -"p& c #D2CDA3", -"q& c #D2D1A0", -"r& c #D3CCA0", -"s& c #D3CFA0", -"t& c #959870", -"u& c #6E765C", -"v& c #70785C", -"w& c #B1B38E", -"x& c #D3D0A4", -"y& c #DEDD96", -"z& c #D1D8C1", -"A& c #D5DAB5", -"B& c #A6A77B", -"C& c #B0B184", -"D& c #C7C99D", -"E& c #C0C197", -"F& c #CBCCA1", -"G& c #DCDDB5", -"H& c #CFD0A6", -"I& c #C2C39A", -"J& c #DCDDB6", -"K& c #DFDFB8", -"L& c #E4E4BD", -"M& c #DFDFB7", -"N& c #D9D9B1", -"O& c #ABAC80", -"P& c #DFE1B9", -"Q& c #E2E4BA", -"R& c #CDCFA3", -"S& c #DFE0B6", -"T& c #D0D2A6", -"U& c #E0E1B9", -"V& c #65643C", -"W& c #6C6940", -"X& c #F9FDC8", -"Y& c #788950", -"Z& c #EEF7CE", -"`& c #EFF7CF", -" * c #D3DEB4", -".* c #758F5A", -"+* c #C4D8A6", -"@* c #A3B686", -"#* c #758857", -"$* c #687B4B", -"%* c #506536", -"&* c #62703F", -"** c #6B7345", -"=* c #565F34", -"-* c #586739", -";* c #6A7A43", -">* c #75894F", -",* c #5D7340", -"'* c #60723E", -")* c #647345", -"!* c #485929", -"~* c #65753C", -"{* c #637541", -"]* c #4A572B", -"^* c #4E5B2F", -"/* c #687843", -"(* c #617340", -"_* c #74844B", -":* c #9CAD64", -"<* c #63773B", -"[* c #687332", -"}* c #8F9E4B", -"|* c #657230", -"1* c #889849", -"2* c #6B7A3E", -"3* c #F5F45A", -"4* c #E4D21B", -"5* c #E3D21B", -"6* c #E3D41B", -"7* c #E4D31D", -"8* c #E4CF1C", -"9* c #E3D01B", -"0* c #E2CC1A", -"a* c #E4CA1C", -"b* c #E3CC1C", -"c* c #E2CF1B", -"d* c #E1CF1B", -"e* c #E4CC1B", -"f* c #DDD31D", -"g* c #E1D31C", -"h* c #E6CB1D", -"i* c #DFAF32", -"j* c #AD702F", -"k* c #936534", -"l* c #8A6736", -"m* c #826536", -"n* c #786135", -"o* c #796436", -"p* c #786132", -"q* c #846736", -"r* c #846533", -"s* c #8A6834", -"t* c #987739", -"u* c #E8EA82", -"v* c #D0CC9F", -"w* c #D1D09F", -"x* c #949870", -"y* c #6C745C", -"z* c #70795D", -"A* c #B3B490", -"B* c #D0CCA0", -"C* c #D6D2A6", -"D* c #D4D2A5", -"E* c #D4D2A6", -"F* c #D3D2A6", -"G* c #DDDB97", -"H* c #EDF383", -"I* c #D0D8C2", -"J* c #CDD5BE", -"K* c #CFD7BF", -"L* c #D0D8C0", -"M* c #CED6BF", -"N* c #D2D8B3", -"O* c #ACAC7F", -"P* c #B7B68A", -"Q* c #A5A477", -"R* c #B7B68C", -"S* c #D4D3AB", -"T* c #C5C499", -"U* c #969669", -"V* c #D1D2A9", -"W* c #E3E5BD", -"X* c #E2E5BE", -"Y* c #E3E6BF", -"Z* c #D3D5A9", -"`* c #D8D9AE", -" = c #C9CA9E", -".= c #E4E4BC", -"+= c #CECFA3", -"@= c #CACC9E", -"#= c #D6D7AD", -"$= c #DCDDB3", -"%= c #6A6942", -"&= c #6E8051", -"*= c #798954", -"== c #F1F9CE", -"-= c #F4F6D1", -";= c #C4CEA3", -">= c #7A8C52", -",= c #D3E699", -"'= c #A9B674", -")= c #717D4F", -"!= c #626E46", -"~= c #5B693D", -"{= c #687949", -"]= c #5B6B3F", -"^= c #4F5D34", -"/= c #6E7D4B", -"(= c #536235", -"_= c #5A6C3E", -":= c #617343", -"<= c #435326", -"[= c #677945", -"}= c #687C42", -"|= c #627141", -"1= c #48552D", -"2= c #536434", -"3= c #697C46", -"4= c #415126", -"5= c #778949", -"6= c #5F7233", -"7= c #505E2C", -"8= c #BECC48", -"9= c #879548", -"0= c #617139", -"a= c #828D40", -"b= c #5F732F", -"c= c #5C703B", -"d= c #7D8340", -"e= c #E4D41D", -"f= c #E5D51E", -"g= c #E1D01A", -"h= c #E1CB1A", -"i= c #E2CC1B", -"j= c #E3CF1B", -"k= c #E4CD1B", -"l= c #E5CE1C", -"m= c #E4CD1D", -"n= c #E2D01E", -"o= c #E0CD1A", -"p= c #E5C624", -"q= c #D7AD2C", -"r= c #B16A33", -"s= c #9C6A2F", -"t= c #846730", -"u= c #726030", -"v= c #716438", -"w= c #716236", -"x= c #756135", -"y= c #796637", -"z= c #756333", -"A= c #7E6735", -"B= c #856936", -"C= c #947739", -"D= c #F7FC6A", -"E= c #D0CFA1", -"F= c #D3CEA3", -"G= c #D0CF9E", -"H= c #D3CCA1", -"I= c #949770", -"J= c #B2B490", -"K= c #D1CCA3", -"L= c #D4D0A6", -"M= c #D5D1A6", -"N= c #D4D2A7", -"O= c #D2D0A5", -"P= c #D3D1A6", -"Q= c #DEDC96", -"R= c #F2F879", -"S= c #D0D6BE", -"T= c #CDD4BC", -"U= c #D4DBB2", -"V= c #B0B084", -"W= c #B0AF83", -"X= c #B5B489", -"Y= c #C4C396", -"Z= c #A8A77D", -"`= c #A8A77E", -" - c #E3E4BE", -".- c #E1E3BA", -"+- c #D9DBB1", -"@- c #E3E5BE", -"#- c #E3E5BC", -"$- c #D8D9AD", -"%- c #C4C59C", -"&- c #BFC094", -"*- c #BCBD93", -"=- c #E6E7BF", -"-- c #686741", -";- c #F7FE85", -">- c #6E8757", -",- c #687F50", -"'- c #738656", -")- c #E5F6CB", -"!- c #EFFCD8", -"~- c #ADBC94", -"{- c #859C63", -"]- c #B2CE8B", -"^- c #72864F", -"/- c #69794C", -"(- c #54643B", -"_- c #57673B", -":- c #677847", -"<- c #49572B", -"[- c #4D582E", -"}- c #687B49", -"|- c #414F24", -"1- c #68794A", -"2- c #5F7242", -"3- c #576A3A", -"4- c #677C45", -"5- c #647542", -"6- c #495629", -"7- c #4A582D", -"8- c #5A6D3B", -"9- c #617345", -"0- c #4D5B2E", -"a- c #687845", -"b- c #5B6C3C", -"c- c #687C3E", -"d- c #9DA95D", -"e- c #596734", -"f- c #6E813A", -"g- c #6B7343", -"h- c #62763F", -"i- c #7E8339", -"j- c #ADB64A", -"k- c #617435", -"l- c #E4CF1D", -"m- c #E3D21C", -"n- c #E5D01B", -"o- c #E3CD1B", -"p- c #E4CE1B", -"q- c #E1CA1A", -"r- c #E2CE1C", -"s- c #E5CC1C", -"t- c #E7C828", -"u- c #E1B133", -"v- c #AC6F2D", -"w- c #936138", -"x- c #81663B", -"y- c #7A6733", -"z- c #746430", -"A- c #6F6031", -"B- c #726334", -"C- c #756535", -"D- c #776332", -"E- c #7E6432", -"F- c #876533", -"G- c #B39D56", -"H- c #CFCC9F", -"I- c #D0CEA0", -"J- c #CFCDA0", -"K- c #D3CCA2", -"L- c #D4D0A2", -"M- c #939771", -"N- c #6B735A", -"O- c #D0CCA3", -"P- c #D2D1A6", -"Q- c #D3D2A7", -"R- c #D5D3A8", -"S- c #E0DF91", -"T- c #CDD3BC", -"U- c #CCD2BC", -"V- c #BDBE91", -"W- c #B1B285", -"X- c #A8A97C", -"Y- c #A7A87D", -"Z- c #AFB087", -"`- c #E5E5BD", -" ; c #DDDFB6", -".; c #D0D0A5", -"+; c #D3D5AB", -"@; c #D1D3AA", -"#; c #E3E5BF", -"$; c #D7D9AF", -"%; c #9FA174", -"&; c #8B8C63", -"*; c #E2E3B9", -"=; c #D4D5AC", -"-; c #B4B48C", -";; c #6A6842", -">; c #6E6C41", -",; c #7D8F5D", -"'; c #748653", -"); c #6D814D", -"!; c #70824E", -"~; c #6F8354", -"{; c #5F774B", -"]; c #6E8151", -"^; c #778954", -"/; c #59713F", -"(; c #687D51", -"_; c #707F50", -":; c #505E33", -"<; c #607043", -"[; c #71804E", -"}; c #4F5C30", -"|; c #4D5B2F", -"1; c #677948", -"2; c #677648", -"3; c #4B5B2F", -"4; c #60733F", -"5; c #506131", -"6; c #687C48", -"7; c #627942", -"8; c #445225", -"9; c #5F7041", -"0; c #667746", -"a; c #47572E", -"b; c #687742", -"c; c #616E40", -"d; c #455529", -"e; c #61743F", -"f; c #546437", -"g; c #586936", -"h; c #627338", -"i; c #4F6128", -"j; c #6D7E42", -"k; c #768638", -"l; c #626D3C", -"m; c #5C6A38", -"n; c #AFB64C", -"o; c #E5D426", -"p; c #E5D41D", -"q; c #E3D31D", -"r; c #E0CA1A", -"s; c #DFC91A", -"t; c #E2CA1A", -"u; c #E2CD1B", -"v; c #E2CF1C", -"w; c #E1CE1D", -"x; c #E2D11E", -"y; c #E6C91D", -"z; c #DDB02F", -"A; c #AC6F32", -"B; c #986538", -"C; c #846636", -"D; c #76642F", -"E; c #756533", -"F; c #746435", -"G; c #716133", -"H; c #786636", -"I; c #7D6433", -"J; c #8D6D3E", -"K; c #CFCC9E", -"L; c #CDCA9D", -"M; c #CDCC9E", -"N; c #CBCB9D", -"O; c #D0D0A2", -"P; c #D1CEA1", -"Q; c #D0CF9F", -"R; c #D3CCA3", -"S; c #D2CEA0", -"T; c #959872", -"U; c #6B735B", -"V; c #71785E", -"W; c #AEB18C", -"X; c #D2CFA4", -"Y; c #D6D5AA", -"Z; c #D1D2A6", -"`; c #CDCEA2", -" > c #D0D1A5", -".> c #CDCCA1", -"+> c #D1D0A5", -"@> c #EBEE81", -"#> c #D1D9B4", -"$> c #CFD6BF", -"%> c #CDD3BD", -"&> c #BEBF93", -"*> c #BDBC91", -"=> c #CECFA5", -"-> c #DEDEB6", -";> c #D6D6AE", -">> c #D9DBB3", -",> c #D6D8AF", -"'> c #D4D6AC", -")> c #C3C499", -"!> c #B8B88B", -"~> c #B6B688", -"{> c #ABAB7E", -"]> c #C6C79B", -"^> c #BDBE94", -"/> c #BBBC8F", -"(> c #DFE1B6", -"_> c #D3D5AC", -":> c #CDCFA6", -"<> c #E2E4B9", -"[> c #D6D8AB", -"}> c #7B7C52", -"|> c #D8D9AF", -"1> c #BBBC91", -"2> c #B4B68B", -"3> c #DCDEB5", -"4> c #64653B", -"5> c #65633E", -"6> c #D9E266", -"7> c #728950", -"8> c #748751", -"9> c #7E8A54", -"0> c #718451", -"a> c #6E8553", -"b> c #7B8954", -"c> c #506035", -"d> c #6B7A4B", -"e> c #717F4D", -"f> c #526133", -"g> c #687646", -"h> c #667643", -"i> c #545F33", -"j> c #5A693C", -"k> c #506033", -"l> c #647742", -"m> c #62723D", -"n> c #627540", -"o> c #4A572D", -"p> c #455425", -"q> c #445324", -"r> c #536436", -"s> c #4A5B2C", -"t> c #647545", -"u> c #505F36", -"v> c #4A5B29", -"w> c #5F6E3B", -"x> c #48562C", -"y> c #596A44", -"z> c #67783C", -"A> c #4F6131", -"B> c #627633", -"C> c #748245", -"D> c #AAA32D", -"E> c #E3CE1C", -"F> c #E5CD1A", -"G> c #E4D01C", -"H> c #E2D01C", -"I> c #E2D11C", -"J> c #E2C91B", -"K> c #E4CA1D", -"L> c #E4CC1C", -"M> c #E4CE1D", -"N> c #E5D220", -"O> c #DFCB1A", -"P> c #E4CC1F", -"Q> c #E3B930", -"R> c #AD7029", -"S> c #986A3B", -"T> c #7E6739", -"U> c #7A6739", -"V> c #735F30", -"W> c #786638", -"X> c #796739", -"Y> c #7D6435", -"Z> c #B7AA7B", -"`> c #CECB9D", -" , c #D3D2A3", -"., c #CECEA0", -"+, c #CACA9C", -"@, c #D3CDA5", -"#, c #969973", -"$, c #697059", -"%, c #6F765D", -"&, c #B3B592", -"*, c #D0CFA4", -"=, c #D2D3A7", -"-, c #D0D3A6", -";, c #CACCA0", -">, c #CAC99D", -",, c #D4D3A8", -"', c #DEE49D", -"), c #D2D8C2", -"!, c #CDD5BD", -"~, c #CFD5BC", -"{, c #DFE1BA", -"], c #D6D8AD", -"^, c #D8DAB0", -"/, c #CBCCA0", -"(, c #CAC99E", -"_, c #C9C89D", -":, c #CBCA9F", -"<, c #C4C397", -"[, c #D9D8AD", -"}, c #C8C79C", -"|, c #C6C59A", -"1, c #B3B287", -"2, c #C4C398", -"3, c #BDBC92", -"4, c #D5D7AC", -"5, c #CACB9F", -"6, c #D2D3A9", -"7, c #ABAB81", -"8, c #77764C", -"9, c #DADCB3", -"0, c #D3D3A9", -"a, c #E2E3BE", -"b, c #86865B", -"c, c #65623E", -"d, c #81965F", -"e, c #657C4D", -"f, c #718C54", -"g, c #728857", -"h, c #778553", -"i, c #6B7F4C", -"j, c #637E4D", -"k, c #6B804F", -"l, c #7B8C5A", -"m, c #516138", -"n, c #768458", -"o, c #5A6F42", -"p, c #738557", -"q, c #687948", -"r, c #535D30", -"s, c #566737", -"t, c #647748", -"u, c #4A5A2D", -"v, c #536537", -"w, c #657846", -"x, c #586436", -"y, c #5A6D39", -"z, c #5F703F", -"A, c #455026", -"B, c #4B5E30", -"C, c #49572D", -"D, c #48582F", -"E, c #69794E", -"F, c #4D582D", -"G, c #4E5E32", -"H, c #50652E", -"I, c #7D8C48", -"J, c #69773B", -"K, c #5F6830", -"L, c #E5CD1C", -"M, c #E5CF1C", -"N, c #E3CD1A", -"O, c #E3D01C", -"P, c #E4CE1C", -"Q, c #E2C81A", -"R, c #E2C61A", -"S, c #E0C61A", -"T, c #E2CA1C", -"U, c #E3CD1D", -"V, c #E2CC1D", -"W, c #E2CB1D", -"X, c #E4D01A", -"Y, c #E5CC1E", -"Z, c #E2B82E", -"`, c #A96F24", -" ' c #8F6535", -".' c #7E6438", -"+' c #776334", -"@' c #7B6738", -"#' c #968454", -"$' c #D1CDA1", -"%' c #D0CDA1", -"&' c #CECDA1", -"*' c #CFCFA3", -"=' c #CBC9A0", -"-' c #7B7951", -";' c #716E46", -">' c #817E56", -",' c #747349", -"'' c #C1C095", -")' c #D1CDA3", -"!' c #D3CDA4", -"~' c #949872", -"{' c #677057", -"]' c #6F775C", -"^' c #AEB08E", -"/' c #D3D2A9", -"(' c #D2D2A9", -"_' c #CFD2A5", -":' c #D0D2A5", -"<' c #8D8E60", -"[' c #99996D", -"}' c #BDBB8F", -"|' c #A9A678", -"1' c #AEAA7D", -"2' c #D2D0A4", -"3' c #D3D1A5", -"4' c #E2E2BA", -"5' c #C7C99E", -"6' c #CACCA1", -"7' c #CACBA2", -"8' c #CDCDA5", -"9' c #D5D5AD", -"0' c #CCCCA4", -"a' c #CDCEA6", -"b' c #BEBF94", -"c' c #C2C399", -"d' c #D1D2A8", -"e' c #C4C59A", -"f' c #C7C89A", -"g' c #BEBF91", -"h' c #DCDEB3", -"i' c #C7C89C", -"j' c #747648", -"k' c #BFC095", -"l' c #DEDFB5", -"m' c #64623D", -"n' c #DBF0B5", -"o' c #9FB680", -"p' c #6A8056", -"q' c #6E8A55", -"r' c #6E8557", -"s' c #768554", -"t' c #6C7F4D", -"u' c #698454", -"v' c #6D8351", -"w' c #70814E", -"x' c #4A5A31", -"y' c #6D7D51", -"z' c #62763E", -"A' c #778F4E", -"B' c #71864C", -"C' c #657347", -"D' c #4C5630", -"E' c #607244", -"F' c #6A7D4D", -"G' c #637645", -"H' c #647741", -"I' c #7E8F4A", -"J' c #828F51", -"K' c #4D5D30", -"L' c #465A31", -"M' c #657648", -"N' c #535D31", -"O' c #596835", -"P' c #4A652F", -"Q' c #4E5E2A", -"R' c #A8B573", -"S' c #4B5729", -"T' c #627340", -"U' c #596A38", -"V' c #566434", -"W' c #5A6534", -"X' c #627336", -"Y' c #546032", -"Z' c #637038", -"`' c #C9B323", -" ) c #E4C81B", -".) c #E4CB1B", -"+) c #E5CC1D", -"@) c #E5D01D", -"#) c #E1C91A", -"$) c #E3C81B", -"%) c #E2C51A", -"&) c #E1C71A", -"*) c #E0C81A", -"=) c #E3C91C", -"-) c #E2CC1C", -";) c #E5C81A", -">) c #E2B32D", -",) c #A56B29", -"') c #8F6331", -")) c #846535", -"!) c #7C6434", -"~) c #776233", -"{) c #C1B98B", -"]) c #CECA9E", -"^) c #CECFA1", -"/) c #8D8E65", -"() c #A3A17A", -"_) c #E0DEB9", -":) c #E8E7C2", -"<) c #D5D6AD", -"[) c #8A8C62", -"}) c #C5C79A", -"|) c #D0CEA3", -"1) c #D2CCA5", -"2) c #969A73", -"3) c #667055", -"4) c #6B7357", -"5) c #B0B38E", -"6) c #D2D2A8", -"7) c #A3A678", -"8) c #9C9E70", -"9) c #DCDEB4", -"0) c #E5E7BD", -"a) c #E7E8BC", -"b) c #999A6D", -"c) c #BEBE92", -"d) c #D4D1A6", -"e) c #CCD4BC", -"f) c #DADEBD", -"g) c #E1E4BD", -"h) c #D3D5AD", -"i) c #D9DCB3", -"j) c #E1E4BC", -"k) c #DEE0B7", -"l) c #CED0A7", -"m) c #DCDBB0", -"n) c #DAD9AF", -"o) c #D3D3A8", -"p) c #D6D8AC", -"q) c #CFD0A4", -"r) c #DFE1B5", -"s) c #E2E2BB", -"t) c #E4E4BE", -"u) c #E3E3BF", -"v) c #E1E2B7", -"w) c #B4B689", -"x) c #BDBF91", -"y) c #E1E0B5", -"z) c #DCDBAF", -"A) c #68663F", -"B) c #64623C", -"C) c #DCE062", -"D) c #C4DB9C", -"E) c #A2B879", -"F) c #6A7F52", -"G) c #6E8A54", -"H) c #698251", -"I) c #758654", -"J) c #697A49", -"K) c #698154", -"L) c #6E8251", -"M) c #6B7D49", -"N) c #67774A", -"O) c #697E3F", -"P) c #819A54", -"Q) c #64783E", -"R) c #657349", -"S) c #637445", -"T) c #546735", -"U) c #64763C", -"V) c #AEBA77", -"W) c #626F35", -"X) c #6C7B4E", -"Y) c #4A582C", -"Z) c #5F6D2D", -"`) c #707C45", -" ! c #818C34", -".! c #B7BB48", -"+! c #CDC94F", -"@! c #B3B74A", -"#! c #6B7C33", -"$! c #62793E", -"%! c #5F7336", -"&! c #6E7E45", -"*! c #7C8438", -"=! c #C1BE4E", -"-! c #C4C04B", -";! c #ABAC44", -">! c #BBBD49", -",! c #E2BE49", -"'! c #E2C042", -")! c #E1C036", -"!! c #E2C330", -"~! c #E2CC21", -"{! c #E3CC20", -"]! c #E5CF20", -"^! c #E3CD1C", -"/! c #E3C91D", -"(! c #E3C91B", -"_! c #E3C81A", -":! c #E3C91A", -"~ c #485626", -",~ c #939F5D", -"'~ c #8B9456", -")~ c #677B39", -"!~ c #B9C45A", -"~~ c #E0D94B", -"{~ c #E1D947", -"]~ c #B6B948", -"^~ c #81943C", -"/~ c #6E7C3A", -"(~ c #898D3C", -"_~ c #8B9440", -":~ c #A6B34C", -"<~ c #D6D451", -"[~ c #DED84B", -"}~ c #D6D861", -"|~ c #DFB973", -"1~ c #E1B376", -"2~ c #DDAE70", -"3~ c #DFB06D", -"4~ c #DEB065", -"5~ c #DCB164", -"6~ c #E2B762", -"7~ c #E6BD5A", -"8~ c #E0BC46", -"9~ c #E2C23C", -"0~ c #E2C433", -"a~ c #E2C828", -"b~ c #E4C924", -"c~ c #E5CB21", -"d~ c #E0C81C", -"e~ c #DEC61B", -"f~ c #E3CB1C", -"g~ c #E2C71A", -"h~ c #E1C31A", -"i~ c #E4C61D", -"j~ c #E4C61E", -"k~ c #E2C41D", -"l~ c #E5C71A", -"m~ c #E4C91A", -"n~ c #E2C61D", -"o~ c #E6B92C", -"p~ c #B16A26", -"q~ c #946537", -"r~ c #C1B889", -"s~ c #CBC99A", -"t~ c #C5C596", -"u~ c #8A8D60", -"v~ c #A2A87D", -"w~ c #A1AA81", -"x~ c #CAD3AB", -"y~ c #CDD3AD", -"z~ c #71764E", -"A~ c #B9BC93", -"B~ c #D0CCA1", -"C~ c #CFCDA2", -"D~ c #D1CCA5", -"E~ c #979B74", -"F~ c #677056", -"G~ c #687054", -"H~ c #CFCD9F", -"I~ c #96986A", -"J~ c #83885E", -"K~ c #939B76", -"L~ c #A2AD8C", -"M~ c #879573", -"N~ c #626C48", -"O~ c #ACB189", -"P~ c #D0CFA5", -"Q~ c #D6D0A5", -"R~ c #D0D3BA", -"S~ c #D0D5C0", -"T~ c #D1D6C1", -"U~ c #D2D7C2", -"V~ c #CED5BC", -"W~ c #CFD6BE", -"X~ c #CED8BF", -"Y~ c #CDD8BF", -"Z~ c #CFD7BE", -"`~ c #D0D5BD", -" { c #D0D4BE", -".{ c #CCD3BB", -"+{ c #CDD4BF", -"@{ c #CAD5BC", -"#{ c #CBD5BD", -"${ c #CAD3BB", -"%{ c #CAD2BA", -"&{ c #D2D5B3", -"*{ c #A09F74", -"={ c #939166", -"-{ c #D3D3AC", -";{ c #DDDFB7", -">{ c #E0E3BB", -",{ c #C6C698", -"'{ c #A2A176", -"){ c #A4A378", -"!{ c #B0B185", -"~{ c #98976C", -"{{ c #B3B288", -"]{ c #CECEA4", -"^{ c #E2E3B8", -"/{ c #DFE0B7", -"({ c #B9BA8F", -"_{ c #B1B388", -":{ c #8B8C62", -"<{ c #7C7B50", -"[{ c #878659", -"}{ c #65643D", -"|{ c #ECF067", -"1{ c #6F835C", -"2{ c #84995A", -"3{ c #869F5F", -"4{ c #6E7F54", -"5{ c #6D8857", -"6{ c #627C46", -"7{ c #808E5C", -"8{ c #728054", -"9{ c #4D5E34", -"0{ c #728355", -"a{ c #6E8050", -"b{ c #566139", -"c{ c #6B7E50", -"d{ c #6F7D51", -"e{ c #4F5E36", -"f{ c #546439", -"g{ c #667148", -"h{ c #596F3E", -"i{ c #677644", -"j{ c #6D743E", -"k{ c #4E5C2A", -"l{ c #6A7C51", -"m{ c #636F37", -"n{ c #5D6428", -"o{ c #71793C", -"p{ c #768135", -"q{ c #849247", -"r{ c #889747", -"s{ c #B2BC59", -"t{ c #BEC34B", -"u{ c #B5BB4B", -"v{ c #9FB352", -"w{ c #B0BC5B", -"x{ c #BBB949", -"y{ c #A9AF47", -"z{ c #8D9145", -"A{ c #8E9245", -"B{ c #C2C863", -"C{ c #D3E294", -"D{ c #E2B173", -"E{ c #E0AE74", -"F{ c #E0AB76", -"G{ c #E1AA77", -"H{ c #E2AC76", -"I{ c #E0AA7A", -"J{ c #DFA778", -"K{ c #DBA471", -"L{ c #DCA772", -"M{ c #E1AE76", -"N{ c #E2B276", -"O{ c #DCAE70", -"P{ c #DFB06C", -"Q{ c #DFB563", -"R{ c #E5BD5A", -"S{ c #E6C350", -"T{ c #E5C345", -"U{ c #E5C93C", -"V{ c #E1CA2D", -"W{ c #E1CA2A", -"X{ c #E1C926", -"Y{ c #DFCC20", -"Z{ c #DECC1D", -"`{ c #E0CA1E", -" ] c #DFCA1B", -".] c #E1CA1B", -"+] c #E2C91D", -"@] c #E5C81D", -"#] c #E5CC22", -"$] c #E4CE21", -"%] c #E1CC1C", -"&] c #DFC91B", -"*] c #E0C71D", -"=] c #DEC51B", -"-] c #E6AA2D", -";] c #B77740", -">] c #CFCB9F", -",] c #D1CD9F", -"'] c #C8C698", -")] c #93956A", -"!] c #8B9269", -"~] c #868F69", -"{] c #97A17C", -"]] c #858D68", -"^] c #727652", -"/] c #C4C69F", -"(] c #CFCDA1", -"_] c #D1CBA4", -":] c #939871", -"<] c #656F54", -"[] c #6B7358", -"}] c #A9AB88", -"|] c #D1CE9F", -"1] c #70754C", -"2] c #697350", -"3] c #667151", -"4] c #697454", -"5] c #6E7451", -"6] c #C1C39B", -"7] c #D6D0A3", -"8] c #D5CFA6", -"9] c #CFD4BF", -"0] c #D0D6C1", -"a] c #D0D6C0", -"b] c #D1D5BF", -"c] c #D0D3BC", -"d] c #D2D5BF", -"e] c #CFD5C0", -"f] c #CDD7C0", -"g] c #C8D6BD", -"h] c #C8D5BC", -"i] c #CDD6BC", -"j] c #CCD5BB", -"k] c #CDD5BC", -"l] c #CBD5BC", -"m] c #C2D2BB", -"n] c #BDD1BC", -"o] c #DBDCB2", -"p] c #A4A476", -"q] c #959469", -"r] c #737248", -"s] c #CBCAA2", -"t] c #9C9C6F", -"u] c #8C8B61", -"v] c #B0AF84", -"w] c #D4D5AB", -"x] c #BEBE91", -"y] c #C7C69A", -"z] c #C5C699", -"A] c #939266", -"B] c #AEAD82", -"C] c #B1B083", -"D] c #9B9B6D", -"E] c #C1C195", -"F] c #DADDB3", -"G] c #E5E6BE", -"H] c #6E6D43", -"I] c #C9C99B", -"J] c #CFCEA4", -"K] c #C7C79A", -"L] c #B2B385", -"M] c #737247", -"N] c #909061", -"O] c #686641", -"P] c #65633C", -"Q] c #B3C397", -"R] c #7B8E59", -"S] c #8BA762", -"T] c #6B7E4B", -"U] c #658452", -"V] c #96B686", -"W] c #728354", -"X] c #718154", -"Y] c #56663B", -"Z] c #6C7B4C", -"`] c #6A7C4C", -" ^ c #535B33", -".^ c #677C4D", -"+^ c #646F43", -"@^ c #54673C", -"#^ c #687D4C", -"$^ c #5C6F3C", -"%^ c #7A8C4C", -"&^ c #6E804B", -"*^ c #617846", -"=^ c #717F42", -"-^ c #A6AB40", -";^ c #81864B", -">^ c #6B7430", -",^ c #AEB651", -"'^ c #C1CA70", -")^ c #7E8648", -"!^ c #768043", -"~^ c #69713D", -"{^ c #747A39", -"]^ c #A6A450", -"^^ c #BEB966", -"/^ c #8D8F3A", -"(^ c #7F863C", -"_^ c #7E8245", -":^ c #A2A64A", -"<^ c #BDC368", -"[^ c #E2E05B", -"}^ c #EADD45", -"|^ c #D9D04E", -"1^ c #D2C37A", -"2^ c #E0AB70", -"3^ c #E1AA6E", -"4^ c #DFA66E", -"5^ c #DFA66F", -"6^ c #E0A76E", -"7^ c #E0A872", -"8^ c #E6AD77", -"9^ c #DEA470", -"0^ c #DFA670", -"a^ c #E6B17A", -"b^ c #E2AF77", -"c^ c #DEAA76", -"d^ c #DEAB79", -"e^ c #DDAB79", -"f^ c #E2B27C", -"g^ c #D7A870", -"h^ c #E2B47A", -"i^ c #D8AB70", -"j^ c #DBAF6F", -"k^ c #DCB26A", -"l^ c #E0B765", -"m^ c #E6C060", -"n^ c #E5C357", -"o^ c #E6C752", -"p^ c #E5C646", -"q^ c #E5C83F", -"r^ c #E2C735", -"s^ c #E1C82D", -"t^ c #DFC926", -"u^ c #DFCB1E", -"v^ c #E0CD1B", -"w^ c #E2CE1B", -"x^ c #E3C21A", -"y^ c #E1BB1A", -"z^ c #E2B81D", -"A^ c #E1B71D", -"B^ c #D0B573", -"C^ c #D0CC9D", -"D^ c #CBC99D", -"E^ c #AEB187", -"F^ c #898F68", -"G^ c #8D9570", -"H^ c #848D69", -"I^ c #717855", -"J^ c #B0B390", -"K^ c #CACAA6", -"L^ c #D2CCA6", -"M^ c #959973", -"N^ c #6A7256", -"O^ c #A7A987", -"P^ c #CFCDA3", -"Q^ c #D4CFA2", -"R^ c #D2CFA0", -"S^ c #A2A57C", -"T^ c #757C58", -"U^ c #6F7655", -"V^ c #787C5A", -"W^ c #B5B691", -"X^ c #D2CEA4", -"Y^ c #D8D2A5", -"Z^ c #D8D1A2", -"`^ c #D3D2AE", -" / c #CED3BE", -"./ c #CED4BE", -"+/ c #CCD5BF", -"@/ c #CDD1BA", -"#/ c #C8D2B9", -"$/ c #C6D2BA", -"%/ c #C1CEB9", -"&/ c #BBCBB8", -"*/ c #B1C9B6", -"=/ c #A2C5B3", -"-/ c #93C0AF", -";/ c #828157", -">/ c #9A996E", -",/ c #9F9E74", -"'/ c #E1E1BA", -")/ c #E1E3BC", -"!/ c #DCDDB4", -"~/ c #9F9D70", -"{/ c #949267", -"]/ c #D2CFA5", -"^/ c #A3A479", -"// c #85855A", -"(/ c #939267", -"_/ c #B2B085", -":/ c #A1A074", -"( c #DFB367", -",( c #DFB660", -"'( c #E4BE56", -")( c #E6C354", -"!( c #E3C248", -"~( c #E5C63F", -"{( c #E2C532", -"]( c #DFC125", -"^( c #DCC01D", -"/( c #E2C31A", -"(( c #D2C790", -"_( c #CBC69A", -":( c #C7C89E", -"<( c #B5B891", -"[( c #A1A480", -"}( c #A2A783", -"|( c #BDC09B", -"1( c #CACAA5", -"2( c #CECCA6", -"3( c #D1CDA2", -"4( c #D0CAA3", -"5( c #999C76", -"6( c #6D755A", -"7( c #CECCA2", -"8( c #D3CDA3", -"9( c #D0CD9F", -"0( c #C4C6A0", -"a( c #C0C19C", -"b( c #CDCBA4", -"c( c #D4CEA3", -"d( c #D7D2A3", -"e( c #D0D4BB", -"f( c #CDD5BB", -"g( c #CDD6BB", -"h( c #CDD2BC", -"i( c #C8CFBA", -"j( c #C6D1BF", -"k( c #BCCFBC", -"l( c #AFCBB9", -"m( c #A5C7B4", -"n( c #96C3B1", -"o( c #88BAAB", -"p( c #7DB3A6", -"q( c #74AFA3", -"r( c #99A37C", -"s( c #8D8C60", -"t( c #8D8B60", -"u( c #B1B086", -"v( c #99986D", -"w( c #B6B888", -"x( c #AEAD80", -"y( c #A3A376", -"z( c #9C9A71", -"A( c #E1E1BB", -"B( c #E0E1BA", -"C( c #CCCBA0", -"D( c #BBB98F", -"E( c #CACA9D", -"F( c #B7BA8C", -"G( c #C7C69B", -"H( c #B1B283", -"I( c #A0A176", -"J( c #67663E", -"K( c #D0D35E", -"L( c #E7F6CE", -"M( c #E1F6CF", -"N( c #778959", -"O( c #E3F6D4", -"P( c #BFD4A6", -"Q( c #748758", -"R( c #72855A", -"S( c #6E804E", -"T( c #59673C", -"U( c #6B7C4C", -"V( c #586139", -"W( c #5C673C", -"X( c #627644", -"Y( c #68773B", -"Z( c #BCCF57", -"`( c #697536", -" _ c #6C7640", -"._ c #68733F", -"+_ c #858A48", -"@_ c #80833F", -"#_ c #686C3B", -"$_ c #4B5624", -"%_ c #596229", -"&_ c #ABB360", -"*_ c #BAC469", -"=_ c #99AA57", -"-_ c #99AD57", -";_ c #C5CF6A", -">_ c #CFDA7A", -",_ c #C8D371", -"'_ c #A9B564", -")_ c #A2AD4F", -"!_ c #C2C957", -"~_ c #E9F2C7", -"{_ c #EEF9CE", -"]_ c #D9DF83", -"^_ c #D0D87B", -"/_ c #BDCA76", -"(_ c #DDA46D", -"__ c #E2A772", -":_ c #E1A172", -"<_ c #DE9C72", -"[_ c #DD9E72", -"}_ c #E2A773", -"|_ c #E2AD79", -"1_ c #E3AA79", -"2_ c #E0A476", -"3_ c #E0A376", -"4_ c #E1A676", -"5_ c #D7A16D", -"6_ c #E2B078", -"7_ c #DCAA74", -"8_ c #DFAD7C", -"9_ c #DFAC7C", -"0_ c #DDAA79", -"a_ c #DEAC78", -"b_ c #E1B178", -"c_ c #DFB075", -"d_ c #DDAC74", -"e_ c #DEAC77", -"f_ c #DFAD77", -"g_ c #E2B179", -"h_ c #DFAD76", -"i_ c #E5A582", -"j_ c #E5A47F", -"k_ c #E4A67F", -"l_ c #DFA37C", -"m_ c #E3AA7E", -"n_ c #E0AA78", -"o_ c #DDA77D", -"p_ c #DCA87D", -"q_ c #DAA977", -"r_ c #D9B169", -"s_ c #E4BF6F", -"t_ c #D7AB61", -"u_ c #CE9356", -"v_ c #CDC89C", -"w_ c #CDC99D", -"x_ c #CDCAA0", -"y_ c #CACBA3", -"z_ c #CBCBA3", -"A_ c #CCCBA3", -"B_ c #D0CDA3", -"C_ c #CFCBA0", -"D_ c #CDCCA0", -"E_ c #9A9E78", -"F_ c #656E54", -"G_ c #A3A582", -"H_ c #D2CEA3", -"I_ c #D1CDA4", -"J_ c #D2D0A1", -"K_ c #D2CFA2", -"L_ c #D7D5A7", -"M_ c #D3D1A3", -"N_ c #D6D2A5", -"O_ c #D4D1A3", -"P_ c #D0D4BF", -"Q_ c #CED3BF", -"R_ c #CAD3BE", -"S_ c #C6D2BC", -"T_ c #BED0BA", -"U_ c #B2CCB6", -"V_ c #ABCAB7", -"W_ c #9CC2B1", -"X_ c #8DBCAE", -"Y_ c #7FB6A9", -"Z_ c #78B5A9", -"`_ c #73B4A9", -" : c #6EB2A8", -".: c #6BB1A9", -"+: c #68B0A9", -"@: c #9C9D71", -"#: c #8A895E", -"$: c #8E8C61", -"%: c #B8B88D", -"&: c #DFE1B8", -"*: c #DBDDB5", -"=: c #B4B58B", -"-: c #909063", -";: c #8B895E", -">: c #8A895C", -",: c #969469", -"': c #ADAB82", -"): c #B9B98B", -"!: c #BFBF91", -"~: c #C9C99C", -"{: c #D3D4A9", -"]: c #78784B", -"^: c #C5C597", -"/: c #AAA97C", -"(: c #7D7C53", -"_: c #67653F", -":: c #63613C", -"<: c #62613C", -"[: c #68663E", -"}: c #C3D38A", -"|: c #7B8E54", -"1: c #6E8056", -"2: c #DCF5C8", -"3: c #789262", -"4: c #6E8354", -"5: c #506039", -"6: c #6C7E50", -"7: c #667947", -"8: c #566439", -"9: c #516139", -"0: c #6A804E", -"a: c #566B3D", -"b: c #657649", -"c: c #849854", -"d: c #546230", -"e: c #5F663C", -"f: c #60682E", -"g: c #CCC86D", -"h: c #C7C063", -"i: c #6E7338", -"j: c #626E39", -"k: c #5C703C", -"l: c #A1B674", -"m: c #95A760", -"n: c #7A8848", -"o: c #6F8445", -"p: c #A7BD6D", -"q: c #CDDE80", -"r: c #D9DF73", -"s: c #D3D25D", -"t: c #CAD05E", -"u: c #AFC054", -"v: c #DFF3C2", -"w: c #E3F7BC", -"x: c #CAD47C", -"y: c #B8BE69", -"z: c #81864D", -"A: c #E1A471", -"B: c #E3A378", -"C: c #DF9E74", -"D: c #DDA171", -"E: c #E5AC76", -"F: c #E1AC71", -"G: c #DCA46E", -"H: c #DEA270", -"I: c #E0A273", -"J: c #DFA472", -"K: c #DFA772", -"L: c #DDAD70", -"M: c #DFAF73", -"N: c #E2B079", -"O: c #E2B07C", -"P: c #E0AE7A", -"Q: c #DDAC73", -"R: c #DFAD75", -"S: c #DDAD75", -"T: c #DDAA76", -"U: c #E3AF7C", -"V: c #E1AD76", -"W: c #E0AD75", -"X: c #D8A370", -"Y: c #DCA575", -"Z: c #DFA976", -"`: c #E0AD74", -" < c #DDAA74", -".< c #DFA777", -"+< c #E0A879", -"@< c #E2AA7A", -"#< c #E6AC82", -"$< c #B58379", -"%< c #7E6F74", -"&< c #D1CC9E", -"*< c #CFCA9E", -"=< c #CFCCA1", -"-< c #D0CB9D", -";< c #D2CD9F", -">< c #D2CCA1", -",< c #CECCA0", -"'< c #D0CBA3", -")< c #999D76", -"!< c #666F54", -"~< c #A5A784", -"{< c #CECA9F", -"]< c #D0CDA4", -"^< c #D1CFA5", -"/< c #D4D0A1", -"(< c #D3CDA0", -"_< c #D6D2A3", -":< c #D4D3A2", -"<< c #CECE9E", -"[< c #D7D6A9", -"}< c #D4D3A6", -"|< c #CDD2BD", -"1< c #CAD4BC", -"2< c #C9D2BC", -"3< c #C2D0BD", -"4< c #BACFBD", -"5< c #ABC8B7", -"6< c #A2C4B3", -"7< c #94BFAF", -"8< c #87B9AA", -"9< c #7CB3A6", -"0< c #74B0A6", -"a< c #70B2A9", -"b< c #70B3AB", -"c< c #6FB2AA", -"d< c #6FAFA8", -"e< c #70AFA9", -"f< c #6EB0A9", -"g< c #6DB1A9", -"h< c #CCCDA1", -"i< c #8D8C61", -"j< c #87855A", -"k< c #C5C59A", -"l< c #E2E4BF", -"m< c #8E8E60", -"n< c #A3A277", -"o< c #949369", -"p< c #BEBC95", -"q< c #D9DAB2", -"r< c #C3C394", -"s< c #B7B789", -"t< c #B1B184", -"u< c #BEBD8F", -"v< c #C3C395", -"w< c #C5C598", -"x< c #DDDEB6", -"y< c #D6D8AE", -"z< c #6B6A41", -"A< c #A1A173", -"B< c #706F45", -"C< c #78774E", -"D< c #65643E", -"E< c #F6FE77", -"F< c #CFE09E", -"G< c #B3C38A", -"H< c #6F8153", -"I< c #63784A", -"J< c #6A8051", -"K< c #6C804F", -"L< c #546239", -"M< c #6E7D4D", -"N< c #536136", -"O< c #6F8052", -"P< c #697650", -"Q< c #708045", -"R< c #6D7C4A", -"S< c #6E7F52", -"T< c #6C7A48", -"U< c #677142", -"V< c #535C2D", -"W< c #4A4F29", -"X< c #616435", -"Y< c #BEB96E", -"Z< c #C7C972", -"`< c #A5AE56", -" [ c #9EA556", -".[ c #637034", -"+[ c #67743C", -"@[ c #ABB966", -"#[ c #BAC260", -"$[ c #CDD576", -"%[ c #C1D074", -"&[ c #BCCB69", -"*[ c #D3D962", -"=[ c #D9D559", -"-[ c #DFDF70", -";[ c #CCD96A", -">[ c #B7CB62", -",[ c #B0BC6C", -"'[ c #A1A75D", -")[ c #889242", -"![ c #B6AF69", -"~[ c #DFA372", -"{[ c #DFA477", -"][ c #DEA571", -"^[ c #DEA66D", -"/[ c #DBA46B", -"([ c #DEA770", -"_[ c #E3AC76", -":[ c #E2AA76", -"<[ c #E1AA75", -"[[ c #E2AD76", -"}[ c #E2AF76", -"|[ c #E5B478", -"1[ c #DEAE73", -"2[ c #E3B279", -"3[ c #DEAB76", -"4[ c #E0AD77", -"5[ c #E2B379", -"6[ c #DFB377", -"7[ c #E1B177", -"8[ c #E0B279", -"9[ c #DEB178", -"0[ c #DDB076", -"a[ c #DFAE76", -"b[ c #DEA776", -"c[ c #DEAD79", -"d[ c #DFAD7B", -"e[ c #E0A779", -"f[ c #E0A878", -"g[ c #DCAA73", -"h[ c #E4AA7D", -"i[ c #E2A47B", -"j[ c #DEA172", -"k[ c #D79873", -"l[ c #BF8679", -"m[ c #856D71", -"n[ c #969384", -"o[ c #D0CDA2", -"p[ c #D0CEA2", -"q[ c #CFCB9E", -"r[ c #D0CCA2", -"s[ c #D3CAA5", -"t[ c #CFCF9F", -"u[ c #999E73", -"v[ c #666D51", -"w[ c #687058", -"x[ c #9FA684", -"y[ c #D1CFA4", -"z[ c #D2D1A5", -"A[ c #D0D0A3", -"B[ c #D3D4A6", -"C[ c #D1D2A3", -"D[ c #D6D3A5", -"E[ c #D6D3A6", -"F[ c #D3D3AE", -"G[ c #D0D5C1", -"H[ c #CFD4C0", -"I[ c #CCD4BE", -"J[ c #CED2BE", -"K[ c #CDD2BF", -"L[ c #CDD3BF", -"M[ c #C9D1BB", -"N[ c #C7D1BC", -"O[ c #C7D2BC", -"P[ c #BFCFB9", -"Q[ c #B2CCB5", -"R[ c #A9C8B3", -"S[ c #8FBBAD", -"T[ c #83B5A8", -"U[ c #80B7AB", -"V[ c #7CB6AC", -"W[ c #76B3AB", -"X[ c #73B3AD", -"Y[ c #6EB3AC", -"Z[ c #70B3AD", -"`[ c #72B2AD", -" } c #75B1AC", -".} c #6FADA4", -"+} c #73B1A6", -"@} c #78B2A6", -"#} c #7EB3A6", -"$} c #8B8B5D", -"%} c #CDCEA3", -"&} c #B1AF83", -"*} c #D6D5AD", -"=} c #DEDFB7", -"-} c #B6B78B", -";} c #DEE0B9", -">} c #BEC091", -",} c #C1C094", -"'} c #B7B78A", -")} c #C1C194", -"!} c #CDCEA0", -"~} c #D9DAAF", -"{} c #D3D5A8", -"]} c #888859", -"^} c #6B6942", -"/} c #656440", -"(} c #C2CC57", -"_} c #DCEDC9", -":} c #DBECCB", -"<} c #6D7E4D", -"[} c #718454", -"}} c #6B804D", -"|} c #6B7C4E", -"1} c #6B7949", -"2} c #576239", -"3} c #708053", -"4} c #5C6F3A", -"5} c #A2BA5D", -"6} c #667837", -"7} c #6F7D4B", -"8} c #586738", -"9} c #606837", -"0} c #75793D", -"a} c #5F6733", -"b} c #5B6233", -"c} c #969C4F", -"d} c #CED676", -"e} c #BACA72", -"f} c #A1B464", -"g} c #A2B365", -"h} c #84974B", -"i} c #BAC976", -"j} c #E2E891", -"k} c #E2E181", -"l} c #E5DE77", -"m} c #EBEA8E", -"n} c #CBDA7E", -"o} c #C3D062", -"p} c #DDE470", -"q} c #D1DA6D", -"r} c #CFDB7C", -"s} c #B0C163", -"t} c #A8B163", -"u} c #5C6629", -"v} c #6B7F47", -"w} c #B99F63", -"x} c #E0A570", -"y} c #DFA573", -"z} c #E0A775", -"A} c #E0AA71", -"B} c #E2AE71", -"C} c #DFAC6E", -"D} c #DFA872", -"E} c #E1A773", -"F} c #DEA670", -"G} c #E3AF76", -"H} c #DAAA6C", -"I} c #DDAD71", -"J} c #DDAD73", -"K} c #DFB076", -"L} c #DFB176", -"M} c #DEB377", -"N} c #DEB779", -"O} c #E2B97C", -"P} c #E5BC7F", -"Q} c #E1B97A", -"R} c #E0B777", -"S} c #E3B678", -"T} c #E0B176", -"U} c #E1B17A", -"V} c #E0AB7C", -"W} c #E2AA7C", -"X} c #E0B27E", -"Y} c #D9AA74", -"Z} c #D5A674", -"`} c #DD957E", -" | c #B77B7B", -".| c #6F6163", -"+| c #686A6F", -"@| c #B0AE91", -"#| c #CFCC9D", -"$| c #D0CD9E", -"%| c #CECDA0", -"&| c #CDCFA1", -"*| c #CDD1A0", -"=| c #999E76", -"-| c #656B51", -";| c #676E5A", -">| c #979F7F", -",| c #C3C69A", -"'| c #C7CA9E", -")| c #C5C99D", -"!| c #C8CCA0", -"~| c #C6CA9E", -"{| c #C4C79C", -"]| c #C4C79D", -"^| c #C4C89E", -"/| c #C2C79D", -"(| c #C1C69D", -"_| c #BFC49B", -":| c #C7CEB0", -"<| c #CDD3BE", -"[| c #CDD5C1", -"}| c #CCD4C0", -"|| c #C5D0BB", -"1| c #BFCEBA", -"2| c #B4CAB7", -"3| c #ABC9B7", -"4| c #9FC4B3", -"5| c #93BEAE", -"6| c #8CBCAE", -"7| c #81B6AB", -"8| c #7AB6AD", -"9| c #7AB9B0", -"0| c #7CB9B0", -"a| c #7EB9AD", -"b| c #7AB5AB", -"c| c #76B5AD", -"d| c #75B3AC", -"e| c #77B4AC", -"f| c #7DB5AB", -"g| c #7FB5A9", -"h| c #89B6A8", -"i| c #90B8A9", -"j| c #9EBEAC", -"k| c #A8BFA9", -"l| c #8A895D", -"m| c #949368", -"n| c #C8C9A0", -"o| c #CECFA4", -"p| c #BCBD90", -"q| c #A2A174", -"r| c #ACAB82", -"s| c #D5D7AE", -"t| c #D7DAAD", -"u| c #A5A779", -"v| c #D4D7AB", -"w| c #A5A476", -"x| c #ADAD7F", -"y| c #B7B689", -"z| c #D7D8AE", -"A| c #DADBB0", -"B| c #CFCFA7", -"C| c #ABAD82", -"D| c #747348", -"E| c #99A859", -"F| c #97AF85", -"G| c #9DB786", -"H| c #677A45", -"I| c #657548", -"J| c #708656", -"K| c #6C8251", -"L| c #627446", -"M| c #687747", -"N| c #58643B", -"O| c #68794B", -"P| c #586C38", -"Q| c #81945C", -"R| c #586636", -"S| c #5C653B", -"T| c #5B6433", -"U| c #626933", -"V| c #A2A95C", -"W| c #8D9449", -"X| c #848947", -"Y| c #A8B051", -"Z| c #C4D576", -"`| c #C9D987", -" 1 c #C3CF6A", -".1 c #98A442", -"+1 c #A5B866", -"@1 c #B4C981", -"#1 c #DFE7A2", -"$1 c #D7E088", -"%1 c #D9DB68", -"&1 c #E2E077", -"*1 c #D9E58D", -"=1 c #C4D279", -"-1 c #D6E386", -";1 c #CAD979", -">1 c #B7C66A", -",1 c #8D9E4F", -"'1 c #849151", -")1 c #626D3E", -"!1 c #5D6E3C", -"~1 c #C89D66", -"{1 c #DFA46D", -"]1 c #DEA471", -"^1 c #DEA671", -"/1 c #E1AA70", -"(1 c #DFAC70", -"_1 c #DEA672", -":1 c #E1A973", -"<1 c #E3AB75", -"[1 c #DFAA72", -"}1 c #E6B679", -"|1 c #E0B374", -"11 c #E0B273", -"21 c #E2B578", -"31 c #DFB677", -"41 c #E0B779", -"51 c #E1BA7C", -"61 c #E5BF7F", -"71 c #E1BC7F", -"81 c #E0BC81", -"91 c #DFBA7E", -"01 c #DBB679", -"a1 c #E2BD7E", -"b1 c #E1BA79", -"c1 c #E5BA7A", -"d1 c #DFB778", -"e1 c #DFB17A", -"f1 c #E2AC7C", -"g1 c #DCA773", -"h1 c #DAAB75", -"i1 c #DEB079", -"j1 c #DAA673", -"k1 c #DF9A7E", -"l1 c #BB7A7C", -"m1 c #775D6A", -"n1 c #65616D", -"o1 c #6A6773", -"p1 c #C1BF99", -"q1 c #CCCA9E", -"r1 c #C8C99E", -"s1 c #C9CA9F", -"t1 c #CACBA0", -"u1 c #C9C99F", -"v1 c #CACAA0", -"w1 c #C9C99E", -"x1 c #C2C79B", -"y1 c #C1C79A", -"z1 c #C1C89D", -"A1 c #C1C79C", -"B1 c #BEC59A", -"C1 c #BEC69B", -"D1 c #BDC39B", -"E1 c #BBC197", -"F1 c #B7C193", -"G1 c #B7C292", -"H1 c #B5BC94", -"I1 c #B7BD97", -"J1 c #B2B98F", -"K1 c #818966", -"L1 c #656A56", -"M1 c #686F5D", -"N1 c #687055", -"O1 c #7C8366", -"P1 c #7E8567", -"Q1 c #7B8365", -"R1 c #7B8164", -"S1 c #797F62", -"T1 c #767D61", -"U1 c #767E64", -"V1 c #747C61", -"W1 c #737B60", -"X1 c #717960", -"Y1 c #BFC5AE", -"Z1 c #D0D3C2", -"`1 c #D2D5C4", -" 2 c #D1D4C1", -".2 c #D0D2BA", -"+2 c #D1D3BC", -"@2 c #C9D2BD", -"#2 c #C6D2BF", -"$2 c #BFCFBC", -"%2 c #BACCB9", -"&2 c #AECBB6", -"*2 c #A4C7B3", -"=2 c #83B6A7", -"-2 c #7EB6A9", -";2 c #7CB6A9", -">2 c #7EB7AD", -",2 c #7BB6AD", -"'2 c #76B2A9", -")2 c #72B2A6", -"!2 c #71B0A6", -"~2 c #72B3A6", -"{2 c #74B3A5", -"]2 c #77B3A6", -"^2 c #7BB2A6", -"/2 c #7FB3A6", -"(2 c #89B6A9", -"_2 c #94BBAB", -":2 c #9DBBAA", -"<2 c #A4BDA9", -"[2 c #AEBFAD", -"}2 c #B2C0AD", -"|2 c #B7C1AC", -"12 c #9FA280", -"22 c #9C9A6F", -"32 c #B3B487", -"42 c #C4C399", -"52 c #9D9D70", -"62 c #A8A981", -"72 c #CBCDA5", -"82 c #D0D2A8", -"92 c #E0E3BA", -"02 c #AEAD7F", -"a2 c #B4B487", -"b2 c #C1C093", -"c2 c #C7C699", -"d2 c #CACC9D", -"e2 c #64643D", -"f2 c #63633F", -"g2 c #61613C", -"h2 c #62633C", -"i2 c #63643E", -"j2 c #798854", -"k2 c #718957", -"l2 c #A5C281", -"m2 c #8BA269", -"n2 c #546438", -"o2 c #627C4B", -"p2 c #5A653A", -"q2 c #5C6D3D", -"r2 c #6E7F4F", -"s2 c #566239", -"t2 c #687648", -"u2 c #616D35", -"v2 c #596036", -"w2 c #6A7637", -"x2 c #919A50", -"y2 c #717936", -"z2 c #717942", -"A2 c #9FA666", -"B2 c #B1B763", -"C2 c #D1D77C", -"D2 c #C4C654", -"E2 c #C7D26E", -"F2 c #D7DD6D", -"G2 c #CFC94E", -"H2 c #C1C353", -"I2 c #96A753", -"J2 c #C0D787", -"K2 c #D1E6AF", -"L2 c #D6F0BD", -"M2 c #A8BD75", -"N2 c #B2C171", -"O2 c #B4C46E", -"P2 c #C1D47C", -"Q2 c #C6D27F", -"R2 c #B3C06B", -"S2 c #8A9A51", -"T2 c #7B874D", -"U2 c #68733E", -"V2 c #646D34", -"W2 c #869142", -"X2 c #DFAA71", -"Y2 c #E0A471", -"Z2 c #E2A776", -"`2 c #E2A976", -" 3 c #E2AB74", -".3 c #DFAB72", -"+3 c #E1AC76", -"@3 c #E2AA78", -"#3 c #E1AA76", -"$3 c #E0A973", -"%3 c #E2B479", -"&3 c #DFB277", -"*3 c #E1B879", -"=3 c #DFBA7A", -"-3 c #DDBA79", -";3 c #DBB877", -">3 c #DEBB7C", -",3 c #E2BD85", -"'3 c #DEB97F", -")3 c #DCB97C", -"!3 c #DFBC7F", -"~3 c #E2BC7F", -"{3 c #DBB176", -"]3 c #DDB67A", -"^3 c #E2B27F", -"/3 c #DFA879", -"(3 c #D9A36E", -"_3 c #E4B177", -":3 c #DDAB75", -"<3 c #DB9579", -"[3 c #C78082", -"}3 c #7B646D", -"|3 c #625B66", -"13 c #645D64", -"23 c #5F6369", -"33 c #99A27D", -"43 c #9BA47D", -"53 c #9AA17E", -"63 c #989E7F", -"73 c #969C7C", -"83 c #959C7C", -"93 c #919878", -"03 c #909877", -"a3 c #8E9576", -"b3 c #8C9273", -"c3 c #8A9171", -"d3 c #869070", -"e3 c #84906F", -"f3 c #828F6D", -"g3 c #808C6C", -"h3 c #7F8B6B", -"i3 c #7E8A6A", -"j3 c #7B8769", -"k3 c #798566", -"l3 c #778363", -"m3 c #768263", -"n3 c #778364", -"o3 c #747A62", -"p3 c #6E7457", -"q3 c #61674E", -"r3 c #636959", -"s3 c #686E5E", -"t3 c #61684F", -"u3 c #5A614C", -"v3 c #59604B", -"w3 c #5C614D", -"x3 c #5A604B", -"y3 c #5C614C", -"z3 c #5C614B", -"A3 c #5B5F49", -"B3 c #5A5F48", -"C3 c #5A5E48", -"D3 c #CED2BC", -"E3 c #CED5C1", -"F3 c #C6D4BC", -"G3 c #C2D0BB", -"H3 c #BDCCB9", -"I3 c #B4C7B8", -"J3 c #A9C6B7", -"K3 c #99C0B1", -"L3 c #8DBBAD", -"M3 c #81B6A9", -"N3 c #7EB6AC", -"O3 c #7AB4AD", -"P3 c #78B4AD", -"Q3 c #7BB5A8", -"R3 c #75B1A3", -"S3 c #6EB1A6", -"T3 c #70ADA0", -"U3 c #7AAF9F", -"V3 c #86B4A4", -"W3 c #8DB7A8", -"X3 c #8EB5A8", -"Y3 c #93B9AA", -"Z3 c #96BAA9", -"`3 c #9FBEAC", -" 4 c #AAC3AF", -".4 c #B1C3AD", -"+4 c #BBC5AD", -"@4 c #C1C6AD", -"#4 c #BEC4AB", -"$4 c #BBC0A5", -"%4 c #7E7F54", -"&4 c #C1BF95", -"*4 c #BFBE93", -"=4 c #DDDEB4", -"-4 c #B7B88C", -";4 c #CBCCA3", -">4 c #D2D4A9", -",4 c #B7B98D", -"'4 c #C3C399", -")4 c #D6D7AB", -"!4 c #BBBB8D", -"~4 c #BCBB91", -"{4 c #BEC092", -"]4 c #909062", -"^4 c #A7A779", -"/4 c #C6C697", -"(4 c #BEBE90", -"_4 c #A2A173", -":4 c #9C9B6D", -"<4 c #B2B284", -"[4 c #BDBC8E", -"}4 c #DDE0B8", -"|4 c #BABC8D", -"14 c #CBCC9D", -"24 c #686941", -"34 c #64623F", -"44 c #666341", -"54 c #65613D", -"64 c #64613D", -"74 c #6E824D", -"84 c #6B8152", -"94 c #758C57", -"04 c #657C47", -"a4 c #6F8554", -"b4 c #5F6B42", -"c4 c #6B8555", -"d4 c #576A3F", -"e4 c #697F4F", -"f4 c #56693A", -"g4 c #5B6C3B", -"h4 c #748048", -"i4 c #687936", -"j4 c #C9D06D", -"k4 c #A0AD5C", -"l4 c #8E9849", -"m4 c #A4AA55", -"n4 c #D6DF85", -"o4 c #EAEA97", -"p4 c #F4EA68", -"q4 c #EFE45C", -"r4 c #DED24B", -"s4 c #EADE59", -"t4 c #CAD254", -"u4 c #90A057", -"v4 c #A6C07A", -"w4 c #CAE5B5", -"x4 c #D5ECC6", -"y4 c #BCC98F", -"z4 c #778442", -"A4 c #91A747", -"B4 c #B4C782", -"C4 c #87964E", -"D4 c #6B7641", -"E4 c #5E733A", -"F4 c #5B6E2F", -"G4 c #7B8E42", -"H4 c #ADBB6D", -"I4 c #DCA46B", -"J4 c #DEA26F", -"K4 c #DBA170", -"L4 c #DCA370", -"M4 c #DCA36D", -"N4 c #DEA473", -"O4 c #DA9F70", -"P4 c #DFA773", -"Q4 c #DFAB77", -"R4 c #E2AE7A", -"S4 c #DFAE78", -"T4 c #DCAF75", -"U4 c #DEB679", -"V4 c #E1BA7D", -"W4 c #E4BC7F", -"X4 c #DFB67C", -"Y4 c #E0B77E", -"Z4 c #E0B87C", -"`4 c #E2BE82", -" 5 c #E0B97F", -".5 c #DDB17A", -"+5 c #E0B27D", -"@5 c #E2AB7F", -"#5 c #DFA779", -"$5 c #DDAA73", -"%5 c #DFA77F", -"&5 c #DE8D7B", -"*5 c #C28181", -"=5 c #695B63", -"-5 c #605F69", -";5 c #626067", -">5 c #606266", -",5 c #696570", -"'5 c #656C56", -")5 c #626A53", -"!5 c #616952", -"~5 c #616953", -"{5 c #626A54", -"]5 c #5F6851", -"^5 c #5F6751", -"/5 c #5F6550", -"(5 c #5E634D", -"_5 c #60644E", -":5 c #5F644E", -"<5 c #606550", -"[5 c #5E644E", -"}5 c #5E634E", -"|5 c #5D614E", -"15 c #5D6250", -"25 c #5F6351", -"35 c #5C5E51", -"45 c #5E6151", -"55 c #5C5E48", -"65 c #62685A", -"75 c #656D5D", -"85 c #636D53", -"95 c #595C4A", -"05 c #575B48", -"a5 c #575948", -"b5 c #585A48", -"c5 c #5A5B49", -"d5 c #585847", -"e5 c #5C5B47", -"f5 c #5B5842", -"g5 c #5C5943", -"h5 c #5A5842", -"i5 c #CDD2BE", -"j5 c #C7D2BB", -"k5 c #C4D2BC", -"l5 c #BECFBB", -"m5 c #B6CBB9", -"n5 c #A9C7B7", -"o5 c #A1C3B3", -"p5 c #90BBAD", -"q5 c #79B4A9", -"r5 c #7BB6AA", -"s5 c #7EB8AB", -"t5 c #7DB7AD", -"u5 c #79B5AD", -"v5 c #78B2AA", -"w5 c #7AB2A9", -"x5 c #82B4A6", -"y5 c #8CBAA9", -"z5 c #98BFAB", -"A5 c #A4C0AA", -"B5 c #B1C4AE", -"C5 c #B4C3AE", -"D5 c #B7C3B0", -"E5 c #B6C3AD", -"F5 c #B8C3AC", -"G5 c #BBC5AC", -"H5 c #BEC6AD", -"I5 c #C1C6AB", -"J5 c #BDC4A8", -"K5 c #BEC6A9", -"L5 c #BBC3A6", -"M5 c #B1B085", -"N5 c #D5D6AC", -"O5 c #C6C79A", -"P5 c #A6A77C", -"Q5 c #838355", -"R5 c #C5C69C", -"S5 c #BAB98F", -"T5 c #E0DFB6", -"U5 c #DFE1B7", -"V5 c #ABAA7D", -"W5 c #A6A679", -"X5 c #A0A073", -"Y5 c #807F54", -"Z5 c #AFAF81", -"`5 c #B4B486", -" 6 c #D1D4A7", -".6 c #B7B688", -"+6 c #C5C69A", -"@6 c #E4E6BD", -"#6 c #6F7048", -"$6 c #7A8D51", -"%6 c #697E50", -"&6 c #5C6D43", -"*6 c #59643A", -"=6 c #5F7043", -"-6 c #6E804D", -";6 c #6A7948", -">6 c #596737", -",6 c #6F7A47", -"'6 c #A8BF6E", -")6 c #D9DB6B", -"!6 c #D2D269", -"~6 c #96A557", -"{6 c #9EAA5B", -"]6 c #A2AD52", -"^6 c #DFE997", -"/6 c #EBF1AC", -"(6 c #F7EF82", -"_6 c #FEED70", -":6 c #F7ED6B", -"<6 c #EFE471", -"[6 c #DADE69", -"}6 c #758142", -"|6 c #627639", -"16 c #9AB46E", -"26 c #B4C379", -"36 c #A1A74E", -"46 c #BBC567", -"56 c #E1F2B0", -"66 c #E7F4CF", -"76 c #DDEEBD", -"86 c #8DA161", -"96 c #667942", -"06 c #6C7D42", -"a6 c #B9CF8D", -"b6 c #E2F5C3", -"c6 c #D6E8BA", -"d6 c #DAA46F", -"e6 c #DEA46E", -"f6 c #E0A56E", -"g6 c #E2A574", -"h6 c #DC9A70", -"i6 c #E3A276", -"j6 c #DF9E71", -"k6 c #DFA072", -"l6 c #DFA276", -"m6 c #E2AA79", -"n6 c #E6B37D", -"o6 c #E0B079", -"p6 c #E0B078", -"q6 c #E5B57D", -"r6 c #E1B379", -"s6 c #DFB376", -"t6 c #E2B779", -"u6 c #DFBB7F", -"v6 c #DFB67D", -"w6 c #E1B37E", -"x6 c #E1AC7C", -"y6 c #E1A77D", -"z6 c #DBA875", -"A6 c #E2AC83", -"B6 c #DB9986", -"C6 c #A17477", -"D6 c #6E5C63", -"E6 c #635B69", -"F6 c #645C6C", -"G6 c #67606D", -"H6 c #635F6E", -"I6 c #626171", -"J6 c #5F5E50", -"K6 c #5D5C4D", -"L6 c #5D5E4B", -"M6 c #5D5E49", -"N6 c #5D5E48", -"O6 c #5E5F4A", -"P6 c #5F604B", -"Q6 c #5C5D48", -"R6 c #5F5D47", -"S6 c #625D48", -"T6 c #615D48", -"U6 c #605D48", -"V6 c #625E49", -"W6 c #605D47", -"X6 c #625F4A", -"Y6 c #5F5C48", -"Z6 c #635F4A", -"`6 c #626148", -" 7 c #615E4A", -".7 c #62604B", -"+7 c #626246", -"@7 c #5D6148", -"#7 c #656C5B", -"$7 c #677260", -"%7 c #667153", -"&7 c #7D7C60", -"*7 c #89886C", -"=7 c #8E8D71", -"-7 c #969479", -";7 c #99977C", -">7 c #9F9B80", -",7 c #A29E82", -"'7 c #A6A287", -")7 c #ABA78B", -"!7 c #A7A488", -"~7 c #ADAB8C", -"{7 c #B1AF90", -"]7 c #B3B092", -"^7 c #C4D0BC", -"/7 c #C4CEBA", -"(7 c #C2CFB9", -"_7 c #BBCCB6", -":7 c #AFC8B3", -"<7 c #A2C3B0", -"[7 c #96BDAB", -"}7 c #8AB6A6", -"|7 c #81B3A6", -"17 c #82B6AA", -"27 c #84B9AE", -"37 c #7FB7AC", -"47 c #7BB6A9", -"57 c #74B3A6", -"67 c #71B1A4", -"77 c #77B0A4", -"87 c #77B1A4", -"97 c #7BB3A4", -"07 c #88BAA9", -"a7 c #96BEA9", -"b7 c #A5C4AE", -"c7 c #AFC6AF", -"d7 c #B5C2AD", -"e7 c #BCC6AE", -"f7 c #BFC6AC", -"g7 c #C0C6AB", -"h7 c #C1C4A9", -"i7 c #C4C3A8", -"j7 c #C5C4A8", -"k7 c #C3C5A9", -"l7 c #C2C6AA", -"m7 c #BEC8AD", -"n7 c #C0C6AD", -"o7 c #C0C7AD", -"p7 c #BEC4AA", -"q7 c #A7A67F", -"r7 c #C4C69B", -"s7 c #CBCCA2", -"t7 c #D0D1A6", -"u7 c #B5B68B", -"v7 c #BDBE92", -"w7 c #BABA8C", -"x7 c #CCCDA3", -"y7 c #C3C297", -"z7 c #B4B386", -"A7 c #BAB98C", -"B7 c #9C9B6F", -"C7 c #A6A579", -"D7 c #B5B587", -"E7 c #B8B88A", -"F7 c #BBBC8E", -"G7 c #868658", -"H7 c #9A9A6C", -"I7 c #A4A475", -"J7 c #E0E3BC", -"K7 c #E6E8BF", -"L7 c #62633B", -"M7 c #64643E", -"N7 c #64643F", -"O7 c #A0B05D", -"P7 c #718554", -"Q7 c #5A673F", -"R7 c #65764B", -"S7 c #616A42", -"T7 c #687C4E", -"U7 c #545F34", -"V7 c #647447", -"W7 c #74804E", -"X7 c #7B8648", -"Y7 c #A3B06A", -"Z7 c #A4B35D", -"`7 c #CCD167", -" 8 c #D2D163", -".8 c #ABB460", -"+8 c #89934B", -"@8 c #99A353", -"#8 c #C7CC73", -"$8 c #F2F2A3", -"%8 c #F5EF82", -"&8 c #F7E769", -"*8 c #EFE770", -"=8 c #DDDF82", -"-8 c #C2D26D", -";8 c #9DB068", -">8 c #EEFFC7", -",8 c #DFF2BF", -"'8 c #BFCA83", -")8 c #C3D076", -"!8 c #CEDF90", -"~8 c #E5F3C1", -"{8 c #EEF7CD", -"]8 c #E9F6D0", -"^8 c #6E7E49", -"/8 c #5F6D36", -"(8 c #9AAD62", -"_8 c #89A367", -":8 c #DDF6D1", -"<8 c #DCF4CE", -"[8 c #CAA06E", -"}8 c #E0A771", -"|8 c #DFA26F", -"18 c #E2A470", -"28 c #DE9E6D", -"38 c #DE9E71", -"48 c #DF9E73", -"58 c #DE9B71", -"68 c #E09B72", -"78 c #E2A176", -"88 c #DFA175", -"98 c #DEA071", -"08 c #DC9E71", -"a8 c #DFA675", -"b8 c #E2A876", -"c8 c #DCA170", -"d8 c #DCA16F", -"e8 c #DDA373", -"f8 c #DDA475", -"g8 c #DDA770", -"h8 c #E2AD73", -"i8 c #DEB078", -"j8 c #DAB07C", -"k8 c #DBB279", -"l8 c #E0AB79", -"m8 c #DCAC77", -"n8 c #E2A87B", -"o8 c #D49282", -"p8 c #835E69", -"q8 c #665A66", -"r8 c #645E68", -"s8 c #645E6A", -"t8 c #686470", -"u8 c #64606D", -"v8 c #625E6A", -"w8 c #85816D", -"x8 c #928E71", -"y8 c #999577", -"z8 c #9F997C", -"A8 c #A29D7F", -"B8 c #A7A185", -"C8 c #A9A487", -"D8 c #ADA78B", -"E8 c #B3AD90", -"F8 c #B5B093", -"G8 c #B8B294", -"H8 c #BEBC9B", -"I8 c #C0BE9B", -"J8 c #C1C09E", -"K8 c #C3C1A0", -"L8 c #C7C5A3", -"M8 c #CAC9A8", -"N8 c #CDCCAB", -"O8 c #CDCBA9", -"P8 c #D1CFAE", -"Q8 c #D3D1A9", -"R8 c #D3D0A8", -"S8 c #D7D4B0", -"T8 c #A5A885", -"U8 c #636A54", -"V8 c #69745F", -"W8 c #8A9573", -"X8 c #DAD9AE", -"Y8 c #DCD9AD", -"Z8 c #DAD8AC", -"`8 c #DBD7AB", -" 9 c #DCD8AD", -".9 c #DAD6AA", -"+9 c #D6D5AB", -"@9 c #D5D6AB", -"#9 c #D4D5AA", -"$9 c #B8CCB3", -"%9 c #A4C3B4", -"&9 c #9FC0B1", -"*9 c #96BAAA", -"=9 c #8EB6A6", -"-9 c #8BB9A9", -";9 c #88BAAC", -">9 c #7BB4A8", -",9 c #7FB6AA", -"'9 c #88B9AE", -")9 c #88B6A9", -"!9 c #83B0A2", -"~9 c #81B0A0", -"{9 c #88B9A8", -"]9 c #8DBAA9", -"^9 c #94B9A8", -"/9 c #A4BEAC", -"(9 c #B9C4AB", -"_9 c #BDC6AA", -":9 c #C1C7AA", -"<9 c #C4C6AC", -"[9 c #C4C6AB", -"}9 c #C2C3A9", -"|9 c #C3C4AA", -"19 c #C0C3A8", -"29 c #C0C6A9", -"39 c #C2C7AC", -"49 c #C4C7AD", -"59 c #C1C6AA", -"69 c #C0C6AA", -"79 c #BCC3A9", -"89 c #BCC4AC", -"99 c #BBC2A9", -"09 c #BEC3AB", -"a9 c #A1A483", -"b9 c #7F8054", -"c9 c #C7C69D", -"d9 c #D5D7AD", -"e9 c #CED1A4", -"f9 c #C4C598", -"g9 c #C1C398", -"h9 c #BFC191", -"i9 c #C4C39A", -"j9 c #ACAD7F", -"k9 c #AAAA7C", -"l9 c #C7C79B", -"m9 c #C1C294", -"n9 c #BCBE90", -"o9 c #C0C091", -"p9 c #BCBC8E", -"q9 c #BABB8E", -"r9 c #78774C", -"s9 c #A2A273", -"t9 c #B3B385", -"u9 c #C7C89B", -"v9 c #D4D7AA", -"w9 c #6A6A42", -"x9 c #D8E063", -"y9 c #698050", -"z9 c #5C6C41", -"A9 c #64754A", -"B9 c #6B8054", -"C9 c #566336", -"D9 c #647851", -"E9 c #61734B", -"F9 c #6C7B4B", -"G9 c #7C8849", -"H9 c #ABB863", -"I9 c #9CB058", -"J9 c #CCD566", -"K9 c #D7D869", -"L9 c #C4C85D", -"M9 c #A5AB5A", -"N9 c #CCD878", -"O9 c #CDCE6C", -"P9 c #EFE163", -"Q9 c #F7EB73", -"R9 c #F7E666", -"S9 c #F1DE56", -"T9 c #D2D15D", -"U9 c #A2B050", -"V9 c #A6C378", -"W9 c #E4FCC5", -"X9 c #DEF3C8", -"Y9 c #AFBC77", -"Z9 c #C3D88F", -"`9 c #D8EEB9", -" 0 c #E7F3CA", -".0 c #F1F6CD", -"+0 c #EAFACF", -"@0 c #D4E4BF", -"#0 c #8AA154", -"$0 c #D1E9BD", -"%0 c #4F6631", -"&0 c #8C9E69", -"*0 c #937B4C", -"=0 c #E1A273", -"-0 c #E0A173", -";0 c #DF9E70", -">0 c #E2A070", -",0 c #E09B6F", -"'0 c #E19B72", -")0 c #E09E74", -"!0 c #DC966D", -"~0 c #DC956D", -"{0 c #DA986E", -"]0 c #D9996E", -"^0 c #DD9C71", -"/0 c #E09C76", -"(0 c #DB9B74", -"_0 c #E1A579", -":0 c #DFA476", -"<0 c #E3A579", -"[0 c #DC9F72", -"}0 c #DFA373", -"|0 c #D99F6D", -"10 c #DCA173", -"20 c #DD9E70", -"30 c #E2A979", -"40 c #DC9C72", -"50 c #D89C76", -"60 c #DC9D7B", -"70 c #E29D85", -"80 c #DCA189", -"90 c #BF8B75", -"00 c #926865", -"a0 c #685B6E", -"b0 c #625B69", -"c0 c #625B67", -"d0 c #645F6C", -"e0 c #676470", -"f0 c #605D69", -"g0 c #635E6C", -"h0 c #A8A38F", -"i0 c #D7D2A9", -"j0 c #D7D2AA", -"k0 c #D6D2A9", -"l0 c #D5D1A8", -"m0 c #D4D0A7", -"n0 c #D5D1A9", -"o0 c #D1CDA5", -"p0 c #D2CEA5", -"q0 c #CED0A6", -"r0 c #CDCFA4", -"s0 c #CFD1A6", -"t0 c #B1B48B", -"u0 c #6E7458", -"v0 c #909977", -"w0 c #D1CEA6", -"x0 c #D5D2A9", -"y0 c #D4D5AD", -"z0 c #B4C7A9", -"A0 c #8ABAAC", -"B0 c #8AB9AB", -"C0 c #8DB9AB", -"D0 c #90BCAE", -"E0 c #91BEB0", -"F0 c #8DB9AD", -"G0 c #8DB9AE", -"H0 c #8AB5A9", -"I0 c #90B9AB", -"J0 c #98BDAD", -"K0 c #9FBFAD", -"L0 c #A6C2AE", -"M0 c #ADC3AD", -"N0 c #B1C5B0", -"O0 c #B7C4AD", -"P0 c #B6C3A9", -"Q0 c #BBC5AA", -"R0 c #BEC5AB", -"S0 c #BEC3A9", -"T0 c #C1C3AA", -"U0 c #C2C6A9", -"V0 c #C2C8AA", -"W0 c #C3C7AC", -"X0 c #C1C7AC", -"Y0 c #BEC6AC", -"Z0 c #BEC6AA", -"`0 c #BDC3A9", -" a c #BBC3A9", -".a c #B8C0A6", -"+a c #B5C0A6", -"@a c #B7C3A9", -"#a c #B7C1A8", -"$a c #B6C1A7", -"%a c #949569", -"&a c #D1D3A9", -"*a c #C4C69A", -"=a c #CACB9E", -"-a c #A1A275", -";a c #D0D1A4", -">a c #BEBE93", -",a c #DBDDB1", -"'a c #979769", -")a c #C0C093", -"!a c #C0C194", -"~a c #C1C395", -"{a c #C4C697", -"]a c #9F9E70", -"^a c #C7C99B", -"/a c #66673F", -"(a c #688050", -"_a c #5D6E43", -":a c #596A3F", -"b c #CDCDA0", -",b c #CFCEA1", -"'b c #CDCBA0", -")b c #CECBA0", -"!b c #CDCCA6", -"~b c #CFCDA6", -"{b c #D0CEA7", -"]b c #CECD9D", -"^b c #6D7354", -"/b c #909876", -"(b c #D0CCA6", -"_b c #D3CEA7", -":b c #D0CDA6", -"c c #E0D84F", -",c c #F1DF4E", -"'c c #E2E785", -")c c #E4F5D1", -"!c c #E2F4DA", -"~c c #D6F1CA", -"{c c #D9F0C8", -"]c c #C4D6AA", -"^c c #9CB377", -"/c c #E5F3CF", -"(c c #EDF5CD", -"_c c #E6F3CF", -":c c #849855", -"d c #B4BEA4", -",d c #B8C3A9", -"'d c #B6C0A6", -")d c #908F66", -"!d c #D3D3AB", -"~d c #C9CAA0", -"{d c #B4B385", -"]d c #969568", -"^d c #919065", -"/d c #DFE3B9", -"(d c #BEC194", -"_d c #BABA8D", -":d c #A2A274", -"e c #636169", -",e c #655E6B", -"'e c #625C69", -")e c #645F6D", -"!e c #686172", -"~e c #655E70", -"{e c #C7C39D", -"]e c #CECCA1", -"^e c #CDC99F", -"/e c #CDCA9F", -"(e c #D0CBA0", -"_e c #D1CD9E", -":e c #B2B58B", -"f c #626E40", -",f c #B8D288", -"'f c #D0E3A3", -")f c #BCCA7D", -"!f c #D7E4A4", -"~f c #E5F6D4", -"{f c #DFF1D3", -"]f c #62753D", -"^f c #809552", -"/f c #9FB15E", -"(f c #AF7F58", -"_f c #DF9476", -":f c #DB8D70", -"g c #C2C294", -",g c #BAB98B", -"'g c #BCBE8F", -")g c #AFB085", -"!g c #BCBE8E", -"~g c #706F46", -"{g c #87885B", -"]g c #9E9E71", -"^g c #A9A97B", -"/g c #ADAD7D", -"(g c #F7FC71", -"_g c #6D7C54", -":g c #718055", -"h c #D2CBA1", -",h c #D1CCA0", -"'h c #B4B78E", -")h c #656F51", -"!h c #68725A", -"~h c #919776", -"{h c #D0D0A6", -"]h c #CFD1A8", -"^h c #D0D3A9", -"/h c #D0D4AA", -"(h c #74784E", -"_h c #BCC096", -":h c #E5E9BF", -"i c #D98A70", -",i c #DB8E72", -"'i c #D98D75", -")i c #DC8D79", -"!i c #D98D78", -"~i c #D88E74", -"{i c #D88C71", -"]i c #D98A75", -"^i c #D78975", -"/i c #DC8F79", -"(i c #DC8579", -"_i c #B06970", -":i c #73546A", -"j c #D0E79A", -",j c #BFD587", -"'j c #B4C066", -")j c #C1C968", -"!j c #DFDE70", -"~j c #EBE159", -"{j c #EADE51", -"]j c #DBD654", -"^j c #DCD553", -"/j c #DDDC55", -"(j c #A6B855", -"_j c #597036", -":j c #65723F", -"k c #CED0A4", -",k c #9FA074", -"'k c #D0D1A3", -")k c #B3B386", -"!k c #D2D3A8", -"~k c #72714A", -"{k c #99986B", -"]k c #BED58E", -"^k c #D5EAB3", -"/k c #CADA8B", -"(k c #90A757", -"_k c #A6C688", -":k c #ABCA8B", -"l c #CCCEA5", -",l c #9A9D75", -"'l c #81865F", -")l c #828762", -"!l c #8A906D", -"~l c #7E8763", -"{l c #5E643F", -"]l c #A5A780", -"^l c #CBCBA1", -"/l c #C4C6AD", -"(l c #C5C8AF", -"_l c #C2C5AC", -":l c #C1C4AB", -"m c #D79972", -",m c #D78F78", -"'m c #DA807C", -")m c #C3707C", -"!m c #A36B85", -"~m c #6E5B6B", -"{m c #686071", -"]m c #605A6B", -"^m c #625E69", -"/m c #5F6067", -"(m c #65606D", -"_m c #615E69", -":m c #5D5B68", -"n c #E5ECA9", -",n c #E6F8D2", -"'n c #EAF8CF", -")n c #D7F0C0", -"!n c #A2B65D", -"~n c #D4EBB0", -"{n c #ECF3D1", -"]n c #E8F7D0", -"^n c #C3D9A2", -"/n c #B1C468", -"(n c #A7B172", -"_n c #4E5527", -":n c #51562D", -"o c #838257", -",o c #9C9B6E", -"'o c #A6A678", -")o c #ABAA7C", -"!o c #CAE2B2", -"~o c #B0CE9A", -"{o c #C4E4A8", -"]o c #C0DD98", -"^o c #7B915A", -"/o c #9DB370", -"(o c #99B175", -"_o c #95B275", -":o c #73905F", -"p c #C2C199", -",p c #C7C59C", -"'p c #CCC9A0", -")p c #D9D89A", -"!p c #ECF179", -"~p c #BEC3AD", -"{p c #C0C5AE", -"]p c #BFC4AD", -"^p c #BBC1AA", -"/p c #BEC6AE", -"(p c #BFC7B0", -"_p c #BAC3AC", -":p c #BBC3AB", -"

q c #4A4444", +",q c #4F4D4E", +"'q c #41424A", +")q c #313140", +"!q c #787882", +"~q c #C2C2C4", +"{q c #3D3C41", +"]q c #434046", +"^q c #353338", +"/q c #4B4A4C", +"(q c #E7E6E6", +"_q c #797070", +":q c #74706D", +"r c #DEDEDE", +",r c #1D1E28", +"'r c #21222A", +")r c #6A6A6C", +"!r c #848386", +"~r c #595352", +"{r c #464446", +"]r c #74747C", +"^r c #474146", +"/r c #2B252B", +"(r c #67666A", +"_r c #E6E6E6", +":r c #AEAAA9", +"s c #F6EBEB", +",s c #CB6969", +"'s c #BE4040", +")s c #E2AAAA", +"!s c #C65556", +"~s c #B94849", +"{s c #B46969", +"]s c #958889", +"^s c #8E8D8E", +"/s c #B6B6B7", +"(s c #C2C2C2", +"_s c #878789", +":s c #66666A", +"t c #626368", +",t c #2B2936", +"'t c #3C3B41", +")t c #514F51", +"!t c #3D3535", +"~t c #595353", +"{t c #343338", +"]t c #86868C", +"^t c #EDE8E8", +"/t c #663E3F", +"(t c #85383A", +"_t c #AD7D80", +":t c #671315", +"u c #8B0D0F", +",u c #BE7879", +"'u c #BE7778", +")u c #DAB0B0", +"!u c #DBB1B2", +"~u c #DCB1B2", +"{u c #BF7879", +"]u c #CB9292", +"^u c #BEB0B0", +"/u c #161314", +"(u c #8C8684", +"_u c #7B7674", +":u c #D5D4D4", +"v c #DCB2B3", +",v c #F4E5E5", +"'v c #DEB3B3", +")v c #DBB0B1", +"!v c #AA484A", +"~v c #890B0D", +"{v c #8A0C0E", +"]v c #A44142", +"^v c #F3E5E5", +"/v c #B55F61", +"(v c #B05C5C", +"_v c #A85C5D", +":v c #484849", +"w c #DDB3B4", +",w c #D09799", +"'w c #B14C4D", +")w c #C27C7D", +"!w c #9F2F31", +"~w c #890B0E", +"{w c #B25E5F", +"]w c #BD7778", +"^w c #E6C9CA", +"/w c #BE7779", +"(w c #B25D5F", +"_w c #972627", +":w c #8A0B0C", +"x c #8A0C0F", +",x c #8A0C0D", +"'x c #8A0B0D", +")x c #8E0F13", +"!x c #9A282B", +"~x c #8E0F10", +"{x c #927A7B", +"]x c #2F2E32", +"^x c #302D31", +"/x c #3A3637", +"(x c #514B49", +"_x c #68625F", +":x c #736D6B", +"y c #484748", +",y c #454040", +"'y c #5C5654", +")y c #74706E", +"!y c #797473", +"~y c #7A7776", +"{y c #807D7D", +"]y c #7C7976", +"^y c #7C7774", +"/y c #76716D", +"(y c #6E6A62", +"_y c #625D50", +":y c #584F40", +"z c #7A7673", +",z c #75716C", +"'z c #75706B", +")z c #716B66", +"!z c #6A655B", +"~z c #5E594C", +"{z c #4F4236", +"]z c #3E312A", +"^z c #2E2320", +"/z c #251E1E", +"(z c #443D37", +"_z c #4D463C", +":z c #51493E", +"A c #6D6760", +",A c #706962", +"'A c #6E6861", +")A c #6A645B", +"!A c #60594D", +"~A c #53493C", +"{A c #4C3F34", +"]A c #3D3129", +"^A c #2F2220", +"/A c #251D1E", +"(A c #191616", +"_A c #302927", +":A c #413933", +"B c #7A786E", +",B c #6E6A5B", +"'B c #686354", +")B c #5D5449", +"!B c #564B43", +"~B c #463D34", +"{B c #49413A", +"]B c #5A5049", +"^B c #574A41", +"/B c #493D32", +"(B c #3C3128", +"_B c #342622", +":B c #271C1C", +"C c #7C7A76", +",C c #736E61", +"'C c #625A4B", +")C c #51493C", +"!C c #3A322B", +"~C c #27201C", +"{C c #1E1A14", +"]C c #1C1613", +"^C c #2F2520", +"/C c #50443D", +"(C c #4C4137", +"_C c #3D332A", +":C c #322823", +"D c #171413", +",D c #161313", +"'D c #211716", +")D c #473C35", +"!D c #40352C", +"~D c #342A25", +"{D c #28211F", +"]D c #1F1B1B", +"^D c #2A2423", +"/D c #473E3A", +"(D c #50493E", +"_D c #534A41", +":D c #544A43", +"E c #4B4038", +",E c #4C4239", +"'E c #4B4238", +")E c #453B32", +"!E c #443831", +"~E c #3A2F2A", +"{E c #54221F", +"]E c #452321", +"^E c #3A3836", +"/E c #615F5A", +"(E c #62615C", +"_E c #6A6765", +":E c #6C6A68", +"F c #62615D", +",F c #686562", +"'F c #6B6867", +")F c #6F6D6C", +"!F c #737274", +"~F c #717072", +"{F c #747375", +"]F c #976C6D", +"^F c #916868", +"/F c #BA3C3C", +"(F c #A24E4F", +"_F c #6C6D6E", +":F c #646667", +"G c #A04D4E", +",G c #707071", +"'G c #6D6E6F", +")G c #666868", +"!G c #606262", +"~G c #5A5C5B", +"{G c #595B5B", +"]G c #5E5E60", +"^G c #606163", +"/G c #5E5F61", +"(G c #58595C", +"_G c #535359", +":G c #5C5C65", +"H c #555761", +",H c #41444F", +"'H c #2B2F3B", +")H c #525258", +"!H c #44434A", +"~H c #1C1C26", +"{H c #27282F", +"]H c #1C1D22", +"^H c #741213", +"/H c #22232E", +"(H c #292A32", +"_H c #111114", +":H c #47423F", +"I c #6F6A68", +",I c #746F6E", +"'I c #757273", +")I c #7B7876", +"!I c #7F7B78", +"~I c #797970", +"{I c #6D6A59", +"]I c #534936", +"^I c #403127", +"/I c #221816", +"(I c #181413", +"_I c #5B5959", +":I c #766E6B", +"J c #7B7977", +",J c #7D7874", +"'J c #79776E", +")J c #6C6756", +"!J c #524734", +"~J c #413328", +"{J c #2B201C", +"]J c #221A17", +"^J c #332E2C", +"/J c #646161", +"(J c #6D6562", +"_J c #6E6563", +":J c #7D7777", +"K c #7C7978", +",K c #7C7979", +"'K c #767368", +")K c #6A6455", +"!K c #594C3D", +"~K c #49392D", +"{K c #3D2C23", +"]K c #41342C", +"^K c #615852", +"/K c #68615C", +"(K c #77706E", +"_K c #7E7B7C", +":K c #7F7C7A", +"L c #514C4C", +",L c #54504F", +"'L c #5F5B59", +")L c #686462", +"!L c #944B4B", +"~L c #905555", +"{L c #787474", +"]L c #7A7573", +"^L c #74726B", +"/L c #726F63", +"(L c #666152", +"_L c #584E3E", +":L c #4C3E30", +"M c #292B30", +",M c #2B2B2F", +"'M c #474347", +")M c #39373A", +"!M c #393639", +"~M c #413E41", +"{M c #4A474A", +"]M c #4D4A4D", +"^M c #504D4F", +"/M c #4B484A", +"(M c #504D4E", +"_M c #535050", +":M c #524D4E", +"N c #4F4F56", +",N c #36363E", +"'N c #292932", +")N c #3A0F10", +"!N c #671113", +"~N c #931313", +"{N c #971818", +"]N c #9E1F20", +"^N c #A02223", +"/N c #A42627", +"(N c #AF3133", +"_N c #B03233", +":N c #A53535", +"O c #8F1116", +",O c #721016", +"'O c #551D25", +")O c #3E313B", +"!O c #32313E", +"~O c #363844", +"{O c #282B34", +"]O c #21222B", +"^O c #373540", +"/O c #494950", +"(O c #33343B", +"_O c #272835", +":O c #292931", +"P c #401616", +",P c #401516", +"'P c #565550", +")P c #5E5D59", +"!P c #62615E", +"~P c #6B6A68", +"{P c #6F6D6E", +"]P c #AA5657", +"^P c #6A6C6D", +"/P c #616362", +"(P c #5B5C5B", +"_P c #764E4D", +":P c #A23433", +"

Q c #322D2B", +",Q c #3E1E1C", +"'Q c #791514", +")Q c #301414", +"!Q c #3E1313", +"~Q c #571111", +"{Q c #373533", +"]Q c #5B5A56", +"^Q c #656868", +"/Q c #774F4F", +"(Q c #714949", +"_Q c #6A4241", +":Q c #643C3C", +"R c #67696A", +",R c #923F3F", +"'R c #575959", +")R c #4F5252", +"!R c #474C4C", +"~R c #404344", +"{R c #35373A", +"]R c #222329", +"^R c #2B1E27", +"/R c #901218", +"(R c #94161C", +"_R c #97191E", +":R c #7F1E24", +"S c #96191D", +",S c #93161A", +"'S c #582028", +")S c #272531", +"!S c #2B2934", +"~S c #2B2B36", +"{S c #18181C", +"]S c #141516", +"^S c #54525A", +"/S c #414348", +"(S c #17171D", +"_S c #222123", +":S c #3F1315", +"T c #737070", +",T c #737171", +"'T c #797776", +")T c #965C5B", +"!T c #926668", +"~T c #767270", +"{T c #605D5C", +"]T c #625F5F", +"^T c #666367", +"/T c #696162", +"(T c #6B6465", +"_T c #6A6465", +":T c #706869", +"U c #926564", +",U c #BD3D3C", +"'U c #9A6061", +")U c #A85252", +"!U c #837372", +"~U c #A35A5A", +"{U c #B6413F", +"]U c #A6302E", +"^U c #B22D2B", +"/U c #A44541", +"(U c #5F4C46", +"_U c #57413C", +":U c #5E2F2A", +"V c #823833", +",V c #59342D", +"'V c #7C2621", +")V c #801E1B", +"!V c #362622", +"~V c #2E221F", +"{V c #631614", +"]V c #3C1A19", +"^V c #6A1311", +"/V c #75100F", +"(V c #2A1918", +"_V c #1D1817", +":V c #241516", +"W c #261616", +",W c #301213", +"'W c #8A0A0A", +")W c #630E0F", +"!W c #241415", +"~W c #3C3A37", +"{W c #3A3731", +"]W c #403E38", +"^W c #5C5A57", +"/W c #847676", +"(W c #B44446", +"_W c #B83A3B", +":W c #AE3F3F", +"X c #46443E", +",X c #44423B", +"'X c #47453E", +")X c #64635F", +"!X c #838285", +"~X c #886C6D", +"{X c #BB3E3E", +"]X c #B93C3C", +"^X c #865051", +"/X c #616463", +"(X c #606362", +"_X c #5E6161", +":X c #525655", +"Y c #96181C", +",Y c #95171B", +"'Y c #911216", +")Y c #901116", +"!Y c #931419", +"~Y c #2C2B32", +"{Y c #2F2E35", +"]Y c #3A383F", +"^Y c #343438", +"/Y c #3B1010", +"(Y c #890A0A", +"_Y c #582A29", +":Y c #4A4544", +"Z c #A75253", +",Z c #9A6161", +"'Z c #807C80", +")Z c #7F7B7E", +"!Z c #827F7D", +"~Z c #716560", +"{Z c #633F3A", +"]Z c #88231E", +"^Z c #9E1714", +"/Z c #8F1613", +"(Z c #971210", +"_Z c #4E1C18", +":Z c #271D1A", +"` c #352726", +",` c #49312E", +"'` c #6C5553", +")` c #5B4643", +"!` c #6E5653", +"~` c #6D524F", +"{` c #77605C", +"]` c #644C48", +"^` c #523731", +"/` c #4D322C", +"(` c #49302B", +"_` c #4A2A24", +":` c #991411", +"<` c #971512", +"[` c #7D1612", +"}` c #2C231E", +"|` c #4D1C1A", +"1` c #900E0E", +"2` c #890B0A", +"3` c #8D0E0D", +"4` c #491010", +"5` c #413F3D", +"6` c #252321", +"7` c #383634", +"8` c #464441", +"9` c #504F4A", +"0` c #55534E", +"a` c #575650", +"b` c #897A7C", +"c` c #6D6F70", +"d` c #954343", +"e` c #8A4545", +"f` c #675B5B", +"g` c #525654", +"h` c #4D504E", +"i` c #4A4F4C", +"j` c #5E4645", +"k` c #7F2E2E", +"l` c #832123", +"m` c #4A2D34", +"n` c #312E37", +"o` c #34323B", +"p` c #701B20", +"q` c #161718", +"r` c #14131A", +"s` c #2E2E33", +"t` c #323338", +"u` c #1F1F22", +"v` c #8E0F11", +"w` c #921212", +"x` c #693A3A", +"y` c #605A59", +"z` c #615B5A", +"A` c #6F6B6A", +"B` c #797675", +"C` c #7E7B7B", +"D` c #7E7A7C", +"E` c #936768", +"F` c #B33333", +"G` c #965B5C", +"H` c #B9393A", +"I` c #AB393A", +"J` c #595555", +"K` c #514C4D", +"L` c #464141", +"M` c #8F3737", +"N` c #B33332", +"O` c #846565", +"P` c #777475", +"Q` c #A85354", +"R` c #837D7B", +"S` c #716761", +"T` c #9C211D", +"U` c #A41B17", +"V` c #502520", +"W` c #2E2420", +"X` c #4B1A17", +"Y` c #900E0D", +"Z` c #5F1513", +"`` c #710D0E", +" . c #580E0F", +". . c #7E0A0B", +"+ . c #900C0C", +"@ . c #541F1F", +"# . c #9B2121", +"$ . c #B12625", +"% . c #814E4D", +"& . c #60423F", +"* . c #85716E", +"= . c #675856", +"- . c #715C59", +"; . c #624945", +"> . c #705953", +", . c #5A443E", +"' . c #49312A", +") . c #452F29", +"! . c #382822", +"~ . c #681A17", +"{ . c #8F0F0D", +"] . c #511514", +"^ . c #201917", +"/ . c #67100F", +"( . c #1A1917", +"_ . c #1A1817", +": . c #2B1B1B", +"< . c #81100F", +"[ . c #8C0D0C", +"} . c #3E1312", +"| . c #2C2A29", +"1 . c #383734", +"2 . c #474541", +"3 . c #33312E", +"4 . c #2C2B27", +"5 . c #3E3C37", +"6 . c #B74747", +"7 . c #837575", +"8 . c #616364", +"9 . c #685D5D", +"0 . c #A63737", +"a . c #4F5251", +"b . c #505351", +"c . c #4C4F4D", +"d . c #4A4E4B", +"e . c #484C4A", +"f . c #444847", +"g . c #3E4141", +"h . c #333437", +"i . c #2F2E34", +"j . c #323039", +"k . c #452830", +"l . c #921419", +"m . c #921317", +"n . c #931518", +"o . c #88181A", +"p . c #332428", +"q . c #1A1921", +"r . c #25262C", +"s . c #3B3C41", +"t . c #6C3D3D", +"u . c #7A7977", +"v . c #7F7A7B", +"w . c #7E7A7B", +"x . c #907274", +"y . c #A24C4C", +"z . c #896969", +"A . c #797575", +"B . c #6D6768", +"C . c #625B5C", +"D . c #923B3B", +"E . c #A85254", +"F . c #867576", +"G . c #7F7874", +"H . c #5F4F46", +"I . c #932620", +"J . c #5B211D", +"K . c #362521", +"L . c #2D231F", +"M . c #91100E", +"N . c #6B1312", +"O . c #171313", +"P . c #8C0A0A", +"Q . c #971212", +"R . c #A51E1E", +"S . c #7B3E3D", +"T . c #716262", +"U . c #9A5554", +"V . c #B42A29", +"W . c #A43432", +"X . c #543734", +"Y . c #6E5A56", +"Z . c #604F4B", +"` . c #5A403B", +" .. c #4E312C", +"... c #503931", +"+.. c #47322B", +"@.. c #402E27", +"#.. c #362822", +"$.. c #401C19", +"%.. c #401213", +"&.. c #581010", +"*.. c #1B1918", +"=.. c #331614", +"-.. c #361717", +";.. c #411414", +">.. c #571110", +",.. c #343332", +"'.. c #32302E", +").. c #41403C", +"!.. c #494741", +"~.. c #474741", +"{.. c #504F49", +"].. c #4D4D47", +"^.. c #474640", +"/.. c #45433D", +"(.. c #706F6F", +"_.. c #757374", +":.. c #777677", +"<.. c #B64647", +"[.. c #837676", +"}.. c #6A5D5D", +"|.. c #A73838", +"1.. c #A43535", +"2.. c #814B4A", +"3.. c #5A5D5C", +"4.. c #565B5A", +"5.. c #4C504E", +"6.. c #494D4B", +"7.. c #464A49", +"8.. c #424544", +"9.. c #404040", +"0.. c #2F2F38", +"a.. c #531B22", +"b.. c #911314", +"c.. c #801011", +"d.. c #231315", +"e.. c #29292E", +"f.. c #6D3E3D", +"g.. c #6C6765", +"h.. c #736D6C", +"i.. c #6E6A69", +"j.. c #7F7B7A", +"k.. c #946666", +"l.. c #9C6363", +"m.. c #BA3B3C", +"n.. c #835758", +"o.. c #716C6D", +"p.. c #A84242", +"q.. c #B73636", +"r.. c #6F6B6B", +"s.. c #726F70", +"t.. c #876869", +"u.. c #9D5656", +"v.. c #BB3C3D", +"w.. c #776E68", +"x.. c #544138", +"y.. c #45322A", +"z.. c #432921", +"A.. c #8A1110", +"B.. c #591916", +"C.. c #4B1B17", +"D.. c #900F0E", +"E.. c #1A1314", +"F.. c #291E1F", +"G.. c #6C3738", +"H.. c #A24646", +"I.. c #72605E", +"J.. c #705F5D", +"K.. c #84706D", +"L.. c #AD2321", +"M.. c #A81E1C", +"N.. c #622E2A", +"O.. c #543E39", +"P.. c #56403A", +"Q.. c #4D332C", +"R.. c #6A2A24", +"S.. c #46322B", +"T.. c #3C2C26", +"U.. c #322520", +"V.. c #750F0E", +"W.. c #4B1112", +"X.. c #3F1313", +"Y.. c #3F1413", +"Z.. c #3F1312", +"`.. c #5A1313", +" +. c #331615", +".+. c #331616", +"++. c #383735", +"@+. c #4F4E47", +"#+. c #56554E", +"$+. c #54524D", +"%+. c #55534F", +"&+. c #747373", +"*+. c #767576", +"=+. c #86787A", +"-+. c #BD4041", +";+. c #847778", +">+. c #666869", +",+. c #944142", +"'+. c #A53736", +")+. c #715756", +"!+. c #595C5B", +"~+. c #575A59", +"{+. c #535756", +"]+. c #535755", +"^+. c #4D504F", +"/+. c #4D5050", +"(+. c #494D4C", +"_+. c #484C4C", +":+. c #454A4A", +"<+. c #444949", +"[+. c #464848", +"}+. c #434344", +"|+. c #353235", +"1+. c #2C2A2E", +"2+. c #313037", +"3+. c #77161C", +"4+. c #202024", +"5+. c #3B1110", +"6+. c #714241", +"7+. c #6D6867", +"8+. c #777574", +"9+. c #7D7978", +"0+. c #946866", +"a+. c #A95354", +"b+. c #877778", +"c+. c #BF3F40", +"d+. c #6D6A6B", +"e+. c #706C6C", +"f+. c #B73737", +"g+. c #747171", +"h+. c #896A6B", +"i+. c #AD494A", +"j+. c #BC3C3D", +"k+. c #A15A5C", +"l+. c #92686B", +"m+. c #7E7C7C", +"n+. c #675C54", +"o+. c #49352C", +"p+. c #3E2E26", +"q+. c #342A23", +"r+. c #3A231E", +"s+. c #881110", +"t+. c #8F0E0D", +"u+. c #8D0D0C", +"v+. c #291C1D", +"w+. c #504345", +"x+. c #6B5C5E", +"y+. c #837777", +"z+. c #7F7676", +"A+. c #7D7473", +"B+. c #796A65", +"C+. c #5C4743", +"D+. c #624A44", +"E+. c #822924", +"F+. c #A41915", +"G+. c #991B18", +"H+. c #4A342C", +"I+. c #48322C", +"J+. c #5A2B25", +"K+. c #8C1D19", +"L+. c #372823", +"M+. c #361514", +"N+. c #3F1212", +"O+. c #401414", +"P+. c #331515", +"Q+. c #393632", +"R+. c #44423D", +"S+. c #54534D", +"T+. c #767474", +"U+. c #767475", +"V+. c #A75354", +"W+. c #606263", +"X+. c #655959", +"Y+. c #5B5E5C", +"Z+. c #555957", +"`+. c #505553", +" @. c #4A4D4C", +".@. c #4B4F4E", +"+@. c #494D4D", +"@@. c #464A4A", +"#@. c #494A4A", +"$@. c #444446", +"%@. c #323034", +"&@. c #312F3A", +"*@. c #3A2C38", +"=@. c #95181E", +"-@. c #981A1F", +";@. c #761416", +">@. c #7C0C0D", +",@. c #610B0D", +"'@. c #6E3F3F", +")@. c #6E6967", +"!@. c #777573", +"~@. c #9A6162", +"{@. c #7B787A", +"]@. c #767374", +"^@. c #9E5656", +"/@. c #B54344", +"(@. c #906465", +"_@. c #AE4B4C", +":@. c #7D7C7A", +"<@. c #7C7771", +"[@. c #594D45", +"}@. c #443229", +"|@. c #382821", +"1@. c #2B231D", +"2@. c #29211D", +"3@. c #411D1C", +"4@. c #910D0C", +"5@. c #802020", +"6@. c #685758", +"7@. c #807576", +"8@. c #7A7070", +"9@. c #807676", +"0@. c #7A6E6D", +"a@. c #71615E", +"b@. c #614A44", +"c@. c #523832", +"d@. c #4E342D", +"e@. c #542E27", +"f@. c #991B17", +"g@. c #A11814", +"h@. c #69221D", +"i@. c #3E2E27", +"j@. c #5B241F", +"k@. c #981310", +"l@. c #2B211D", +"m@. c #241D1A", +"n@. c #5A1111", +"o@. c #7E0C0C", +"p@. c #401514", +"q@. c #591111", +"r@. c #271717", +"s@. c #333131", +"t@. c #3C3934", +"u@. c #56554F", +"v@. c #585651", +"w@. c #5D5C59", +"x@. c #92686A", +"y@. c #7B7A7C", +"z@. c #7F4848", +"A@. c #585B59", +"B@. c #4F5350", +"C@. c #4D514F", +"D@. c #4E5250", +"E@. c #4D5250", +"F@. c #474B4B", +"G@. c #464B4C", +"H@. c #4A4C4D", +"I@. c #414145", +"J@. c #323138", +"K@. c #2F2E37", +"L@. c #31303D", +"M@. c #5C252F", +"N@. c #96191C", +"O@. c #911315", +"P@. c #3B1213", +"Q@. c #3A1011", +"R@. c #26262B", +"S@. c #911011", +"T@. c #6B3D3D", +"U@. c #6D6968", +"V@. c #797775", +"W@. c #7C7778", +"X@. c #A14B4C", +"Y@. c #856769", +"Z@. c #B64446", +"`@. c #7A7A74", +" #. c #716B61", +".#. c #4D4037", +"+#. c #31231D", +"@#. c #251E1C", +"##. c #251D1A", +"$#. c #6B110F", +"%#. c #971110", +"&#. c #A72120", +"*#. c #994949", +"=#. c #807979", +"-#. c #7F7878", +";#. c #7E7270", +">#. c #644F4C", +",#. c #5D4540", +"'#. c #4E352D", +")#. c #493229", +"!#. c #463129", +"~#. c #432E26", +"{#. c #68221D", +"]#. c #9B1512", +"^#. c #991311", +"/#. c #3D241F", +"(#. c #4F1D1A", +"_#. c #91100D", +":#. c #451716", +"<#. c #1E1A19", +"[#. c #241515", +"}#. c #43403C", +"|#. c #504F4B", +"1#. c #575552", +"2#. c #B04E4F", +"3#. c #7A797B", +"4#. c #A53636", +"5#. c #903E3E", +"6#. c #615655", +"7#. c #555856", +"8#. c #525553", +"9#. c #4C504F", +"0#. c #44494A", +"a#. c #474A4B", +"b#. c #494C4D", +"c#. c #4C4F50", +"d#. c #3F3F43", +"e#. c #3A3A44", +"f#. c #8F1F26", +"g#. c #94171B", +"h#. c #630D0F", +"i#. c #6E0B0C", +"j#. c #1F1112", +"k#. c #25252A", +"l#. c #673939", +"m#. c #706B6A", +"n#. c #7A7774", +"o#. c #7A7976", +"p#. c #926765", +"q#. c #BE3E3E", +"r#. c #A15959", +"s#. c #A15A5A", +"t#. c #807D7E", +"u#. c #7D7D7A", +"v#. c #7A796E", +"w#. c #655C4F", +"x#. c #372922", +"y#. c #291F1A", +"z#. c #241A1A", +"A#. c #231A19", +"B#. c #241A17", +"C#. c #391E1D", +"D#. c #973A3A", +"E#. c #A44746", +"F#. c #856D6D", +"G#. c #7C7373", +"H#. c #776D6C", +"I#. c #796E6B", +"J#. c #695753", +"K#. c #513731", +"L#. c #50342E", +"M#. c #462F28", +"N#. c #402E26", +"O#. c #31251F", +"P#. c #2E231D", +"Q#. c #891310", +"R#. c #93110E", +"S#. c #85100F", +"T#. c #83100F", +"U#. c #411515", +"V#. c #8A0A0B", +"W#. c #41403B", +"X#. c #646261", +"Y#. c #956B6B", +"Z#. c #956B6C", +"`#. c #877979", +" $. c #696A6C", +".$. c #626465", +"+$. c #606363", +"@$. c #5D6060", +"#$. c #894545", +"$$. c #AC3030", +"%$. c #AA2E2D", +"&$. c #A03231", +"*$. c #5D5352", +"=$. c #505453", +"-$. c #4B4F4D", +";$. c #4A4E4D", +">$. c #444A4A", +",$. c #424647", +"'$. c #4A4D4F", +")$. c #48494B", +"!$. c #464649", +"~$. c #404044", +"{$. c #424349", +"]$. c #3D3E44", +"^$. c #4B3237", +"/$. c #94181B", +"($. c #7B0B0B", +"_$. c #252428", +":$. c #603333", +"<$. c #777371", +"[$. c #777572", +"}$. c #797774", +"|$. c #7D7B79", +"1$. c #847372", +"2$. c #857474", +"3$. c #9A605F", +"4$. c #B54446", +"5$. c #7C7B77", +"6$. c #746F62", +"7$. c #55493A", +"8$. c #433229", +"9$. c #32251F", +"0$. c #261F1C", +"a$. c #251819", +"b$. c #2F2322", +"c$. c #615353", +"d$. c #7D7474", +"e$. c #786F70", +"f$. c #7C7070", +"g$. c #7C6E6D", +"h$. c #6A5854", +"i$. c #64504C", +"j$. c #503832", +"k$. c #482F28", +"l$. c #3E2C25", +"m$. c #372822", +"n$. c #2E241F", +"o$. c #251F1A", +"p$. c #251F1C", +"q$. c #3D1C19", +"r$. c #403E3A", +"s$. c #5E5D58", +"t$. c #605F59", +"u$. c #6D7070", +"v$. c #5E6160", +"w$. c #5D605F", +"x$. c #675C5C", +"y$. c #AD3131", +"z$. c #A92D2C", +"A$. c #A72B2A", +"B$. c #9C2F2E", +"C$. c #6A4443", +"D$. c #484D4C", +"E$. c #43494A", +"F$. c #414647", +"G$. c #414547", +"H$. c #444749", +"I$. c #444648", +"J$. c #434347", +"K$. c #444347", +"L$. c #434246", +"M$. c #343538", +"N$. c #292B2E", +"O$. c #741416", +"P$. c #86090A", +"Q$. c #87090B", +"R$. c #231215", +"S$. c #231416", +"T$. c #7C0B0C", +"U$. c #3E1215", +"V$. c #2E2D31", +"W$. c #552929", +"X$. c #686263", +"Y$. c #7A7875", +"Z$. c #926665", +"`$. c #A85251", +" %. c #7C7B7A", +".%. c #867678", +"+%. c #9F5956", +"@%. c #77746F", +"#%. c #696054", +"$%. c #4E3E32", +"%%. c #2F231E", +"&%. c #211819", +"*%. c #2B1C1C", +"=%. c #5F5251", +"-%. c #7F7777", +";%. c #7C7170", +">%. c #6C5F5D", +",%. c #645350", +"'%. c #634843", +")%. c #553832", +"!%. c #4D312B", +"~%. c #462D26", +"{%. c #3F2B24", +"]%. c #382722", +"^%. c #31231E", +"/%. c #221E1C", +"(%. c #451515", +"_%. c #8D0C0C", +":%. c #301212", +"<%. c #630E0E", +"[%. c #3D3C39", +"}%. c #46443F", +"|%. c #686764", +"1%. c #7A7C7A", +"2%. c #5C5F5F", +"3%. c #655A5A", +"4%. c #A82C2C", +"5%. c #A62B2A", +"6%. c #A62A29", +"7%. c #A52928", +"8%. c #A42828", +"9%. c #684140", +"0%. c #474D4C", +"a%. c #454C4C", +"b%. c #414748", +"c%. c #404446", +"d%. c #434648", +"e%. c #434647", +"f%. c #414346", +"g%. c #3A3A3E", +"h%. c #242528", +"i%. c #311719", +"j%. c #870A0B", +"k%. c #870A0A", +"l%. c #560F11", +"m%. c #4D2122", +"n%. c #615C5D", +"o%. c #7E7C7A", +"p%. c #7E7B79", +"q%. c #7F7D7C", +"r%. c #7E7D7B", +"s%. c #BE3F41", +"t%. c #9F5957", +"u%. c #777671", +"v%. c #554940", +"w%. c #49382F", +"x%. c #3B2B25", +"y%. c #2C201D", +"z%. c #201616", +"A%. c #57494A", +"B%. c #7A6E6E", +"C%. c #776C6B", +"D%. c #766766", +"E%. c #6A5856", +"F%. c #6B5652", +"G%. c #573B35", +"H%. c #472E28", +"I%. c #402A23", +"J%. c #3A2922", +"K%. c #33231E", +"L%. c #2E221E", +"M%. c #211C1A", +"N%. c #1B1616", +"O%. c #1A1516", +"P%. c #3F1112", +"Q%. c #181515", +"R%. c #301314", +"S%. c #3C1312", +"T%. c #2F1212", +"U%. c #44413D", +"V%. c #4A4843", +"W%. c #4C4A46", +"X%. c #514F4C", +"Y%. c #777576", +"Z%. c #5A5D5D", +"`%. c #754E4E", +" &. c #913F3F", +".&. c #A13333", +"+&. c #A92D2D", +"@&. c #A72C2B", +"#&. c #A52929", +"$&. c #853434", +"%&. c #464B4A", +"&&. c #464B4B", +"*&. c #444B4A", +"=&. c #424949", +"-&. c #414749", +";&. c #3F4547", +">&. c #434649", +",&. c #414345", +"'&. c #6E0C0F", +")&. c #241518", +"!&. c #7E0E10", +"~&. c #321518", +"{&. c #202026", +"]&. c #4B1214", +"^&. c #8F0F11", +"/&. c #471A1C", +"(&. c #595556", +"_&. c #7D7A78", +":&. c #995F5F", +"<&. c #737068", +"[&. c #42322C", +"}&. c #412F29", +"|&. c #352622", +"1&. c #281F1B", +"2&. c #1D1514", +"3&. c #433A3A", +"4&. c #766C6D", +"5&. c #827779", +"6&. c #766867", +"7&. c #6E5E5B", +"8&. c #644B46", +"9&. c #5A3C37", +"0&. c #4B312B", +"a&. c #462F29", +"b&. c #3D2A25", +"c&. c #322721", +"d&. c #2B1F1D", +"e&. c #261D1B", +"f&. c #201918", +"g&. c #570F10", +"h&. c #231414", +"i&. c #5C5A54", +"j&. c #716E6E", +"k&. c #616564", +"l&. c #664D4C", +"m&. c #6D4645", +"n&. c #6C4544", +"o&. c #67403F", +"p&. c #643F3E", +"q&. c #434949", +"r&. c #404647", +"s&. c #3F4647", +"t&. c #404648", +"u&. c #3E4144", +"v&. c #3D3E40", +"w&. c #424346", +"x&. c #474749", +"y&. c #424344", +"z&. c #2C2D2F", +"A&. c #41181C", +"B&. c #42171C", +"C&. c #151316", +"D&. c #571112", +"E&. c #221313", +"F&. c #911214", +"G&. c #481B1E", +"H&. c #4C484A", +"I&. c #797474", +"J&. c #7B7574", +"K&. c #7A7775", +"L&. c #84817F", +"M&. c #83817E", +"N&. c #888582", +"O&. c #888583", +"P&. c #83807E", +"Q&. c #878484", +"R&. c #817E80", +"S&. c #A95455", +"T&. c #916564", +"U&. c #6C685D", +"V&. c #3A2A25", +"W&. c #382623", +"X&. c #2C211D", +"Y&. c #201916", +"Z&. c #3B3131", +"`&. c #736A6A", +" *. c #7A7474", +".*. c #7C7475", +"+*. c #786B69", +"@*. c #6C5956", +"#*. c #58423E", +"$*. c #4E322D", +"%*. c #4A2F28", +"&*. c #442D26", +"**. c #3D2924", +"=*. c #302621", +"-*. c #2C2420", +";*. c #161716", +">*. c #151716", +",*. c #712323", +"'*. c #722424", +")*. c #722525", +"!*. c #441818", +"~*. c #502422", +"{*. c #463531", +"]*. c #4B4843", +"^*. c #52504B", +"/*. c #53524D", +"(*. c #676560", +"_*. c #6C6B67", +":*. c #726F6F", +"<*. c #707273", +"[*. c #65696A", +"}*. c #636767", +"|*. c #626766", +"1*. c #575A5A", +"2*. c #515555", +"3*. c #4D5150", +"4*. c #4B4F4F", +"5*. c #494E4D", +"6*. c #474C4B", +"7*. c #444A49", +"8*. c #424849", +"9*. c #3D4345", +"0*. c #3D4446", +"a*. c #3E4446", +"b*. c #3E4244", +"c*. c #3D3F41", +"d*. c #464647", +"e*. c #35272B", +"f*. c #901316", +"g*. c #901115", +"h*. c #671317", +"i*. c #88090B", +"j*. c #6B2E2E", +"k*. c #4E4E4E", +"l*. c #515051", +"m*. c #262426", +"n*. c #242429", +"o*. c #27262C", +"p*. c #2F2125", +"q*. c #4C2022", +"r*. c #393537", +"s*. c #8D8989", +"t*. c #8A8483", +"u*. c #9B9997", +"v*. c #878481", +"w*. c #928F8D", +"x*. c #9C9A99", +"y*. c #9D9B99", +"z*. c #9B9999", +"A*. c #888586", +"B*. c #926768", +"C*. c #95696B", +"D*. c #AA5456", +"E*. c #8F6463", +"F*. c #76726E", +"G*. c #6D5A51", +"H*. c #64332B", +"I*. c #731715", +"J*. c #910E0D", +"K*. c #740D0C", +"L*. c #581C1C", +"M*. c #7B6565", +"N*. c #827A79", +"O*. c #7F7674", +"P*. c #766B68", +"Q*. c #65534E", +"R*. c #59433B", +"S*. c #49312B", +"T*. c #473029", +"U*. c #432D26", +"V*. c #3B2923", +"W*. c #28221E", +"X*. c #231D1B", +"Y*. c #181615", +"Z*. c #A74747", +"`*. c #A74848", +" =. c #A84848", +".=. c #A84849", +"+=. c #A64343", +"@=. c #9E2221", +"#=. c #982724", +"$=. c #743A37", +"%=. c #878582", +"&=. c #878584", +"*=. c #939291", +"==. c #72706F", +"-=. c #727070", +";=. c #757373", +">=. c #616667", +",=. c #616565", +"'=. c #5B5E5D", +")=. c #545756", +"!=. c #525656", +"~=. c #505554", +"{=. c #4E5252", +"]=. c #4C5050", +"^=. c #4A4F4F", +"/=. c #464C4B", +"(=. c #404748", +"_=. c #3E4546", +":=. c #3D4244", +"<=. c #3D4144", +"[=. c #3E4143", +"}=. c #414143", +"|=. c #464547", +"1=. c #403438", +"2=. c #86171A", +"3=. c #921519", +"4=. c #6A171C", +"5=. c #1A1A22", +"6=. c #620D0E", +"7=. c #8C0D0F", +"8=. c #A34041", +"9=. c #984141", +"0=. c #764B4D", +"a=. c #393739", +"b=. c #4E1518", +"c=. c #312023", +"d=. c #2E2A2C", +"e=. c #7E797A", +"f=. c #888383", +"g=. c #84827F", +"h=. c #85827F", +"i=. c #9C9A98", +"j=. c #928F8C", +"k=. c #868383", +"l=. c #9C9A9A", +"m=. c #888585", +"n=. c #AB4947", +"o=. c #AF3D3A", +"p=. c #B02F2D", +"q=. c #8E0D0C", +"r=. c #9B1C1C", +"s=. c #B73738", +"t=. c #B84445", +"u=. c #816D6A", +"v=. c #6E655F", +"w=. c #60534B", +"x=. c #533E35", +"y=. c #4E3A2F", +"z=. c #473329", +"A=. c #423028", +"B=. c #3C2B25", +"C=. c #342621", +"D=. c #2C221E", +"E=. c #221B19", +"F=. c #1A1716", +"G=. c #1B1817", +"H=. c #25201E", +"I=. c #24211F", +"J=. c #741110", +"K=. c #1D1B19", +"L=. c #1C1B19", +"M=. c #A03A3A", +"N=. c #942020", +"O=. c #941F1F", +"P=. c #9E3535", +"Q=. c #A44242", +"R=. c #AB4B4B", +"S=. c #B15151", +"T=. c #A83231", +"U=. c #A42523", +"V=. c #7F3835", +"W=. c #777673", +"X=. c #878684", +"Y=. c #888685", +"Z=. c #727170", +"`=. c #737272", +" -. c #757474", +".-. c #767575", +"+-. c #777676", +"@-. c #79797C", +"#-. c #646768", +"$-. c #606464", +"%-. c #505353", +"&-. c #4F5352", +"*-. c #4D5151", +"=-. c #494E4E", +"--. c #484D4D", +";-. c #464C4C", +">-. c #444B4B", +",-. c #434A49", +"'-. c #414747", +")-. c #3D4445", +"!-. c #3E4447", +"~-. c #3F4244", +"{-. c #4D4C4D", +"]-. c #583C3D", +"^-. c #8C1D1F", +"/-. c #94171A", +"(-. c #652026", +"_-. c #661113", +":-. c #8D0F10", +"<-. c #952525", +"[-. c #A64747", +"}-. c #962627", +"|-. c #A0393A", +"1-. c #9D484A", +"2-. c #3C1F22", +"3-. c #2C2829", +"4-. c #686363", +"5-. c #726C6B", +"6-. c #837F7F", +"7-. c #9A9996", +"8-. c #86827F", +"9-. c #918E8B", +"0-. c #898783", +"a-. c #7D7A76", +"b-. c #848180", +"c-. c #928F8F", +"d-. c #838080", +"e-. c #857577", +"f-. c #BC3D3C", +"g-. c #B73836", +"h-. c #B43433", +"i-. c #A62625", +"j-. c #AB2B2A", +"k-. c #BB3A39", +"l-. c #885955", +"m-. c #675F56", +"n-. c #594D44", +"o-. c #514036", +"p-. c #4D3B31", +"q-. c #403129", +"r-. c #2E231E", +"s-. c #1F1817", +"t-. c #1B1718", +"u-. c #292421", +"v-. c #3D3630", +"w-. c #3F3832", +"x-. c #403A33", +"y-. c #48342E", +"z-. c #402E2B", +"A-. c #2E2C28", +"B-. c #2B2825", +"C-. c #292623", +"D-. c #262321", +"E-. c #1B1B1A", +"F-. c #4F1616", +"G-. c #671212", +"H-. c #9D3434", +"I-. c #931B1B", +"J-. c #AA4746", +"K-. c #B45453", +"L-. c #AE403F", +"M-. c #A72725", +"N-. c #5F5E58", +"O-. c #6F6D6A", +"P-. c #6C6E6F", +"Q-. c #545858", +"R-. c #4F5353", +"S-. c #474C4D", +"T-. c #454B4C", +"U-. c #3E4547", +"V-. c #3C4144", +"W-. c #3E4346", +"X-. c #464749", +"Y-. c #4F4F50", +"Z-. c #7F3939", +"`-. c #9A1D1F", +" ;. c #8F2123", +".;. c #532B31", +"+;. c #282933", +"@;. c #21212C", +"#;. c #16171A", +"$;. c #5B1417", +"%;. c #8E1314", +"&;. c #A74749", +"*;. c #9A282A", +"=;. c #6B1619", +"-;. c #2B1D1E", +";;. c #880909", +">;. c #7E0E0F", +",;. c #655E5E", +"';. c #6E6766", +");. c #76706F", +"!;. c #9C9998", +"~;. c #858280", +"{;. c #7C7975", +"];. c #9F5756", +"^;. c #906563", +"/;. c #8D6260", +"(;. c #8A5E5D", +"_;. c #8F6261", +":;. c #906363", +"<;. c #8A5C59", +"[;. c #6C665E", +"};. c #60594C", +"|;. c #564E40", +"1;. c #4D4135", +"2;. c #493B31", +"3;. c #44372E", +"4;. c #41352D", +"5;. c #352923", +"6;. c #271E1C", +"7;. c #201919", +"8;. c #181414", +"9;. c #3F3A37", +"0;. c #4F4946", +"a;. c #5C5952", +"b;. c #5B5850", +"c;. c #5A564D", +"d;. c #575349", +"e;. c #565349", +"f;. c #4F4C41", +"g;. c #4C463F", +"h;. c #403B34", +"i;. c #3D3831", +"j;. c #35312B", +"k;. c #322E29", +"l;. c #2A2723", +"m;. c #414040", +"n;. c #282727", +"o;. c #741111", +"p;. c #952222", +"q;. c #9F3636", +"r;. c #A84A4A", +"s;. c #9D3433", +"t;. c #972726", +"u;. c #972626", +"v;. c #A03939", +"w;. c #911919", +"x;. c #911A1A", +"y;. c #9D3334", +"z;. c #A53F3F", +"A;. c #AE504F", +"B;. c #AB3735", +"C;. c #6A6865", +"D;. c #868583", +"E;. c #939190", +"F;. c #777577", +"G;. c #585C5C", +"H;. c #505555", +"I;. c #4F5253", +"J;. c #42494A", +"K;. c #3B4244", +"L;. c #3C4245", +"M;. c #3D4346", +"N;. c #404447", +"O;. c #47494B", +"P;. c #694042", +"Q;. c #9E2E2F", +"R;. c #A32626", +"S;. c #972829", +"T;. c #693337", +"U;. c #3F4047", +"V;. c #30323A", +"W;. c #1A1B22", +"X;. c #4A2223", +"Y;. c #923434", +"Z;. c #952424", +"`;. c #A34142", +" >. c #A8494A", +".>. c #A74648", +"+>. c #A64446", +"@>. c #8F1013", +"#>. c #811012", +"$>. c #826566", +"%>. c #A5A5A5", +"&>. c #494949", +"*>. c #504F50", +"=>. c #505050", +"->. c #634041", +";>. c #77191A", +">>. c #1C1718", +",>. c #645E5E", +"'>. c #67605F", +")>. c #837F7D", +"!>. c #797573", +"~>. c #908D8C", +"{>. c #9B9996", +"]>. c #B5B3B2", +"^>. c #979593", +"/>. c #D8D7D5", +"(>. c #999693", +"_>. c #B7B5B3", +":>. c #A3A19F", +"<>. c #999695", +"[>. c #999897", +"}>. c #B47C7D", +"|>. c #CB6768", +"1>. c #C04445", +"2>. c #B46B6C", +"3>. c #9A999A", +"4>. c #9D9C9C", +"5>. c #918F90", +"6>. c #8C8A89", +"7>. c #908E8D", +"8>. c #838180", +"9>. c #989797", +"0>. c #999898", +"a>. c #9A9898", +"b>. c #928E8E", +"c>. c #8F8C88", +"d>. c #ACA9A4", +"e>. c #615B4D", +"f>. c #554D3E", +"g>. c #4F4538", +"h>. c #4F453A", +"i>. c #675E56", +"j>. c #716962", +"k>. c #69625C", +"l>. c #625B57", +"m>. c #5F5A57", +"n>. c #5C5655", +"o>. c #534D4C", +"p>. c #3E3939", +"q>. c #261F1F", +"r>. c #433D3D", +"s>. c #464241", +"t>. c #565351", +"u>. c #6B6763", +"v>. c #6F6B66", +"w>. c #827F7C", +"x>. c #8D8A86", +"y>. c #8D8B87", +"z>. c #8D8A85", +"A>. c #86847D", +"B>. c #77736C", +"C>. c #625F56", +"D>. c #5D5A50", +"E>. c #706D65", +"F>. c #747169", +"G>. c #59544B", +"H>. c #4C483E", +"I>. c #484439", +"J>. c #454137", +"K>. c #464139", +"L>. c #595655", +"M>. c #504F4E", +"N>. c #393939", +"O>. c #4C4C4C", +"P>. c #535151", +"Q>. c #525151", +"R>. c #4A4A4A", +"S>. c #535252", +"T>. c #4D4C4C", +"U>. c #525252", +"V>. c #474545", +"W>. c #545353", +"X>. c #4E4C4C", +"Y>. c #513737", +"Z>. c #704242", +"`>. c #964B4B", +" ,. c #8F1414", +".,. c #8F1515", +"+,. c #A13C3C", +"@,. c #A84949", +"#,. c #9D3333", +"$,. c #A74847", +"%,. c #823D3D", +"&,. c #681616", +"*,. c #6E4E4E", +"=,. c #644141", +"-,. c #6E4D4D", +";,. c #4E2626", +">,. c #9B2D2E", +",,. c #D09A9A", +"',. c #E0BEBE", +"),. c #E5C5C5", +"!,. c #E1C7C7", +"~,. c #C4C3C2", +"{,. c #8F8E8C", +"],. c #71706D", +"^,. c #797976", +"/,. c #858482", +"(,. c #AAA9A8", +"_,. c #6B6966", +":,. c #8F8D8C", +"<,. c #858383", +"[,. c #716F6E", +"},. c #8E8D8C", +"|,. c #AEAEAD", +"1,. c #939191", +"2,. c #8B8A8A", +"3,. c #868585", +"4,. c #6A6D6D", +"5,. c #444A4B", +"6,. c #43484A", +"7,. c #404547", +"8,. c #3E4647", +"9,. c #3D4245", +"0,. c #414447", +"a,. c #45474A", +"b,. c #4A4C4F", +"c,. c #63484A", +"d,. c #6C4244", +"e,. c #5D4143", +"f,. c #48494C", +"g,. c #48484D", +"h,. c #1D1E26", +"i,. c #2A2A2C", +"j,. c #584D4E", +"k,. c #7B4444", +"l,. c #A34141", +"m,. c #9C3333", +"n,. c #A94A4B", +"o,. c #A33A3C", +"p,. c #8F1516", +"q,. c #F5E9E9", +"r,. c #EFEBEB", +"s,. c #6B6B6B", +"t,. c #3D3D3D", +"u,. c #3C3C3C", +"v,. c #4F4E4F", +"w,. c #5E5A59", +"x,. c #635E5D", +"y,. c #645C5B", +"z,. c #706867", +"A,. c #9A9695", +"B,. c #84807F", +"C,. c #918E8D", +"D,. c #A8A6A3", +"E,. c #9C9A97", +"F,. c #A8A6A4", +"G,. c #D9D8D8", +"H,. c #BDBCBC", +"I,. c #9D9B9A", +"J,. c #929090", +"K,. c #A19494", +"L,. c #C87474", +"M,. c #CE6D6E", +"N,. c #BD7D7E", +"O,. c #979597", +"P,. c #939292", +"Q,. c #969595", +"R,. c #9C9B9B", +"S,. c #9B9A99", +"T,. c #9B9998", +"U,. c #8B8987", +"V,. c #999896", +"W,. c #999999", +"X,. c #979696", +"Y,. c #979695", +"Z,. c #9A9897", +"`,. c #999796", +" '. c #9A9795", +".'. c #A7A4A1", +"+'. c #CFCECB", +"@'. c #656154", +"#'. c #5B5547", +"$'. c #5C5447", +"%'. c #746D64", +"&'. c #716B62", +"*'. c #6D675F", +"='. c #6B655E", +"-'. c #5F5A56", +";'. c #66605F", +">'. c #757371", +",'. c #817F7D", +"''. c #93928F", +")'. c #999694", +"!'. c #94908F", +"~'. c #898583", +"{'. c #8F8B87", +"]'. c #8B8883", +"^'. c #6E6B64", +"/'. c #7E7A74", +"('. c #86837D", +"_'. c #5B574D", +":'. c #524F42", +"<'. c #4C493C", +"['. c #6E6A61", +"}'. c #706C66", +"|'. c #4E4A48", +"1'. c #4F4C4C", +"2'. c #595756", +"3'. c #565453", +"4'. c #474544", +"5'. c #403F3F", +"6'. c #444444", +"7'. c #515050", +"8'. c #4D4D4D", +"9'. c #3F3E3E", +"0'. c #553C3C", +"a'. c #753939", +"b'. c #9C4444", +"c'. c #A94A4A", +"d'. c #9E3232", +"e'. c #A54242", +"f'. c #9F4A4A", +"g'. c #7C3333", +"h'. c #601A1A", +"i'. c #1F1E1E", +"j'. c #373636", +"k'. c #4B4A49", +"l'. c #444443", +"m'. c #2B2A2A", +"n'. c #525152", +"o'. c #5C5152", +"p'. c #633E3E", +"q'. c #CAB3B3", +"r'. c #BF9998", +"s'. c #AA8281", +"t'. c #A59E9C", +"u'. c #8D8D8A", +"v'. c #C5C4C3", +"w'. c #ECECEC", +"x'. c #A7A6A4", +"y'. c #898886", +"z'. c #969694", +"A'. c #CCCCCB", +"B'. c #888684", +"C'. c #8E8D8B", +"D'. c #83817F", +"E'. c #898787", +"F'. c #91908F", +"G'. c #8D8C8B", +"H'. c #A1A19F", +"I'. c #CFCECE", +"J'. c #949292", +"K'. c #929191", +"L'. c #969696", +"M'. c #555958", +"N'. c #4C5051", +"O'. c #4A4F50", +"P'. c #464C4D", +"Q'. c #434849", +"R'. c #424749", +"S'. c #42474A", +"T'. c #44474A", +"U'. c #4B4D4F", +"V'. c #4D4F51", +"W'. c #4D4F50", +"X'. c #4D4D4F", +"Y'. c #4B4A4F", +"Z'. c #403E45", +"`'. c #3D3C44", +" ). c #34343D", +".). c #1B1B22", +"+). c #202129", +"@). c #212229", +"#). c #5D4747", +"$). c #931A1C", +"%). c #A8494B", +"&). c #AB4B4D", +"*). c #C48384", +"=). c #EBD6D6", +"-). c #C17E7E", +";). c #CAAEAE", +">). c #595656", +",). c #6F6A69", +"'). c #948F8E", +")). c #7E7876", +"!). c #A6A4A2", +"~). c #898785", +"{). c #9C9996", +"]). c #797773", +"^). c #A6A5A2", +"/). c #8E8B89", +"(). c #9C9B99", +"_). c #989594", +":). c #868483", +"<). c #999696", +"[). c #B6B5B5", +"}). c #B38787", +"|). c #AE8D8E", +"1). c #838181", +"2). c #B0AFAE", +"3). c #BCBBBA", +"4). c #A5A4A2", +"5). c #949391", +"6). c #7B7B79", +"7). c #8C8B89", +"8). c #989694", +"9). c #979591", +"0). c #6F6C65", +"a). c #676459", +"b). c #605B4F", +"c). c #716B5F", +"d). c #88847B", +"e). c #A5A19B", +"f). c #817D74", +"g). c #837D76", +"h). c #95918C", +"i). c #6C6865", +"j). c #878482", +"k). c #888483", +"l). c #827F7E", +"m). c #A4A2A2", +"n). c #A4A3A2", +"o). c #817E7E", +"p). c #868181", +"q). c #8D8986", +"r). c #A19F9A", +"s). c #93908B", +"t). c #87847F", +"u). c #84817B", +"v). c #565346", +"w). c #555244", +"x). c #6A675C", +"y). c #A5A29C", +"z). c #A09D97", +"A). c #3C362F", +"B). c #5C5B5B", +"C). c #8D8D8C", +"D). c #555453", +"E). c #4E4D4B", +"F). c #4C4B4B", +"G). c #363636", +"H). c #8C8C8C", +"I). c #656565", +"J). c #5C5050", +"K). c #672525", +"L). c #AA5F5F", +"M). c #B25E5E", +"N). c #A13A3A", +"O). c #5B3636", +"P). c #313030", +"Q). c #B9B9B9", +"R). c #797877", +"S). c #757472", +"T). c #82817E", +"U). c #A2A2A0", +"V). c #8D8C8A", +"W). c #9E9C9C", +"X). c #ABABAA", +"Y). c #898888", +"Z). c #959494", +"`). c #636666", +" !. c #575B5A", +".!. c #545857", +"+!. c #494D4E", +"@!. c #3C4145", +"#!. c #3F4448", +"$!. c #42464A", +"%!. c #43474A", +"&!. c #494C4F", +"*!. c #4D5053", +"=!. c #505254", +"-!. c #4F5053", +";!. c #4E4E51", +">!. c #505053", +",!. c #525053", +"'!. c #4D4B4F", +")!. c #444348", +"!!. c #3E3D44", +"~!. c #313137", +"{!. c #2A2A32", +"]!. c #20202D", +"^!. c #2B2A2D", +"/!. c #231415", +"(!. c #691315", +"_!. c #A33D3F", +":!. c #ECD7D8", +"~. c #2F2F2F", +",~. c #545354", +"'~. c #343434", +")~. c #BEBEBE", +"!~. c #828280", +"~~. c #474643", +"{~. c #B6B5B4", +"]~. c #D8D8D7", +"^~. c #8D8B8A", +"/~. c #DEDEDD", +"(~. c #CFCFCE", +"_~. c #818080", +":~. c #959493", +"<~. c #737271", +"[~. c #727474", +"}~. c #626667", +"|~. c #535856", +"1~. c #4D5252", +"2~. c #4A5050", +"3~. c #454A4C", +"4~. c #404749", +"5~. c #3F4648", +"6~. c #3B4146", +"7~. c #3E4347", +"8~. c #404448", +"9~. c #43464A", +"0~. c #44484C", +"a~. c #45494C", +"b~. c #4E5153", +"c~. c #505255", +"d~. c #505054", +"e~. c #555559", +"f~. c #585659", +"g~. c #535155", +"h~. c #4E4C50", +"i~. c #3B3B40", +"j~. c #323238", +"k~. c #1C1C24", +"l~. c #1F202A", +"m~. c #2C2A2D", +"n~. c #525153", +"o~. c #4E4E4F", +"p~. c #28272A", +"q~. c #847A7D", +"r~. c #EFEBEC", +"s~. c #4B2227", +"t~. c #A29595", +"u~. c #3C3C3B", +"v~. c #4E4A49", +"w~. c #4E4745", +"x~. c #797371", +"y~. c #8C8B8A", +"z~. c #767471", +"A~. c #A5A3A1", +"B~. c #A6A4A1", +"C~. c #AEADAB", +"D~. c #9C9B9A", +"E~. c #D7D6D6", +"F~. c #929091", +"G~. c #AAA9AA", +"H~. c #878585", +"I~. c #908E8E", +"J~. c #9F9D9B", +"K~. c #969593", +"L~. c #848281", +"M~. c #B8B7B6", +"N~. c #C9C8C5", +"O~. c #E1E0DE", +"P~. c #817C72", +"Q~. c #6C685E", +"R~. c #77736F", +"S~. c #EEEDED", +"T~. c #838281", +"U~. c #888686", +"V~. c #BCBABA", +"W~. c #878687", +"X~. c #7B797B", +"Y~. c #A7A5A6", +"Z~. c #E5E4E4", +"`~. c #CFCFCC", +" {. c #6D6A61", +".{. c #69665C", +"+{. c #646055", +"@{. c #CBCAC7", +"#{. c #F1F1F0", +"${. c #AAA7A2", +"%{. c #4F4B3F", +"&{. c #87847C", +"*{. c #ECECEA", +"={. c #84817A", +"-{. c #5D5850", +";{. c #7F7A76", +">{. c #5A5957", +",{. c #585655", +"'{. c #565554", +"){. c #3C3A39", +"!{. c #666565", +"~{. c #666666", +"{{. c #393838", +"]{. c #655050", +"^{. c #502929", +"/{. c #9E3434", +"({. c #C58585", +"_{. c #B66666", +":{. c #886262", +"<{. c #EAE8E8", +"[{. c #3B3939", +"}{. c #F3E7E7", +"|{. c #832C2C", +"1{. c #CCB0B0", +"2{. c #CB9393", +"3{. c #BF7979", +"4{. c #B2B1B1", +"5{. c #444343", +"6{. c #555555", +"7{. c #31312F", +"8{. c #4A4946", +"9{. c #74726F", +"0{. c #595754", +"a{. c #888886", +"b{. c #8F8D8B", +"c{. c #9E9D9C", +"d{. c #CECECD", +"e{. c #F3F3F2", +"f{. c #A09E9E", +"g{. c #949393", +"h{. c #908F8F", +"i{. c #757575", +"j{. c #6C6F6F", +"k{. c #696C6C", +"l{. c #626566", +"m{. c #4B5050", +"n{. c #494E4F", +"o{. c #3D4546", +"p{. c #3C4345", +"q{. c #3D4246", +"r{. c #3C4146", +"s{. c #3E4449", +"t{. c #414649", +"u{. c #45494D", +"v{. c #46494D", +"w{. c #474A4D", +"x{. c #4A4E50", +"y{. c #4D5052", +"z{. c #505256", +"A{. c #525356", +"B{. c #565559", +"C{. c #575559", +"D{. c #555256", +"E{. c #4E4D4F", +"F{. c #464548", +"G{. c #2D2C33", +"H{. c #3E3D40", +"I{. c #525052", +"J{. c #454445", +"K{. c #272727", +"L{. c #2D2C2D", +"M{. c #2E2C30", +"N{. c #B4B4B6", +"O{. c #A4A2A8", +"P{. c #2B2B32", +"Q{. c #191A1D", +"R{. c #474443", +"S{. c #413A38", +"T{. c #625B58", +"U{. c #D3D1D0", +"V{. c #7F7F7C", +"W{. c #BCBAB9", +"X{. c #787571", +"Y{. c #DDDCDB", +"Z{. c #959390", +"`{. c #ADACAB", +" ]. c #C7C7C7", +".]. c #8E8C8C", +"+]. c #8F8D8D", +"@]. c #9A9997", +"#]. c #D2D2D1", +"$]. c #747270", +"%]. c #D8D7D6", +"&]. c #CBCAC6", +"*]. c #AAA7A1", +"=]. c #837F76", +"-]. c #827F76", +";]. c #7A766F", +">]. c #CDCBC9", +",]. c #6A6763", +"']. c #706F6E", +")]. c #A6A4A4", +"!]. c #E8E8E8", +"~]. c #AAA9AB", +"{]. c #706E68", +"]]. c #6A675F", +"^]. c #656259", +"/]. c #5B564C", +"(]. c #F0F0EE", +"_]. c #A9A7A1", +":]. c #4F493D", +"<]. c #D7D6D3", +"[]. c #837E78", +"}]. c #746E68", +"|]. c #5B5550", +"1]. c #4C453F", +"2]. c #473F3C", +"3]. c #BEBDBC", +"4]. c #343230", +"5]. c #E8E8E7", +"6]. c #514E4D", +"7]. c #565454", +"8]. c #494847", +"9]. c #452A2A", +"0]. c #BF9B9B", +"a]. c #CBAEAE", +"b]. c #902F2F", +"c]. c #901818", +"d]. c #9C2F2F", +"e]. c #A94B4B", +"f]. c #C58686", +"g]. c #E2C2C2", +"h]. c #351717", +"i]. c #D7D7D7", +"j]. c #424141", +"k]. c #BC9F9F", +"l]. c #CC9393", +"m]. c #8D0F0F", +"n]. c #C07979", +"o]. c #B15D5D", +"p]. c #D9AFAF", +"q]. c #454545", +"r]. c #2B2B29", +"s]. c #C0C0BF", +"t]. c #74736F", +"u]. c #989896", +"v]. c #CDCCCC", +"w]. c #949392", +"x]. c #9E9E9C", +"y]. c #C3C2C2", +"z]. c #959393", +"A]. c #767574", +"B]. c #5B5F5F", +"C]. c #565A59", +"D]. c #4A504F", +"E]. c #42484A", +"F]. c #3B4346", +"G]. c #3C4346", +"H]. c #3B4045", +"I]. c #3F4449", +"J]. c #404449", +"K]. c #44484B", +"L]. c #484B4D", +"M]. c #4A4D50", +"N]. c #4C5052", +"O]. c #505356", +"P]. c #515256", +"Q]. c #545558", +"R]. c #5C5B5E", +"S]. c #595659", +"T]. c #524F51", +"U]. c #4A494A", +"V]. c #3F3D40", +"W]. c #302F34", +"X]. c #4E4E50", +"Y]. c #4E4D4E", +"Z]. c #4E4D4D", +"`]. c #555356", +" ^. c #69686A", +".^. c #DAD9DB", +"+^. c #8A8989", +"@^. c #413F3E", +"#^. c #58514F", +"$^. c #D2D0CF", +"%^. c #B7B5B4", +"&^. c #787673", +"*^. c #D2D1CF", +"=^. c #7B7974", +"-^. c #908E8C", +";^. c #ADABAB", +">^. c #BCBCBA", +",^. c #797778", +"'^. c #908E8F", +")^. c #A8A6A8", +"!^. c #DEDDDE", +"~^. c #A6A4A3", +"{^. c #B9B7B5", +"]^. c #D7D7D5", +"^^. c #ADABA6", +"/^. c #78756E", +"(^. c #7F7B76", +"_^. c #8D8B86", +":^. c #D9D8D7", +"<^. c #B3B2B1", +"[^. c #787779", +"}^. c #A7A6A6", +"|^. c #D0CFCE", +"1^. c #6D6A64", +"2^. c #646159", +"3^. c #635F55", +"4^. c #585349", +"5^. c #555045", +"6^. c #CFCDCA", +"7^. c #A7A29E", +"8^. c #CFCDCC", +"9^. c #CDCBCA", +"0^. c #CCCAC9", +"a^. c #CAC9C8", +"b^. c #DBDAD9", +"c^. c #8F8E8D", +"d^. c #545352", +"e^. c #DCB5B5", +"f^. c #C38181", +"g^. c #A84948", +"h^. c #A03737", +"i^. c #AC8888", +"j^. c #C7C3C3", +"k^. c #555454", +"l^. c #504444", +"m^. c #F2E4E4", +"n^. c #2D2D2D", +"o^. c #C68686", +"p^. c #2A292A", +"q^. c #BFBEBE", +"r^. c #888786", +"s^. c #7E7D7A", +"t^. c #8A8988", +"u^. c #989695", +"v^. c #CBCBCA", +"w^. c #696865", +"x^. c #AEADAC", +"y^. c #E6E6E5", +"z^. c #A6A5A4", +"A^. c #AFAEAE", +"B^. c #888787", +"C^. c #808182", +"D^. c #636665", +"E^. c #5D5F60", +"F^. c #5C6061", +"G^. c #5A5E5E", +"H^. c #565B5B", +"I^. c #555959", +"J^. c #505454", +"K^. c #4F5453", +"L^. c #3D4347", +"M^. c #3B4145", +"N^. c #3C4246", +"O^. c #3E4348", +"P^. c #41464A", +"Q^. c #464A4C", +"R^. c #474B4D", +"S^. c #4B4F52", +"T^. c #4A4E52", +"U^. c #4C4F54", +"V^. c #5F5D5E", +"W^. c #565254", +"X^. c #4D4A4B", +"Y^. c #3B393C", +"Z^. c #2C2B2F", +"`^. c #1F2026", +" /. c #202127", +"./. c #2A292C", +"+/. c #525253", +"@/. c #282829", +"#/. c #313032", +"$/. c #8D8C8F", +"%/. c #8F8E92", +"&/. c #8C8B8F", +"*/. c #6E6D72", +"=/. c #69696C", +"-/. c #3B3B3B", +";/. c #3E3D3C", +">/. c #4D4644", +",/. c #D2CFCE", +"'/. c #767572", +")/. c #A4A4A0", +"!/. c #999794", +"~/. c #DEDEDC", +"{/. c #908E8B", +"]/. c #D8D7D7", +"^/. c #A8A6A7", +"//. c #72706D", +"(/. c #B5B4B1", +"_/. c #CAC9C7", +":/. c #AEADA9", +"(. c #B1B0B0", +",(. c #1F1B1A", +"'(. c #D0CDCD", +")(. c #B7B4B3", +"!(. c #BCBAB8", +"~(. c #D2D2D0", +"{(. c #A7A5A2", +"](. c #9C9A96", +"^(. c #ADADAB", +"/(. c #898887", +"((. c #E4E3E3", +"_(. c #A6A5A3", +":(. c #777471", +"<(. c #74716E", +"[(. c #716E6B", +"}(. c #ACA9A6", +"|(. c #8C8984", +"1(. c #AAA8A8", +"2(. c #9A9899", +"3(. c #989697", +"4(. c #888789", +"5(. c #C2C1C3", +"6(. c #BAB9B8", +"7(. c #76736E", +"8(. c #706D67", +"9(. c #757169", +"0(. c #534E43", +"a(. c #9F9B97", +"b(. c #403830", +"c(. c #D4D2D0", +"d(. c #898581", +"e(. c #9B9A9A", +"f(. c #9A9999", +"g(. c #817F7F", +"h(. c #474444", +"i(. c #535150", +"j(. c #B3B2B2", +"k(. c #676565", +"l(. c #666464", +"m(. c #CFCBCB", +"n(. c #591313", +"o(. c #6D1E1E", +"p(. c #814C4C", +"q(. c #6F4F4F", +"r(. c #515151", +"s(. c #464645", +"t(. c #C0C0C0", +"u(. c #686868", +"v(. c #1C1C1A", +"w(. c #D0CCCC", +"x(. c #E0CACA", +"y(. c #B35E5E", +"z(. c #CCCBCB", +"A(. c #762B2B", +"B(. c #A03B3A", +"C(. c #B86B6B", +"D(. c #E5C8C8", +"E(. c #373637", +"F(. c #5E5E5E", +"G(. c #3A3A39", +"H(. c #3A3A38", +"I(. c #C4C4C3", +"J(. c #91918F", +"K(. c #81807E", +"L(. c #B6B6B4", +"M(. c #B3B3B2", +"N(. c #BCBBBB", +"O(. c #E7E7E6", +"P(. c #5C6161", +"Q(. c #595E5E", +"R(. c #525756", +"S(. c #4F5554", +"T(. c #4E5353", +"U(. c #4C5151", +"V(. c #494F4F", +"W(. c #40464A", +"X(. c #42474B", +"Y(. c #454A4E", +"Z(. c #464A4E", +"`(. c #494D4F", +" _. c #4D5154", +"._. c #4D5054", +"+_. c #58585D", +"@_. c #565556", +"#_. c #474647", +"$_. c #37373B", +"%_. c #2E2F34", +"&_. c #28292F", +"*_. c #23252B", +"=_. c #282930", +"-_. c #2C2C36", +";_. c #292834", +">_. c #474747", +",_. c #CECECF", +"'_. c #45444A", +")_. c #57565C", +"!_. c #4A484F", +"~_. c #CDCCCB", +"{_. c #B6B3B1", +"]_. c #D9D9D8", +"^_. c #BAB9B7", +"/_. c #767470", +"(_. c #9A9895", +"__. c #999797", +":_. c #A6A5A6", +"<_. c #D3D2D3", +"[_. c #DBDBDB", +"}_. c #82817F", +"|_. c #908D8B", +"1_. c #D1D0CF", +"2_. c #6E6B66", +"3_. c #76746F", +"4_. c #B4B3B0", +"5_. c #D7D5D3", +"6_. c #CECCCA", +"7_. c #ACA9A7", +"8_. c #807C79", +"9_. c #A5A3A3", +"0_. c #928F90", +"a_. c #969596", +"b_. c #A9A8A9", +"c_. c #B7B6B7", +"d_. c #7F7E7C", +"e_. c #E7E6E5", +"f_. c #6D6A62", +"g_. c #66635B", +"h_. c #A7A59F", +"i_. c #7B766E", +"j_. c #4D463A", +"k_. c #746E65", +"l_. c #DFDDDC", +"m_. c #9C9895", +"n_. c #A5A2A1", +"o_. c #4D4A48", +"p_. c #4D4B4B", +"q_. c #494747", +"r_. c #656363", +"s_. c #323030", +"t_. c #403E3E", +"u_. c #5A5A5A", +"v_. c #676666", +"w_. c #474645", +"x_. c #B8B7B7", +"y_. c #484847", +"z_. c #281A1A", +"A_. c #BFBEBF", +"B_. c #636363", +"C_. c #2B2A29", +"D_. c #4B4A4A", +"E_. c #EDE4E4", +"F_. c #9A2C2C", +"G_. c #E7CDCD", +"H_. c #BE7878", +"I_. c #41413F", +"J_. c #3F3E3C", +"K_. c #C6C6C5", +"L_. c #CBCAC9", +"M_. c #A9A9A7", +"N_. c #A0A09E", +"O_. c #DCDBDB", +"P_. c #DADAD9", +"Q_. c #5D6161", +"R_. c #5C5F60", +"S_. c #5C6160", +"T_. c #5C605F", +"U_. c #595D5C", +"V_. c #515655", +"W_. c #4B5152", +"X_. c #414849", +"Y_. c #44494D", +"Z_. c #474C50", +"`_. c #484C50", +" :. c #4A4D51", +".:. c #4F5256", +"+:. c #505357", +"@:. c #5D5B5D", +"#:. c #414041", +"$:. c #2E2E36", +"%:. c #2A2934", +"&:. c #2A2A35", +"*:. c #1B1A21", +"=:. c #3F3F45", +"-:. c #525355", +";:. c #535157", +">:. c #46454C", +",:. c #4C4C52", +"':. c #56565C", +"):. c #2E2E34", +"!:. c #222226", +"~:. c #403F40", +"{:. c #2B2524", +"]:. c #A6A2A1", +"^:. c #A9A5A4", +"/:. c #7F7C79", +"(:. c #C0C0BE", +"_:. c #B0AEAB", +"::. c #B3B2B0", +"<:. c #969490", +"[:. c #969492", +"}:. c #C7C7C6", +"|:. c #A3A2A1", +"1:. c #E2E2E1", +"2:. c #F4F4F4", +"3:. c #C9C9C9", +"4:. c #9C999A", +"5:. c #92908F", +"6:. c #8F8D8A", +"7:. c #9A9896", +"8:. c #8D8C89", +"9:. c #93928E", +"0:. c #B2B0AE", +"a:. c #73716D", +"b:. c #706D69", +"c:. c #6C6964", +"d:. c #A8A5A1", +"e:. c #BAB9B5", +"f:. c #ABA9A6", +"g:. c #A4A29F", +"h:. c #908D8A", +"i:. c #93918F", +"j:. c #B4B3B2", +"k:. c #9D9C9E", +"l:. c #CCCBCA", +"m:. c #A09F9B", +"n:. c #8C8880", +"o:. c #EAEAE8", +"p:. c #CCCAC8", +"q:. c #9B9794", +"r:. c #2D2623", +"s:. c #575350", +"t:. c #D5D4D3", +"u:. c #686666", +"v:. c #525050", +"w:. c #414141", +"x:. c #4F4F4E", +"y:. c #444242", +"z:. c #3E3C3C", +"A:. c #919090", +"B:. c #4A4949", +"C:. c #B9B0B0", +"D:. c #986060", +"E:. c #8D1212", +"F:. c #A44141", +"G:. c #B15C5C", +"H:. c #E8CFCF", +"I:. c #696868", +"J:. c #8C8C8B", +"K:. c #787777", +"L:. c #2B2A2B", +"M:. c #4B4A48", +"N:. c #B2B1B0", +"O:. c #D5D5D4", +"P:. c #CACAC9", +"Q:. c #CBCACA", +"R:. c #7E7E7B", +"S:. c #8B8A88", +"T:. c #C0BFBE", +"U:. c #858483", +"V:. c #8A8887", +"W:. c #AEADAD", +"X:. c #8F8E8E", +"Y:. c #797878", +"Z:. c #5C6060", +"`:. c #5B5F5E", +" <. c #585C5B", +".<. c #505655", +"+<. c #495050", +"@<. c #3F4548", +"#<. c #42464B", +"$<. c #44484D", +"%<. c #464A4F", +"&<. c #494D51", +"*<. c #4C4F53", +"=<. c #4E5155", +"-<. c #525459", +";<. c #58595E", +"><. c #5F5F63", +",<. c #636265", +"'<. c #5D5B5C", +")<. c #312F32", +"!<. c #3A383D", +"~<. c #39383E", +"{<. c #333239", +"]<. c #34333B", +"^<. c #2E2D36", +"/<. c #282832", +"(<. c #21232B", +"_<. c #505156", +":<. c #29292A", +"<<. c #48474F", +"[<. c #59585E", +"}<. c #9B9A97", +"|<. c #82807E", +"1<. c #8B8A89", +"2<. c #989696", +"3<. c #8D8B88", +"4<. c #74716C", +"5<. c #6E6C67", +"6<. c #6E6B65", +"7<. c #8D8984", +"8<. c #817E79", +"9<. c #969392", +"0<. c #8B8989", +"a<. c #9C9A9B", +"b<. c #8F8D8F", +"c<. c #7B7A79", +"d<. c #8C8A84", +"e<. c #8A8881", +"f<. c #7E7B72", +"g<. c #635E53", +"h<. c #D9D8D5", +"i<. c #8B867E", +"j<. c #5F574F", +"k<. c #6F6862", +"l<. c #5F5852", +"m<. c #625C59", +"n<. c #26221F", +"o<. c #434141", +"p<. c #3A3939", +"q<. c #363535", +"r<. c #484747", +"s<. c #6A6969", +"t<. c #504E4F", +"u<. c #583333", +"v<. c #8D1312", +"w<. c #4A4848", +"x<. c #3C3B3C", +"y<. c #3D3C3D", +"z<. c #71716E", +"A<. c #686662", +"B<. c #5E5C5A", +"C<. c #636160", +"D<. c #656362", +"E<. c #6D6B68", +"F<. c #82807F", +"G<. c #747272", +"H<. c #706D6E", +"I<. c #4F5553", +"J<. c #4D5353", +"K<. c #4A5151", +"L<. c #484F4F", +"M<. c #474D4D", +"N<. c #454C4D", +"O<. c #434A4C", +"P<. c #41494A", +"Q<. c #404649", +"R<. c #474C4F", +"S<. c #4B4F53", +"T<. c #4E5256", +"U<. c #53555A", +"V<. c #626165", +"W<. c #636164", +"X<. c #5B595B", +"Y<. c #4C4A4C", +"Z<. c #3B393A", +"`<. c #3A353A", +" [. c #434044", +".[. c #312F36", +"+[. c #312F37", +"@[. c #2E2C35", +"#[. c #2B2D38", +"$[. c #252832", +"%[. c #3A3A40", +"&[. c #333438", +"*[. c #494850", +"=[. c #59585F", +"-[. c #212029", +";[. c #56565D", +">[. c #28272E", +",[. c #504E50", +"'[. c #3B3A3C", +")[. c #4E4C4E", +"![. c #484340", +"~[. c #888381", +"{[. c #7E7975", +"][. c #9A9998", +"^[. c #9D9C9B", +"/[. c #8D8A88", +"([. c #74726E", +"_[. c #71706B", +":[. c #716F6A", +"<[. c #6C6A64", +"[[. c #84807C", +"}[. c #6F6C69", +"|[. c #918F8D", +"1[. c #9F9D9F", +"2[. c #8F8E8F", +"3[. c #908F8E", +"4[. c #7B7A78", +"5[. c #74726D", +"6[. c #848077", +"7[. c #7D786F", +"8[. c #98948D", +"9[. c #C0BDB9", +"0[. c #9F9B96", +"a[. c #A4A09D", +"b[. c #E8E7E7", +"c[. c #8D8886", +"d[. c #201C1A", +"e[. c #535251", +"f[. c #464545", +"g[. c #4F4D4C", +"h[. c #444241", +"i[. c #3E3D3D", +"j[. c #3D3C3C", +"k[. c #535152", +"l[. c #5B595A", +"m[. c #6B696A", +"n[. c #6F6E6B", +"o[. c #4C4B46", +"p[. c #8D8B89", +"q[. c #908F8D", +"r[. c #91908D", +"s[. c #929190", +"t[. c #72716F", +"u[. c #6F6C6C", +"v[. c #666969", +"w[. c #535857", +"x[. c #4C5150", +"y[. c #494F50", +"z[. c #444A4C", +"A[. c #41474A", +"B[. c #3F4549", +"C[. c #3D4147", +"D[. c #41454A", +"E[. c #44474D", +"F[. c #474B50", +"G[. c #4C5053", +"H[. c #4D5155", +"I[. c #545659", +"J[. c #595B5F", +"K[. c #5C5D61", +"L[. c #626265", +"M[. c #5F5D5F", +"N[. c #494749", +"O[. c #3D383B", +"P[. c #403A3F", +"Q[. c #3D393D", +"R[. c #353337", +"S[. c #2F2E33", +"T[. c #282B36", +"U[. c #272931", +"V[. c #313038", +"W[. c #32313B", +"X[. c #342E2C", +"Y[. c #5D5854", +"Z[. c #6F6966", +"`[. c #807E7B", +" }. c #86837F", +".}. c #817E7C", +"+}. c #898786", +"@}. c #8E8C8B", +"#}. c #8F8F8D", +"$}. c #8A8987", +"%}. c #7F7D79", +"&}. c #898684", +"*}. c #716F69", +"=}. c #7B7873", +"-}. c #6D6966", +";}. c #868382", +">}. c #939192", +",}. c #949394", +"'}. c #76736D", +")}. c #746F67", +"!}. c #686359", +"~}. c #595347", +"{}. c #5F594E", +"]}. c #625B53", +"^}. c #746E67", +"/}. c #B5B1AF", +"(}. c #C1BFBC", +"_}. c #BCB9B8", +":}. c #5D5754", +"<}. c #5D5856", +"[}. c #534F4D", +"}}. c #343233", +"|}. c #413F3F", +"1}. c #3E3C3B", +"2}. c #525150", +"3}. c #3B3A39", +"4}. c #333132", +"5}. c #3E3C3D", +"6}. c #4B4946", +"7}. c #494744", +"8}. c #4C4A47", +"9}. c #4C4B47", +"0}. c #595855", +"a}. c #6D6A6A", +"b}. c #7B7C7A", +"c}. c #6F7271", +"d}. c #6B6E6D", +"e}. c #656867", +"f}. c #535757", +"g}. c #484D4F", +"h}. c #42494B", +"i}. c #41464B", +"j}. c #46494F", +"k}. c #494C52", +"l}. c #4B4F54", +"m}. c #4C5054", +"n}. c #4C5154", +"o}. c #4F5255", +"p}. c #4F5356", +"q}. c #5B5C60", +"r}. c #616165", +"s}. c #5E5E61", +"t}. c #605F62", +"u}. c #5C5B5C", +"v}. c #595859", +"w}. c #434041", +"x}. c #363438", +"y}. c #2E2D32", +"z}. c #2B2A32", +"A}. c #272934", +"B}. c #2B2D37", +"C}. c #212125", +"D}. c #212027", +"E}. c #68625E", +"F}. c #736E6B", +"G}. c #757270", +"H}. c #76736F", +"I}. c #6E6D68", +"J}. c #696562", +"K}. c #6B6865", +"L}. c #706D6B", +"M}. c #797777", +"N}. c #807C73", +"O}. c #5A5246", +"P}. c #4F463B", +"Q}. c #443C31", +"R}. c #40372E", +"S}. c #372F29", +"T}. c #322A26", +"U}. c #595654", +"V}. c #4B4848", +"W}. c #585656", +"X}. c #454342", +"Y}. c #4E4C4A", +"Z}. c #52504D", +"`}. c #52514D", +" |. c #5C5B58", +".|. c #797A78", +"+|. c #717473", +"@|. c #4C5250", +"#|. c #454B4D", +"$|. c #3F4649", +"%|. c #40444A", +"&|. c #42474C", +"*|. c #45494E", +"=|. c #484C51", +"-|. c #4A4E53", +";|. c #4D5255", +">|. c #525558", +",|. c #55575B", +"'|. c #606064", +")|. c #616164", +"!|. c #5B5B5E", +"~|. c #58575A", +"{|. c #545355", +"]|. c #515052", +"^|. c #423F41", +"/|. c #3D383A", +"(|. c #373337", +"_|. c #323135", +":|. c #2F2F35", +"<|. c #26272F", +"[|. c #272831", +"}|. c #2C2D38", +"||. c #242529", +"1|. c #202125", +"2|. c #242331", +"3|. c #5E5853", +"4|. c #797572", +"5|. c #777674", +"6|. c #75726E", +"7|. c #706D68", +"8|. c #6D6B65", +"9|. c #6A6862", +"0|. c #6C6864", +"a|. c #6E6B69", +"b|. c #777472", +"c|. c #7B7A7B", +"d|. c #74716D", +"e|. c #716E68", +"f|. c #67635B", +"g|. c #615B50", +"h|. c #676156", +"i|. c #7C766C", +"j|. c #6A6359", +"k|. c #4F463C", +"l|. c #3B322B", +"m|. c #2B2421", +"n|. c #534F4F", +"o|. c #585554", +"p|. c #292726", +"q|. c #575555", +"r|. c #302F2F", +"s|. c #514F4D", +"t|. c #575653", +"u|. c #53524E", +"v|. c #555350", +"w|. c #474E4E", +"x|. c #44494E", +"y|. c #494D52", +"z|. c #4C5055", +"A|. c #4D5055", +"B|. c #515356", +"C|. c #56585C", +"D|. c #5D5E62", +"E|. c #5F5F64", +"F|. c #5F5E62", +"G|. c #5C5B5F", +"H|. c #545458", +"I|. c #423F42", +"J|. c #3B383B", +"K|. c #353237", +"L|. c #303035", +"M|. c #2D2D34", +"N|. c #292B32", +"O|. c #2C2D37", +"P|. c #2F313A", +"Q|. c #212226", +"R|. c #1E1F22", +"S|. c #121111", +"T|. c #221E1B", +"U|. c #2C2722", +"V|. c #75716E", +"W|. c #777672", +"X|. c #726F6A", +"Y|. c #6B6964", +"Z|. c #6D6A67", +"`|. c #716E67", +" 1. c #6D6860", +".1. c #5D574C", +"+1. c #554E41", +"@1. c #696257", +"#1. c #6D655E", +"$1. c #58514A", +"%1. c #473F3A", +"&1. c #423B36", +"*1. c #3C3632", +"=1. c #595453", +"-1. c #565353", +";1. c #403F3E", +">1. c #3D3B3B", +",1. c #4D4C4A", +"'1. c #585653", +")1. c #5C5A58", +"!1. c #7E7F7D", +"~1. c #7D7E7C", +"{1. c #7A7C7B", +"]1. c #707271", +"^1. c #6D706F", +"/1. c #666968", +"(1. c #646765", +"_1. c #464D4D", +":1. c #444B4C", +"<1. c #43494B", +"[1. c #4A4D52", +"}1. c #4C4F55", +"|1. c #4E5156", +"11. c #525357", +"21. c #57585C", +"31. c #5D5C62", +"41. c #545356", +"51. c #444145", +"61. c #3A383B", +"71. c #37363A", +"81. c #38373D", +"91. c #262730", +"01. c #292B33", +"a1. c #32343C", +"b1. c #1C1D20", +"c1. c #17181E", +"d1. c #171614", +"e1. c #201C19", +"f1. c #403A36", +"g1. c #736F6B", +"h1. c #747370", +"i1. c #73716B", +"j1. c #666256", +"k1. c #5E584A", +"l1. c #564F42", +"m1. c #4F473B", +"n1. c #473E34", +"o1. c #52483F", +"p1. c #675F5A", +"q1. c #5B5755", +"r1. c #4A4746", +"s1. c #242220", +"t1. c #353334", +"u1. c #464444", +"v1. c #545250", +"w1. c #5A5855", +"x1. c #5E5B59", +"y1. c #7F7F7E", +"z1. c #7C7D7B", +"A1. c #7B7D7C", +"B1. c #707372", +"C1. c #6C6F6E", +"D1. c #686B6A", +"E1. c #646766", +"F1. c #5E615F", +"G1. c #404549", +"H1. c #41474C", +"I1. c #4D5056", +"J1. c #5E5F64", +"K1. c #5D5D61", +"L1. c #5A5A5E", +"M1. c #5A5B5E", +"N1. c #565658", +"O1. c #444244", +"P1. c #383739", +"Q1. c #3B3B3E", +"R1. c #3E3D41", +"S1. c #302F36", +"T1. c #32333B", +"U1. c #37383F", +"V1. c #34363D", +"W1. c #211F25", +"X1. c #131414", +"Y1. c #74736E", +"Z1. c #797875", +"`1. c #716E69", +" 2. c #6A6762", +".2. c #6B6864", +"+2. c #6F6B68", +"@2. c #7A7878", +"#2. c #6F6B64", +"$2. c #676257", +"%2. c #5E584B", +"&2. c #534C3E", +"*2. c #50493C", +"=2. c #4C4337", +"-2. c #43392F", +";2. c #3B3229", +">2. c #3C332E", +",2. c #262422", +"'2. c #262523", +")2. c #383636", +"!2. c #484644", +"~2. c #53514F", +"{2. c #615F5E", +"]2. c #6C6969", +"^2. c #7D7F7D", +"/2. c #7A7B79", +"(2. c #676A68", +"_2. c #5C5F5E", +":2. c #41484A", +"<2. c #42484B", +"[2. c #4A4F53", +"}2. c #4D5156", +"|2. c #505358", +"12. c #515459", +"22. c #54565C", +"32. c #595A5E", +"42. c #606165", +"52. c #5A5B5F", +"62. c #58595D", +"72. c #56585B", +"82. c #585A5C", +"92. c #58595B", +"02. c #555556", +"a2. c #4A4A4B", +"b2. c #3B3B3D", +"c2. c #414244", +"d2. c #2D2C32", +"e2. c #39393E", +"f2. c #3E3F44", +"g2. c #38393E", +"h2. c #252629", +"i2. c #111112", +"j2. c #121214", +"k2. c #4C4541", +"l2. c #73726E", +"m2. c #716F6B", +"n2. c #76726F", +"o2. c #68635A", +"p2. c #5F5A4E", +"q2. c #585244", +"r2. c #494134", +"s2. c #41372E", +"t2. c #382E27", +"u2. c #342B25", +"v2. c #302823", +"w2. c #29231F", +"x2. c #25201D", +"y2. c #221D1B", +"z2. c #41403E", +"A2. c #787977", +"B2. c #6E7170", +"C2. c #4E5352", +"D2. c #43494C", +"E2. c #4F5257", +"F2. c #52555A", +"G2. c #585A5F", +"H2. c #5C5E62", +"I2. c #5F6064", +"J2. c #5E5F63", +"K2. c #55565B", +"L2. c #535558", +"M2. c #555859", +"N2. c #56585A", +"O2. c #3E3E40", +"P2. c #434445", +"Q2. c #434345", +"R2. c #404043", +"S2. c #38383A", +"T2. c #353437", +"U2. c #3C3B3F", +"V2. c #454447", +"W2. c #454548", +"X2. c #28292E", +"Y2. c #24252B", +"Z2. c #242428", +"`2. c #27272A", +" 3. c #28292C", +".3. c #1E1F26", +"+3. c #2D2726", +"@3. c #757470", +"#3. c #72706B", +"$3. c #716E6A", +"%3. c #777370", +"&3. c #625D54", +"*3. c #5E584E", +"=3. c #5B5448", +"-3. c #4A4135", +";3. c #473F32", +">3. c #42392F", +",3. c #352D26", +"'3. c #302722", +")3. c #29221E", +"!3. c #27211E", +"~3. c #231E1C", +"{3. c #1E1B1A", +"]3. c #1F1C1A", +"^3. c #252223", +"/3. c #2C2A2B", +"(3. c #3B3A3A", +"_3. c #464342", +":3. c #4F4D4A", +"<3. c #565451", +"[3. c #7B7D7B", +"}3. c #767876", +"|3. c #737473", +"13. c #707371", +"23. c #6A6D6C", +"33. c #626665", +"43. c #4C5252", +"53. c #434B4C", +"63. c #43474D", +"73. c #4D5256", +"83. c #515359", +"93. c #56585E", +"03. c #5B5C61", +"a3. c #54565B", +"b3. c #535659", +"c3. c #555759", +"d3. c #56575A", +"e3. c #535457", +"f3. c #444445", +"g3. c #3E3E3E", +"h3. c #3E3D3E", +"i3. c #2C2E31", +"j3. c #27292C", +"k3. c #25252B", +"l3. c #2A292D", +"m3. c #252528", +"n3. c #1A1B20", +"o3. c #121212", +"p3. c #59524C", +"q3. c #736F6C", +"r3. c #564F43", +"s3. c #534B3E", +"t3. c #494034", +"u3. c #443B30", +"v3. c #3E342B", +"w3. c #372E27", +"x3. c #322923", +"y3. c #2B231F", +"z3. c #211E1D", +"A3. c #242120", +"B3. c #494746", +"C3. c #4A4845", +"D3. c #5B5958", +"E3. c #727473", +"F3. c #636766", +"G3. c #5A5E5D", +"H3. c #575C5B", +"I3. c #464B50", +"J3. c #4F5358", +"K3. c #55575C", +"L3. c #56585D", +"M3. c #53565A", +"N3. c #515255", +"O3. c #4C4D4F", +"P3. c #464646", +"Q3. c #434343", +"R3. c #424042", +"S3. c #434143", +"T3. c #424243", +"U3. c #373739", +"V3. c #303133", +"W3. c #2B2C2F", +"X3. c #28282C", +"Y3. c #2B292C", +"Z3. c #282729", +"`3. c #202022", +" 4. c #202126", +".4. c #2E2623", +"+4. c #4B433E", +"@4. c #726E69", +"#4. c #73716E", +"$4. c #726F6B", +"%4. c #706C69", +"&4. c #69645C", +"*4. c #615B4F", +"=4. c #575043", +"-4. c #50483B", +";4. c #443A30", +">4. c #3A3129", +",4. c #2F2622", +"'4. c #2A221F", +")4. c #28221F", +"!4. c #26211F", +"~4. c #1F1B19", +"{4. c #181818", +"]4. c #4D4B4A", +"^4. c #504D4C", +"/4. c #595755", +"(4. c #6C6868", +"_4. c #6D6F6E", +":4. c #626664", +"<4. c #5E6262", +"[4. c #5F6463", +"}4. c #5E6261", +"|4. c #565C5B", +"14. c #4C5251", +"24. c #44494F", +"34. c #505359", +"44. c #54575C", +"54. c #55585D", +"64. c #55585C", +"74. c #56595D", +"84. c #55585B", +"94. c #55565C", +"04. c #5B5B60", +"a4. c #4D4E50", +"b4. c #49494B", +"c4. c #413F40", +"d4. c #444344", +"e4. c #3A3B3B", +"f4. c #2E2E31", +"g4. c #272629", +"h4. c #252426", +"i4. c #1E1E22", +"j4. c #251F1B", +"k4. c #5F5954", +"l4. c #726D68", +"m4. c #716D69", +"n4. c #6B685F", +"o4. c #655F56", +"p4. c #50493B", +"q4. c #4B4236", +"r4. c #463C31", +"s4. c #312923", +"t4. c #271F1C", +"u4. c #261F1D", +"v4. c #221C1B", +"w4. c #1F1D1B", +"x4. c #23211F", +"y4. c #3A3838", +"z4. c #575553", +"A4. c #5F6362", +"B4. c #525856", +"C4. c #40474A", +"D4. c #43484C", +"E4. c #53555B", +"F4. c #57595E", +"G4. c #54575B", +"H4. c #5C5D62", +"I4. c #505154", +"J4. c #464544", +"K4. c #414142", +"L4. c #3C3C3D", +"M4. c #383838", +"N4. c #323234", +"O4. c #2A2A2D", +"P4. c #242326", +"Q4. c #191615", +"R4. c #231E1A", +"S4. c #362F29", +"T4. c #504A45", +"U4. c #6D6863", +"V4. c #71706C", +"W4. c #716E6C", +"X4. c #6E6A66", +"Y4. c #72706A", +"Z4. c #706D66", +"`4. c #6B675E", +" 5. c #666257", +".5. c #5F5A4D", +"+5. c #4E4639", +"@5. c #42382D", +"#5. c #3E342A", +"$5. c #382F28", +"%5. c #27201D", +"&5. c #241F1C", +"*5. c #211D1A", +"=5. c #211D1B", +"-5. c #1E1C1A", +";5. c #201E1C", +">5. c #4C4A49", +",5. c #706C6B", +"'5. c #6F7171", +")5. c #595E5D", +"!5. c #484E4F", +"~5. c #3E4448", +"{5. c #3F464A", +"]5. c #505459", +"^5. c #53565B", +"/5. c #595B5E", +"(5. c #585A5E", +"_5. c #57585B", +":5. c #535458", +"<5. c #4C4E4F", +"[5. c #4C4B4A", +"}5. c #413E3E", +"|5. c #3F4041", +"15. c #383A3A", +"25. c #2B2B2C", +"35. c #2E2C2F", +"45. c #29282B", +"55. c #212124", +"65. c #26211D", +"75. c #342D27", +"85. c #75716D", +"95. c #75726D", +"05. c #726F6D", +"a5. c #6F6B65", +"b5. c #625D52", +"c5. c #5E584C", +"d5. c #5A5346", +"e5. c #534D40", +"f5. c #4F493B", +"g5. c #3A2F28", +"h5. c #362C26", +"i5. c #2E2521", +"j5. c #29221F", +"k5. c #261F1B", +"l5. c #26201D", +"m5. c #231D1A", +"n5. c #221F1C", +"o5. c #211F1D", +"p5. c #363534", +"q5. c #464543", +"r5. c #53524F", +"s5. c #706D6C", +"t5. c #5E6162", +"u5. c #474D4E", +"v5. c #41474B", +"w5. c #4F5357", +"x5. c #57595F", +"y5. c #56595E", +"z5. c #535557", +"A5. c #515254", +"B5. c #4E5051", +"C5. c #4C4E4E", +"D5. c #4C4D4C", +"E5. c #454442", +"F5. c #3E3E3F", +"G5. c #3C3D3E", +"H5. c #373738", +"I5. c #2E2F30", +"J5. c #29292B", +"K5. c #302923", +"L5. c #565049", +"M5. c #6B6861", +"N5. c #666259", +"O5. c #656155", +"P5. c #5B5549", +"Q5. c #524B3E", +"R5. c #4B4336", +"S5. c #433B2E", +"T5. c #3A3029", +"U5. c #352B25", +"V5. c #2F2621", +"W5. c #24201D", +"X5. c #2E2D2D", +"Y5. c #3D3C3A", +"Z5. c #6D6B69", +"`5. c #676B6B", +" 6. c #575C5C", +".6. c #535958", +"+6. c #4F5555", +"@6. c #55575A", +"#6. c #3A3A3A", +"$6. c #353536", +"%6. c #222223", +"&6. c #222124", +"*6. c #131215", +"=6. c #101111", +"-6. c #121110", +";6. c #101010", +">6. c #191415", +",6. c #27211F", +"'6. c #2C2522", +")6. c #2C2521", +"!6. c #352E28", +"~6. c #3D352C", +"{6. c #4C4539", +"]6. c #706A69", +"^6. c #716F68", +"/6. c #69655C", +"(6. c #646155", +"_6. c #5F5B4E", +":6. c #565043", +"<6. c #514A3D", +"[6. c #463D32", +"}6. c #40362C", +"|6. c #3B312A", +"16. c #382E28", +"26. c #322822", +"36. c #2E2520", +"46. c #2C2520", +"56. c #2A2420", +"66. c #201D1A", +"76. c #211E1C", +"86. c #1E1B19", +"96. c #3B3938", +"06. c #6C6968", +"a6. c #696666", +"b6. c #737574", +"c6. c #686B6C", +"d6. c #43494D", +"e6. c #515355", +"f6. c #4F5153", +"g6. c #505153", +"h6. c #505152", +"i6. c #4D4D4E", +"j6. c #494948", +"k6. c #1D1E1F", +"l6. c #121215", +"m6. c #101113", +"n6. c #111110", +"o6. c #2B251F", +"p6. c #342C25", +"q6. c #3A3127", +"r6. c #565046", +"s6. c #6F6D68", +"t6. c #6F6C67", +"u6. c #68645B", +"v6. c #646156", +"w6. c #615E52", +"x6. c #5C584A", +"y6. c #555042", +"z6. c #565143", +"A6. c #504A3C", +"B6. c #4C4437", +"C6. c #484033", +"D6. c #483E33", +"E6. c #443A2F", +"F6. c #3F352B", +"G6. c #3D322B", +"H6. c #3B3129", +"I6. c #2A231F", +"J6. c #201B19", +"K6. c #1D1A18", +"L6. c #343331", +"M6. c #5C5956", +"N6. c #707272", +"O6. c #616462", +"P6. c #4E5257", +"Q6. c #535658", +"R6. c #525557", +"S6. c #525456", +"T6. c #4F5052", +"U6. c #505252", +"V6. c #4F5050", +"W6. c #4A4B4B", +"X6. c #3F3F3E", +"Y6. c #3B3B3C", +"Z6. c #3D3D3E", +"`6. c #212122", +" 7. c #202123", +".7. c #121010", +"+7. c #47423C", +"@7. c #342E25", +"#7. c #2B241D", +"$7. c #312A22", +"%7. c #352D23", +"&7. c #3E3629", +"*7. c #6B6863", +"=7. c #6E6B6A", +"-7. c #6F6D67", +";7. c #68655D", +">7. c #605C51", +",7. c #615D50", +"'7. c #5D594C", +")7. c #565244", +"!7. c #514C3D", +"~7. c #4C4537", +"{7. c #494032", +"]7. c #463D31", +"^7. c #3D322A", +"/7. c #372D26", +"(7. c #342922", +"_7. c #312822", +":7. c #2C231F", +"<7. c #28211D", +"[7. c #25201C", +"}7. c #221D1A", +"|7. c #6D6969", +"17. c #8B6D6C", +"27. c #8A6C6B", +"37. c #797977", +"47. c #626666", +"57. c #665F5E", +"67. c #745857", +"77. c #5F6363", +"87. c #5B5E5F", +"97. c #595D5D", +"07. c #6F4242", +"a7. c #4A4649", +"b7. c #603D41", +"c7. c #76464A", +"d7. c #684D51", +"e7. c #56595C", +"f7. c #6D4849", +"g7. c #4C4D4D", +"h7. c #484949", +"i7. c #464746", +"j7. c #3E3F3E", +"k7. c #373737", +"l7. c #39393A", +"m7. c #522A2A", +"n7. c #332929", +"o7. c #2E2B2C", +"p7. c #1F1F20", +"q7. c #4D1A1B", +"r7. c #391A1D", +"s7. c #262629", +"t7. c #251011", +"u7. c #55514B", +"v7. c #4A443C", +"w7. c #342E24", +"x7. c #2F281F", +"y7. c #342D24", +"z7. c #3B3329", +"A7. c #443B31", +"B7. c #564F45", +"C7. c #7B6460", +"D7. c #80605B", +"E7. c #78635D", +"F7. c #855B57", +"G7. c #974E4B", +"H7. c #746763", +"I7. c #72645F", +"J7. c #8A5651", +"K7. c #6A675E", +"L7. c #656256", +"M7. c #5B574B", +"N7. c #595548", +"O7. c #585447", +"P7. c #585245", +"Q7. c #565142", +"R7. c #554F40", +"S7. c #4D4637", +"T7. c #4D4537", +"U7. c #484032", +"V7. c #453C2F", +"W7. c #43392D", +"X7. c #42382E", +"Y7. c #3C3229", +"Z7. c #3A2F27", +"`7. c #312620", +" 8. c #28201D", +".8. c #231E1B", +"+8. c #291B19", +"@8. c #281B19", +"#8. c #261918", +"$8. c #3A1A19", +"%8. c #2E1818", +"&8. c #2C1717", +"*8. c #251919", +"=8. c #451212", +"-8. c #2A1515", +";8. c #351617", +">8. c #461C1D", +",8. c #572323", +"'8. c #473130", +")8. c #752E2C", +"!8. c #4D4B48", +"~8. c #8A5655", +"{8. c #7D5E5D", +"]8. c #786060", +"^8. c #896C6A", +"/8. c #A45553", +"(8. c #9F5958", +"_8. c #936160", +":8. c #876A68", +"<8. c #767775", +"[8. c #616465", +"}8. c #6D5D5D", +"|8. c #745B5B", +"18. c #6C5B5A", +"28. c #854B4A", +"38. c #844A49", +"48. c #914343", +"58. c #974140", +"68. c #795454", +"78. c #565A5A", +"88. c #6E4A4A", +"98. c #883B3A", +"08. c #783F3F", +"a8. c #784140", +"b8. c #8C3636", +"c8. c #893434", +"d8. c #6C3F40", +"e8. c #594044", +"f8. c #6D3639", +"g8. c #6F383A", +"h8. c #862F32", +"i8. c #873134", +"j8. c #753C40", +"k8. c #6D484C", +"l8. c #8E373A", +"m8. c #90383B", +"n8. c #90383C", +"o8. c #5A5357", +"p8. c #5C5558", +"q8. c #625154", +"r8. c #843F41", +"s8. c #8A3C3D", +"t8. c #7B4142", +"u8. c #813E3E", +"v8. c #8E3536", +"w8. c #6A4345", +"x8. c #4A4C4C", +"y8. c #464747", +"z8. c #454646", +"A8. c #6E2828", +"B8. c #6A2426", +"C8. c #642929", +"D8. c #7C2222", +"E8. c #5D2122", +"F8. c #461D1E", +"G8. c #711718", +"H8. c #6F1516", +"I8. c #6E1415", +"J8. c #6E1315", +"K8. c #22181B", +"L8. c #29292C", +"M8. c #321317", +"N8. c #4D0F12", +"O8. c #550D0F", +"P8. c #4A0E0F", +"Q8. c #121314", +"R8. c #141211", +"S8. c #645F5B", +"T8. c #57524C", +"U8. c #443E35", +"V8. c #352F24", +"W8. c #472D25", +"X8. c #4F2C27", +"Y8. c #363028", +"Z8. c #383128", +"`8. c #5E584D", +" 9. c #6A665D", +".9. c #81605C", +"+9. c #A04541", +"@9. c #A14542", +"#9. c #9F4340", +"$9. c #A14541", +"%9. c #9B4947", +"&9. c #855A55", +"*9. c #6C6963", +"=9. c #6C6862", +"-9. c #765F58", +";9. c #8E5049", +">9. c #6D6159", +",9. c #65625A", +"'9. c #67635A", +")9. c #69655B", +"!9. c #656156", +"~9. c #625E50", +"{9. c #5F5B4D", +"]9. c #555041", +"^9. c #534D3F", +"/9. c #534D3E", +"(9. c #524C3D", +"_9. c #4E4738", +":9. c #494132", +"<9. c #473E31", +"[9. c #443A2E", +"}9. c #41372B", +"|9. c #3D3228", +"19. c #3E332A", +"29. c #512923", +"39. c #482A24", +"49. c #241E1B", +"59. c #211D19", +"69. c #321A17", +"79. c #4C1715", +"89. c #651211", +"99. c #421615", +"09. c #421614", +"a9. c #6F1211", +"b9. c #661312", +"c9. c #291A18", +"d9. c #311B19", +"e9. c #521513", +"f9. c #541514", +"g9. c #641211", +"h9. c #6E1211", +"i9. c #431818", +"j9. c #6C1111", +"k9. c #631212", +"l9. c #401818", +"m9. c #281414", +"n9. c #4E1212", +"o9. c #6A1010", +"p9. c #461314", +"q9. c #3D1515", +"r9. c #4F1313", +"s9. c #6B1111", +"t9. c #6C1212", +"u9. c #781E1C", +"v9. c #6C3837", +"w9. c #786260", +"x9. c #7E5E5E", +"y9. c #855B5A", +"z9. c #A14545", +"A9. c #706363", +"B9. c #7C5B5B", +"C9. c #8C4E4E", +"D9. c #8D4F4F", +"E9. c #934B4B", +"F9. c #9F4343", +"G9. c #905252", +"H9. c #A9504E", +"I9. c #A84E4D", +"J9. c #886B69", +"K9. c #975C5A", +"L9. c #975B5B", +"M9. c #736262", +"N9. c #994243", +"O9. c #924444", +"P9. c #994242", +"Q9. c #994141", +"R9. c #874F4F", +"S9. c #626765", +"T9. c #8B4747", +"U9. c #973F3F", +"V9. c #97413F", +"W9. c #785353", +"X9. c #604F4F", +"Y9. c #8D3736", +"Z9. c #8C3635", +"`9. c #8C3534", +" 0. c #8B3535", +".0. c #8A3434", +"+0. c #7C3A3A", +"@0. c #4E4A4A", +"#0. c #603D40", +"$0. c #852F32", +"%0. c #873033", +"&0. c #883134", +"*0. c #833639", +"=0. c #544E53", +"-0. c #754549", +";0. c #6E494D", +">0. c #5A5255", +",0. c #893A3C", +"'0. c #903738", +")0. c #8F3638", +"!0. c #8F3738", +"~0. c #8E3637", +"{0. c #7F3B3B", +"]0. c #4E5050", +"^0. c #494B4B", +"/0. c #444646", +"(0. c #434444", +"_0. c #3F4140", +":0. c #3E403F", +"<0. c #373938", +"[0. c #5C2B2B", +"}0. c #781E1F", +"|0. c #781E20", +"10. c #6E1E1E", +"20. c #362C2C", +"30. c #2E2D2E", +"40. c #1D1D1E", +"50. c #491719", +"60. c #6D1314", +"70. c #22181E", +"80. c #601013", +"90. c #690E10", +"00. c #5D0C0E", +"a0. c #261112", +"b0. c #120F0F", +"c0. c #43403F", +"d0. c #664E4C", +"e0. c #953834", +"f0. c #8E312B", +"g0. c #7F2C26", +"h0. c #852722", +"i0. c #872926", +"j0. c #743431", +"k0. c #38332C", +"l0. c #3A3128", +"m0. c #433A2E", +"n0. c #52493E", +"o0. c #79625F", +"p0. c #9F4341", +"q0. c #825854", +"r0. c #8E504C", +"s0. c #865A56", +"t0. c #6D6A63", +"u0. c #6A665F", +"v0. c #6A5C54", +"w0. c #705951", +"x0. c #7D534B", +"y0. c #625F52", +"z0. c #676356", +"A0. c #645F51", +"B0. c #5C5849", +"C0. c #5B5646", +"D0. c #585343", +"E0. c #555040", +"F0. c #534D3D", +"G0. c #504A3A", +"H0. c #5E4335", +"I0. c #8C2D22", +"J0. c #8A2B21", +"K0. c #792C23", +"L0. c #633328", +"M0. c #573126", +"N0. c #562F25", +"O0. c #562E25", +"P0. c #68231D", +"Q0. c #7E1E19", +"R0. c #751E1A", +"S0. c #2D251F", +"T0. c #29201C", +"U0. c #2B1C1B", +"V0. c #661311", +"W0. c #6E1110", +"X0. c #5C1413", +"Y0. c #6D1110", +"Z0. c #6E1312", +"`0. c #2D1717", +" a. c #2B1616", +".a. c #461414", +"+a. c #6B1011", +"@a. c #6D1213", +"#a. c #6E1414", +"$a. c #494745", +"%a. c #53514E", +"&a. c #9C413F", +"*a. c #9D4140", +"=a. c #974745", +"-a. c #9D4341", +";a. c #A14543", +">a. c #905352", +",a. c #A04544", +"'a. c #825858", +")a. c #6D6162", +"!a. c #974546", +"~a. c #9D4343", +"{a. c #9E4243", +"]a. c #994647", +"^a. c #786061", +"/a. c #7E7574", +"(a. c #84706F", +"_a. c #A35352", +":a. c #876B69", +"b. c #892920", +",b. c #7F2820", +"'b. c #603126", +")b. c #6F2B22", +"!b. c #83221C", +"~b. c #82211B", +"{b. c #81201B", +"]b. c #7E1C18", +"^b. c #741E18", +"/b. c #3B2722", +"(b. c #26211E", +"_b. c #231F1C", +":b. c #281A18", +"c. c #484239", +",c. c #332B22", +"'c. c #5C574D", +")c. c #8E4F49", +"!c. c #76564F", +"~c. c #6D5F56", +"{c. c #69645B", +"]c. c #6B675C", +"^c. c #686459", +"/c. c #6E6057", +"(c. c #97453D", +"_c. c #96433C", +":c. c #7C5146", +"d. c #313434", +",d. c #2B2D2E", +"'d. c #292B2C", +")d. c #6A1B1C", +"!d. c #72191A", +"~d. c #3E2022", +"{d. c #382527", +"]d. c #1F2022", +"^d. c #1D1E20", +"/d. c #1E1F21", +"(d. c #18191A", +"_d. c #341717", +":d. c #6B1112", +"e. c #854C4C", +",e. c #8C4848", +"'e. c #8C4949", +")e. c #8D4949", +"!e. c #805050", +"~e. c #844A4A", +"{e. c #854C4B", +"]e. c #904343", +"^e. c #765150", +"/e. c #685857", +"(e. c #614948", +"_e. c #723C3C", +":e. c #474F4F", +"f. c #504B39", +",f. c #514A38", +"'f. c #4D4434", +")f. c #494031", +"!f. c #4C4233", +"~f. c #483E2F", +"{f. c #5C3429", +"]f. c #533529", +"^f. c #41352B", +"/f. c #3D3128", +"(f. c #68241F", +"_f. c #5F251F", +":f. c #322821", +"g. c #242628", +",g. c #3D2022", +"'g. c #5F191C", +")g. c #701718", +"!g. c #3B1E20", +"~g. c #1B1C1E", +"{g. c #1A1B1D", +"]g. c #211719", +"^g. c #601012", +"/g. c #3F1718", +"(g. c #611A1B", +"_g. c #551819", +":g. c #281C1E", +"h. c #342020", +",h. c #473030", +"'h. c #4D4B49", +")h. c #5B5856", +"!h. c #6F6462", +"~h. c #8F5150", +"{h. c #835958", +"]h. c #A14745", +"^h. c #A14645", +"/h. c #9B4949", +"(h. c #845A59", +"_h. c #9F4443", +":h. c #8D5050", +"i. c #635E52", +",i. c #5E5C4D", +"'i. c #615646", +")i. c #5E5B4B", +"!i. c #605C4D", +"~i. c #5B5749", +"{i. c #5E594B", +"]i. c #6C493B", +"^i. c #6D493C", +"/i. c #8A372C", +"(i. c #82382C", +"_i. c #504A39", +":i. c #4E4635", +"j. c #242527", +",j. c #232426", +"'j. c #501416", +")j. c #1E1E20", +"!j. c #431B1D", +"~j. c #391B1C", +"{j. c #3E1618", +"]j. c #36181A", +"^j. c #23191B", +"/j. c #5D1717", +"(j. c #55191B", +"_j. c #26262A", +":j. c #471F23", +"k. c #4B5252", +",k. c #464D4E", +"'k. c #41494C", +")k. c #40484B", +"!k. c #832E31", +"~k. c #464B4F", +"{k. c #654B4E", +"]k. c #53575C", +"^k. c #75474A", +"/k. c #52565A", +"(k. c #5B5558", +"_k. c #883A3D", +":k. c #8E3538", +"l. c #5D1412", +",l. c #381715", +"'l. c #2E1716", +")l. c #221615", +"!l. c #461312", +"~l. c #341514", +"{l. c #461313", +"]l. c #261C1C", +"^l. c #5D2A2A", +"/l. c #564B49", +"(l. c #585654", +"_l. c #423836", +":l. c #422424", +"m. c #493E30", +",m. c #473B2D", +"'m. c #403328", +")m. c #3F3329", +"!m. c #3D3026", +"~m. c #3C2F27", +"{m. c #362B23", +"]m. c #31251E", +"^m. c #31241E", +"/m. c #2E221C", +"(m. c #3F201B", +"_m. c #611D19", +":m. c #6A1D19", +"n. c #493527", +",n. c #322922", +"'n. c #211917", +")n. c #160F0F", +"!n. c #0E0F0D", +"~n. c #100F0F", +"{n. c #161311", +"]n. c #4C322D", +"^n. c #65403B", +"/n. c #69514A", +"(n. c #5C5A51", +"_n. c #5A554A", +":n. c #595446", +"o. c #544839", +",o. c #4F4332", +"'o. c #3C2A21", +")o. c #221D17", +"!o. c #161211", +"~o. c #130F0F", +"{o. c #100F0E", +"]o. c #0F0E0F", +"^o. c #110E10", +"/o. c #100E0F", +"(o. c #10100F", +"_o. c #181614", +":o. c #49403A", +"p. c #534C3A", +",p. c #544D3A", +"'p. c #4A4131", +")p. c #463B2C", +"!p. c #463A2C", +"~p. c #44382B", +"{p. c #3B2F25", +"]p. c #372B23", +"^p. c #251E1A", +"/p. c #4E4C4B", +"(p. c #5F5F5B", +"_p. c #474644", +":p. c #5B5857", +". + + @ # $ % & & * & # @ = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 5 6 7 8 9 0 a b c d e f g h i j k l m l m n o p p q p p % r s s r r s t r t t t s s s s r t u u u v v v v u w v u u w u u u s u u t t s t s s t u x # u y z A m 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 ` . .. +. @. #. $. %. &. *. =. -. ;. >. ,. '. ). !. ~. {. ]. ^. /. (. _. :. <. [. }. }. |. 1. 2. 3. 3. 4. 4. 5. 5. 6. 7. 8. 9. 0. a. b. c. d. e. f. g. h. i. j. k. l. m. n. o. p. m. q. r. s. t. u. v. w. x. y. z. A. B. C. D. E. F. X G. H. I. J. H. I. K. 8. I. L. M. M. M. N. N. O. N. N. N. P. P. O. O. N. O. Q. P. P. R. R. P. P. O. S. T. U. V. W. X. X. Q. Q. Y. P. P. X. R. Q. P. P. P. X. P. Z X. X. Y. R. Z. `. + .+ ++ @+ #+ $+ %+ &+ *+ =+ -+ ;+ >+ ,+ '+ )+ '+ !+ !+ ~+ {+ ]+ Z. ^+ /+ /+ (+ _+ :+ Z. Z. <+ Z. [+ }+ |+ 1+ 2+ 2+ 3+ 4+ 5+ ,+ 6+ 7+ 7+ 8+ 8+ 8+ 9+ 0+ 8+ a+ 0+ a+ b+ c+ d+ e+ f+ g+ h+ i+ j+ e+ k+ d+ l+ h+ h+ h+ g+ g+ m+ n+ o+ p+ q+ r+ ", +"s+ @ z * & @ @ # x x * t+ & u+ v+ > w+ x+ y+ z+ ~ A+ ] B+ C+ D+ ( E+ < F+ G+ H+ I+ J+ K+ L+ M+ N+ O+ x+ P+ 0 Q+ R+ b d S+ e f f T+ U+ U+ U+ V+ W+ m m n X+ Y+ % Z+ p % % % % s x r u s u s t s s s u u u u v v v u v v v v v v v `+ @ `+ w w v v w v s s v v u s r u v x v & z .@ v+ +@ @@ #@ $@ %@ &@ *@ =@ -@ K ;@ >@ ,@ '@ )@ !@ ~@ {@ ]@ ^@ /@ (@ _@ :@ <@ [@ }@ |@ 1@ 2@ 3@ 4@ 5@ 6@ 7@ 8@ -. 9@ 0@ a@ b@ c@ d@ e@ f@ g@ h@ i@ j@ k@ l@ m@ [. 8. n@ |. o@ 5. 4. p@ 4. 2. L. L. 8. q@ Z 0. C. r@ s@ t@ u@ v@ w@ x@ y@ z@ A@ B@ C@ D@ E@ E@ F@ k. G@ H@ I@ J@ K@ L@ M@ N@ x. z. O@ P@ Q@ R@ S@ T@ U@ V@ U. M. I. I. O. W@ 8. I. 2. M. M. O. O. O. Q. O. O. N. Q. Q. O. Q. O. O. O. O. Q. O. X. R. Q. X@ Y@ U. U. X@ X@ X. R. P. O. O. Q. P. Q. P. Q. P. Q. Q. P. P. Z P. P. Z@ Q. `@ `@ # .# +# @# ## $# %# &# *# -+ =# -# ;# )+ ># |+ |+ ,# '# ,# )# !# Z. ~# {# ^+ {# Z. ]# !# ^# ^# !# /# (# 1+ 2+ _# 3+ :# <# ;# [# }# |# |# 1# d+ d+ c+ d+ 8+ 0+ 0+ 2# b+ c+ 3# 4# 5# e+ 6# f+ 2# k+ 5# 7# 7# 8# h+ g+ 9# 9# 0# n+ a# q+ b# c# ", +"d# @ @ * e# f# @ d# y d# # @ g# k f h# i# j# | k# l# m# n# o# p# q# r# / s# t# H+ u# y+ v# w# x# y# x+ z# A# B# C# b D# h# S+ E# E# f F# G# H# I# J# n n o n n o o % r r x s v s K# L# x u u u u u u u u v v w w `+ M# w v u v v v w w v @ `+ v @ @ s N# O# w v s u v v u t s x v v # A ; P# Q# R# S# T# U# V# W# X# Y# Z# `# $ .$ +$ @$ #$ $$ %$ &$ T *$ =$ -$ ;$ n@ >$ ,$ '$ )$ !$ ~$ {$ ]$ ^$ /$ ($ _$ :$ <$ [$ }$ |$ 1$ 2$ 3$ 4$ $$ 1. 5$ 6$ -. 7$ 8$ [. [. 1. }. 1. 9$ O. 0$ I. a$ b$ 8. c$ W d$ r@ e$ f$ g$ h$ i$ j$ k$ l$ m$ n$ o$ p$ C@ q$ r$ s$ o$ t$ F@ u$ v$ i. w$ L@ x$ y$ z$ A$ B$ C$ D$ E$ F$ G$ V@ H$ V. q@ I. O. n@ Z O. 2. 0$ 0$ M. O. O. Q. O. O. N. O. I$ J$ Q. O. O. N. N. O. 0$ Q. X. K$ S. U. q@ L$ K$ P. Q. X. X. M$ N$ P. P. Q. Q. P. P. O. O. Q. P. H. P. O$ N$ Q. P. T. Y@ P$ Q$ R$ S$ T$ T$ U$ V$ W$ X$ Y$ Z$ _# _# !# !# `$ {+ (+ [+ !# % :+ .% Z. :+ +% ]# }+ ^# [+ @% #% $% _# 3+ %% %% 4+ <# &% [# *% =% d+ 1# d+ d+ d+ 1# d+ c+ 3# 2# a+ 1# k+ e+ -% ;% >% 5# d+ e+ 5# 7# h+ 7# h+ g+ 9# 9# p+ o+ ,% '% )% !% ", +"p @ * # ~% {% ]% y y @ ^% /% (% _% :% <% I+ [% }% |% 1% 2% 3% 4% 5% 6% 7% k# 8% 1 9% v# 0% a% b% c% d% e% f% g% h% c i% d S+ g j% j% k% l% m% n% o% n p% n p o p Y+ % x x x v q% r% s% s% s% t% s v v v v v w N# u% v% w% x% v% y% M# w w w w `+ @ z% `+ @ `+ @ `+ w @ A% B% C% `+ u u w `+ w v s x D% v f# E% F% G% H% I% J% K% L% M% N% O% P% Q% R% S% T% U% V% W% X% Y% Z% `% & .& /@ V. [@ +& @& #& '@ $& %& && *& =& -& ;& _$ N >& '@ }$ ,& '& )& !& ~& _@ /. {& ]& ^& /& -$ (& V. /. L. L. L. _& :& :& <& [& }& W a. b. |& z. 1& 2& 3& 4& 5& 6& 7& 8& 9& 0& a& b& c& d& e& s$ f& g& h& i& i& j& k& l& m& n& A$ u@ o& p& q& r& s& G$ T. V. T. O. O. I. t& O. 2. u& v& M. N. O. O. O. O. Q. X. w& x& y& O. O. O. O. O. N. O. N. R. `@ z& A& B& C& P. O. D& A& E& F& G& P. Q. X. P. Q. O. Q. Q. H& I& I& J& K& L& Q. H. 9. M& N& O& P& 2+ 2+ Q& R& S& T& U& V& W& X& ]+ [+ (+ Y& {+ {+ Z& `& * .* +* @* #* $* ]+ %* #% _# _# &* :# &* ** =* <# -* ;* >* ,* '* )* j+ d+ 4# c+ d+ d+ c+ 3# !* 3# ~* {* {* ]* ^* /* >+ 5# j+ j+ f+ g+ (* g+ 0# _* :* <* [* }* |* 1* 2* ", +"r % e# * 3* {% 4* y * 5* > 6* 7* x+ J+ 8* 9* 0* a* b* c* d* e* f* g* h* i* j* k* K+ l* m* n* o* d% p* q* r* s* t* i% S+ u* v* f j% w* U+ x* y* z* A* B* p p p % % s x v D% x x C* y% r% r% r% D* x w v w `+ v v `+ E* w% F* F* F* B% v% `+ G* @ @ @ G* `+ z% `+ w `+ `+ G* H* G* A% B% I* @ v w @ @ `+ v v x v u J* K* m% L* M* N* O* P* Q* R* S* T* U* V* W* X* Y* Z* `* = .= += @= #= $= %= U@ &= *= == -= ;= >= ,= '= )= != ~= {= ]= ^= /= (= _= := <= [= }= |= 1= 2= L. 3= ]& 4= 5= -$ Y@ U. i@ 6= M. 7= 8= 8= 8= 9= 0= a= b= c= d= e= f= g= h= i= j= k= l= m= n= o= p= d& q= r= s= s= t= u= v= w= x= y= z= A= A= B= C= D= E= F= o& G= H= I= J. J= 9= I& B& K= L= D& M= N= I& O= O. O. Q. Q. O. N. P. K$ P= Q= H& Q. Q. O. O. N. O. N. O. P. J$ R= S= T= U= M$ P. J& M$ V x& V= Q. P. R. P. Q. P. P. O$ I& I& J& J& W= X= Y= Y. H. V H. Z= S@ `= - .- +- +- V& U& @- #- !# ]# {# ^+ (+ $- )# %- &- *- #* =- -- ;- >- ,- '- ># :# &* &* :# &* )- ;# >% !- ~- {- ~- ]- ^- 9# 9# ^- ^- 2# 2# ^- j+ ^- /- ~- ~- ~- ]* (- _- >+ :- <- [- 6# h+ }- (* |- 1- 2- 3- 4- 5- 6- 7- 8- ", +"9- 0- a- J* 3* b- c- ^% V+ I# f d- L+ k* 8% { e- f- g- h- i- j- k- l- m- | n- 9% o- p- q- r- s- t- u- v- c t* h# w- w- f 6* 6* i U+ > z* x- y- 5* z- A- B- # Z+ r s s D% x v x D% s C- y% r% D- w D% @ w `+ `+ v @ v w t% w% y% E- F* F- `+ G* `+ @ G* `+ @ `+ `+ G- H- A% I- J- K- I* E- I* G* `+ v w w w w v x s r 5* L- M- N- M* O- P- Q- R- S- T- U- V- _$ W- X- Y- Z- `- ; .; +; .$ @; *$ #; $; %; &; *; =; -; ;; >; ,; '; ); !; ~; {; ]; ^; /; :. (; _; m@ :; <; [; }; 6. |; ]& c@ #$ 1; 2; M. 1. i@ 6= 3; 4; 8= 9= 5; ~# 6; 7; 8; 9; 0; a; b; c; k$ d; e; l= n= m= f; g; h; i; j; k; l; l; m; s$ n; o; p; q; r; s; t; u; a; h$ v; w; x; y; c= '# z; 5; A; B; x& [& [& I& C; O= y& Q. O. O. Q. Q. P. X. X. D; D; E; M$ O. Q. Q. O. N. N. O. X. F; G; P. H; U= I; w& A& J; K; L; w& P. X. R. R. X. P. Q. X. M; J& D; A& Z@ Q. N; N; Q. H. R. O; K$ J. 1+ P; =- Q; Q; W& '+ R; S; [+ /+ /+ {+ /+ (+ T; U; &- #* -- V; W; |+ X; '- _# =* <# ** ;# Y; Z; 5# 6# `; > .> +> m+ 0# @> @> #> $> 9# 0# j+ m+ ^- #> %> &> {* > l+ :- :- d+ h+ g+ *> => o+ -> r+ ;> >> ,> '> )> )> 8- !> ", +"~> {> c- p 3* A- z- V+ (% _% ]> ^> /> (> A+ _> :> <> E+ [> }> |> 1> k# 2> 3> y+ v# M+ 4> 7 5> 6> f% 7> c h# h# w- f 8> 6* j i J# J# m 9> 0> a> ^% z- A- 3* & % s x v @ w @ w @ s K# F* y% b> w v @ `+ `+ `+ v @ @ w x% F* v% I- F* A% G* G* `+ @ z% G* G* @ O# c> E- F* B% I* z% I* E- I* G* G* `+ v v u u u x x @ m d> e> f> g> h> i> j> k> l> m> n> o> p> q> r> s> t> u> ,@ v> w> x> y> z> 6. 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> `> <= j@ 1; $; /. /. , , ., +, [& U= @, #, 7; $, %, &, *, u; =, -, ;, >, l= ,, ', ), !, g; ~, {, ], ^, /, k; (, _, :, <, [, }, |, c; 1, 2, 3, 4, 5, 6, u@ 7, 8, 9, 0, a, C& Z P. I. D& I& I& b, Z@ Q. O. O. Q. y& A& A& c, M$ D; P= Q. O. Q. Q. O. Q. Q. Q. Q. d, e, I& R= f, g, K$ h, E& E; i, P. P. P. X. R. K$ X. P. X. j, L; L; N$ Q. k, Y. Y. R. Y. l, O. H. H. m, n, o, p, +- q, (# r, ]# S; _+ {# {+ (+ {+ )# s, -- t, t, -- u, $% v, w, x, y, z, y, A, &% &% B, C, ~- D, E, F, => n+ q+ q+ 0# 9# h+ @> #> 0# #> ^- G, '* H, I, d+ l+ 5# e+ (* J, K, => L, M, N, )% O, P, Q, R, 8- S, T, ", +"~> U, @ @ z- V, W, X, d Y, 9% Z, `, }% ' B+ .' +' @' #' $' %' &' *' J+ 4 =' -' Y, x+ 6> ;' b b >' S+ e S+ v* j% j% U+ > > /% > V+ ,' '' p% p z- b- )' x s v D% D% w w D% D% @ C% y% y% !' ~' ~' @ @ @ @ @ `+ @ z% b> E- {' w ]' E- C% @ G* @ @ G* z% z% G* C% E- E- E- ^' G* /' A% E- I* @ G* @ `+ w F- (' t % % 5* _' :' <' [' }' |' 1' 2' 3' 4' 5' 6' 7' 8' 9' 0' a' b' 7@ ^; 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' [. 5$ G' H' I' J' K' L' M' n@ 8. N' +, O' J; P' Q' R' S' 7, T' U' V' 1, W' X' Y' Z' `' ) .) +) @) #) #) $) %) $) &) *) $) *) X' l$ =) -) |, ;) >) ,) ') t; 4, )) !) ~) {) ]) ^) /) () O; H. 9. }& _) N$ Q. Z@ Q. Q. N. O. M$ J& B; O= :) D; Q. Q. P. P. P. Q. O. Q. Q. P. q@ M. D& <) D& [) }) |) Z Z H. R. P. P. P. X. K$ R. P. N$ D; D; F& Q. Q. X. P. X. R. R. Y. P. q@ G; A& 5; 1) 2) 3) q, Z. [+ ]+ !# /+ (+ I= I= {+ 4) 5) 6) ,# 7) 8) 9) x, 0) ** ,+ ,+ a) b) >% c) d) ~- e) f) g) h) i) j) k) l) -> m) n) @> o) @> @> #> p) {- {- C, q) 5# 7# h+ 9# r) s) n+ o+ K, l) r+ c# t) P, u) R, 8- v) v) ", +"~> w) x) g# y) z) A) f% B) 2 C) A+ D) E) F) G) H) I) J) K) L) M) N) y+ v# x# r- x+ A# 6> R+ O) P) Q) R) g g E# f w* U+ > p% m m S) S) S) w) T) % U, {> U) x s v D% D% D% w w @ C% V) r% I- W) I- V) X) G- z% G* @ G* z% /' I- X) @ w ]' Y) I* z% G* G* G* G* G* G* G* G* G* {' E- A% G* /' C% F* I* @ `+ `+ @ `+ v Z) `) ! * 5* .! +! @! #! $! %! &! *! =! -! ;! >! ^= ,! '! )! !! ~! {! ]! ^! /! (! _! :! ~ t& ,~ t& t& 9. R. X. X. P. P. X. X. M$ D; '~ E& )~ E& R= E; d, P. X. H. K$ !~ ~~ J& U= M; K$ {~ o, ]~ ~# ^~ ~# [+ I= I= `$ `$ `$ /~ (~ _~ :~ <~ [~ }~ |~ 1~ 2~ a) 3~ 4~ 6# 2# 5~ 6~ 7~ 8~ 9~ 0~ a~ b~ c~ d~ e~ f~ f~ g~ f~ n) p+ $> h~ i~ &> j~ k~ j~ l~ m~ n~ r) n+ K, K, o~ K, f~ p~ q~ r~ s~ R, t~ u~ v~ w~ ", +"x~ y~ z~ v+ A~ B~ C~ D~ n- z+ { E~ m# / E+ F~ G~ H~ |% I~ J~ K~ L~ M~ O+ 7 A# 0 N~ O~ P~ R) Q~ R~ S~ A) A) T~ U~ V~ /% /% W~ o n % Y+ X~ Y+ % % Y~ Z~ `~ { s v `+ @ w G* K- ]' y% E- .{ +{ E- V) I- {' @{ H* z% G* z% G* z% c> ]' z% G* @{ E- I* z% @ G* G* @ @ z% z% z% /' #{ Y) ${ z% /' %{ E- I* G* w `+ @ `+ v u t &{ K* m *{ ={ -{ ;{ >{ ,{ '{ ){ !{ ~{ {{ ]{ ^{ /{ ({ _{ :{ <{ [{ }{ |{ 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{ /@ Y> r{ s{ t{ u{ v{ w{ x{ , y{ Q= z{ A{ s& #, B{ C{ o& D{ E{ F{ t; G{ H{ I{ J{ K{ L{ P! M{ N{ O{ P{ Q{ Q{ R{ S{ T{ R{ U{ P! P! $) V{ 7& W{ X{ T! Y{ }, U! Z{ `{ ] ~ .] +] @] #] $] %] &] *] 5; U= O$ P= k, Z@ O. P. Q. O. Q. M$ :) w& P. w& X. X. X. P. X. X. R. K$ H. O. M. M. q@ q@ I& c, O. =] =~ K$ X@ !~ X. X. X. R. T= M; U= U= -] ;] U= =] >~ >] x& ,] V. 8. K$ '] T. Q= x& E; )] H. !] z; E$ g, g, ~] /+ {] I= `$ ]] ^] /] (] &~ _] :] <] |~ 2~ b) b) 3~ [] }] |] 1] |] 2] 3] i) 4] 5] l) e~ e~ d~ 6] 6] f~ l) 0# 7] 8] 9] 0] a] b] c] c] d] e] f] g] K, g~ h] i] Q, j] k] k] l] m] n] o] p] q] r] ", +"s] t] u] v] w] x] y] z] 8% A] A+ B] .' < 7% C] D] H+ I+ E] F] L+ G] b% H] z# ;' C# c I] R) @! J] E# f 6* K] J# L] x- M] n p p Y+ % Y+ % x s N] r% O] F- P] w @ `+ @ G* G* I- E- E- J- A% F* V) I* ~' Q] R] H- G* @ /' /' G* C% F* H* z% S] E- I* G* G* z% z% z% z% T] z% /' T] U] #{ V] W] {' E- Y) X] @ @ Y] D% v v s Z+ z- Z] d> j% `] ^ 5 .^ +^ @^ #^ $^ %^ 6' &^ *^ =^ -^ ;^ ^& a{ >^ ,^ '^ )^ !^ ~^ {^ ]^ ^^ /^ (^ _^ :^ <^ [^ }^ |^ 1^ 2^ 3^ 4^ 5^ 6^ 7^ 8^ 9^ 0^ a^ b^ c^ d^ e^ v{ f^ g^ h^ i^ j^ k^ l^ |. H$ 8$ m^ n^ ~+ o^ p^ q^ r^ s^ t^ u^ ') `! v^ w^ x^ y^ z^ A^ B^ K{ O{ C^ D^ E^ E^ E^ F^ E^ G^ R{ H^ P! I^ M! J^ K^ L^ M^ N^ O^ l$ P^ -, Q^ c; R^ 5, S^ T^ U^ V^ W^ X^ Y^ Z^ `^ !~ Y. O. O. V O. v& D& Q= / O= >~ N. P. X. P. X. H. H. Z 9. J. 9. M. M. q@ ;~ ./ Y. D; K$ X@ X@ X X K$ K$ K$ +/ _) z{ @/ f, U= #/ $/ Q. R. :) O$ P. Q. K$ g, Y@ Z P. Q. %/ H& '~ &/ s! () () */ {# I= `$ '# '# =/ :] -/ ;/ >/ ,/ '/ )/ !/ !/ ~/ {/ ]/ ^/ => |] // r+ (/ _/ :/ Q, c# e~ 6* U+ J# > V+ B* 0> B/ % r r % % s v x C/ y% v `+ G* C% `+ `+ @ G* z% G* D/ I* D/ E- E- I* H* G* G* c> @{ G* `+ z% U] z% G* E/ R] E- Y) Y) I* /' /' /' /' z% z% z% G* T] T] T] /' /' F/ {' E- G/ C% w @ w D% v D% s q H/ I/ B J/ K/ L/ M/ N/ O/ P/ Q/ R/ S/ T/ U/ V/ W/ X/ Y/ Z/ `/ ( .( +( @( #( $( 7@ %( &( *( =( -( ;( >( ,( '( )( !( ~( {( ]( ^( /( (( {( _( :( <( [( }( <; %; |( 1( {^ 2( 3( 4( 5( X , 6( l^ 7( 8( 9( 0( q^ a( b( c( d( e( f( v^ w^ g( h( i( j( k( l( O{ m( n( o( p( E^ q( r( s( s( F^ E^ P! t( u( v( w( x( y( ) z( ;, A( P^ B( C( D( E( @~ F( G( H( I( J( K( L( `^ `@ H. Q. Q. O. O. O= >~ J& A& }& D; P. Q. Q. P. X. K$ X@ 8$ t& J. G$ X V. M. O. w& R. U= Z K$ K( X@ X X@ X@ K$ K$ M( G& S= =] U= ./ N( Y. R. +/ M; k, Q. Y. g, K$ H. t& X. N. O( '~ P( Q( R( () {# */ `$ '# '# S( T( U( V( ,/ W( W( X( Y( Z( `( _ ._ +_ M, // @_ F, F, #_ $_ Q, %_ Q, Q, Q, _ -_ ,_ h] g~ '_ )_ &_ Q, !_ ~_ {_ s~ ]_ ^_ /_ w~ b/ (_ __ :_ <_ ", +"w+ h% [_ 4 }_ n/ |_ 1_ 2_ s# / < F+ h* 3_ 4_ 5_ 6_ 7_ B) 8_ d% 9_ 0_ a_ b_ 7* h# C c_ d_ e_ 6* K] U+ > /% V+ n f_ ~> g_ % s r s x v v v D% M# h_ w @ w @ `+ @ G* z% z% G* z% H- E- {' G* i_ %{ j_ Y) k_ G* @ G* /' G* z% /' G* E/ c> Y) l_ /' z% /' /' /' /' /' z% /' T] /' z% z% /' T] m_ E- C% w w v n_ n_ n_ Z+ o_ p_ q_ r_ s_ N~ 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_ `_ : w> .: +: @: #: $: %: &: *: =: H$ -: ;: >: ,: 3{ ': ): [. 8$ !: ~: {: ]: ^: /: (: _: :: <: u^ y! H{ [: }: h( |: M{ 1: o( j( 2: z^ 3: 4: D^ 5: 5: r( F^ s( 6: s( 7: 8: 9: +) 0: M! a: b: c: A! d: e: W' z! f: g: h: i: j: k: 8, (] l: !] )] P. m: R. X. Q. Q. D; c, N$ w& ;~ D; Y. Q. O. P. P. Z =~ Z= Z= K( G$ n: o: H$ U. 8$ i, ;~ Z H. T. p: `@ K$ =~ X@ 9. Z X@ q: =] C& R. r: s: t: u: v: w: K$ K$ ^~ K( =~ X. m: k, N; J& ./ x: y: ^~ ~# {# `$ '# ~+ z: S( A: B: C: D: W( E: Z( F: F: G: H: // @_ F, I: J: l) K: L: M: 1* c# N: t) Q, c# f~ c# O: g~ [/ P: h] Q: R: |* &_ S: T: U: R: V: %_ %_ )> W: X: Y: Z: `: < .< __ +< +< @< #< ", +"$< %< p/ I+ &< *< =< -< / ;< g- h* >< ,< 1 9% F] '< )< d% 9_ a_ !< h% 7> ~< i% w+ g {< ]< ^< /< (< k V+ V+ n _< ~> :< r r v x v D% D% D% D% D% `+ b> O# G* G* z% G* z% z% G* G* /' /' R] E- l_ G* G* T] << #{ z% /' z% z% z% G* z% T] /' z% C% c> [< z% T] T] T] T] z% z% z% G* T] }< /' G* z% T] z% X] X] @ D% x # * @ o_ |< |< _' 1< 2< u- 3< 4< 5< 6< 7< 8< 9< 0< a< b< c< d< e< f< 8^ @: 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< ;$ 5= 7{ H< I< ; %= J< 8. X K< L< M< N< O< P< Q< R< S< T< U< V< v^ I{ x^ W< X< G^ G^ Y< G^ Z< 2: `< [ .[ +[ +[ @[ #[ $[ %[ &[ D^ R{ *[ =[ u( I^ -[ ;[ b: >[ ,[ '[ '[ )[ f( U' ![ ~[ {[ ][ ^[ /[ /~ ([ {~ K$ K$ K$ K$ X. P. O$ ;~ X. X. )] O$ X. P. P. R. X. Z 9. X@ G$ F$ l^ U@ V@ 6( G. 8$ 8$ H; t& X. q@ q@ W. K( =~ 9. X 9. 9. j, _[ :[ !~ R. W. <[ v: X. R. K$ X. K$ [[ s& X X. Z@ Z@ N( H; }[ O; |[ g, ~# (+ ~+ 1[ ;/ 2[ 2[ ;/ |~ 3[ 4[ 5[ 6[ 7[ 0( 8[ 9[ I: I: 0[ N, a[ )% e~ )% b[ c[ d[ e[ f[ 2* c# n) g[ h[ 6] O: 6] i[ j[ >_ k[ l[ l[ )> m[ n[ )> o[ p[ q[ r[ s[ t[ u[ v[ w[ x[ :_ :_ y[ z[ A[ ", +"B[ C[ 2> 8% D[ i* E[ F[ G[ H[ k# Z, 1 I[ J[ 4 B) K[ z# L[ M[ N[ c O[ P[ Q[ A/ A/ 8> (< R[ S[ T[ U[ U[ V[ W[ X[ X[ &{ Y[ r x w v v v w w ~' w w `+ K- G- z% z% z% /' /' /' z% z% /' H* m_ << z% z% T] z% T] z% /' /' /' U] U] T] U] U] /' z% /' Z[ l_ << `[ U] T] /' T] /' z% T] }< U] /' z% /' G* @ W) C% v & @ ^% g# } _' .} +} j% @} #} $} %} &} *} =} -} ;} >} 2@ ,} '} )} !} ~} {} S% ]} ^} /} (} _} 7{ %( :} <} l> [} }} |} 1} 2} 3} 4} 5} 6} 7} 8} 9} 0} +: a} b} c} d} e} f} W% g} h} i} j} k} 3{ l} J< 8. m} n} o} p} q} r} s} t} u} v} w} v^ x} y} B! z} |: A} B} C} 4: D} E} 6: F} G} n( H} I} J} 6: K} L} M} X< i( i( I^ N} O} P} Q} R} S} ,[ k$ k$ T} U} y! V} +~ +] W} X} Y} $, 7; {] ~# `@ 9. K$ K$ 9. Z h, J; Z} }& ;~ )] w& Q. P. H. Z I. Z t& 9. Y@ N& l^ m} m} `} -$ <@ G& U. P. Q. R. ~# l^ | X@ 9. Y. .| j, f, !~ !~ W. !~ W. X. X. K$ P. P. +| Z= Z= q@ Z@ Q. k, K$ @| M$ #| +| =~ ~# Y& S( 2[ $| %| ;/ |~ )/ &| *| =| -| ;| >| ,| I: N, '| '| '% 0[ '% )% e~ %_ )| !| ~| N: 2* 1* n| o| > k m V+ n p% S) $ $ $ # x x x D% w @ w w w z% @ @ G* G* @ z% z% /' T] z% z% /' z% z% /' /' z% z% /' T] z% T] /' /' /' /' T] U] T] /' U] G* T] T] /' T] /' U] T] /' }< }< U] T] /' /' T] /' G* z% z% ~' w @ x * ^% g# p| q| _' P# T+ j% r| K/ s| t| u| @. v| w| x| y| z| A| B| C| D| E| F| G| H| I| & J| K| i} ]^ L| M| N| O| P| p< _= 2} 2@ Q| b} R| S| T| U| V| W| X| Y| Z| )( `| 1 :@ .1 +1 @1 #1 $1 3{ &$ %1 ;$ Q$ &1 *1 =1 -1 r^ ;1 >1 ,1 '1 )1 !1 ~1 {1 ]1 |: ^1 /1 /1 D^ (1 D^ .[ _1 :1 <1 :1 L} [1 }1 |1 11 |1 21 31 ^1 B^ 41 51 41 61 71 81 91 '[ `{ 01 a1 t; b1 c( c1 d1 e1 w; f1 g1 F: B: '# ~# K$ t& X@ t& O. Z Z Z Z Z P. y& N$ N$ Z O. Z Z Z H. V. V. 6( h1 !: i1 h1 /@ 8$ U. P. X. X. G$ j1 F$ J. X@ R. k, k1 P. K$ !~ W. K$ R. P. !~ K$ X. P. X@ l1 o: H$ X. Y. Y. H. V X. m1 !~ !~ g, Y& S( )/ 2[ o^ 2[ )/ )/ n1 6[ o1 p1 q1 r1 s1 '| '| s1 '% t1 '% u1 Q, Q, N: v1 u) w1 N: 2* t) e[ y1 [| z1 )> [| :| A1 B1 t~ t~ S, C1 D1 .< x[ x[ E1 F1 G1 H1 I1 I1 J1 ", +"t# 8% D[ i* g- K1 e| f| 3_ z] L1 J[ M1 N1 K[ O1 P1 Q1 h% t* i% l| E# g A/ 8> f/ R1 J# > /% n p% p% p @ * * # & x S1 Y] @ ~' z% z% @ w ~' ~' G* G* G* @ /' /' /' /' z% /' /' /' /' /' /' /' z% z% T] z% z% T] T] /' z% U] }< U] T] U] z% T] T] T] U] U] T] T] T] /' T] T] /' /' T] T] /' @ G* @ S1 & & p p g# T1 v+ U1 _' P# T+ i f R+ V1 W1 X1 Y1 Z1 `1 2 .2 +2 @2 #2 $2 %2 &2 *2 =2 -2 #= ;2 >2 ,2 6{ '2 %. )2 !2 ~2 {2 ;& ]2 ^2 /2 i^ (2 _2 :2 <2 [2 }2 |2 12 22 32 42 52 62 %; -$ {& 72 82 92 02 a2 U H$ b2 c2 d2 e2 -1 s} f2 g2 h2 i2 v^ j2 ]1 |: |: k2 X< l2 m2 n2 o2 p2 Y< q2 I} :1 r2 s2 }1 _1 :1 s2 t2 _1 4: M{ u2 v2 71 w2 x2 y2 91 z2 U} T} A2 2, R^ B2 :: e1 C2 D2 E2 F2 k) @_ ]/ T( |+ s& M& X T. V. Z 8. 8. 8. q@ X. Z Z P. Z O. Z Z I. Z V. [. 8. G2 m} H2 I2 J2 U@ 8$ H$ G2 8$ 9. G$ l^ F$ =~ X. P. w: R. P. K$ !~ X. K$ R. R. K$ R. R. 8. G. K2 Y@ U. R. Y. V t& X. P. R. T. W. <+ '# L2 M2 q& n1 )/ 6[ 6[ $, p1 N2 N2 O2 P2 P2 Q2 '| t1 R2 u1 u) ~| Q, N: c# %_ 2* S2 S2 S2 S2 e[ %_ t) p[ t) p[ z1 z1 y1 y1 [| A1 B1 u~ S, T2 ^_ D1 U2 .< E1 y[ @< V2 W2 G1 X2 Y2 J1 ", +"Z, 1_ Z2 s# ;< `2 k# 2> h| 3 q/ B) 6 .3 x+ +3 @3 s* h# #3 w+ g 8> 8> 6* J# > J# v+ /% ; S) p S) * # * # & n_ n_ v w `+ @ G* G* @ G* G* G* z% G* z% G* /' /' /' /' /' T] T] T] T] T] T] T] /' z% T] T] z% T] U] /' G* T] T] T] /' T] /' T] T] U] }< U] T] T] /' /' U] T] /' T] U] z% G* @ z% @ n_ * * ^% ^% ; /% } _' } v+ I# U+ E# f% $3 %3 &3 *3 =3 -3 ;3 >3 ,3 '3 )3 !3 ~3 {3 ]3 ^3 /3 (3 _3 02 :3 <3 I| [3 M| }3 |3 13 23 b} 5} 33 T/ 43 53 63 73 83 93 03 a3 b3 c3 d3 e3 f3 %; /@ {& g3 82 h3 i3 j3 k3 l3 m3 n3 o3 p3 r} s} S< ,1 q3 r3 s3 t3 u3 ]1 v3 /1 31 .[ _1 E} X< w3 5: _1 x3 y3 :1 z3 [1 .[ q2 x3 |1 .[ 8: I^ *) A3 71 d: d: B3 C3 a1 D3 a1 E3 <: e1 F3 G3 k) J: ._ ^/ H3 I3 J3 K3 L3 M3 }+ N3 Z= p: T. V. U. q@ 8. q@ V. t& t& H. Z Z H. H. O. Z U. T. H$ [. 8$ .1 O3 P3 Q3 m} _@ _@ R3 G$ l^ F$ J( l1 p: U. `@ O; X. X@ |[ K$ K$ X@ 9. !~ R. R. T. X E. l^ q@ S3 X. X. 9. O; R. K$ K$ !~ ~# [+ B: L2 T3 U3 6[ 7[ {/ V3 W3 X3 Y3 '| Q2 Q2 Z3 Z3 `3 4 t1 u) ~| )> %_ Q, ~| N: N: %_ S2 S2 2* p[ p[ .4 .4 t) q[ }| t~ t~ r[ S, +4 ^_ v) D1 D1 .< @4 w[ F1 @< V2 V2 W2 X2 #4 #4 Y2 ", +"$4 d| K1 s# `2 ,< 2> %4 &4 *4 =4 K[ -4 ]> d- k| t* l| m| m| g 8> f/ R1 > > /% z~ z~ ; o_ @ * @ * x x & x S1 @ `+ `+ @ z% /' z% z% /' G* G* z% z% /' z% /' /' T] T] U] T] U] }< U] T] U] T] T] /' U] T] U] T] T] /' z% U] T] T] T] T] T] T] T] U] ;4 }< U] }< /' z% U] T] /' T] /' @ `+ `+ @ >4 * x) @ g# g# v+ q| _' } v+ v+ > J# g ,4 '4 )4 !4 ~4 {4 ]4 ^4 /4 (4 _4 :4 <4 [4 }4 |4 14 24 m@ 34 44 54 64 I| 74 84 ,. 94 04 14 a4 b4 <= c4 -. d4 w' e4 f4 g4 h4 i4 j4 k4 l4 m4 >2 %; /@ n4 4$ 82 ]. o4 p4 U@ /@ q4 r4 s4 t4 u4 v4 w4 V< x4 x} y4 v3 z4 A4 B4 C4 l2 D4 l2 m2 C} T{ E4 :1 y3 F4 G4 <1 _1 q2 m2 J} &[ F^ R{ H4 I4 J4 K4 m$ '[ T} L4 M4 N4 E3 e1 O4 P4 ._ Q4 {: I( I= ~# J. J. =~ J. K( Z= Z= Z= M& p: M& U. U. V. V. V. Z 9. K$ t& Z Z H. H. O. Z V. V. U. X X X ;$ :@ H2 R4 S4 T4 _@ U4 G. p: Z= N& F. U@ V@ X@ X@ =~ K$ K$ t& =~ K$ K$ O; S3 X 8$ j1 O& V. P. K$ W. K$ H. H. K$ X. T. !~ <+ !+ I( J3 o1 8[ V4 p1 p1 9[ X3 W4 '| '| Q2 X4 Z3 Y4 Z4 e[ u) `4 R, N: c# %_ ~| ~| Q, t) %_ %_ 5 .4 .4 .4 .4 5 r[ t~ r[ S, /_ ^_ `: .5 +5 x[ @4 @5 #5 E1 @< $5 V2 %5 Y2 &5 #4 *5 ", +"=5 -5 =5 ;5 >5 ,5 3 '5 )5 !5 ~5 ]> d- h% {5 h# w+ m| A/ A/ ]5 R1 R1 R1 J# /% z~ g# x) x) @ * # & & x S1 S1 Y] Y] ^5 @ G* z% /' T] z% G* z% z% T] /' z% /' /' /' T] T] /' }< U] U] U] /' /' U] T] T] T] U] T] U] T] U] T] /' U] T] T] U] T] U] /' U] T] U] ;4 /' ;4 U] /' T] z% /' T] G* `+ @ w >4 x x) T1 /5 v+ p| } v+ z~ z~ ; z~ p% |< w+ q/ (5 _5 :5 <5 [5 }5 |5 15 25 4' 35 45 55 65 75 ]{ 85 !@ 72 95 54 05 a5 b5 c5 d5 e5 `# 2} f5 g5 h5 i5 j5 |4 k5 l5 m5 n5 o5 p5 '@ q5 r5 s5 t5 $; :@ u5 v5 7{ w5 x5 y5 &= -$ z5 A5 B5 C5 D5 E5 F5 U' H{ G5 v3 H5 I5 J5 K5 L5 M5 Y< N5 l2 4: D^ [ O5 :1 P5 Q5 6: 6: s( C} J} 4: H^ I^ x2 K4 R5 S5 T5 A2 U5 V5 W5 X5 Y5 Z5 I3 `5 6 ~] U4 R3 V@ H$ $; V@ X> 8$ 8$ 8$ V. q@ q@ V. T. U. T. T. U. V. U. H. H. K$ t& O. H. H. Z P. X. U. U. K$ `@ T. H$ :@ h@ .6 +6 @6 =$ _@ V@ X `@ S. #6 O3 V@ X@ K$ J. 9. 9. K$ J. X@ H. X@ T. V. V@ Z= #6 H$ T. T. O; K$ O; H. K$ K$ T. K$ ~# ,# $6 )/ %6 V4 >| >| &6 *6 r1 P2 Q2 =6 =6 -6 Z4 ;6 e[ >6 e[ ~| u) e~ 1* Q, N: t) ~| p[ t) ~| .4 ,6 .4 .4 t~ u~ t~ S, t~ T2 T2 ^_ D1 U2 x[ @4 E1 #5 #5 @< V2 V2 X2 '6 G1 )6 #4 &5 ", +"!6 >5 ~6 z] {6 ]6 i| 6 j| -4 ^6 f% h% #3 l| m| A/ /6 n| K] R1 > > |< ; ^% g# ^% p @ # s x w v @ @ @ ~' (6 ~' G* z% z% z% /' /' G* z% /' T] z% /' /' T] }< U] }< T] U] U] T] U] T] /' U] U] U] U] U] T] U] U] T] T] T] U] U] T] U] T] _6 :6 :6 :6 <6 [6 U] ;4 }< U] T] /' /' z% @ Y] Y] n_ # * }6 ; v+ v+ v+ ; p| T1 5* 5* p% S) m C F] |6 16 26 36 %! 46 n< 56 66 76 86 [4 96 :2 06 4{ v5 !@ a6 J| b6 O_ c6 d6 e6 f6 g6 h6 i6 j6 k6 l6 m6 n6 o6 p6 q6 r6 s6 t6 u6 v6 T- w6 x6 y6 :@ :@ z6 t5 A6 w5 B6 C6 ;$ D6 E6 F6 G6 H6 D5 >1 I6 U' J6 x^ ]1 I5 K6 L6 M6 N6 C4 .[ 6: N5 J} s( [ [ :1 :1 6: .[ 5: s( 7: P! U{ R! *) O6 K4 v= P6 Q6 R6 S6 T6 U6 V6 M2 I= Z= G$ G. X X 8$ H$ 8$ X> ;$ H$ ;$ ;$ 8$ U. V. q@ 8. q@ V. U. T. U. U. X U. U. T. T. q@ U. q@ Z U. V. U. T. X X X T. X V@ :@ _@ W6 X6 Y6 Z6 %; V@ U@ j1 `6 p: K$ X@ M& `@ X p: M& X@ K$ !~ T. U. U. V@ Z= X X. R. R. K$ T. X. T. T. T. T. =~ ~# 7 .7 +7 V4 @7 #7 9; %, $7 %7 &7 *7 =6 -6 *7 =7 -7 u) 4 e[ q[ t) N: S2 N: ~| ~_ z1 ~_ [| [| t) ;7 r[ u~ S, >7 T2 v) +4 || .5 ,7 '7 )7 w[ !7 :_ ~7 $5 {7 *5 ]7 '6 X2 &5 &5 ^7 ", +"/7 z] (7 _7 :7 %< 6 $< z# P1 <7 O[ #3 [7 /6 /6 f/ K] K] > }7 |7 17 /% g# @ ^% 27 # # n_ D% v w D% @ ~' @ @ z% (6 z% /' /' z% z% T] U] /' /' U] /' U] T] }< }< ;4 }< T] T] U] U] U] T] T] 37 /' /' T] U] T] T] U] U] T] T] U] U] /' T] /' (6 _6 [6 _6 :6 _6 47 T] /' /' T] T] /' G* Y] x & t+ x) g# p| 57 ; v+ ; @ ; p @ p o o 67 S+ ) )4 77 87 97 07 d5 l> a7 X# b7 c7 d7 e7 f7 g7 ; h7 i7 j7 k7 u> l7 m7 n7 f6 t{ o7 p7 q7 r7 s7 l6 ^2 x> t7 u7 v7 w7 x7 y7 z7 R- A7 B7 E7 F7 G7 H7 I7 J7 c( K7 L7 M7 N7 O7 |: z4 B4 M} N5 N5 m2 P7 7: 5: s( Q7 6: q2 E4 4: (1 D^ R7 P! F! S7 T7 U7 R5 '[ P6 V7 W7 X7 Y7 Z7 `7 6 G$ $; $; $; X 8$ H$ 8$ 8$ 8$ ;$ 8$ H$ ;$ ;$ 8$ V. q@ V. U. T. U. q@ U. U. V. T. U. V. V. T. T. q@ q@ V. q@ q@ V. U. U. U. T. T. U. T. X V@ _@ m} 8 .8 B6 +8 o: 6( p: g, =~ K$ Z= T. @8 `@ T. T. W. K$ p: `@ U. `@ g, `@ K$ W. !~ m: `@ T. T. X. K$ !~ |[ =~ {+ 2~ $, #8 $8 %8 &8 9; %7 *8 Z4 *7 Y5 =8 =8 Z4 `4 e[ e[ u) S2 2* 2* 2* N: [| ~_ )> -8 8- R, ;8 >8 ;8 u~ T, v) C1 C1 .5 w~ U2 ,8 '8 )8 !8 w[ ,1 ~8 {8 {7 ]8 {7 %5 *5 ^7 #4 ^8 ", +"/8 /8 ^> i| (8 _8 O1 ^6 B# k| :8 [7 m| m| A/ f/ K] <8 > > /% z~ z~ ; ^% x) @ # & & S1 D% v ~' @ z% z% z% ~' Q] _6 /' /' /' /' /' T] U] U] T] }< T] T] /' U] U] U] T] T] T] }< U] T] T] T] ;4 z% z% T] U] T] /' U] T] /' T] T] /' z% T] T] [8 _6 _6 :6 :6 U] T] T] /' /' G* G* `+ x & # @ @ ^% ; v+ }8 ; |8 ^% ^% o_ * @ @ p p% 18 C y+ 28 38 %! 48 58 68 m5 78 88 76 98 08 a8 b8 22 7@ c8 c8 B> d8 e8 l7 f8 n7 g8 t{ h8 p7 i8 ': j8 m@ k8 l8 d' m8 )2 n8 z_ 6' o8 p8 q8 33 r8 g3 s8 t8 g@ J| u8 v8 w8 E7 /@ C6 x8 y8 z8 A8 B8 t} C8 D8 E8 F8 G8 H8 H8 I8 .[ n2 o2 8: S{ J8 T{ 4: o2 8: U{ K! K8 L8 M8 S7 (, N8 O6 K4 v= O8 E3 <: P8 %8 Q8 R8 6; 6 (@ G$ S8 V@ H$ 8$ 9. G2 8$ ;$ 8$ 8$ H$ X 8$ 8$ H$ V. U. V. U. U. U. V. U. U. V. V. q@ V. T. V. U. T. U. V. q@ V. q@ q@ V. U. T. X X `@ `@ V@ G$ 2= {& T8 U8 V8 +8 R3 n: l^ X@ p: p: U. &= `@ M& K$ K$ T. X S. M& X Y@ W. W. +| W. K$ `@ `@ T. K$ K$ K$ O; O; () W8 o1 9[ #7 &8 X8 Y8 Z8 `8 *7 9 9 .9 .9 Y4 `4 R2 S2 `4 e[ c# e[ S2 f[ [| y1 y1 W: t~ r[ >7 >8 +9 @9 v) #9 w~ v~ .< .< @4 E1 )8 $9 %9 &9 *9 {8 {8 ]7 {7 ]7 =9 ]7 -9 ^8 ;9 ", +"^> :7 >9 ,9 '9 )9 B# @3 k| t* !9 /6 ~9 A/ f/ }7 > {9 /% /% 17 g# g# ^% @ 27 t+ x n_ x v w @ Q] @ z% z% z% Q] U] U] T] T] /' /' U] U] z% T] U] U] /' U] U] T] z% /' T] U] U] U] U] U] U] T] U] T] /' T] T] /' T] T] /' /' T] T] T] z% /' /' (6 :6 (6 (6 /' T] T] z% z% (6 ^5 Y] S1 # 27 @ g# ; p| } v+ v+ ; @ @ @ ^% @ p * p p% } ]9 4 ^9 /9 (9 _9 := :9 <9 [9 }9 |9 19 29 a8 39 49 O_ 59 j3 B> 69 2{ 79 89 k' 99 09 [} a9 b9 ': p! c9 d9 e9 f9 g9 h9 i9 n5 j9 k9 l9 m9 B7 %( j' f@ f@ .= ,2 n9 o9 4$ {& p9 q9 r9 s9 t9 u9 P8 v9 w9 x9 y9 G8 z9 D} D} /1 31 D^ w3 A9 Q{ T{ B9 w3 C9 Q{ M8 #) D9 E9 F9 h; T7 s$ G9 H9 I9 J9 J7 G3 K9 ]: L9 K2 U@ Z= 6( U@ o: X H$ 8$ H. 8$ ;$ 8$ 8$ 8$ 8$ H$ ;$ 8$ H$ U. T. U. U. U. V. V. U. V. X M& T. U. U. V. V. `@ X V. U. U. V. V. U. T. T. U. T. `@ `@ `@ U@ M9 i! D7 N9 O9 P9 {& :@ J2 Q9 U@ U@ p: `@ X p: X@ 9. X@ T. X `@ Y@ W. W. K$ K$ !~ +| Y@ W. `@ `@ K$ K$ !~ |[ =~ [+ Z( Y} R9 f1 #~ =8 Y5 Z4 Z4 =6 Y5 S9 `4 Y4 -7 R2 `4 R, S2 2* e[ e[ S2 5 [| [| t~ u~ u~ T, T9 T, #9 C1 C1 < < @4 w[ E1 w[ U9 !7 &9 Y2 '6 *5 *5 ^7 ]7 ^8 V9 ^8 W9 ;9 X9 ", +",9 (8 K[ Y9 P1 k| k| Z9 #3 l| /6 /6 n| ]5 e/ /% |7 /% /5 T1 x) @ @ 27 & & x n_ S1 Y] Y] w @ Q] @ z% U] /' z% /' U] T] T] /' T] }< }< T] T] U] U] T] T] T] U] T] T] T] U] T] /' T] T] U] T] U] T] T] T] U] T] T] T] T] /' T] U] U] /' /' z% ~' :6 [8 /' z% z% z% `9 Y] ^5 S1 & 27 @ ^% ; v+ v+ p| } p| ^% ^% ^% @ p ^% * p * p W~ p| 0 .0 K +0 @0 #0 $0 *3 %0 &0 ~{ (4 t6 *0 @: Z/ 22 _; y6 a2 =0 ;2 -0 5} ;0 >0 ,0 '0 )0 B7 !0 p9 ~0 {0 ]0 ^0 /0 (0 _0 :0 <0 [0 }0 |0 10 a9 ]^ 20 30 j3 02 e8 40 .= 4$ ~@ +8 ): 50 60 ^_ 70 80 90 00 a0 b0 u3 c0 d0 e0 /1 O7 n2 D^ N! Q{ f0 g0 h0 i0 j0 j; k0 k0 l0 m0 n0 o0 p0 H9 q0 2& r0 P< s0 t0 z5 u0 M9 v0 U@ &= V@ G2 8$ X H$ X 8$ 8$ H$ H$ H$ H$ H$ 8$ V@ V@ X G$ M& G$ G$ V@ X V@ X 6( G$ V@ H$ 8$ H$ 8$ H$ U@ 6( H$ X X X X X X X X M& p: Y@ U@ 6( 6( C7 f@ w0 x0 y0 C6 E7 `= G$ l^ n: 6( M& X p: M& U@ X `@ T. X M& `@ K$ K$ W. S. J. K$ K$ W. K$ 9. X. K$ K$ ~# ~+ 8[ z0 f1 A0 w; *7 *7 *7 .9 B0 B0 `4 Z4 =7 Q, )> ~_ S2 t) N: e[ S2 5 .4 }| t~ u~ u~ T, #9 C0 w~ < w~ .< x[ D0 D0 @5 E0 F0 G0 Y2 H0 I0 #4 #4 ^7 #4 ^8 J0 K0 ^8 L0 X9 ", +"M0 N0 Y9 P1 O0 s* #3 !9 [7 /6 P0 ]5 R1 Q0 R0 > /5 /5 /5 ^% @ 27 t+ t+ & x n_ x Y] ~' Y] w @ z% z% Q] U] U] Q] /' [6 }< U] }< U] T] }< U] /' /' U] U] T] z% T] U] U] U] }< T] T] T] U] T] /' T] U] /' /' /' z% T] T] T] T] z% T] U] U] T] /' :6 :6 (6 z% /' /' z% `9 Y] S0 & x) T0 T0 /5 p| } p| p| v+ T0 @ @ @ ^% @ p # @ @ o 17 v+ U0 V0 W# #0 W0 6' X0 Y0 Z0 `0 a .a t6 +a e7 @a n' ; j7 #a g3 R -0 $a %a &a *a @= =a Q| -a ;a Y% >a ,a 'a I_ e7 )a i9 !a 6' ~a l4 {a E< 92 ]a 30 B> ^a e8 I< .= i7 /a J< ~0 (a _a y8 :a 7 /_ >7 #9 .5 .< @4 x[ @4 U2 U2 @5 E1 @5 sa !7 G0 $9 %5 %5 *5 #4 ^7 ^8 #4 ta J0 -9 ua X9 ", +")9 )9 Q1 va wa xa [7 ya ~9 f/ o| R0 {9 /% ; z~ T1 ^% @ & t+ t+ & za Y] ^5 ^5 Y] ~' G* @ ~' z% z% z% Q] /' /' /' /' [6 U] U] }< U] U] U] T] T] /' U] T] U] T] T] U] T] U] T] ;4 }< U] T] U] U] T] U] T] T] U] T] U] T] T] T] T] U] T] T] U] z% :6 _6 (6 z% /' /' @ n_ x & }6 ^% ^% T1 p| p| p| T1 ^% T1 Aa ^% Ba @ @ * @ @ @ Z+ % @ p| Ca Da Ea Fa 48 Ga Ha Ia W0 Ja a Ka La h4 Ma @a 14 %( y6 j3 +& Na ^$ Oa 2! Pa Qa I< =a Ra l} Sa .6 z6 Ta 5@ Ua Va Wa Xa Ya Za `a b }5 Q| 3{ .b B> +b 95 1( @b ]a #b ~0 ): $b 50 %b &b *b O4 =b $9 -9 E8 F8 -b ;b K6 >b /1 B} B^ *[ u2 $) 41 51 ], g; ,b 'b )b !b !b ~b {b ]b N@ ^b /b (b _b :b 6 Q, Q, ~| u) )> ~| t) 7b t) 8b >8 #9 #9 T, w~ x[ w~ 9b 0b w[ @5 @4 x[ D0 E0 G0 ab H0 H1 H0 %5 =9 #4 #4 ^7 #4 bb J0 J0 W9 cb db ", +"eb fb gb hb ib ib g jb kb R1 R1 R0 /% |7 z~ g# ^% x) 27 & & x n_ S1 Y] ^5 ^5 `+ G* @ ~' z% z% z% z% Q] /' /' /' U] [6 }< U] T] T] U] T] U] }< U] U] T] T] U] U] U] U] }< }< lb ;4 U] T] U] U] T] T] /' T] U] U] T] U] T] T] T] ;4 U] U] U] /' (6 _6 (6 z% z% G* w & & Aa /5 T1 /5 p| } v+ ; ^% Aa ^% ^% @ * # # # * t t r Z+ * } mb nb ob pb qb rb X0 sb tb ub vb _4 wb xb p< l@ D< yb r{ 4$ zb Ab Bb Cb f6 Db Eb i^ Fb Gb g' %; s8 w5 Hb Ib Jb 1} Kb Lb *3 Mb k9 Nb `| Ob Pb Qb n4 w5 44 j< Rb Z% Qb +6 W6 Sb Tb +4 Ub Vb Wb [a :_ H1 Xb Yb t3 t3 Zb e0 k2 i( J! J! u2 L8 j0 ], g; h; `b c 9a .c +c @c #c $c %c &c (b *c z5 ja %$ ^. %$ _@ U4 | Q( Q( =c G$ V@ X G$ V@ G$ G$ X G$ G. G$ G$ X G. na Q9 Z= Z= na na Z= na na Z= U@ U@ U@ 6( V@ V@ V@ V@ U@ n: n: U@ U@ Z= Z= 6( 6( V@ V@ V@ V@ U@ l^ o: o: [b ^. Y% {& -c ;c >c J< b2 U@ l3 o: #6 n: Q9 l^ G$ G$ V@ Z= `@ `@ X K$ K$ +| X@ K( s& g, =~ X@ J. X@ K$ K$ M& E$ Y( a# ,c Y5 B0 Y4 Y4 Y4 e[ u) >6 u) Z4 u) ~| v1 R, 7- 8- ;7 ;8 ;8 T, || C1 C1 `: C0 .< 'c y[ E1 &9 )c +< &9 G1 !c H0 ~c H1 %5 V9 %5 =9 ^7 ^8 ]7 bb {c K0 K0 ua db ", +"]c s* #3 ib mb mb ^c ]5 Q0 /c .} v+ ; g# ^% p * # x & x n_ n_ S1 Y] ^5 ^5 G* G* G* z% z% Q] Q] Q] /' /' /' /' /' [6 U] T] /' /' }< U] U] U] U] }< T] T] U] }< ;4 }< }< lb }< ;4 U] }< U] /' T] U] T] /' U] U] /' U] U] T] /' U] U] /' z% z% (6 :6 (6 z% @ @ `+ & * T1 ; ; z~ /% /% ; ^% @ ^% @ * & # & x & # u v t t t ; f/ E (c %0 W# a9 _c :c p9 w0 O_ '@ [} Y1 8c 9c 0c ac bc _^ >! cc dc ec fc gc 6c j< hc ic jc +6 kc lc mc A1 nc oc Y5 pc &9 00 qc !1 rc sc x2 tc uc 81 p= vc i0 wc m; h; xc yc zc m; G9 Ac Bc Cc Dc Ec Fc Gc Hc Ic Jc 2= M9 ^. U4 R3 R3 =c G$ G. G$ G. =c R3 _@ G$ X G$ G$ G. X X G$ Z= G$ G$ na na Z= Z= na na na na na Z= n: o: Z= G$ 6( V@ 6( Z= l^ n: U@ U@ U@ Z= n: U@ 6( V@ 6( G. G$ l^ T@ h1 m} O3 %$ Y% 5( Kc x0 Lc Y% l3 l^ #6 o: Q9 G$ l^ U@ Z= G$ Z= p: X W. =~ =~ K$ K$ J. ~# F$ s& J. g, =~ =~ W. V@ p: ~+ Mc P4 Nc -7 Y4 =7 Y4 v1 v1 v1 `4 v1 ~| ~| v1 ~_ )> W: ;8 ;8 0/ v) #9 v~ .< .< U2 w[ E1 y[ @< @< %9 @< G0 Y2 Y2 H1 Oc %5 q3 Pc I0 i2 -9 ^8 W9 ;9 L0 L0 Qc L0 ua ", +"#3 ib mb g /6 ^c R1 U1 R0 {9 /% z~ ^% ^% p $ @ # v v n_ S1 S1 S1 Y] Y] `9 G* G* G* :6 z% Q] /' /' U] [6 /' Q] /' U] T] T] /' T] }< U] T] T] T] }< U] T] U] }< U] T] U] }< U] T] /' U] U] U] U] T] T] U] U] /' U] T] U] U] T] T] /' z% z% z% ~' (6 (6 @ w v v d# ^% ; /% ; /% z~ ^% z~ @ Ba @ @ # & x x & & r t u s Rc z z~ n| Sc Tc Uc Vc Wc Xc Yc Zc `c d .d +d @d #d $d i^ a6 y5 n4 %d '( &d *d 5@ &a d9 ~! r{ |b =d #; Sa -d 92 ;d b@ >d ,d m> ,( 'd )d !d n7 ~d 1b {d D7 ]d 95 ^d /d 72 (d _d :d )> W: r[ ;8 v) v) w~ < U2 w[ D0 w[ E0 :_ %9 &9 G1 %9 $9 H0 id id id %5 =9 =9 J0 jd -9 -9 ;9 L0 L0 Qc kd ld md ", +"w+ mb /6 nd ]5 R1 /c } v+ v+ ; ^% p x) @ & # x n_ Y] S1 S1 S1 S1 @ @ `+ z% G* G* z% :6 U] [6 [6 [6 [6 Q] Q] U] U] :6 [8 [8 (6 U] U] T] U] /' T] U] U] U] U] U] T] }< U] U] T] /' /' U] }< U] T] U] T] T] z% ;4 }< }< }< T] U] /' /' /' (6 ~' ~' ~' D% x s & x) /5 p| v+ |< ; z~ ^% z~ @ * @ @ * y x & # & @ r u w v @ ^% k od pd Uc qd rd n' sd c3 td ud vd +d 0! @a wd xd yd ~@ |; zd ,: |5 Ad ]& Bd ]^ Cd Dd j7 h' Ed i7 a6 95 Fd ($ Gd Hd e 6( 6( U@ =c G$ 2= U4 R3 G$ G$ 6( 6( G$ G$ 2= ad -e _@ 2= ad Z= na 2= 2= na G$ na na na Z= na na na G$ G$ G$ na l^ l^ G$ l^ l^ Q9 Q9 G$ Q9 Z= l^ Z= U@ l^ bd O3 `} `} l^ l3 {d ,e 8 'e O3 )e K2 K2 h1 !e h1 Q9 T@ 2b na na M& G$ X@ X@ G$ J. J. K( F$ S@ S@ l^ G$ s& Z= G$ l1 S@ `5 @_ ~e {e u1 u1 1* Q, hd v1 7- hd hd v1 v1 ~_ -8 W: r[ u~ v) #9 < U2 @4 E1 @5 y[ %9 %9 H1 H0 J1 &5 *5 id a0 id id V9 bb =9 K0 K0 W9 L0 ]e ^e /e Qc /e cb ^e ", +"mb nd nd ]5 Q0 R0 q| } v+ p| 5* @ p * # & & n_ n_ Y] n_ Y] Y] ^5 G* z% z% G* G* T] U] z% T] U] U] T] T] /' /' U] (e :6 :6 _6 :6 _6 T] /' }< U] T] U] U] T] U] }< T] T] U] T] /' /' z% /' T] /' T] T] /' T] /' U] U] U] /' z% /' G* G* G* (6 w n_ x * * 5* 5* z~ ; ; ; z~ ^% ^% x) p * & & & x u u u x & @ r u w s 5* ^% ^% ]9 _e &0 98 n' :e *a =( td i] e~ hd 7- hd l[ Ie Wb )> )> 7- ~_ W: Je v) S, ^_ C0 .< < @4 E1 D0 @5 @< $9 !c H1 H0 J1 &5 }a Ke Le Me Pc Pc bb K0 L0 L0 {c L0 /e ld Ne ld Oe Pe Qe ", +"P0 ]5 Re Se > R0 } v+ ; T1 ^% @ ^% # & x n_ ^5 ^5 ~' Y] ~' ~' (6 G* G* z% /' /' T] }< /' /' T] /' U] T] /' T] U] (e <6 _6 [6 [6 <6 U] T] }< U] U] U] T] /' U] }< U] U] ;4 ;4 T] U] T] T] U] T] /' /' /' U] T] U] U] T] /' z% /' G* @ @ ^5 @ x # * @ o_ o_ z~ z~ g# g# x) x) 27 @ & # # x & v v u w n_ x x u u v x * ^% .@ Te Ue Ve We Xe Ye -( Ze `e f Yc 1c .f :. g7 c6 +f {@ fe @f k@ #f $f %f ,2 r8 r8 h@ x{ Y &f f@ *f i3 &! =f -f Hd '3 {2 ;f >f be ,f 'f )f Z% !f z6 a6 ,2 ~f {f P9 :d :d Kc S4 ke ]f `} G$ na (@ ~] 6 r& ^f /f (f /b _f :f )> )> %_ Ie Ie Ie ~_ W: W: t~ v) ^_ D1 v~ < < w[ @5 @5 @5 G1 Y2 H1 H1 I1 }a }a 0f 0f af bf bb ]e bb cf ^e /e L0 L0 ^e md df df md Qe ef ", +"]5 Se R1 Q0 > /% ; /5 T1 T0 @ # # x # x & S1 Y] ^5 ^5 ~' ^5 ~' [8 z% /' U] T] /' T] z% /' T] T] }< z% z% }< U] 47 _6 <6 <6 _6 }< ;4 }< }< }< U] T] T] U] U] U] T] U] 37 37 U] U] }< }< T] T] U] U] T] U] /' }< U] T] /' z% G* G* @ S1 n_ n_ # * @ 5* v+ m /% /% z~ g# x) x) @ @ x # * * & v s t v & @ # s s v v # @ ^% ff gf hf if ;& l8 jf kf lf mf nf of pf Ad g7 g7 {^ x5 a6 &. [3 qf rf sf i3 tf uf D6 M9 Sa z> D7 C7 *$ vf V# wf xf yf zf Af Bf Cf Df Ef Ff ]. +b }b %d j' Gf B6 [b Hf %$ M9 l^ 6( X $; X V@ X H$ G$ Q9 h1 6 r& o^ If Jf Kf Lf Mf Nf Of Pf M{ Qf Rf Sf M} H^ <, Tf Uf Vf Ce 3b !e De Wf 2= M9 _@ e@ 2= U4 2= G. G. G$ G$ G$ =c U4 U@ _@ `} h1 h1 *e h1 h1 !: !: !: h1 `} Q9 Z= na na na U@ na Z= Z= Z= Z= Z= Z= na G$ na na Q9 na l^ Z= h1 h1 O3 b2 cd X% U4 U@ Z= na na l^ ]f ke O3 T@ O3 'e n} ke ]f l^ l^ K2 `= Ge h1 l^ Z= l^ l^ K( s& s& Z= K( F$ G$ K( Z= Z= s& j1 P& P& J( Z= l^ j1 F$ K( I= J3 -> 9f d~ ~| )> %_ %_ y1 )> ~_ r[ t~ t~ /_ `: .5 w[ < x[ E1 E0 Xf I1 I1 *5 !c J1 ab ab Yf Ke Zf Yf bf bf cf db `f ^e g L0 ^e md cb md .g Qe Qe .g +g ", +"Q0 R1 Q0 {9 |7 z~ T1 ^% @ @ * & & S1 & x & Y] @g ^5 ^5 ~' #g $g %g /' z% /' &g *g =g -g ;g >g ,g 'g &g *g ,g =g )g !g _6 <6 :6 _6 U] T] T] }< }< T] /' T] U] T] T] T] U] U] U] }< ;4 U] T] T] U] U] /' T] ;g ~g ;g /' G* @ {g $g @g Y] ]g ^g /g (g 5* o_ v+ m _g :g 5g ]= 6g 7g 8g 9g 0g ag 1c bg #d cg Ib dg u> 6{ Eb eg fg b3 sf x5 b' w5 #$ 2= w8 gg {& hg ig jg kg lg mg W# ;0 {$ ng og pg kg qg zd rg sg tg c9 ug x{ V@ D6 :@ X H$ 8$ 8$ H$ H$ H$ H$ V@ U@ Z= o: l^ j1 }+ vg wg xg yg zg Ag Bg _, D4 Cg Dg Eg Fg 31 Gg Hg Ig Jg Q8 Kg ~] Lg ja ad 2= _@ U4 _@ na ad G$ 6( G$ G$ G$ U4 U4 2= Hf 5f Mg Ng Og Pg Ic Mg Qg ]f !e h1 Q9 Z= na na na K( K( Z= Z= Z= na na na G$ G$ Z= Q9 Z= Q9 l^ l^ l^ m} )e Rg Pd i1 U4 G$ na U@ Z= l^ l^ )e ke cd O3 b2 dd J2 m} T@ l^ l^ 2b h1 cd l^ Q9 Z= l^ Z= s& Z= K( Z= K( K( K( K( K( Z= l^ Sg Tg E. F$ l^ /# E. l^ E$ M3 (* K, e~ !_ !_ &_ h[ p[ z1 z1 }| r[ t~ T2 D1 .5 x[ U2 D0 E0 @5 I1 ab J1 *5 J1 ab Ke Ke 0f 0f Ug af Ug Ug Vg g ^e g Wg ^e Oe Pe Oe Qe Qe Pe Pe +g Xg ", +"> Q0 > /% z~ g# ^% x) @ t+ & & # n_ x & & Y] ^5 Yg Zg (6 ~' (6 -g `g h &g ;g >g >g ;g >g .h U] T] T] ;4 ;4 U] U] [8 _6 }< U] 47 <6 _6 :6 _6 U] T] /' T] U] T] T] T] T] T] U] T] T] /' U] T] T] T] /' T] z% /' /' z% @ @ S1 S1 n_ & * p 5* o_ m ; ; o_ ^% ^% ^% * @ & @ & # n_ >4 u u `+ s s t # @ * s t s x r y m J/ +h @h e5 :2 #h $h %h &h *h {2 n7 ;& =h -h ;h 79 >h ; ,h 'h ae b4 )h j3 B> !h C7 D6 i' y6 ~h t8 {h ]h ^h /h (h _h .$ :h )> t) x1 y1 p[ [| t~ T2 ^_ +4 D1 .< x[ D0 G0 $9 G0 J1 H0 H0 yh }a &5 }a 0f bf zh zh zh g g Vg g Wg ^e Wg cb Oe .g Pe +g +g Ah |a +g |a ", +"v+ } /% ; ; ^% x) @ 27 & S1 n_ x S1 & x x x n_ Bh {g (6 ~' (6 -g ~g Ch Dh Eh Eh Dh Eh Eh Fh T] U] U] ;4 ;4 }< U] T] T] %g Gh Hh Ih Jh Jh :6 [6 T] ~g Gh Gh =g ;g =g Eh Eh Gh *g Kh /' T] Lh Gh Eh Eh Ch Mh ~g T] (6 `+ `9 S1 n_ # @ @ ^% o_ o_ m m o_ 5* @ p ^% * @ # @ # x n_ u s Nh @ v 1g Oh ^g Ph Qh Rh 1g Sh s Oh Th d> Uh Vh Wh Xh Yh Zh `h i .i +i @i Y0 #i d4 h8 $i %i (; ,: g8 &i Eh *i =i -i {& i7 D7 Hf ;i >i D6 t8 ,i Eh Eh 'i )i K !i ~i {i ]i ^i /i (i _i fe :i h] %_ zi x1 x1 .4 Ai r[ u~ v) +4 D1 Bi w[ E1 @5 G0 Xf J1 H1 Oc Oc yh Yf Yf Yf Ci db Ug af bf Di g g g g db cb md Qe +g +g +g .g |a +g Ei Fi ", +"p| q| p| /5 ^% x) @ * # & S1 S1 n_ S1 & S1 S1 x x ^5 ^5 (6 ~' :6 &g Ch Eh Ch Eh Eh Eh Eh Eh Eh Gi .h }< U] U] U] U] T] ~g Dh Eh Hi :6 _6 <6 _6 <6 U] *g Eh Eh Eh Eh Eh Eh Eh Eh Eh >g /' Ii Eh Eh Eh Eh Eh Eh Eh Ji Ki S1 x x * p ^% ^% ; z~ z~ v+ ; o_ 5* @ p @ & # & # # & s u s Li w v s v & S1 & s u u s # A Mi I# 5> Ni Oi Pi Qi 25 pb d Ri @^ {2 n6 Si Ti Ui g7 Vi 5@ Wi h8 Xi Yi Zi ti `i j .j %$ tg j ka +j @j #j $j %j )i &j *j =j -j Eh ;j Ld >j zd /a B6 B> x5 ,j w8 q@ -$ 8$ ;$ V. q@ H. 8$ 8$ 8$ 8$ 8$ G2 G. =c U4 'j Eh Eh Eh )j !j ~j L@ Zd {j t2 ]j ^j /j (j _j :j k ,k ^f +k (@ Z= Q9 U@ V@ G$ K( G$ K( Q9 na G$ na na G$ na G$ na l^ T@ T@ j1 N& l1 Z= m} 'k H2 )k !k ~k U4 Q9 `6 S. l1 j1 `= {k ]k l^ Sg F$ l1 Z= l^ o: #6 O& K2 T@ bd j1 s& K( K( K( K( K( G$ K( Z= K( G$ K( Z= j1 (# 2+ ^k [+ J( /k /k 2+ (k 0# _k h[ x1 t) 5 Ai S, B1 ^_ `: fj )7 :k E0 %9 ab ab H1 yh yh Pc D8 Zf Le af zh Di zh Ug hj hj g g g g jj g *g Mh Eh Gi Eh Eh =g U] }< }< U] T] .h Eh Eh =g _6 _6 <6 <6 }< }< T] Eh Gi Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Ch 3k Eh Ch =g Ch Eh Eh 4k & & # p |8 ; ; ; z~ x) ^% p * @ @ Z+ r & * * x S1 v v v v `+ `+ v w u y # # s t x r p rj R0 m O~ 5k 6k {2 pf m5 7k K *! 8k .f x> d4 9k ;h l@ Bj Si 0k ak bk ck Eh =c #6 A> M9 %1 [b ad Ee dk Eh Eh ek fk gk +0 hk ik Eh Eh jk kk lk 02 {f mk mk j' zd [b 4h -$ .1 U. 4h X> 8$ 8$ 8$ 8$ G2 G2 X X X X J. Th nk ok pk qk rk sk tk uk vk wk xk yk Wj zk Ak Bk Ck Dk Ek Fk Gk F$ ;e na (@ =c 2= G. 6( 6( V@ 6( G$ _@ 2= Ee R4 Hk Ik Jk Kk Lk Mk Tb Nk Ok Pk Qk Rk ]k K2 l^ n: 6( na K( G$ na Q9 na G$ na G$ G$ G$ G$ G$ na l^ l^ l1 S. Z= Z= l^ `} 'e 7f Sk Tk 'e ad o: Z= M& j1 2b bd bd F$ E. l^ l1 Z= U@ n: #6 j1 j1 bd 2b j1 Z= J. G$ Z= Z= Z= K( s& Z= G$ F$ Z= Z= F$ /# (# '# le K2 2+ Uk 2+ 5+ Vk Wk h[ zi Ai Xk 5 A1 ^_ || .5 y8 %b Yk $9 G1 ab Ke id -9 id V9 Pc af Zf af Ug hj Di g Di hj Zk ij g }< }< U] T] Kh Eh Eh 'g [8 _6 <6 47 U] U] Lh Dh Gi Eh Ch U] T] T] U] ;g %g Ch Dh Eh `g z% $l /' %l &l *l 3g p ^% 5* ; v+ p| ^% ^% ^% @ # * * * r % x x # # x S1 x v w v u v u v s w 1g & t s u % Z+ m v+ J# R+ =l -l ~2 zf >l ^= ,l #f rf 'l )l Eh !l dd D7 1; U m} M9 x{ `g Eh Eh ~l {l ]l ^l /l 88 Eh Eh (l _l :l `- 5c %$ f@ 02 X> 8$ 8$ V. q@ ;$ 8$ 8$ H$ 8$ G2 X X V@ 6( G. G$ [l Eh }l ok |l 1l 2l 3l 4l 5l 6l 7l 8l 9l 0l al bl cl dl Eh el P4 me P$ `} ja _@ 6( G$ G$ M& 6( G$ G$ 2= %$ o! fl gl hl il jl kl ll ml nl ol pl ql rl sl E. l^ F. l^ j1 l^ na na Z= na na na na Z= Q9 na G$ na 2= l^ Z= n: na n: G$ `} `} H2 tl ul S4 2= o: Y@ l1 na na l^ l^ l^ P& j1 Z= Z= Z= Z= o: T@ l^ T@ l^ l^ l^ Z= G$ na G$ G$ G$ K( Y@ G$ F$ s& K( K( F$ %* 1+ /k 1+ P& vl wl (k xl Wk p[ p[ Ai t~ S, yl .5 '7 w[ D0 Yk sa ab sa G0 ab }a Yf a0 id yh yh Le Ug g Wg hj g g Zk `k ij `k `k `k [k }k |k Xg +l Xg .l zl Al @l #l Bl ", +"o_ 5* p ^% @ # & n_ S1 S1 S1 ^5 S0 ^5 (6 S0 ^5 ^5 ^5 ^5 ~' )g Eh 3k 3k =g /' T] T] T] T] /' /' U] Gh Eh Eh Ch Lh U] U] T] T] Cl U] ;4 T] }< ;4 U] U] T] ,g Eh Eh Eh =g T] z% z% Cl Dh Eh Eh Eh Ch Dl @ El &g Fl Eh Eh Eh (g 5* z~ /% /% g# ^% @ Gl Hl Il Eh Eh Eh Eh Jl 4k s Eh Eh Kl Li Ll w `+ v v `+ Nh 4k Jl Eh Eh Eh Il Ml Eh Eh Ml Nl v+ Ol 6> Pl Ql *j @^ .d N% Rl [} bg d4 g7 Sl .f {; Tl p< ^; Ul @^ 'l Vl Wl Xl p! /& E7 Yl :@ D7 i7 Zl `l m .m +m @m #m $m %m &m *m =m -m ;m i7 {& .6 f@ >m ,m b' 6. q@ 8$ X. q@ X G2 G2 X 8$ G2 X G. G. =c =c G$ 'm Eh Eh Eh l[ )m !m ~m {m Eh Eh Eh ]m 0l ^m Xj _j /m Eh Eh (m _m :m E. ~. l |} Qi um B7 Eh Eh Eh vm i7 E7 ka #$ x{ wm Eh Eh xm ym zm Am Bm Cm Dm Em Fm 6< Gm ]. f@ C7 ^. {@ ,m Hm tf Im ;$ 4i Jm Km 3i Lm 8$ 8$ H$ H$ H$ V@ V@ =c R3 X J. Eh Eh Eh Mm Nm Om Pm Qm Eh Eh Eh Eh Rm zk Sm 8l 7l Eh Eh Tm >[ Um ]: Lg ja | X G$ G$ G$ 6( 6( =c _@ ka @6 Vm Wm h- Lk Xm Ym Nk Zm 6 (@ G$ G$ G$ G$ na G$ G$ G. na G. G$ U@ U@ Z= Z= U@ G$ U@ U@ U@ n: n: U@ l^ o: Z= U@ Z= G$ Z= U@ m} :d :d dd K< l^ Z= l3 Sg G$ K( Z= K2 l3 #6 j1 U@ Z= na l^ bd K2 F. n: n: Z= U@ Z= U@ n: U@ Y@ Y@ Z= p: Z= Z= p: Z= S. N& (# `m n 8m 2+ wl .n +n P: .4 A1 B1 ^_ || `: fj w[ D0 sa Xf Xf ~c ~c am 0m 0m 0m gj @n Ci gj af Zf bm Zk jj n ,n Sc 'n )n !n ~n Eh Eh Eh Eh Eh {n ]n ^n /n d4 (n _n :n +a ~2 W_ o Eh Eh ,o 'o )o !o ~o {o K< ]f =c _@ G$ 6( G$ G$ G$ R3 un &1 n} 'k -e @k | G$ G. G. G2 8$ G$ 6( V@ X M& M& M& V@ M& H$ V@ J. G$ G$ G$ G$ G$ Q9 l^ Q9 Z= na n: G$ n: U@ Z= U@ Z= j1 n: Q9 ad `} J2 m3 E. l^ U@ na F$ Z= Q9 l^ T@ Z= p: p: Q9 Q9 Q9 bd F. o: Z= Z= Z= G$ 6( G$ U@ U@ Z= Y@ Z= Y@ Y@ Y@ p: g, Y@ l1 P& vn ]o .n 5+ U$ d+ }/ o[ S, ^_ ^_ .5 Bi w[ :k ^o sa Xf }a }a }a ~c }a am 0m 0m @n @n gj @n Vg Zf af Ci hj g go a6 ho Hf fe io jo Eh ko Eh Eh Eh Eh Eh Eh Eh Eh bn 8$ 8$ H$ H$ G2 X 9. 9. lo Eh Eh Eh mo no oo Eh Eh Eh Eh Eh Eh po kn Il Eh Eh qo ro so to uo hh Tg un ke `} _@ 6( G$ V@ G$ 2= `} =c -$ vo wo Q( G. G$ 6( V@ V@ G. J. X X X@ `@ X 9. X p: X@ T. X J. G$ G$ G$ G$ s& K( G$ G$ na na G$ l^ na na na G$ T@ na l^ h1 O3 l^ 2+ j1 l^ Q9 Z= Z= T@ j1 j1 l^ K( g, K( Z= s& Z= K2 T@ Z= G$ Z= N& na G$ na G$ Z= K( K( g, g, K( g, s& g, J. ~# N3 n xo yo 6m q) zo x1 Ao T2 D1 D1 Bo E1 s9 Yk ^o sa }a 0m ~c ab ab ~c am gj Ci yn Ci @n @n Le af Vg hj Di `k l `k l lj mj mj nj @l @l #l #l 2k 1k 1k dm Co Do Eo Fo ", +"@ * & x n_ n_ S1 ^5 ^5 Y] Y] ~' ~' (6 ^5 (6 :6 :6 (6 <6 =g Eh Eh )g _6 [8 U] }< /' T] T] /' U] 37 T] T] U] T] U] }< }< }< *g Eh Eh 'g }< U] U] T] T] T] *g Eh Eh Eh Ii =g /' `g /' %l Ch Eh Eh n_ * @ (g Go Ho ; Eh Eh Il p Z+ % s Io Eh Eh Eh 1g u w w w u v Jo Eh Eh Eh -j v u v v v [o Jl Eh u s t d# @ p Go 7l Ko Lo ff C K/ 5> Mo Eh Eh Eh Kj No Oo Po Ln Eh Eh Eh Qo 4{ ]$ _0 Qi Ro p7 So /& $o Eh Eh To +8 q9 j bn Eh Eh [8 (* 3n %b Uo Vo @d Wo Eh Eh Xo Yo Zo .= `o .6 fe Hm p Eh Eh Eh bn 2i .p p an Eh Eh Eh 3i 8$ H$ H$ G2 d# +p @p #p Eh Eh Eh $p %p &p *p =p Eh Eh Eh Eh -p ;p Eh Eh Eh >p ,p 'p )p !p ~p +k )e ke h1 `} l^ G$ G$ G$ G$ =c R3 G$ 9. t& X X $; $; $; U@ 6( X@ K$ K$ K$ 9. K$ K$ J. K$ 9. J. K( K( J. J. K( K( F$ G$ K( K( F$ K( G$ K( G$ G$ F$ G$ S@ J. Z= Z= G$ Z= K2 l^ s& G$ na n: Z= Q9 S@ Z= K( K( K( =~ Z= S@ K2 ~# s& ~# s& g, K( g, K( K( K( =~ =~ J. s& g, K( g, ~# g, ~# bd wl *# {p -# 8# [/ x1 r[ /_ D1 .< Bi D0 xn G0 ab ab }a 0m }a ~c ~c am gj Ci Ci yn @n @n @n Vg Zf bm ^e Di `k l l cm }k mj }k }k @l Al 2k #l #l #l 2k ]p ^p /p (p _p ", +"^% @ # x x n_ Y] ^5 ~' ~' ^5 ^5 Y] ~' ~' (6 :6 (6 ~' (6 oj oj Ch (6 (6 (6 /' T] `g *g >g >g *g pj *g *g Kh U] T] U] }< }< >g Eh Eh =g U] }< }< U] T] Hi Dh Eh Eh Ch Ii *g T] ~g ~g @g Ch Eh Eh @ (g :p

qp Eh Eh Eh Z+ -$ V. V. q@ q@ Jm Eh Eh rp U. U. U. Lm sp cn @p V@ tp Eh Eh up vp Eh Eh Eh wp xp Eh Eh 7l yp Eh Eh Eh 6i zp Ap Bp Cp &b I3 Dp si ]f h1 +k `= P& na G. G. X G. X@ X G. G. G$ V@ 6( V@ p: K$ K$ K$ K$ 9. K$ 9. K( K( K$ =~ K( J. J. =~ X@ X@ X@ =~ X@ =~ J. J. K( J. X@ X@ g, J. ~# X@ =~ X@ Z= K( J. s& Z= G$ na Z= na F$ j1 l^ g, J. g, K( Z= F$ J( ~# s& ~# g, J. g, g, g, K( J. g, K( J. g, ~# g, =~ F$ s& ~# j1 n &# Ep 8# 0# h] x1 u~ w~ Bi E1 @4 D0 sa sa sa Xf }a ~c ~c am }a gj @n Yf gj gj Ci yn Ci g bm g g hj jj Fp [k }k lj }k nj lj mj @l 2k #l dm dm dm :o _o Gp Hp Ip ", +"& & & x x S1 Y] ^5 ~' ~' ~' (6 (6 :6 (6 (6 :6 (6 ~' (6 Eh <6 %g :6 :6 :6 T] Hi Eh Gh Ch Eh Eh Eh Dh =g 'g 'g Dh Dh U] U] >g Eh Eh =g T] U] }< U] U] U] U] Eh Eh Eh ~g T] /' z% G* Jp Eh Eh Eh ^% ^% p% V+ V+ p% * Eh Eh Kp Lp Lp Lp Mp Np Eh Op Pp Qp }p v u v w v w 4k Eh Eh -j v v u Li Sh -j Eh Cn * Gl Rp (g (g * Qh Eh Eh

q 70 ,q 'q )q !q Eh Eh ~q {q ]q #a ^. _@ ^q p Eh Eh ck yo .1 Z V. q@ q@ 2i Eh Eh an V. V. Lm X X 9. 9. X /q Eh Eh (q _q Eh Eh Eh :q /m Eh Eh ]m 4 Y] ^5 ~' ~' ^5 `9 ~' (6 ~' G* G* G* r =g Eh Eh Gh _6 47 U] Gh Eh Eh Ch Eh Eh Eh Eh Eh Eh Eh Eh Gi U] }< *g Eh Eh =g /' U] }< U] T] :6 [6 Eh Eh =g G* ~' Y] n_ n_ & fm Eh Eh dn ^% .r +r @r @r aq Eh Eh Np aq Mp aq #r Eh Eh $r aq aq aq %r v v @ v s 1g Eh Eh Kl w w v }o -j im Eh Eh &r &r Eh *r |g r Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Yi ,r <$ Cm 58 'r +o ~@ F' )r Eh Eh !r j )l Eh Eh hp 6 K, ~r &b {r ,f 99 ]r Eh Eh Ji ^r /r ): m} %# (r Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh cn T. U. 8$ 9. U. U. &= 2= _r Eh Eh Eh Eh Eh :r g &n pj ir Gh 'g pj Lh Gi Gi Eh Eh jr }< }< r Eh Eh 'g kr }< 37 ;4 T] (6 :6 Eh Eh lr Y] S1 x x n_ & fm Eh =n mr nr @r @r @r or aq Eh Eh pr aq Lp Pp qr Eh Eh Eh aq rr rr sr Li Ml tr tr 1g -j Eh Eh Eh Jo km ur `+ v v Eh Eh Il (g :p

g Eh Eh Ch ;4 .h ;4 U] [8 ~' (6 Eh Eh Kl Y] S1 x & # ^% 1o Eh >s ,s @r or or or 's aq Eh Eh )s Mp aq aq !s Eh Eh Eh aq ~s {s ]s w ^s `+ 3p w -j Eh Eh Eh Nh Nh w v v w *l Eh Eh /s 5* v+ h (s Eh Eh Eh _s :s 4 n_ `9 G* (6 G* G* G* (6 47 47 =g Eh Eh Ls U] T] 47 T] T] U] }< }< ;4 37 pj Eh Eh 'g }< (e .h &n Eh Eh Ch Lh .h Ii /' [8 ~' $g Eh Eh jm & & & @ ^% Ms Ns Eh Eh Os @r 's 's 's 's Ps Eh Eh Qs Rs Ss Ts Sh Eh Eh Eh 4k km km *l km *l *l *l 1g %n Eh Eh Ch Sh *l ^s s ^s Sh x fm Eh 7l Eh Us Eh Eh zr Eh Vs _s Ws Xs nb Ys Eh Eh Zs `s t .t +t @t ]r #t $t %t &t *t 5} =t -t ;t >t ,t 95 't uq ko Eh Eh Eh Eh Eh Km $; )t 7s !t ~t {t {a A_ ]t Eh Eh ^t /t (t _t :t 6 Z4 R2 Z4 1* '| rt X3 7, st tt ut vt c= C. wt {] <+ S@ j1 F$ l1 S. Z= Y@ Y@ p: M& J. J. J. =~ K( J. g, g, s& s& ~# F$ ~# s& g, s& g, g, ~# ~# s& K( g, J. ~# ~# F$ s& s& ~# K( s& s& s& s& s& g, g, s& s& s& s& [+ (k 9m x1 r[ jp E1 G1 G0 G0 J1 Yf &5 Ke }a -9 Le gj gj Le hj ij @n @n g bm bm E8 bm Oe l `k l jj Fp nj nj @l b0 b0 Vq b0 zn #n 7q 7q :o Yq Yq xt Hp hr yt -s zt ", +"& y & & x `9 @ Y] S1 `9 `9 `9 `9 ^5 ^5 G* (6 (6 (6 47 47 Ji Dh Eh Ch Lh }< }< }< U] T] U] T] U] At Ch Eh Eh >g T] U] <6 r Eh Eh Gi U] U] T] z% (6 ~' $g Eh Eh fm & @ Bt Ct or @r Dt Eh Eh Os 's 's Mp Et Ft Gt Eh Eh im u }o -j -j Ch Eh Eh Eh Kl km Ht lr Kl -j -j -j Eh Eh Eh Ch Jo Ht 4k s s s y Qh Eh Eh Eh Eh Eh Eh Eh Eh Eh wr It Jt Kt Lt Eh Eh Mt Nt Ot Pt Qt Rt St Tt Ut cp Yi Vt Yi Wt pf Xt !$ o< u{ v8 Yt Zt `t ck Eh Eh Eh u #p K< .u +u @u #u $u %u &u Eh Eh *u =u -u ;u >u ,u 'u Eh Eh Eh )u !u ~u {u ]u ^u Jm Nl Jm Jm Jm Jm Jm X 8$ V. H. /u 8$ ti (d -g Eh Eh Eh (u 6t _u [q ^m :u Eh Eh %n 4 ^5 G* G* G* [8 [8 (6 (6 (6 ^5 Ch Eh Eh =g U] }< U] T] U] }< T] U] Gi Eh Eh Ch U] U] ,g 'g Eh Eh Eh Ch Gh =g Kh U] ^5 ^5 Zg 2p Eh Cu Du @r or or @r @r Eu Eh Eh Os Fu Ss v u s s Eh %n jk v ^s ur Sh %n Eh Eh Eh %n ur km ur %n -j -j Jl Eh Eh Eh Ch Jo Ht v s s }r Il Eh Gu Hu Iu Eh Ko Ju Ku Eh Lu Mu Nu yr Ou Pu Eh Eh Eh Qu Ru Su Tu Uu Vu o7 Wu Eh Eh ko Xu Yu Zu `u $^ v .v j3 +v Pr Wu Eh Eh Eh @v #v $v %v &v *v =v -v ;v >v Eh Eh Eh ,v 'v )v !v ~v {v ]v Eh Eh Eh ^v )u /v (v (v _v yo :v Eh Eh Eh ^% rp Lm ;$ q@ 4 >4 `9 ^5 `9 >4 >4 G* (6 ^5 >4 G* G* G* (6 [8 G* %g Eh Eh Eh Gh ~g T] }< }< U] U] ,g Eh Eh Eh Ii /' U] ,g 'g %g Eh Eh =g Hh &n Gv <6 ^5 Hv Iv Jv Kv Lv @r or Lp @r or Mp Mv Nv Ov Pv x t s u s u Kl km ur v `+ `+ w u Ch Eh Eh %n Li w w w w Li Eh Eh Eh Eh Eh `+ `+ G* v u & fm 7l Gu |8 :g En Qv w* Ku Eh Rv ^i yr Sv Tv Uv Eh Eh Eh ~q Vv Wv Xv zf d4 Yv Eh Eh 5o Zv Nb _2 }} `v w ;& .w k7 cd Y +w Eh Eh Eh @w #w $w %w &w *w =w -w ;w >w ,w Eh Eh *v 'w )w !w ~w {w ]w ^w Eh Eh Eh /w (w _w :w $ |w T8 Jo 1w 2w K} 3w 4w +u 6v 5w Kl 1g Wj yk Vr 6w 7w 8w 9w 0w aw bw cw aj Z= s& Z= F$ Z= s& ~] I= `$ R@ dw G= ew _f jv fw gw kv $c hw t. m. G@ l. iw t$ o0 t$ jw kw o. lw mw nw ow pw #e qw rw sw tw T3 uw 6; */ ~# Z= s& K( ^~ ^~ J. X@ X@ =~ K( g, X@ J. K( g, s& g, g, g, g, K( K( g, g, ~# K( ~# Z. s& K( J. J. g, g, s& K( s& s& g, ~# J( J( S@ S@ F$ ~# Z. R; y, o) wv ,8 @5 V2 xv yv yv 0f 0f af db Zf Le Vg Le Zf ^e db g 4 >4 >4 `9 `9 >4 >4 `9 ^5 ^5 ^5 ^5 G* [8 (6 Aw (6 G* =g Ch Eh Gh Dh Dh .h Fh Kh Gi Eh Gi Gi ;s }< T] T] U] }< U] Eh Gi Gh _6 _6 _6 (6 ^5 & Bw t+ Cw Du Dw or Fu Fu |p Ew % Fw Gw Hw Iw s s u u w `+ `+ `+ w w v w w Jo Eh Eh Eh Eh jk km km Kl Eh Eh Eh Eh Eh Eh ur Li `+ u u d# |g 7l Eh Jw v+ v+ [6 Ko Eh Eh Kw Lw Mw nb nb Nw Ow Eh Eh Eh Pw ~$ +a @^ Qw Rw Eh Eh Sw f' _; Tw #q X0 _= /n Uw Vw Ww ~v Xw Eh Eh Yw Zw `w Zw x .x +x @x #x $x %x &x Eh *x =x &w -x ;x >x ,x 'x )x ^v Eh Eh Yw !x ~x ~x x {x Eh Eh Eh .p M. M. 8. ;$ <@ Z O. n@ ad ]x ^x /x (x _x :x 4 >4 >4 `9 `9 `9 ^5 ^5 ^5 G* G* (6 G* (6 G* (6 (6 Aw [8 pj U] }< kr >g >g Eh Hi Gi Fh }< U] ;4 ;4 37 ;4 Kh Fh ,g Eh Eh Ch Cx :6 _6 ^5 Y] 27 t+ @ ^% ^% ^% p % r D% D% x Dx Mp aq Mp aq Rs v s `+ @ `+ `+ w G* w v w Nh Ch Kl Eh im Eh Eh Eh Eh Eh %n im Eh Eh Eh v Li w s u r p Gu Eh Eh 7l Ex Fx Eh Eh ao Gx Hx Hx Ix Jx Kx Lx Ys Eh Eh Eh Mx Eh Eh Eh Eh Eh q Nx Ox c4 b4 -h Px Qx Rx Sx Tx Ux {v Vx Wx Xx Yx Zx y .p 8. [. [. <@ q@ O. U. Ee &1 mc ,y 'y #[ )y !y ~y Wj }x {y Sm Jq ]y ^y /y (y _y :y 4 ^5 `9 `9 ^5 `9 G* (6 G* (6 (6 (6 (6 (6 (6 Aw (6 [8 [8 47 47 g T] U] /' T] 37 }< Lh }< pj Eh %g %l ~' ^5 n_ x uy 27 g# z~ 5* @ % r v ~' v v x vy aq Ps Mp Mp v% w @ @ w w w @ @ w `+ `+ *l Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh Eh u u w u v Z+ dn wy 7l Eh Eh Eh Eh Eh xy yy zy Ay By Cy Dy Ey Fy Kx Gy Eh Eh Eh Eh Eh Eh Eh Eh 76 6< Hy Iy Jy Ky Ly My Ny Oy &y Py Sx Qy Ry Sy Ry ,x Ty Zw Zw Uy Vy Wy Xy rn Yy x0 ^i Eh Zy `y a2 [! ]a +8 :@ z .z +z @z Eh Eh Eh Eh Eh Eh Eh Gi q@ 8. 8. 8. [. <@ I. 6. #z &= 2= $z %z &z *z I} 3v =z -z Wj ;z {y Vr >z ,z 'z )z !z ~z 0v {z ]z ^z /z */ Q( X@ 8$ t& H. 9. X@ J. s& F$ G$ s! #, vg %8 @] (z qw 5y r. _z {b {b :z r. 4 G* (6 (6 (6 (6 ^5 G* 47 (6 [8 (6 (6 (6 [8 }< >g >g 'g Eh Eh %g =g Hi U] U] }< U] }< ;4 T] U] Lh Eh Eh =g ~' Y] S1 x @ @ x) z~ ^% ^% x x s x D% v w D% kz Ps aq Mp Ps rr lz G* @ w `+ w w $g Ht 3p ur Jo 3p Ch Eh Eh Eh Eh Eh Eh Ch mz Eh Eh Eh nz oz Ss p @ o_ ; ; m pz Eh Eh Eh qz rz sz tz uz vz wz xz Dy yz zz Az Eh Eh Eh Eh Bz Eh Eh Eh Cz Dz Ez Fz Tx Gz Hz Iz Jz Kz Kz Lz Qy Mz Nz Oz Pz [. Qz Zw Zw Rz Sz ke Tz Uz Vz Wz Eh Eh Xz 6f x{ w0 Na Yz Zz `z A .A +A Eh Eh Eh Eh Gi Eh Eh @A 8. M. M. 8. 8. <@ y{ q@ 6. Rr K< #A $A %A &A *A z =A {y {y Ak -A ;A >A ,A 'A )A !A ~A {A ]A ^A /A */ (A 8$ 8$ 8$ Z H. t& K$ G$ s& Q9 ~] Cs R' _A t@ :A 4 >4 >4 `9 ^5 ^5 >4 `9 ^5 ^5 G* G* G* G* G* G* (6 [8 47 [8 (6 (6 47 T] U] pj >g >g ~g T] }< }< }< U] T] U] U] /' Lh %g Eh Ch Eh jA ]g & p ^% T0 ^% T0 @ # r u u u v w v v `+ ~s aq Ps Ps rr Iw z% G* `+ @ w w ur ur 3p Dl @ @ km Ht mz Jo lr Kl Nh Jp ur km Ht km nz kA or lA g# :g z~ v+ U+ T+ ff ff mA nA oA pA qA U0 rA sA 0 tA 97 uA vA wA xA yA Eh zA AA BA CA DA EA FA ;u 'x GA HA IA JA KA LA MA L' |w NA OA PA , QA Zw #w $w RA SA TA pn UA `g Eh _r Eh r9 VA H2 WA XA #; :@ ug YA ZA `A B ;y Eh 8+ .B +B @B I. 8. 8. [. [. 8. M. 6. j! !e o3 #B $B %B &B *B =B -B Xj ;B Wj >B ,B 'B )B !B ~B {B ]B ^B /B (B _B :B ev l, ;$ H$ U. q@ V. Z 8$ X na ~] Z= () 4 >4 `9 ^5 `9 ^5 `9 G* ^5 (6 (6 (6 (6 [8 [8 [8 [8 [8 [8 /' U] U] T] T] T] U] U] }< }< }< ;4 U] U] U] /' U] z% ^5 za n_ n_ & * p ^% ^% @ * * & v u w `+ `+ u v v v oB aq aq aq Ps Gw G* kz v% I- %r lz `+ G* G* @ @ @ w w w v w v u & v v v u pB or qB rB ^% p| .} i T+ sB C 3o tB uB tz vB wB xB yB zB AB BB `0 CB Fa d3 Za !$ 6$ DB EB Ua FB GB HB IB JB KB LB MB NB OB Ob PB =d [b vm QB RB M' , 8. SB TB Zx UB VB WB ^x $b XB ): tg Z6 `} ja YB ZB `B Ed v0 C .C [} +C @C #C #C L. L. , 8. 8. I. I. 8. 8. q@ T. 4h X ]k $C Wb %C &C *C =C -C ;C yk t >C ,C 'C )C !C ~C {C ]C ^C /C (C _C :C 4 `9 >4 n_ >4 `9 ^5 `9 G* (6 (6 ^5 ^5 G* (6 [8 (6 G* (6 G* 47 U] /' z% U] T] /' U] }< }< }< }< T] U] U] /' /' @ S1 n_ & t+ x) @ @ @ @ * * # & x s v `+ `+ v v v `+ nC aq aq Ps Ps oB oC rr rr rr rr rr pC `+ w `+ w `+ v w `+ u v `9 n_ n_ & & & # qC @r rC sC o_ d> i Ol tC C uC vC uB wC wB xC yC yB zC AC BC CC DC [c &h A7 EC Ob FC GC HC o5 IC JC KC LC MC NC OC PC v| @. QC j8 %; Q$ RC v0 q! q! M. i@ Qz D O; ,D 'D )D dt !D ~D {D ]D R( c$ K$ t& H. H. X. X. X. X M& Z= s& =~ Cs ^D f1 /D 2& i. m. (D pw 6C Nf _D Nf :D 4 `9 >4 `9 `9 `9 >4 `9 `9 G* `9 ^5 (6 (6 <6 47 [8 47 [8 /' U] }< T] z% T] U] U] U] U] U] U] T] U] U] Q] Q] @ x t+ 27 t+ x) @ # # & r # & x n_ >4 Y] `9 @ `+ v u v %r aq aq aq aq Ps Ps Ps rr fD rr aq rr I- w `+ w w v w w n_ S1 S1 x x x & x * gD hD hD iD v+ h j tC jD kD lD mD tz vB nD oD pD qD rD sD tD uD vD wD xD yD zD <3 FC AD BD CD CD _2 *j $0 &} 62 DD 10 ED m' FD GD +8 p! HD M' [. M. i@ L. [w | QD RD D4 L} +D @D SD ~y TD UD VD WD XD YD /u ZD J' /@ C$ `D ps E bv .E +E K( c$ (A t& V X. P. X. U. T. p: s& G$ G$ Q( #, @E #E 2& $E %E &E &E *E =E -E Nf ;E >E >E ,E Cc 'E 9B dy )E !E ~E {E ]E o^ R@ E$ () ~# g, J. J. X@ X@ K( X@ K$ X@ =~ X@ X@ g, jy fC fC Zx Zx Zx Zx 0z hy S@ K( =~ J. J. K( J. =~ K( tx x 0z `w `w eC l1 l1 S. N& 7m 7m s& [+ F$ S@ J( Z. cA 8D (# a) ^E w~ *5 {c db ^e g /e cb md Oe md Oe Pe +g +g vx vx vx zl @l dm #l Bl #l br /E (E B4 Xq #n #n vu Eo Gp Zq _E Is :E lB lB Ev n ", +"^% y u n_ >4 n_ `9 `9 >4 `9 >4 `9 `9 ^5 G* G* ^5 ^5 (6 (6 47 [8 [8 <6 [8 [8 /' T] }< U] U] T] T] U] U] U] U] /' /' /' ~' ~' w x 27 @ 27 p # x x s s v v x v Y] Y] S1 S1 w w w w v% rr aq Ps Ps rr Ps Ps aq rr Ps rr rr oB w `+ v v v w w n_ x S1 x n_ n_ & Ba ^% |E 1E 1E 2E T+ ff u* 3E @@ 4E 5E vB 6E 7E 8E 9E 0E aE bE AB cE CC Tc tb dE Vc eE fE gE t' qq hE iE Cm yj Fd jE kE lE mE nE Q% oE pE qE y6 rE sE 6= M. i@ I. QA tE :w uE ~x vE UB :t De ka #a [b F vw Bv /p ,F Zq xu 'F :E lB )F aD Ev cD 4 >4 `9 `9 ^5 ^5 `9 ^5 [8 (6 G* G* G* [8 <6 [8 <6 47 [8 U] T] /' }< U] _6 _6 _6 :6 :6 _6 (6 :6 ~' Y] ~' D% # * x) x) @ @ r x D% v s s v D% D% S1 x n_ S1 t s w ]F ~s Ps aq aq aq aq Ps rr aq Ps aq aq rr v% v @ v u u w `+ x Y] n_ x x & @ u+ ^% ^F 1E /F (F +@ 5p _F Fn :F M' L. /. 8. V. [w 7 v) v^ D} t2 )y uF vF wF xF yF zF AF BF CF U. q@ /u DF R8 $[ ^, EF 4z FF GF HF IF G$ G$ U@ V@ &= G$ X G. X@ X G$ j1 U@ G$ |[ () vt =8 QE qv JF KF LF 1D r. Cc MF ,E Cc mv NF XE 5A OF PF 8i 7A QF RF SF TF */ ~# K( K( Z= M& `@ J. X@ X@ J. X@ X@ J. K( K( UF fC Zx VF x x fC dB K$ =~ J. =~ K( ~# ~# K( WF fC Zx 0z XF YF ~# F$ l1 p: Y@ S. Z= ~# S@ F$ J( [+ /# [+ 7m l3 }+ ** a[ ZF V2 -9 ^e ^e md Oe Oe ef `F +g .g .g Ei vx vx wx hB @l 2k br B4 dr 9D G /E Av Xq >F vu vu Gp Zq xu Is .G qy lB +G Ev cD @G #G eD !F iA !F $G %G ", +"u & & u n_ >4 >4 n_ `9 `9 G* `9 `9 G* G* ^5 (6 [8 [8 (6 }< [8 (6 (6 47 U] T] /' T] T] 47 <6 _6 :6 :6 _6 (6 ~' ~' Y] n_ # * @ ^% @ 27 * r x v v v D% D% v x >4 n_ S1 n_ bq Ft Qp rr rr rr aq Ps aq Mp rr rr Ps &G v% ]F @ G* G* w w `+ v S1 x n_ S1 n_ x @ *G Aa Aa ^% =G -G ;G >G ,G 'G tB )G [F !G 6E }F }F ~G 6E zC {G ]G ^G /G (G _G Hd :G }. 8. , q@ 6. 0G :w tE aG SC bG ~x cG ja Hf v0 $; !: ]f vh dG w0 e8 Yz j^ j^ (3 5g eG B7 fG 6= gG gG gG gG gG O. [. <@ Q( J3 Q, hG _m ]1 K5 t2 uF iG jG kG lG mG nG oG pG qG V. R. P. /. rG sG Q! l$ N8 |f tG uG +E K( X@ V@ 6( Z= 6( X X G. X X Z= Z= K( X@ g, *~ %6 *7 B2 vG wG wG xG yG zG AG MF dy BG CG kv DG EG FG GG Qj ^) RF =w HG ~# s& =~ X@ Z= p: X X@ 9. 9. X@ X@ 9. =~ J. =~ J. IG fC :w fC 0z x m^ X@ X@ X@ =~ K( g, =~ &F fC fC fC IG K( g, K( sx M& p: l1 N& Z= l1 ~# g, F$ }+ }+ (# %* l3 E. '+ p+ JG KG LG Oe Oe Oe +g ef Qe +g Ah Xg vx ny wx iB ny kC 9D br #n (E MG Av B4 Xq (E >F >F NG (p Zq OG PG hr qy lB )F cD Ev cD QG nB eD !F mC !F {F {F ", +"y d# & >4 >4 n_ >4 `9 `9 >4 G* ^5 G* [8 (6 `9 G* (6 (6 (6 [8 [8 47 [8 [8 [8 /' z% /' T] [8 _6 _6 <6 :6 (6 (6 ^5 n_ n_ # ^% * @ @ t+ t+ & x v D% v D% w D% v D% u n_ RG SG rr rr rr rr rr Ps aq aq aq aq &G TG lz w `+ `+ @ `+ @ `+ w @ Y] ^5 n_ S1 x x & @ u+ ^% ; v+ UG /F VG WG XG YG H ,H O| h9 'H u| 2{ /2 8F )H !H ~H m! <= {H ]H #; , 6= 6. 6= K; :w Ry :w %w `x ^H Q$ ja !: v0 H$ F$ {k ]f {k Y% tf 4$ p9 p! m@ /H 5g 22 (H vm _H 6. Qr q@ M. V /u (A R@ 0[ :H _m Xb M5 .G 8 qH -9 ^e md Oe +g `F `F |a |a Ei Fi ny hB @l @l @l 9D B4 (E Av rH Av #n ez sH NG Eo Eo Gp OG Ip tH qy qy lB uH cD @G dD ty gz gz iA mC mC %G %G ", +"d# d# & u u u >4 `9 ^5 >4 >4 >4 ^5 G* G* ^5 [8 G* [8 47 (6 [8 [8 (6 47 47 U] T] /' T] 47 :6 _6 <6 (6 Y] ^5 S1 # & # @ * t+ 27 t+ Bw n_ D% D% D% D% D% D% D% x Iw v% ~s rr rr rr rr rr rr rr rr aq aq Qp vH w w w w @ w @ u w G* v >4 S1 Y] S1 x * # Ba ^% |8 |8 ; v+ wH xH yH zH AH BH CH DH EH FH GH |F |F HH IH rA BC JH cE KH LH MH MH NH OH PH QH Sa c9 RH SH s6 !a TH UH VH WH XH Q_ OH YH ZH ^2 ep P_ `H I Zz .I V@ , , +I TB Zx Zx `w ~x @I `i ja ke S8 &= K( P& R3 U@ _@ >c ^@ :@ #I $I ]a ep %I %I Qn ]^ &I *I 6. H. I ,I 'I 4w ~y )I >z !I ~I {I ]I ^I /I (I ,D '+ _I :I F sH Eo (p oI _p PG PG pI bD bD lB cD cD #G QG gz hz iA mC {F {F $G {F ", +"z y & & u >4 >4 n_ `9 ^5 >4 ^5 G* ^5 ^5 ^5 [8 G* (6 47 G* 47 47 (6 [8 U] ;4 }< T] T] U] _6 :6 _6 (6 Y] n_ # # & * @ * Bw Bw Bw & x S1 w @ D% D% w qI aq Ps fD fD rr rI rr rr aq Ps rr Ps aq rr Gw u `+ `+ w `+ G* `+ G* v @ z% w Y] S1 Y] n_ & @ @ @ ^% m ; .} sI tI uI vI wI xI yI zI FH zI FH AI |F IH }F wB xB /G @H BI CI DI EI FI GI HI II JI Y w5 KI LI MI NI OI PI QI RI SI TI UI VI jg b} WI O_ XI i6 YI Y> X> 6. 6. M( ZI `w Zx :w 0z Zx `I J .J +J H$ l^ `= o: H$ .1 cd @J /@ Q$ #$ j3 92 ]& #J 49 Oa 4} $J Z6 Z= S( Mc fd %J &J *J =J &C *C -J ;J ~y ~y >J Eg ,J 'J )J !J ~J {J ]J ^J /J uF (J _J :J F sH >F >F NG (p jJ Ip kJ tH qy qy )F uH Ks cD QG QG lJ iA {F {F mC {F Sp %G ", +"v t v >4 & `+ w `+ G* G* ^5 ~' ~' ~' (6 (6 (6 (6 :6 _6 U] U] U] T] U] U] T] T] /' /' :6 ^5 ^5 ^5 S1 Y] & # # @ & x s D% D% n_ v @ ~' w w D% @ v Qp Ps Ps Ps Ps rr Ps fD rr Ps aq Ps Ps Ps aq Rs x ~' @ w w @ `+ `+ @ `+ `+ w v S1 n_ s+ + ^% z ^% o_ I# I# j mJ nJ oJ pJ qJ DH EH rJ FH zI sJ tJ +H 6E BC xB +H By uJ vJ wJ xJ yJ zJ AJ BJ %1 h' CJ DJ EJ FJ GJ HJ IJ JJ KJ DA LJ MJ NJ OJ r5 5} N 22 P_ PJ .# =d q! q@ M. QJ tE x #w K EE Vr ,K Eg kG 'K )K !K ~K {K ]K ^K K! /, /K (K _K z :K F NG 0D oK Yq xt OG hr hr pI pI qy bD Ev xw cD #G dD nB nB gz mC {F {F T+ !F ", +"s t v v v `+ `+ @ G* @ ~' (6 (6 (6 (6 :6 :6 (6 (6 (6 47 /' /' T] T] T] U] U] /' Q] (6 Hv za za & x * * & # n_ v x D% w w @ ~' z% @ @ D% @ v pK Ps aq aq Ps rr Ps aq qI qK Iw Ps Ps Ps aq %r D% @ w w v v v w w v s v n_ & # @ + + 5* v+ Mi rK +@ 0 _F sK pJ tK yI rJ EH zI uK vK wK 6E +H +H 6E 6E xK yK BI vJ qD zK AK BK CK DK EK FK GK SI HK IK JK KK LK MK NK OK LJ MJ PK QK ]h 5} RK e9 ]^ SK TK UK VK 8. L. QJ WK ZI #w ,x Zx L ,L 'L )L !L ~L {L >K ,K ,K 9t ]L ^L /L (L _L :L + *_ 'c i2 W9 X9 ^e Oe `F +g Xg mK yL nK zL dm dm Bl Av dr 7q #n er vw vw NG 0D (p Gp OG Ip hr fz AL aD qy )F Ks Ks @G dD dD nB gz gz iA mC {F %G ff ", +"u u u s s w `+ @ @ @ ~' (6 ~' ~' ~' ~' (6 (6 :6 _6 U] /' T] U] T] T] U] U] Q] ~' Y] n_ n_ & @ # * * x x S1 D% v w @ @ w @ @ w @ w w D% w v% aq Mp Mp Ps vy BL v D% Hw aq Ps aq Ps lz v w D% w w v v w w v u u & # * ^% A o_ ; d> i CL ]9 kD DL EL qJ DH EH EH FL GL HL 6E vB 6E vB vB |F |F 6E IL vz JL KL 5s LL ML NL OL {v PL QL RL SL Jz TL KK UL VL WL XL YL ZL `L M .M 5{ |4 e9 <3 ': RB +M 6. L. i@ @M Zw Zw #w hK :w #M SJ $M %M @x YK `x RJ &M *M =M -M ;M >M tg Lc ,M 'M )M !M ~M {M ]M ^M /M (M _M :M N ,N -N n6 g8 'N 5e Ed %; X> [. L. )N tE Zw ZI TB ,x [w G$ !N 8K 8K ~N {N ]N ^N /N (N _N :N F er vw vw _o >F YN Gp PM ZN PG hr qy )F lB )F )F cD @G @G #G dD nB hA eD gz hz !F mC mC Q# ", +"s r t s s `+ @ @ `+ @ ^5 ~' (6 (6 :6 (6 ~' (6 (6 _6 :6 _6 <6 :6 <6 (6 ^5 ^5 Y] Y] za t+ x) @ * x x # n_ S1 n_ D% @ @ w w D% @ ~' w D% x D% D% w x x w x x v v v w rr Ps aq Ps aq `N D% `+ w w `+ u w v u & & * @ @ T1 /% d> j nd Te O .O lD +O `G @O rJ EH #O +H 6E $O xC IH |F xC |F }F 8E nD %O @O &O *O =O ^N -O ;O IB >O ,O 'O )O e6 !O !d ~O {O %q C7 5= T ]O %f ^O /O (O -N _O ep :O y6 =d $; [. , 8. 0G WK Zw Zw TB ~v P ,P S. S. l1 Y@ Y@ S. Y@ Y@ Z= Z= S. g, #% =* 2+ E. @% 2# .5 Me ua ^e cb Oe md 'P +l nK yL )P dr Bl )P rH Av Av er !P !P !P !P (p (p Zq hr Ax ~P aD )F zu Bx cD #G QG dD {P eq hA gz nB nB ~F !F {F %G ff ", +"v u s v w w @ @ @ `+ ^5 (6 ~' ~' (6 ~' ~' :6 _6 :6 _6 <6 <6 _6 :6 (6 Y] n_ S1 n_ & & t+ & n_ S1 Y] S1 Y] Y] ~' ~' w @ w w @ @ ~' @ @ D% w ~' w @ v D% @ w D% D% D% ]F Ps Ps aq aq Ps Ps ]P w w v u u ~' n_ & # @ ^% g# z~ v+ d> T+ tC 0 ^P YG VM sz /P vB @O EH FH 6E +H BC xC xC .H |F |F 6E HH (P xC _P :P

kE 0P aP bP cP 79 {^ %; H$ , M. 0G Zw Zw Zw TB dP UJ s! 9j eP fP gP hP iP jP kP lP mP nP oP pP qP rP Q3 sP 4N tP uP u3 ]e __ bm zv vP wP xP yP zP AP BP CP mO DP di EP Q +7 MN ,Q 'Q RF SF kH 0z 0z 0z bA WN cB x hK VF #w )Q T. K$ QN lI !Q ~Q =P hK hK fC hK fC tL fK RN VF hK x fK !~ tx fC hK ~Q p: )Q ~Q tx x Zx Zx x Zx eB Z= Y@ Y@ S. p: Y@ p: Z= p: S. `6 X& ;# 3+ %* W8 {Q I1 ^e .g Oe Qe +g |a l ]Q #l Av )P cr rH rH Av rH Co !P Eo !P Yq Zq Ip *s hr pI lB Ev Ev Ev Ev cD QG dD #G cD ty nB hA gz mC !F %G {F {F {F ", +"s s u v w w @ G* z% G* ~' ~' ~' :6 ~' (6 (6 (6 :6 :6 _6 <6 _6 :6 (6 ~' ^5 Y] D% x t+ & n_ n_ n_ n_ Y] Y] ^5 ~' ~' Q] ~' w D% w @ ~' ~' @ w D% D% ~' @ w w D% v w D% D% w I- Ps rr rr Ps Ps Ps aq oB w u u Y] S1 n_ # ^% p ^% 5* ; I# j mJ ]9 ^P Fn ^Q ZG $O 6E `G /Q FH rJ $O 6E IH xC |F $O |F IH 6E IH zC ~G zC {G (Q _Q :Q 3Q ;0 B_ c8 1; y{ p9 54 4Q 5Q GI jg i6 e8 '( 3e j OA Y> H$ [. 8. 6Q #w TB Zw Zw dP 7Q IF 8Q 9Q 0Q aQ bQ cQ bQ dQ eQ fQ gQ hQ iQ jQ kQ lQ mQ ;L 'L -K nQ zv Vg oQ pQ )L qQ ,I rQ sQ tQ lO lO uQ vQ 8 ]7 Oe +g .g +g Fi Xg 1k zL rH cr MG (E MG Av cr #n $R (p $R xt Ip Is hr fz aD zu Ev R uB vB H $O |F 6E @O zI ,R IH $O 6E |F 6E 6E IH xC }F xC IH }F }F }F 'R )R !R ~R {R ]R ^R /R (R _R :R %m H/ nR oR pR bh fi qR rR sR tR uR vR wR xR yR zR AR BR CR DR ER FR GR HR IR JR JR KR d$ I= <+ s& ~] */ s! IF LR fC :w MR NR 0z %Q OR A: I( PR ZQ o^ )/ L2 QR YQ RR SR TR /+ UR 0z x *] 5q VR x x hK VF hK )Q K$ `@ WR ~Q WN WN tx ~Q wL Y@ W. K$ W. W. R. ;P fC uL TN XR iC 0z hK hK hK hK hK :w hK x x x `w x x mI Z= Z= Z= l1 Z= p: Z= Y@ 5q :+ `6 MM ,- ** YR s1 >8 Me Oe +g Ei nj 1k zL iB #l cr rH MG MG MG Xq !P $R (p (p xt Ip ~P qy qy lB yt -s xw cD Ev #G mB QG &R &R hA gz ff ZR ff %G Sp Sp Sp T+ ", +"t t s v v `+ `+ @ `+ `+ Y] (6 (6 ~' ~' (6 :6 _6 _6 :6 :6 :6 (6 ~' ~' S1 n_ & % Bw n_ za n_ n_ S1 Y] ^5 Y] ^5 (6 ~' ~' ~' @ ~' Q] z% @ @ @ ~' @ D% w ~' v v w D% ~' w v `R Ps Ps Ps Ps S .S aq Ps Ps Ps Hw x & * * ^% n m I# w* E# u* ,n Fn ^Q +S @S |F vB 6E IH vB #S rJ $S xC .H .H 6E 6E |F |F |F xC xC 6E IH zC {G 0E %S &S ~R *S =S & -S ;S >S ,S 'S )S !S ~S B7 {S y{ V. ]S p9 Z% 1h ^S /S d@ (S J| `- Y m} F' %; _S H$ 6Q Ry TB TB #w ,x :S =I =1 P x 0z +R |+ '# CS *Q DS B: ES FS GS ,# Y& (+ {# NR fB 0z NR jC iC fB x VF VF gK +| `@ W. Y@ W. `@ W. +| +| +| `@ W. g, +| W. !~ ;P hK uL uL hK hK x hK :w :w hK hK hK x x Zx Zx x x x tx Z= Z= Y@ Y@ Y@ Y@ S. M& [[ S; 7m %* %s HS ~/ f~ !% IS $5 cb +g +l 1k 1k #l #l 9D cr Av Av MG >F !P !P (p xt Zq hr qy lB qy aD Au xw xw yw Bu %R #G &R iA eq !F ZR >n eD ff $G $G {F {F hz ", +"r r s w @ `+ `+ `+ @ @ ^5 ^5 ~' :6 (6 :6 :6 :6 (6 :6 JS (6 ^5 za n_ & & & Bw n_ n_ za za n_ S1 ^5 ~' Y] Y] ~' (6 ~' ~' ~' ~' @ @ ~' Q] @ @ w v v D% w v x D% w D% D% KS Ps Ps Mp aq |p v qI aq Ps Lp Lp Fu @ ^% p V+ V+ v+ i v* jD b Fn LS MS @S $O NS $O $O $O vB OS rJ PS GH QS GH RS SS ,R TS zI zI US US VS WS XS {G YS &S ZS `S 54 _3 T _R .T +T @T '( &. cc ZJ #T 8$ 8. Qr %; (S $T %T &T *T %= v5 =T OA i! i! /@ P$ 4h M( TB Zw TB T ,T 'T tQ )T eS eS !T uR kn ~T {T ]T ^T -L 6R /T (T _T :T n ZR hA {F Sp {F !F !F ", +"t t r u `+ w @ `+ G* @ G* G* z% [8 (6 ^5 (6 (6 ^5 wT xT yT zT & t+ 27 n_ Hv S1 S1 S1 S1 Y] ^5 @ @ ~' @ w ~' ~' w @ @ @ w @ ~' ~' w w @ D% v @ w w D% D% w ~' @ Qp Ps rr AT Ps vH D% lz Mp AT 's @r @r BT ; o_ W+ I# i CL 0 -R CT LS oA @S H DT #S GL SS vK EH EH EH FH FH rJ EH zI EH US ET zI US zI US FT US GT HT IT JT KT LT j6 MT hc _R .T _R NT OT PT QT RT ST TT , ;$ 8$ %; 4$ Bf UT *T j8 m@ j7 U (& 8$ 4h ;$ [. VT Ry #w :w U ,U uQ CP eS di z di 'U uQ uQ uQ )U 6v pR pR o z !U ~U {U ]U ^U /U (U _U :U V ,V 'V )V !V ~V {V .Q ]V ^V /V (V +E _V R( =I (A c$ J. X@ :V :w hK !Q K$ T. =P K MV NV mP eN lO _< nO z OV PV uQ zQ QV RV EP SV TV UV mO VV WV XV YV ZV `V W .W +W @W #W $W %W &Q &W *W RF =W -W 7u ;W 0. Cs g, p: >W dB VF VT &= X ,W 'W F NG vu $R (p Ip PG tH tH tH pI qy zu Ev Ev xw Bu cD cD QG &R eq 7V 7V {F {F {F {F mC $G mC !F mC !F ", +"s r s s s w w @ G* G* G* z% G* (6 Y] ^5 S0 S0 ^5 & uy & n_ Bw Bw n_ Hv ^5 ^5 ^5 ~' ~' (6 (6 z% ~' ~' z% Q] Q] ~' @ z% z% @ w ~' z% ~' D% w z% ~' ~' ~' @ z% w v @ kz rr Ps Ps Ps Qp s s x * p /W (W rC 9V -G ;G _W :W X ,X 'X 'X {8 ^e [k tu ;b Av sH sH )X (p (p xt OG Ip tH tH pI qy Dv Bx Ev xw Ev {P #G #G ty ty eq iA mC %G {F %G %G {F Sp mC !F %G !F ", +"t z t s u w w G* @ G* G* ^5 ~' ~' ^5 Y] & n_ S0 & t+ Bw za n_ n_ n_ S1 Y] ^5 ~' ^5 ^5 (6 :6 Q] ~' w w ~' ~' ~' z% Q] ~' w D% ~' z% @ D% w z% !X ~' Q] w w v x @ vy rr rr Ps aq Rs s # p g# ^% V+ ~X {X 9V ]X xH yH vI pJ ^X /X (X _X _X uz uz vB [F !G !G vB vB 6E |F |F 6E IH |F 6E |F vB xK vB 3W zC wB IH wB 4W HT :X TX UX @< 3V IS *5 Oe Ei nj br #n NG !P (p (p xt wu PG pI ~P AL Au Au xw cD Ks Ev cD &R dD &R &R &R eq iA {F {F %G %G {F $G Sp {F %G {F ", +"u Z+ r u u v `+ @ `+ `+ ^5 ~' Y] ^5 n_ x x & & & Bw n_ za Hv ^5 Y] Y] Y] ^5 ~' ~' Y] ^5 (6 :6 ~' ~' ~' z% z% ~' z% z% @ @ @ D% w w v @ !r VX z% z% D% D% w v WX aq Ps Ps Ps `N s * @ ; /% z~ J# U+ wH VG xH yH XX YX ZX `X |W Y .Y .Y _X 6E !G @S vB +Y 6E `G $O |F 6E |F IH 6E $O 6E IH 6E +H xB wB 6E IH @Y #Y $Y %Y &Y *Y =Y -Y ;Y >Y ,Y 'Y )Y !Y qV ~Y {Y T8 :@ ;$ 4h q@ L. q@ X. Z@ V@ n! ]Y ^Y g' ;a B6 Q$ 6( es q@ q@ X. /Y (Y Zx UB Zx SF _Y :Y Je 4 u Lp GW [Y }Y dN |Y 1Y 2Y 3Y 4Y 5Y dQ zO 6Y 7Y 8Y qC GW GW HW uQ uQ @r @r @r 9Y qX JW Wj 0Y aY bY cY rS dY eY fY gY hY iY +E jY kY lY mY NX nY U. oY Qr pY d, m, qY rY sY tY uY vY wY xY yY zY AY BY CY 'W DY P. X. )Q uL fC lH K$ !~ g, ~# EY WQ 0z 0z 0z FY fB fB iy 5q Y@ Y@ +| +| +| +| Y@ Y@ Y@ g, Y@ Y@ x tx g, g, Y@ g, ;P hK VF GY T. W. W. ~Q VF hK hK VF uL uL VF =P uL hK :w VF VF &F g, ~# g, K( =~ K( ar g, `6 N& N& 7m %* ;X !# {+ W8 H: g[ ZF 0b HY 3V ^8 Pe Ah kC Av vw tT Eo Eo (p Hp tH ~P ~P IY Dv Au Bx cD Z ,Z qC Z+ 'Z )Z 3L !Z ~Z {Z ]Z TW ^Z /Z (Z _Z :Z iZ ,# ^k (] @> jZ kZ UX lZ xv mZ .l dm #n tT Yq Eo Fo _p hr pI qy zu Bx ` ,` '` )` !` ~` {` ]` ^` /` (` _` :` <` [` }` |` BY 1` X Cs 0. ar g, KM 2` VF K$ sx 0z 0z 3` mY fC 0z cB VR S. Y@ [[ `6 g, +| +| W. W. +| +| Y@ g, g, Y@ +| fC tx g, g, Y@ S. x VF 4` K$ K$ K$ K$ R. !~ K$ R. W. K$ R. K$ lI uL uL :w fC :w lH X@ =~ =~ J. g, S@ Z. `6 7m !# ,+ ;# 1~ 2# ^E 5` O: 2~ W8 6` 7` 8` KG 9` 0` a` |k 2k 7q tT Gp (p wu Hp tH pI qy zu cD 2 s` t` vm B> u` 6( H$ V. q@ Q. GZ Zw #w :w v` w` x` y` z` A` B` ;J yk KZ C` yk >K _K D` E` Lp MP s v w Rc VV 6O F` G` H` I` J` K` L` M` N` O` P` ch 67 di >Z Lp Q` z @ t JW _K R` S` T` U` yX V` W` X` Y` Z` a. =I 0. `` .. .+ .@ .# .$ .% .& .* .= .- .; .> ., .' .) .! .~ .+F { .] .^ . X jI mY / .( .y: _ .~# az FY tx ~# : .< .=w 3` [ .0z 0z g, [[ S. Y@ g, [[ [[ S. Y@ g, Y@ +| +| W. +| Y@ Y@ -P hK WN Y@ g, Y@ eB x lH `@ `@ K$ K$ K$ K$ W. !~ K$ +| W. !~ !~ } .uL uL :w fC :w WF K( =~ K( K( g, ~# [+ |+ pH ;X _~ | .YR 1 .S2 2 .8` jZ ]| 3 .4 .5 .]8 X9 Oe Fi 2k 2k ;b An !P iU Hp hr ~P Ax yu Au Ev Bx Ev Ks cD dD vT hz eq iA 7V 7V 7V mC %G %G {F {F $G Sp $G Sp Sp %G ", +"v u v v v `+ G* v w n_ * * @ & & x x n_ S1 ^5 Y] ^5 ~' ~' ~' (6 z% z% z% ~' ~' Y] ^5 :6 Q] ~' ~' ~' ~' Q] Q] @ w w @ ~' z% z% w w Y] S1 x w v D% RM qI Ps Ps aq 6 .7 .p 5* m V+ m U+ Ol u* -R Fn LS MS 8 .9 .0 .yI yI DH 1W 1W rJ rJ FH rJ FH GL wK H |F 6E IH |F H vB H $O xC xC IH _X 3W $Y lV xU a .b .c .d .e .f .g .h .i .HU j .k .l .m .n .o .p .`i 8. M. O. L. 8. 6( U@ &= $; w8 q .T r .s .t5 vm OA o: H$ 8. q@ N. GZ Zw #w Zx ~x ~N t .8S hR A` B` u .MV 9l yk ^m 0l v .w .LW zQ Lp dX s v x .Lp @V y .eQ xW z .A .B .C .D .N` $p sQ PU di z E .GW HW GW Dw F .uR ^% G .H .I .zN J .K .L .X` M .N ._+ =~ O .P .Q .R .S .T .U .V .W .X .Y .Z .` . .....+..@..#..$..jI [ .jT 0. %..fC fC VF &..(A *.._ .*..=..fC m^ ~# ~# {# -..;..NR 0z tx Y@ Y@ S. S. S. g, S. g, g, g, g, S. g, g, g, g, +| XR x tx g, Y@ RN iK tx T. K$ K$ K$ K$ fK tL tL UN W. K$ K$ K$ K$ >..uL VF hK VF :w m^ K( =~ J. X@ J. g, |+ 5# ,..o) 9# hJ '..)..y[ iJ !..~..{..]..^../..@< ^8 Di lj dm Bl Co :o Hs iU zx hr ~P qy Au Au xw Ev (..yw cD dD vT hz iA mC _..mC 7V mC $G %G $G Sp $G $G $G :..Sp mC ", +"n_ & & x n_ S1 S1 x x & @ @ * # # & n_ S1 Y] (6 ~' (6 (6 (6 G* z% /' ~' _6 G* Q] ~' (6 Q] z% ~' ~' z% ~' Q] Q] z% ~' @ w @ z% ~' D% D% ~' ~' D% D% D% RM `N Mp Mp Mp <..[..g# g# m k U+ 6* ff =R -R Fn ^Q pA QY uJ uJ }..|..yI yI rJ yI rJ rJ FH rJ EH EH 1..2..uz vB uz uz vB 6E xC }F HH xC 3..4..IT O n .b..c..d..L. O. O. i@ [. %1 J< :@ :@ Sa j3 j7 i' s` e..n4 +8 l^ 6( X P. M. +I Zw #w Zx %w yM f..g..h..i..Dg [J [J ch j..Xj 0l j..^m k..uQ @V l..u Rc 0q Lp Lp @V m..n..UU 2S o..MU p..q..r..>T s..t..u..v..HW GW or qB MZ 3L Wj w..x..y..z..}U A..B..C..D..HG (A E..F..G..H..EL I..J..K..L..M..N..O..P..Q..R..S..T..U..gY V..mY VF W..X..7U fC fC fC Y..=~ ^~ =~ y: y: Z..>W =~ {~ ~# ~# g, `..fC eB g, ^~ g, +..+.g, g, =~ 5J =~ ^~ ^~ +| g, g, g, Y@ XR x tx Y@ S. ar sx [[ K$ T. T. oT jT VF hK hK hK lH W. Y@ P. T. lH #w #w :w hK :w cU Y@ ^~ ^~ W. +| s& /# 4# ++..4 XN w~ jZ qH ru -9 @+.lZ ]..ua #+.bf $+.%+.+l 2k cr An (o Fo iU _p Hp hr fz zu Bx Au Ev cD QG #G #G #G nB nB eq _.._..eq &+._..}E mC }E :..*+.{F %G Sp %G hz ", +"# # x x x & # # # * @ p @ # # x v D% @ ~' (6 G* G* ~' G* (6 [8 ^5 _6 (6 /' z% z% Q] ~' z% z% Q] /' /' Q] Q] z% ~' @ ~' z% @ w w @ @ D% D% =+.`N Mp Mp -+.`N ;+.T1 /% m I# w* T+ C 3E @@ >+.^Q :F QY _X uJ uJ uJ 9 .,+.rJ yI yI rJ rJ rJ rJ rJ rJ rJ rJ '+.)+.uz uz 6E IH XS zC xC !+.~+.{+.:X ]+.xU ^+./+.(+._+.:+.<+.[+.}+.|+.1+.2+.0..3+.LB qV n .%w tE tV I. 0$ O. L. 6. Y p! fc 5$ #$ x{ q9 f@ w0 4+.}b w8 G$ 6( 8. T. S3 5+.Zw Zw K 0+.fM @V a+.QU b+.zQ c+.Lp @r 9Y 67 {P d+.|T e+.f+.dQ g+.h+.i+.j+.HW uQ Lp Dw k+.l+.^% m+.RP n+.o+.p+.q+.r+.s+.M .t+.u+.R= v+.w+.x+.y+.z+.A+.B+.C+.D+.E+.F+.G+.H+.I+.J+.K+.L+.~V gY M+.7U fC VF N+.fC [ .fC fC fC X..=~ =~ =~ =~ ar =~ =~ Y@ +| S. g, W. bA 0z jC S. g, ^~ O+. x 0z tx P+.^~ ^~ g, {~ Y@ g, g, S. S. eC x tx Y@ [[ ~# g, `6 cU ;P hK VF VF #w #w #w #w #w wL K$ `@ +| ;P VF hK uL fC uL } .!~ Y@ W. +| [[ `6 |+ f+ {Q Q+.R+.]8 Me %+.a` md md S+.LG 0` lK nK #l l l iB Co !P wu wu Hp Ip PG hr fz zu zu zt {P #G QG QG QG &R ,T ,T &+.&+._..7V _..&+.T+._..T+.U+.}E $G $G $G P# {F ", +"Ba & S0 n_ Ba & Ba Ba Ba @ * * # & x Y] @ @ @ @ ^5 ^5 ^5 ^5 ^5 (6 (6 ~' :6 (6 (6 ~' ~' Q] Q] z% z% z% Q] ~' ~' @ @ @ ~' ~' @ D% w w w @ D% pK `N Mp or or V+.Y+ % g# k J# h T+ 5p -R @@ >R Ay MS pA uJ _X uJ QY QY _X W+.,+.rJ 1W rJ eV rJ zI eV FH rJ 1W rJ zI ,R X+.3W 4W !+.zC Y+.~+.Z+.:X `+.g` xU @..@.+@.:+.<+.@@.#@.$@.%@.|h &@.*@.=@.-@.2X ;@.>@.TB TB ,@.O. O. M. 6. C7 x{ +8 Y% Y% D7 D7 B6 #b ed B> q9 V@ V@ H$ 8. O. 5+.Zw #w U zO uQ @V /j ~@.@r @V Lp 9Y uR ei {@.]@.Vj A .q..hQ ^@.CP /@.eS (@._@.Lp Q` pX tW 67 :@.<@.[@.}@.|@.1@.2@.3@.+F t+.4@.5@.6@.7@.8@.9@.0@.a@.b@.c@.d@.e@.f@.g@.h@.i@.j@.k@.l@.m@.4U n@.7U :w jT o@.7U NX VF fC fC X..^~ =~ |[ =~ ar =~ K$ +| W. g, g, Y@ x IM S. +| p@.q@.cB fC x 0z x bA r@.^~ =~ Y@ g, Y@ g, S. >P x cB Y@ g, ar g, [[ dB VF uL =P lH lH lI VT )Q T. `@ W. K$ `@ lH VF hK hK fC hK } .!~ W. !~ W. S. 7m |+ s@.,6 e[ t@.IS qu jj mK |a md `F 'P u@.v@.hB (E rH zL 1k w@.Fo OG OG Ip ~P ~P fz qy zu zu Ev #G cD cD QG dD ,T eq 7V _..&+._..T+.U+.7V _..U+.T+.T+.*+.$G $G %G $G %G ", +"& @ & & @ Ba @ @ @ @ x x v D% w Y] ^5 ^5 ^5 Y] ^5 ~' ~' (6 ~' (6 ~' (6 ~' :6 (6 z% ~' z% Q] ~' ~' ~' w @ ~' @ w w w @ w w D% D% w lz nZ Mp aq Mp <..x@.Z+ y@.n m U+ i T+ u* 3E ;R >R :F MS W+.W+.uJ W+.QY _X _X 6E _X uz $S rJ 1W eV 1W FH eV zI zI zI zI zI zI US z@.!+.HT HT A@.$Y :X B@.C@.D@.E@.+@.F@.@@.G@.<+.+@.H@.I@.J@.K@.L@.M@.NK N@.O@.P@.Q@.J >J al Xj Xj EE Vr ~y >U fM uQ uQ _K rR @V @V MZ t uR ei QU pR ,K W@.lO m..X@.Y@.EP 67 nO Z@.@r >Z oR oR @ `@. #..#.YP +#.#W @#.##.$#.%#.&#.*#.=#.-#.-#.;#.>#.,#.'#.)#.!#.~#.{#.]#.^#./#.(#._#.:#.<#._+ SX VF VF VF XK NX lH ;P fC fC X..=~ ^~ =~ =~ =~ =~ =~ g, g, S. g, eB hK tx tx x 0z fC q@.r@.WN fC fC fC dB r@.g, g, g, Y@ Y@ S. ux 0z 0z g, Y@ g, g, g, Y@ !~ K$ X. T. T. T. T. [#.!Q ~Q ;P lH lH =P VF VF hK uL uL VN W. +| +| W. Y@ !# Tg 5# .4 }#.IS R+.3V |#.1#..g +g `F v@. l v@.zL MG MG er An (o Fo xt Ip PG ~P pI lB aD Bx xw {P QG cD cD dD &R &R eq &+.7V _.._.._..U+._..T+.T+._..&+.}E {F %G %G $G mC ", +"@ u+ Aa Aa *G ^% ^% ^% @ @ s x v D% D% S1 Y] ^5 ^5 ^5 ^5 (6 (6 ~' (6 (6 Y] (6 ^5 (6 :6 U] z% @ ~' ~' z% ~' ~' @ ~' z% w v D% w @ w @ w .S Mp aq Mp 2#.~@.q y@.q 3#.; > j ff s_ 3E DL LS oA pA .Y _X uJ uJ 8 .8 .uz uz _X uz _X _X rZ 4#.rJ 1W FH 1W rJ US vU US zI zI vU vU 5#.6#.~+.7#.8#.xU 9#.5...@._+.@@.@@.0#.a#.b#.c#.yU d#.Q* e#.m' f#.g#.Kz ~v 4h es h#.:w $ #$ B6 k#.+8 U@ l3 p: 8. 8. %X (Y VF Zx YK kH l#.m#.)y $D n#.o#.o#._j Jq Jq ~y ~y ~y p#.fM q#.uQ yk r#.@r s#./j z t t QU W dB fC hK fC gK g, S. g, Y@ g, g, }V fC x S. S. ar S. g, S. Y@ !~ X. T. )Q E& &X #w hK #w #w VF #w #w #w #w VF uL fC !~ !~ !~ !~ !~ W. [[ '- 3# g[ W#.3V @< &5 4V +l |a Fi Xg mK `F |k zL Av >F Eo $n !P X#.OG hr tH qy qy qy lB Ev Ev cD #G cD #G dD &R &R ,T &+._..&+.T+._..U+._..U+.U+.T+._..&+.{F %G {F $G {F ", +"T1 /5 u+ u+ ; *G *G ^% Ba & # D% D% w D% S1 ^5 Y] Y] ~' ~' (6 (6 (6 (6 (6 ^5 (6 (6 (6 (6 Q] z% z% ~' ~' ~' @ ~' @ @ ~' @ D% D% @ @ w @ w Dx Y#.Z#.`#.* ^% 5* ^% 5* ; Mi j g 0 3E $.>+..$.+$.pA QY QY _X _X QY QY @$._X QY QY QY .Y 6E wB #$.rJ FH rJ zI US vU vU US zI $$.tU %$.&$.*$.=$.^+.^+.-$..@.;$.!R >$.0#.,$.a#.'$.)$.!$.~$.{$.]$.^$./$.Oy ~v #M ;$ es ;$ >@.J Xj Xj >K Xj |$.1$.q#.q#.q#.,K 2$.3$.LZ 6v + /j QU ..TN fC fC uL hK x x >..8U Y@ Y@ +| +| +| eB fC x x x RN g, Y@ +| g, S. tx x x S. ar ~# S. g, S. Y@ !~ oT =P VF #w #w #w #w VF hK VF VF #w VF VF uL fC bA +| !~ W. K$ W. Y@ Y@ ]+ !* +9 r$.R+.+< bf 5V 1k kC kC s$.t$.1k 1k )P An !P Gp Gp wu OG kB Ax ~P AL lB lB bD xw cD #G QG dD dD dD &R eq eq 7V T+.&+.U+.U+.T+._..U+.U+.U+.T+._..{F $G $G %G {F ", +"p| p| 57 *G u+ u+ ^% @ # n_ x w D% @ w S1 ^5 Y] ~' :6 ^5 ^5 ^5 (6 ~' ^5 (6 ~' (6 ~' (6 ~' ~' ~' ~' ~' ~' ~' @ @ @ ~' @ w @ ~' @ w D% v x # * * p 5* o_ 5* Mi h nd u* u$.Fn LS Hx 8 .+$.QY QY v$.QY @$.@$._X _X _X QY _X QY +$.QY 6E w$._X x$.#$.rJ y$.zI $$.zI $$.vU tU FT z$.A$.B$.C$.9#..@.(+.D$.!R :+.E$.F$.G$.H$.I$.J$.K$.L$.M$.N$.O$.dP P$.Q$.R$.|R H$ 8$ S$. 4$ p9 F' `i J2 M9 #$ x{ V$.): +8 :@ 8$ [. Qz Zw Zw `w ~x %M W$.X$.-U <$.n#.Y$.]y Vr Jq >K Xj Xj ~y ~y Z$.zO `$.Xj yk 9l %. %.+ + %.,%.'%.)%.!%.~%.{%.]%.^%.0H /%./%.+E (%._%.7U #w :%.P ;P VF #w #w #w (Y #w VF #w =P <%.lH lH =P #w #w VF uL fK W. W. !~ K$ W. W. Y@ ~# A, [%.}%.IS 3V ]8 zh +l ny #l )P br cr #n Av $n Eo wu Zq |%.Ip kB qy AL aD aD lB )F Ev cD #G #G QG dD &R eq ,T &+.&+._..T+.T+.T+._..T+.T+.T+.U+.T+.T+.{F $G $G %G {F ", +"1%.; ; u+ u+ ^% @ * x S1 w w D% ~' ~' Y] Y] ^5 (6 JS ~' (6 :6 :6 :6 (6 (6 (6 ~' ^5 (6 Q] z% Q] Q] z% ~' ~' ~' ~' ~' @ @ @ @ ~' w D% D% v x # p @ ^% V+ k J# ]5 tC w+ u$.AH >+.8 .8 .W+.+$.QY _X .Y QY _X _X QY QY QY QY _X _X QY .Y v$.w$.w$.2%.2%.3%.#$.zI $$.vU vU vU FT 4%.5%.6%.7%.8%.9%._+.0%.!R a%.>$.b%.c%.d%.e%.f%.J$.kg g%.h%.i%.j%.k%.TB l%.R3 M9 >e V@ U@ U$.K >K :K ~y [H p%.Vr Xj Xj :K q%.r%.yk KZ m+.EP 6* g c` -R AH Ay Ay MS W+.uJ W+.QY QY QY QY QY _X _X _X _X @$._X QY _X v$.2%.2%.w$.2%.@Y Z%.@Y @Y `%. &..&.+&.4%.@&.6%.#&.8%.8%.$&.%&.&&.*&.=&.-&.;&.,$.>&.,&.f%.!$.$@.@# gg '&.{v >u $w )&.V@ n: $; &= m} _@ #M Zw e U. 8. V. 8. X -$ +8 EZ {&.4$ _@ ]&.Zw Zw Z GW @r @V :&.>C <&.ov [&.}&.|&.1&.2&.3&.4&.5&.L- 6&.7&.8&.9&.0&.a&.b&.NE c&.d&.e&.f&._V Q%.x: x: P } .K$ T. X. T. P. h&.`^ lH SN )Q K$ +| `^ #w hK !Q !~ W. Y@ [[ +| !~ Y@ Y@ s& yi +_ T9 G1 qu xv ^7 0` i&.#l 9D cr er !P Hs (p Zq OG Ip Ip hr qy aD lB )F lB uH j&.cD cD QG QG dD &R &R &+.&+._.._..T+.U+.U+.Y%.T+.T+.U+.Y%.U+.U+.U+.Sp Sp Sp $G {F ", +"; 57 ; u+ @ # & u u v w @ @ @ @ Y] Y] ^5 za ^5 (6 z% (6 G* G* G* z% z% (6 (6 (6 @ ~' ~' @ w @ ~' ~' w w @ w v v D% D% x s r * @ o_ m J# Ol Ol u* c` d- nU ^Q k&.+$.pA QY yK uJ uJ uJ QY QY +$.+$.QY _X @$.2%._X QY @$.@$.2%.2%.w$.2%.@Y Z%.@Y Z%.4W #Y RY RY l&.m&.n&.C$.o&.p&.%&.:+.E$.q&.r&.s&.t&.,$.u&.v&.w&.x&.y&.z&.A&.&y RT Kz B&.i! Rr X> ;$ 6( `i :@ C&.h#.*.>*.`@ 9. |[ =~ lH VF VF lI !~ W. +| +| W. WR W. +| +| W. W. +| W. W. +| +| Y@ S. Y@ +| Y@ Y@ Y@ g, Y@ Y@ Y@ +| g, g, Y@ g, g, Y@ g, S. g, .% ^# S. `6 [[ g, W. W. K$ T. T. T. `^ VF VF VF VF =P *X VT `^ lI SN ;P ,*.'*.)*.'*.,*.'*.'*.tx !*.~*.{*.]*.*5 ^*./*.'P i&.(*._*.)P ]p !P Eo (p xt Ip Is hr ~P qy lB Eg 9l )F uH :*.dD dD dD dD &R ,T eq _..&+._..&+.T+.T+.T+.Y%.T+.T+.Y%.U+.U+.Y%.Y%.Sp $G $G %G mC ", +"^% *G *G @ # & y >4 S1 n_ w `+ ~' @ @ ~' ^5 ^5 S1 ~' (6 (6 (6 ~' ~' (6 (6 (6 ~' (6 ~' ~' @ z% ~' @ ~' ~' w w w Y] S1 S1 S1 S1 n_ # * p q Y+ V+ I# i <*.w+ XG fb [*.}*.|*.pA QY pA pA uJ uJ uJ QY QY QY QY _X _X _X _X @$._X _X @$.@$.2%.w$.2%.@Y @Y 4W HT 1*.1*.#Y :X 2*.=$.3*.4*.5*.6*.%&.7*.E$.8*.r&.9*.0*.a*.b*.c*.v&.d*.Yt ;i e*.f*.QT g*.h*.5= i! 4h L. H$ OA 59 n! ;$ V. Qz Z lO uQ E*.F*.G*.H*.I*.J*.K*.L*.M*.N*.O*.P*.Q*.R*.S*.T*.U*.V*.NE .E W*.X*.DX Y*.!~ P. 4h H$ es T. T. 9. Y@ `@ `@ (& `@ W. X@ g, X@ lH fC NX VN W. 9. |[ X@ =~ `@ w: `@ K$ K$ !~ =~ |[ =~ g, J. W. =~ +| +| W. +| Y@ S. Y@ g, g, +| 5J .% ar g, .% ^~ {~ g, ar ~# S; S. S. S. Y@ W. Y@ Y@ K$ T. T. K$ jT VF VF VF VF #w VF #w #w hK hK Z*.`*.Z*.`*.Z*.Z*. =..=.+=.:P @=.#=.$=.yv 'P lK Xg }$.%=.Co #n Hs Gp xt OG *s Is Ax fz qy lB &=.*=.cD cD ==.-=.dD dD dD [E eq &+.;=.&+.T+.T+._..T+.&+.T+._..U+.Y%.Y%.U+.Y%.U+.%G %G %G {F mC ", +"|8 |8 ^% @ * # # n_ S1 Y] v v `+ @ `+ G* z% @ `+ @ ~' ~' (6 ^5 ^5 ~' ~' ^5 ^5 ^5 @ Q] ~' Q] ~' Q] Q] z% @ ~' @ ^5 n_ x n_ x x * * p n n I# j% nd =R -R nU }*.>=.,=.pA QY +$.pA pA QY QY QY +$.QY QY QY _X QY _X QY _X QY QY _X 2%.uz IH wB @Y 3W '=.HT sZ )=.!=.~=.{=.]=.^=.5*./=./=./=.<+.8*.(=._=.0*.0*.:=.<=.[=.}=.3i |=.1=.2=.zZ 3=.4=.5=.&$ Z6 ;$ y{ G2 x{ s7 #T G2 t& P. 6=.'x 7=.`w :w TB J Vr k=.l=.m=.di EP B*.Lp Lp MP Dw %V .%.+V mO zO n=.o=.p=.0K q=.mY r=.s=.t=.u=.v=.w=.x=.y=.z=.A=.B=.C=.D=.E=.aH 0. (A Y*.O; t& 9. T. 9. =~ 0. _+ F=.G=.JX 4U 5U M%.VQ H=.I=./~ jI J=.K=.L=._+ /+ 0. ~# `@ S. W. =~ g, =~ |[ |[ =~ J. =~ J. K( +| g, +| +| W. Y@ Y@ Y@ Y@ =~ ^~ g, ar g, ~# g, ^~ ar ar ~# `6 S. [[ 5q S. Y@ -P cU SN ;P VF uL uL uL hK hK uL uL uL VF hK VF VF Z*.M=.N=.O=.N=.N=.N=.P=.Q=.R=.S=.T=.U=.V=.0` @l nK W=.X=.!P Eo Yq (p Zq PM 'F :E ~P qy lB lB Y=.*=.Ks @G @G ,T Z=.`=.`=.eD eD eD eD eD -..-.>n _..&+._..&+.T+.Y%.Y%.Y%.+-.T+.$G %G {F {F %G ", +"|8 ^% ^% ^% @ # & n_ x Y] u v @ @ w @ z% G* @ z% (6 ~' (6 ^5 ^5 ~' ^5 Y] ^5 ~' ~' Q] ~' Q] z% Q] z% z% z% ~' S1 ^5 S1 & & & # ^% 5* V+ m @-.w* v* jD -R Fn #-.,=.$-.k&.+$.QY pA pA QY QY _X _X QY _X _X QY _X _X _X pA @$.2%.@Y 2%.wB _X zC IH 4W HT HT sZ RY %-.%-.&-.*-.4*.=-.--.;-.>-.,-.'-.s&._=.)-.0*.!-.9*.~-.~R x&.{-.]-.^-./-.N@.(-. ; _; 3e *$ i7 m} U4 x{ ]H 4$ M9 X@ H$ X> _-.:-.$w Ry Zw <-.[-.}-.|-.1-.2-.cd Z6 Zz 5$ D7 cd *F hK #w Zx x $w bd 3-.4-.=z 5-.<$.6-.7-.8-.)I n#.w*.y*.)I K&.n#.9-.0-.a-.Vr ]y K&.>J b-.c-.d-.PU EP B*.@r or ~@.e-.9Y S&.Dw f-.f-.6Y g-.h-.i-.j-.iP eN CP k-.l-.m-.n-.o-.p-.XP q-.#..r-.#W s-.t-. | =~ K$ Z t& |[ Q%.F=.zS 3U u-.LN n& n& z. v-.0; w-.x-.v@ y-.aZ z-.A-.B-.C-.D-./) {+ {~ E-.+| g, ~# =~ =~ =~ ^~ g, J. J. S. g, S. +| g, +| Y@ g, Y@ Y@ g, g, ar ~# ar ~# ar ar ~# ar ar Z. [[ ux F-.G-.dB uL hK uL VF uL VF VF uL fC fC fC hK uL uL fC VF hK =.H-.VF VF hK hK hK Zx `w I-.J-.K-.L-.M-.ij @l N-.O-.>J $R wu (p wu xt OG 'F .G fz lB aD aD Y=.*=.cD @G @G ,T Z=.eD eD `=.`=.eD &+.>n &+.&+.&+.T+.U+.U+.T+.T+.T+.U+.T+.U+.T+.$G {F mC {F {F ", +"|8 ^% ^% @ & x n_ Y] n_ S1 S1 @ @ G* `+ z% /' z% G* /' (6 (6 ~' ^5 ^5 ^5 ^5 ^5 ^5 ~' ~' (6 @ z% ~' Q] z% z% Q] @ n_ Y] S1 & * * $ n m k I# j% u* P-.@@ CT Hx pA +$.+$.pA +$.pA pA _X QY QY _X _X _X _X +$.QY _X _X QY _X _X _X @$.@Y @Y IH @Y 4W 4W #Y Q-.:X ~=.R-./+.]=.+@.S-.T-.a%.E$.=&.'-.s&._=.U-.0*.V-.W-.c%.d%.X-.Y-.Z-.^N `-. ;..;.+;.79 L| @;.4Q 02 ~@ ~h v5 &$ y6 [b R3 Zz #;.{S $;.,x #w #w M=.[-.%;.[t &;.*;.=;.-;.U@ V@ ;$ H$ xL x :w ;;.Zw >;.na [O }d ,;.';.);.L&.!;.~;.n#.K&.w*.!;.)I ]y )I [H ]y [H {;.K&.Vr _&.|$.Xj ,K ,K yk WZ GW @r @r @r @r Q` eS ];.^;./;.(;.cN _;.k..LW :;.:;.<;.[;.};.|;.1;.2;.3;.4;.5;.VW 6;.7;.}Z @k 0. Q( R( 8;.Fs d$ %6 9;.0;.G5 a;.b;.c;.B3 c;.R5 -, d;.e;.f;.t; g;.5, h;.i;.j;.k;.l;.&~ (+ ^+ _+ _+ ar ^~ =~ =~ =~ X@ K$ J. g, g, +| g, +| *# 9..=* Y@ g, ^~ g, ~# g, g, 5# m;.n;.NR `..o;.fB p;.q;.r;.`*.[-.s;.t;.uL hK VF VF VF hK s;.u;.VF uL uL hK hK hK `*.v;.H-.w;.fC hK x;.y;.x;.I-.z;.A;.K-.B;.%+.nj br Bl em An (p Zq OG PM C;..G qy qy lB aD lB D;.E;.uH @G @G ,T Z=.eD &+.`=.`=.eD eD &+.&+.>n ;=._.._..7V _..T+._..T+.U+.T+.T+.F;.%G {F {F iA ", +"|8 ^% @ Ba # x & S1 S1 S1 `9 @ w G* z% /' G* @ G* /' (6 :6 ~' ~' ~' ^5 (6 (6 ^5 ~' ~' ~' ~' z% ~' /' Q] z% z% @ S1 Y] n_ # @ p% S) V+ > U+ j u* P-.Fn LS .$.pA +$.+$.pA pA pA pA +$._X QY QY @$._X @$._X _X @$._X @$._X QY _X 2%.2%.2%.Z%.'=.4W 4W G;.Q-.!=.H;.I;.{=.4*.^=.!R G@.T-.E$.J;.(=.r&.)-.K;.L;.M;.<=.N;.>&.O;.P;.Q;.R;.S;.T;.U;.V;.b4 22 79 /$ &. 6{ zb y5 W;.!0 *$ J< C7 vm 59 t5 p! X;.Y;.Z;.`*.`;..=. >..>.+>.@>.#>.$>.%>.&>.*>.=>.->.;>.(Y Ty [w X >>.{l ,>.'>.:x )>.!;.L&.!>.n#.~>.{>.K&.]>.^>.j=./>.{;.(>.]>.]y _>.:>.<>.[>.l=.l=.}>.|>.1>.2>.3>.ur 4>.5>.6>.7>.Bk 8>.9>.0>.-p a>.b>.)I c>.d>.e>.f>.g>.h>.i>.j>.k>.l>.m>.n>.o>.p>.q>.s-.r>.6/ ._ s>.t>.M5 u>.v>.w>.x>.y>.z>.A>.B>.C>.D>.E>.F>.G>.-, H>.I>.J>.K>.x} Pe dm L>.M>.jK !+ ~# ,+ N>.O>.P>.Q>.R>.=>.S>.T>.N>.g, Y@ :- U>.R>.Y@ =* V>.S>.W>.X>.Y>.Z>.`>. ,.0z 0z .,.+,.r;.@,.q;.H-.#,.$,.Z*.%,.&,.;P lH jT VF `*.H-.hK fC XR } .cU XR *,.=,.-,.;,.fK ;P )*..=.>,.@,.,,.',.),.!,.~,.{,.dm ],.^,.Co /,.(,._,./,.:,.7>.<,.[,.},.|,.lB &=.1,.Ks @G dD ,T ,T _' 2,.3,.eD >n >n eD eD eD &+._..U+._.._..T+._.._..U+.T+.T+.$G {F {F {F eD ", +"^% ^% Ba & # & & S1 Y] Y] @ `+ w @ z% G* @ `+ /' /' (6 (6 ~' ~' ^5 ^5 :6 (6 Y] ^5 ~' ^5 @ ~' z% Q] z% ~' @ S1 x x # * p n V+ J# 6* g 3E 4,.Fn LS oA +$.pA +$.QY QY QY pA QY +$._X QY QY _X QY QY QY _X _X QY _X _X _X @$.2%.2%.4W Z%.'=.#Y #Y Q-.2*.R-.{=.]=.4*.+@.--.5,.0#.6,.7,.r&.a*.8,.)-.M;.M;.9,.<=.0,.a,.b,.c,.d,.e,.f,.g,.*m !$ 10 b4 /$ Bd 2{ 5=.:! zb h,.<3 r8 {@ f@ 24 %q -d i7 i,.j,.k,.[-.l,.m,.P=. >.n,.o,.p,.q,.r,.s,.t,.u,.*>.v,.;# Z@ U. U. `$ w,.x,.y,.z,.Ur A,.B,.gi )I C,.!;.mG /m D,.E,.Eh {;.F,./m {;.G,.H,.I,.<>.J,.J,.K,.L,.M,.N,.O,.P,.Q,.R,.S,.T,.U,.V,.W,.X,.Y,.Z,.`,. '..'.+'.@'.#'.$'.%'.&'. #.*'.='.K! G5 -'.I5 'y pe ;'.hR vP .G NU >'.,'.''.)'.!'.~'.O&.x>.{'.]'.^'./'.('._'.C@ :'.<'.q$ ['.}'./1 @n |'.1'.2'.3'.4'.W>.P>.V>.5'.6'.S>.W>.7'.8'.7'.9'.g, S. 7'.S>.}# S>.T>.0'.a'.b'.c'.@,.d'.0z 0z PN e'.f'.g'.h'.*] cU +| i'.j'.7'.k'.!~ !~ ;P uL `*.H-.hK hK W. K$ !~ +| 7'.l'.7'.m'.+| Y@ }# n'.o'.p'.q'.r'.s'.t'.u'.v'.w'.x'.y'.!P z'.A'.B'.C'.D'.E'.F'.G'.H'.I'.aD Y=.J'.cD @G dD ,T ,T K'.L'.s+ >n >n &+.eD &+.>n >n _..U+.&+.&+.&+.&+.&+.&+.&+._..$G lJ iA 7V mC ", +"|8 |8 @ @ x & x S1 Y] S1 `+ w `+ `+ @ G* z% `+ G* /' ~' ^5 ^5 ~' ^5 Y] ~' ~' ^5 ~' ^5 ^5 ^5 ~' ~' ~' ~' w S1 n_ & @ ^% 5* V+ m J# Ol g c` 4,.>R Ay MS +$._X _X QY _X QY QY _X _X +$._X _X _X _X _X _X QY _X _X QY _X _X _X 2%.@Y @Y 4W 4W HT #Y M'.!=.R-.{=.N'.O'.S-.!R P'.Q'.R'.S'.7,.a*.M;.0*.0*.L;.M;.W-.W-.T'.U'.V'.W'.X'.Pr Y'.Y'.Z'.`'. ).4} 62 tf &$ /& .).~H 5{ 33 .= rg g3 h,.+).@).n4 lQ =>.=>.#).%X Zw Zx $).%).&).*).=).-).;).q@ t& l^ 3i =>.E-.q@ X. () >).,).').)).)).)'.w*.!).~).C,.i=.Y$.{;.{;.{).Eh ]).^)./m /).()._).x*.:).7v <).[).}l }).|).[8 I j).k).l).m).n).o).x*.xk p)..U>.J).K).L).M).0z 0z N).@,.+=.cB `..O).YM G).7m `6 5q +| !~ W. !~ P).2,.rj P).WN hK @,.H-.fC hK W. g, Y@ W. 7'.6'.Q>.>+ F).g, d+ U>.2i Z; Q).R).E).S).$n ij T).Eh U).$R (p al V).S).8l W).7v J,.X).I'.aD D;.J'.j&.@G dD dD Y).Z).iz eD >n >n &+.eD &+.eD &+._..T+.7V 7V 7V _..7V &+._..&+.7V mC 7V 7V &+.", +"^% ^% @ @ & x x n_ x x v `+ @ `+ @ G* z% @ @ z% (6 ^5 ~' ~' ^5 Y] ~' ^5 ^5 (6 ^5 ^5 ~' z% @ D% w w x & t+ x) g# ; > e/ ^c <*.ib 4,.nU `).+$.pA QY _X QY pA QY _X _X @$.QY QY _X _X QY QY _X _X _X QY QY @$._X @$.2%.@Y 2%.@Y 4W !.M'..!.Q-.H;.]=.O'.+!.!R G@.;-.E$.-&.!-.!-.M;.!-.!-.M;.L;.@!.#!.$!.%!.&!.*!.=!.-!.;!.>!.,!.'!.)!.!!.~!.{!.2e t5 vm Sa m@ ]!.-m 33 j' >a 72 _; ]O Q i7 ^!.KL =>.n;.M. /!.eB (!._!.&).:!..Eh 8!.9!.:u u*.0!.a!.x*.Q&.b!.7l c!.bs d!.e!.f!.di Eh ln |n =p Eh g!.}$.V@.Y$.h!.Bk i!.5!.-o j!.k!.l!.m!.n!.Eh o!.p!.q!.r!.s!.t!.u!.v!.w!.x!.Eh y!.y!.z!.H,.Eh ~y A!.B!.C!.Fq D!.q!.E!.F!.G!.H!.I!.J!.Eh K!.L!.M!.N!.d= S' O!.|n P!.Q!.R!.:~ .% ^~ U>.S!.xl _r T!.U!.|n V!.[[ W!.X!.Y!.Z!.Z!.Xx `!. ~.`>..~.+~.k+ <+ -n @~.TF ;- #~.`6 W,.s+ S. $~.%o =g *r %o %~.uL @,.&~.*~. x g, W. W. =~.-~.;~.Eh Ih Eh g, >~.,~.=+ '~.)~.!~.~~.u .O-.cm 7q {~.]~.Gp V,.:u ^~.3).Lu /~.(~.[J n).I'.)F &=.X).Ku _~.-=.m+.:~.Y).eD eD eD `=.eD `=.`=.[E <~.&+.&+.eq eq 7V U+.&+.&+._..7V iA iA 7V &+.7V ", +"@ @ Ba @ * x n_ n_ n_ n_ n_ @ @ `+ @ G* @ G* /' @ ^5 ^5 ~' (6 ~' ~' ~' Y] ^5 ~' ^5 ^5 ^5 @ D% D% w w # @ @ g# ; |< ]5 [~.ib XG AH ^Q }~.MS pA QY pA QY QY QY QY QY +$._X QY _X _X _X _X QY QY _X @$.QY QY @$._X 2%.2%.Z%.@Y Z%.HT |~.:X ~=.~=.1~.2~.--.G@.5,.3~.E$.4~.5~.!-.M;.6~.7~.!-.!-.N;.8~.9~.0~.a~.'$.b~.c~.d~.e~.f~.g~.h~.UA i~.j~.Cd k~.t5 &$ c8 ]^ _O d5 u{ k~.{f .= l~.]O {h Y% m~.n~.o~.Z@ Z@ V. G$ l^ p~.q~.r~.s~.MA t~.L'.Z X X v,.u~.T. 6. Jm G,.v~.w~.x~.6l z!.y~.z~.N&.d!.A~.n#./m B~.{>.Eh 8!.D,.P!.{>.:u C~.D~.E~.y!.fi F~.}o G~.d!.lm H~.Eh b!.I~.7-.J~.7!.K~._j mG }$.Bk L~.M~.E~.k2 N~.O~.P~.Q~.j0 s!.`j sG g( R~.S~.T~.U~.V~.d!.W~.X~.47 Y~.Z~.Eh EE gi xp `~. {..{.+{.@{.#{.${.%{.&{.*{.={.-{.x. ;{.Eh +4 vt Eh >{.,{.Eh '{.){.^+ ~# O>.!{._r ~{.{{.]{.^{.%~.]u /{.({.Eh _{.0z cB :{.<{.SU Gs W>.[{.;# W>.}{.+=.=w fB |{.Eh P).P).%o ~{.xl Q>.** 1{.2{.`*.3{.Z!.0z Y@ `@ `@ 4{.cq 5{.Eh 3g Y@ Y@ d+ 6{.>~.7{. m L~.8{.%D 9{.0{.w@.a{.Eh (p V,.-o b{.Eh [J qy Eh aD c{.d{.)F *=.e{.f{.cD -.g{.h{.i{.[E `=.[E [E [E [E [E `=.eD 7V 7V eq 7V eq _.._..7V eq ,T eq eq iA eq &R ", +"^% @ Ba Ba * x n_ S1 Y] ^5 v `+ w `+ `+ @ @ G* z% @ Y] Y] ^5 (6 ~' ~' ~' ^5 ^5 ^5 Hv Hv S1 w w w D% x @ ^% z~ /% |< P# CL U0 j{.k{.^Q l{.pA MS /X W+.pA QY +$.pA QY QY +$.QY _X _X _X _X _X QY _X _X _X _X _X @$.@$.@$.2%.4W Z%.1*.sZ :X :X =$.&-.m{.n{.S-.5,.0#.Q'.4~.o{.p{.M;.q{.r{.s{.!-.7~.t{.9~.u{.v{.w{.x{.y{.z{.A{.B{.C{.D{.E{.F{.Ld G{..S!.T. 6. Jm 2,.R{.S{.T{.U{.M~.V{.z~.[$.T!.W{.}$./m B~.{>.Eh X{.!).Y{.Z{./m `{.g!.Ch rj fi F~.ur ].9).,].:E '].6!.)].t#.!].~].q Z+ Jp }o l=.Eh ah D;.Ku {].]].^].b& /].(]._].:].<].[].}].|].1].2].^>.3].4].5].Hp 6].c+ 7].8]./+ .% 9].0].a].b].c].@,.d]. x Eh e].f].g].SZ h].g, ~# i].Y).~# W>.j].P).7].k].l].m].=w n].2{.!Q Ba 9>.S. }# S>.}# tx Eh o].n].p].0z +| `@ K$ Jm cq q].Eh m'.[[ [[ ]o YM &# r].s].L~.E0 %D t].1k w@.^,.Eh Yq u].v].y'.d!.w].Dg qy lB x].I'.+G E~.y].+G @G h{.z].A].nB nB [E dD [E nB nB [E [E eD 7V eq ,T eq &R ,T 7V 7V ,T dD QG iA 7V ,T dD ", +"@ @ & & # n_ n_ n_ n_ S1 `+ @ w G* `+ @ G* G* @ G* (6 (6 :6 :6 (6 ~' (6 ~' ~' ~' S1 n_ S1 @ @ S1 # p z~ z~ }7 U+ i tC U0 -R Fn ^Q :F pA pA +$.QY pA QY _X QY QY _X QY QY 8 .uJ QY _X _X uJ QY @$.@$.QY @$.@$.@$.B].B].4W HT C].!=.2*.=$.~=.{=.D].--.;-.5,.J;.E].5~.F].G].F].6~.6~.H].I].J].$!.>&.K].L].M].N].*!.O].P].Q].R].S].T].U].V].W].]@ 92 Q_ ~^ c6 ;& ep I' `- YJ tf O_ u> qE J< 4S KL X].o~.Y].Z].l*.`]. ^.Eh .^.9p N{.bn Eh * 8$ 9. *>.u~.T. V. Jm +^.@^.>Q #^.$^.%^.%D &^.&^.T!.W{.:j *^.B~.7-.Eh =^.F,.=p -^.#].;^.>^.E~.,K ,^.'^.}o di )^.!^.J,.Eh u .+].@].:,.~^.6!.gi V@.A!.0h Ak {^.]^.C9 @{.^^./^.(^._^.:^.<^.Wj >n [^.1o }^.EP Eh ~g q Z+ oj }r R).Eh u .4).|^.1^.2^.3^.4^.5^.6^.7^._z Eh k!.8^.9^.0^.a^.b^.T!.R!.c^.in T!.TD SU d^.~# *..mH e^.f^.g^.g^.@,.h^. x *~.3{.i^.j^.YM .% g, 1# Ll Aa S; D).j].c+ k^.l^.Eh SF m].m^.Q=.KM =~.sp ^~ >~.W>.n^.az p].o^.n].*~. x +| T. K$ =~.cq 5{.Eh p^.[[ i'.&# 6{.&# r].q^.r^.2k s^.:E 1k em t^.Eh Hs u^.v^.w^.x^.d!.y^.z^.u .c{.I'.A^.E~.E;.uH B^.g{.fi Z=.Z=.Z=.,T dD @G dD Z=.dD lC Z=.,T ,T dD dD dD &R ,T eq ,T #G #G &R &R dD nB ", +"@ @ @ Ba Ba n_ S1 n_ S1 S1 w G* w G* w `+ @ G* z% G* ~' ~' z% z% ~' z% z% @ ~' ~' D% C^.S1 n_ S1 & x) z~ |7 /% o| f g 3E ;R nU LS MS .$.pA D^.pA +$.pA pA +$.+$.QY _X pA +$.uJ yK yK yK E^._X QY @$.@$._X 2%.F^.F^.G^.4W H^.I^.!=.J^.K^.{=.3*.D].^=.--.a%.J;.-&.5~.!-.L^.M^.6~.N^.O^.r{.P^.$!.a~.Q^.R^.x{.S^.T^.U^.z{.Q].cE V^.W^.X^.{r Y^.Z^.7c 3e 2e kE /$ 22 cg cg g5 92 `^. /.`- `- qE B6 ./.+/.*>.&+ @/.)- =* p^.#/.$/.Mt %/.&/.*/.=/.dn #o X. P. =>.-/.P. P. Jm cq ;/.`Q >/.,/.6i :K '/.&^.P!.W{.u%.xp )/.!/.Eh {;.F,.~/.{/.#].`{.>^.]/.[J rj h{.}o EP ^/.>r J,.Eh _j b{.V,.C'.!).6!.$D bl Cg //.=^.(/.F!.aL _/.:/..|/.nO 1o e!.z Eh Lh uR z K'.x*.JZ Eh &^.1/.`~.2/.3/.4/.5/.6/.7/.8/.~B Eh 9/.{).0/._&.~y a/.;J c+ h+ SU 0>.Eh b/.6# R( R( 0. c/.M).d/.e/. =.f/. ,.g/.h/.i/.j/.k/.l/..% m/.Ll n/.S; o/.j].p/.q/.r/.s/.t/.}t u/. x hK v/.'m s& N>.YM @% TF p].f].3{.*~.VF !~ K$ !~ w/.2,.q].Eh -# j1 cA x/.zB y/.>~.z/.A/.B/.s^.tT Co Co [).G,.(p u].A'.Zq Ip C/.D/.Eh E/.z^.F/.F/.G/.O!.9l z].z].r^.dD dD @G -=.,T dD dD -=.dD dD dD -=.-=.-=.-=.&R QG dD &R &R cD cD -=.,T -=.dD ", +"@ @ @ @ & n_ Y] S1 Y] Y] >4 `+ w @ `+ @ G* z% /' G* z% z% ~' ~' ~' z% ~' w @ w n_ Y] n_ t+ t+ 27 z~ v+ }7 f/ mb =R P-.Fn ^Q :F oA .$.MS pA [W MS QY +$.QY QY QY QY QY pA QY yK E^.yK yK IL _X _X _X _X @$.B].F^.F^.H/.I/.J/.K/.K^.L/.1~.]=.^=.--.--.;-.M/.5~.5~.M;.M;.7~.N^.N^.O^.N/.#!.O/.O/.R^.P/.S^.N].Q/.R/.S/.T/.U/.V/.@U W/.X/.Y/.Z/.`/.r .Cd Pb cc (..(.+(.@(.m6 #(.]R $(.t5 <. B> B> %(.*>.X].&(.T. 8. Z G. cd *(.=(.e~.-(.;(.Qb i! an F).X. *>.u,.O. H. >(.cq u,.,(.%J '(.)(.QP jG &^.P!.!(.u%.~(.)/.!/.Eh 1r {(.0!.](./m ^(.z*.Eh /(.fi J,.R,.nO ((.H,.t^.Eh V@.C'.V,.{/._(.xp :(.<(.[(.[(.1r (/.]^.4a _/.}(.|(.q2 Ck |^.1(.2(.3(.EP 1o (g 4(.=r 5(.r z +^.S,.6(.Eh 7(.8(.Eh 9(./].0(..T>.S. A(.Eh B(.C(.D(.VF !~ K$ !~ Eh 2,.F).Eh ]o 7m MM E(.F(.G(.H(.I(.J(.K(.u#.w@.Co <~.7l 4).wu Z,.v].y'.X).kB :E #].L(.M(.Eh r%.N(.O(.*=.a{.r^.g{.Aw @G cD cD cD -=.,T dD cD -=.-=.cD cD dD -=.dD #G #G QG cD cD @G -=.,T -=.dD ", +"^% @ Ba Ba Ba & n_ S1 S1 S1 >4 `+ w G* `+ @ @ @ G* z% z% Q] z% ~' @ z% ~' S1 Y] Y] x & t+ 27 x) ; k > ]5 g ib -R >R LS oA MS pA pA :F [W QY QY +$.+$.pA pA QY QY QY QY @$.yK uJ /G /G /G @$.2%.2%.2%.2%.P(.B].Q(.I/.Q-.R(.S(.T(.1~.U(.V(.V(.;-.>$.M/.(=.5~.p{.!-.!-.q{.!-.L^.s{.W(.X(.Y(.Z(.`(.M].R/. _.*!.._.T/.+_.@H V/.@_.1'.#_.$_.%_.&_.*_.=_. 1 -_.;_.5@ 1e .$ -N 3{ o4 j3 y6 v5 g3 !h d~.>_.*>.T$ V@ U. [. H$ )r ,_.'_.)_.)_.!_.7c Y% ^% Jm Q. |!.-/.M. Z >(.cq t,.F=.fd ~_.{_.%D :(.}$.]_.^_./_.xp !).(_.Eh $D B~.]^.u*.%].^(.x*.x^.7l __.I~.:_.<_.[_.l=.}_.Eh _j C'.7-.|_.!).1_.wF [(..8_.;K 1_.9_.0_.}o q Hl ;n a_.b_.d!.c_.di d_.2!.e_.Eh f_.g_.h_.`j i_.j_.k_.in l_.m_.x$ 1q Eh n_.o_..mm bs v_.m;.-n |j m;.W>.w_.W>.x_.u(.:+ k^.r/. % ;# D).y_.|n _r z_.8U W. K$ $o A_.B_.C_.D_.E_.o].F_.$,.G_.H_.W. xl w/.%o H).7'.Eh L{.%s %% t,..p I_.J_.K_.Iq C~.().w].L_.Lt M_.6>.Zq N_.:u *=.Eh 9l 7v F/.*=.{~.I'.)F Y=.O_.P_.+G [,.+^.P,.fi -=.-=.@G -=.dD @G cD dD @G cD dD @G @G dD #G cD QG #G QG cD @G -=.-=.@G ", +"^% @ Ba & & @ x n_ S1 S1 S1 >4 Y] ^5 `9 @ `9 `9 ^5 ~' @ ~' (6 @ Y] ~' (6 Y] n_ Y] n_ & }6 T0 ; |< > f/ /6 =R -R AH ^Q :F oA .$.8 .W+..$.8 .QY QY +$.QY QY QY _X +$.+$.QY uJ uJ uJ uJ yK _X Q_.2%.R_.B].S_.T_.U_.C].M'.V_.H;.T(.1~.W_.^=.P'.P'.E$.X_.M/.-&.0*.!-.M;.M;.7~.P^.I].P^.X(.Y_.Z_.`_.T^.Q/. :..:.+:.P].+_.@H V/.@:.6{.X>.#:.W].aO %_.&_.:l $:.%:.Bd &:.'@ b@ -N @).B> D7 f@ *:.$(.=:.-:.&+ =>.T$ V@ H$ H$ /@ w ;:.>:.)_.,:.':.):.!:.Lm Km P. =>.u,.q@ Z ^% .-.~:.0. {:.]:.^:./:.Bk $D (:._:.Kq ::.<:.(_.P!.}$.[:.]>.8).}:.|:.z*.:).g!.1:.Eh 2:.3:.4:.5:.u .#].V@.6:.7:.8:.9:.0:.a:.b:.c:.c:.|q d:.e:.aL f:.g:.h:.i:.Sm j:.1n g{.f!.q c_.`l k:.k:.k:.1o Eh Eh l:.m:.F!.^].b& C@ n:.o:.Eh s!.8/.p:.q:.A. r:.s:.t:.Eh Eh 0>.() _+ () u:.Eh Eh -~.F).g, g, s_.v:.9m ar Ih Fj Eh T!.+ [[ w:.rj _~.n;.D).W>.m/.iz x:.:+ '{.y:.]# ]# z:.k^.Gu A:.@% !~ W. (k B:.C:.M!.Eh z(.D:.uL E:.F:.G:.H:.Eh %o I:.J:.K:.T>.*r n^.%s L:.5{.ww 8].M:.N:.O:.xp P:.Q:.z'.Dg R:.S:.Zq 7).T:.U:.D~.Eh Eh x].V:.z^.W:.)F &=.*=. m c^.[,.[E X:.P,.Y:.-=.@G @G cD @G cD dD @G cD cD cD cD cD cD cD cD @G cD Ks Ks dD ,T -=.", +"@ ^% @ Ba n_ @ x n_ S1 Y] Y] S1 S1 Y] Y] ~' ~' ~' :6 (6 ~' :6 :6 ^5 S1 Y] ^5 n_ & x uy }6 T0 ; v+ R1 ^c mb =R ;R >+.Ay `).`).MS pA 8 ..$.MS W+.W+.pA QY QY pA +$._X QY QY QY QY yK QY W+.uJ F^.F^.Z:.Z:.G^.`:. <.M'.{+..<.1~.U(.2~.+<.V(.P'.M/.M/.-&.-&.U-.@<.!-.7~.7~.@!.7~.O/.#<.$<.Y_.%<.&<.T^.*<. :.=<.+:.-<.;<.><.,<.+B '<.,~.j].{p )<.!<.~<.{<.]<.^<./<.'0 && rf i4 (<.uf f@ 5$ WJ =0 YJ _<.Pr T$ KL :<.;$ 8. [. j! 4$ o9 <<.[<. L )_.'_.tg F' ;$ 9. l*.u,.4h 8. 8. Y].~:.D. 5U Oc vp %D :(.$D -^.{>.]).Kq 8!.}<.|_.n#.Y$.mG |<.T,.T,.x*.1<.9l 9l *=.R,.x*.2<.q%._j V@.}$.6:.7:.3<.wF 3_.4<.5<.6<.:1 kG 7<.8<.M{ M{ v*.i:.9<.<).0<.F~.a<.b<.[8 oj ur Ki }o {g c<.o#.8!.^L d<.e<.f<.g<.h<.i<.+c j<.k<.l<.in m<.gI n<.D$ C. o<.7].V>.k+ ~# _+ n;.N>.P>.S>.S>.p<.=* }+ S>.T>.5{.S>.T>.Z].YM K{.S. 5'.YM [[ g, X>.D).q<.[+ ]# Z. '{.j].Z. ]# !# r<.Eh s<.U>.=>.7'.t<.=>.u<.tL 8U K$ TN VF VF v<.F:. =.7'.7'.Q>.Q>.7'.w<.=>.x<.=+ y<.S>.aD pI z<.[$.A<.mj B<.Do C<.D<.r%.6>.OG |%.&=.7>.9l E<.E<.D;.J,.F<.aD +G &=.E;.+G +G [,.cD ah P,.X:.G<.cD @G cD @G Ks cD cD +G +G j&.+G uH j&.UU j&.:*.H<.lB xw cD @G cD ", +"& ^% ^% @ & & S1 n_ n_ n_ Y] S1 n_ Y] Y] ~' ~' ~' (6 (6 ~' ~' ^5 ^5 Y] Hv za n_ Bw t+ @ ^% /5 {9 R1 nd g u$.4,.^Q Ay MS [W [W MS [W QY W+.pA QY +$.QY QY QY +$.+$.QY QY _X QY _X uJ QY QY _X R_.R_.B].T_.U_. <.M'.V_.V_.I<.J<.K<.V(.L<.M<.N<.O<.P<.!-.Q<.M;.P^.#!.!-.#!.M;.J].O/.$<.Y_.P/.R<.S<.T^.T<.._.&T U<.+_.4F V<.W<.+B X<.Y<.Z<.d2 `<. [.Xl .[.+[.@[.E< 8@ .$ #[.$[. K !0 w8 fc n4 {f %[.':.&[.:<.KL :<.&= [. [. X> ;a R *[.=[.-[.>N ;[.>[.J< G$ X ,[.'[.es I. 8. )[.y<.1+ d$ ![.~[.{[.[/.h!.|_.7-.]).8!.jG 7-.b{.K&.K&.)I _j o%.K~.][.D~.^[.z*.S,.l=.J'.r%.>J o#.V@.&^.6:.(_./[.([._[.:[.<[._1 m2 ro x>.[[.D^ N5 }[.|[.u^.][.z*.lm }o }o 1[.ur 2[.EP R,.3[.4[.:j 5[.(y 5a 8v 6[.7[.8[.dl 9[.0[.a[.b[.c[.'L H=.d[.,(.=I () p<.S>.S>.S>.e[.v:.P>.f[.,+ f[.S>.P>.S>.W>.S>.S>.S>.YM YM m;.5q S. w:.W>.S; ~# X>.g[.^+ /+ /+ (+ '{.h[.(+ [+ [+ jz R,.xl i[.j[.j[.+p S@ T. gK fC VF uL uL VF VF uL N=.i[.t,.9'.&* U>.YM k[.W>.l[.+B m[.C/.n[.:o o[.9` 1#.dm Hs X#.Hp d_.p[.wu xt pI t^.q[.q[.r[.s[..].t[.)F aD D;.s[.)F +G [,..>}.,}.oj oj 2[.`9 nO 8Y :).o).]y '}.f_.)}.!}.~}.gx {}.]}.^}./}.(}._}.:}.<}.[}.d[.Ds Ds () () K( }+ }}.|}.5'.p<.=* g, ~# g, =* N>.m;.m;.t_.t_.m;.|}.,+ ~# <+ Z. [# k+ Z. Gs R!.1}./+ (+ )# )# c+ hJ )# {+ Y& 2}.3}.[+ K$ K$ !~ K$ X X [#.hK uL uL hK hK uL hK hK W. +| +| `@ >+ -# }# q) 4}.5}.r<.6}.7}.8}.9}.ru Ci 0}.Co !P fr aD $].Zq OG PG lB 9l <,.U:.7v lB +G +G aD 8+.9l )F )F +G Ev Ev [,.JZ 7v S).C/.[,.+G )F +G )F aD +G [,.+G aD uH )F uH a}.lB uH +G )F lB +G ", +"@ @ & @ Ba # x & x n_ ^5 S1 n_ Y] ^5 Y] ^5 ^5 (6 ~' Y] Y] ^5 za Bw lU uy @ b}.1%.; R0 R1 nd c}.d}.AH e}.`).pA pA [W [W pA [W /X QY /X .$.W+.QY QY QY QY QY QY QY QY _X @$.2%._X 2%.QY @Y G^.G;.I/.I^.f}.K/..<.L/.x[.m{.^=.S-.g}.z[.6,.h}.5~.U-.#!.q{.s{.N/.i}.#!.#<.O/.j}.k}.l}.m}.n}.o}.p}..:.z{.U<.q}.r}.r}.s}.t}.u}.v}.kp @p w}.(a rn x}.y}.z}.,$ 62 =a A}.&& B}..v `B !h C}.x{ 59 j' &= L. 0$ M. X> 4$ D}.i^ /$ ]$ @;.]^ *$ P9 J2 M9 :@ es T. t& t& [. T. 2[ ]) i: E}.F}.G}.h!.X{.[$.z~.[/.&^.n#._j ~y ~y >J _j _j 'T 'T 'T u .u .'T MV Vr ~y $D ])./_.H}.7(.[/.Fg I}.<[.E} Y< D^ 1: N5 J}.K}.L}.[/.4v a/.`T M}.67 ^% A di fi MV MV ~y z~.7(.]].3^.N}.FE O}.P}.Q}.R}.DG S}.T}.r:.-8 U}.;7 Ds Ds () 0. ^~ =~ K( K( ^~ g, ~# R( _ .() () () ~# */ /+ {# _+ {# {# ~# {# /+ /+ [+ /+ `$ V}.W}.1~ )# ,# ,# ,# Y& ,# !+ )# )# :~ ;X <+ !~ K$ `@ M& X T. K$ UN uL hK VF fC hK hK hK +| `@ W. W. +| `@ =~ K( ~# 5+ }}.X}.Y}.Z}.`}.|#.|#.4V |.(o Yq Eo wu Zq |%.hr hr E<.E<.qy qy AL )F +G aD aD +G )F aD aD Ev xw +G +G +G C/.[,.[,.+G )F +G aD aD aD )F +G )F lB bD uH bD )F )F )F )F uH +G ", +"& @ Ba Ba & # x x S1 ^5 S1 n_ x x S1 Y] ^5 S1 Y] Y] ^5 Y] n_ & Bw uy @ ^% .|./c } ]5 +|.u$.k{.nU ^Q D^.D^./X /X [W D^.MS [W .Y uz QY W+.QY QY QY QY QY _X _X _X QY _X @$.@Y _X _X @$.G^.U_.H^.I^.R(..<.S(.K^.@|.D].V(.;-.3~.#|.t{.t{.Q<.$|.@<.$|.7~.%|.&|.&|.O/.*|.*|.=|.-|.l}.G[.;|.>|.O].%@ ,|.BB '|.)|.)|.!|.~|.{|.]|.U].^|./|.(|._|.:|.{!.<|.62 [|.d5 }|.rf `v 33 r .||.1|.i7 !0 2 B> ~0 %$ /@ 6. q@ H. Z [. M. Bs -Q &8 3|.L} G}.4|.8!.$D }$.[$.&^.V@.)I gi ~y _j ~y ~y ~y 5|.8+.'T 'T 'T V@.V@.gi $D Kq 6|./_.7(.Fg 7|.8|.9|.X< D^ 7: Y< 0|.-}.a|.<(.b|.bl gi ch fi ; c|.; bh rj MV V@.n#.d|.e|.f|.g|.h|.i|.j|.k|.R}.l|.oL dK m|.#8 n|.o|.p|.DX _+ _ .0. 0. ^~ =~ J. ^~ ^~ R( R( R( () _ ._ .() () */ /+ {# `$ `$ I= {+ {+ /+ I= I= i+ q|.b/.,# Y& !+ !+ !+ !+ !+ W8 ,# Y& !+ }+ ^~ !~ R. K$ `@ X X !~ !~ =P uL VF uL hK hK hK +| Y@ Y@ `@ W. M& X@ g, g, /# r|.@^.s|.t|.4V l u|.v|.0}.B<.Hs Eo (p (p xt Ip Ip kB :E qy aD aD aD aD aD )F )F +G +G +G !.X].N[.I|.J|.r9 K|.L|.M|.N|.[|.Q| O|.P|.`| && W_ :O wV Q|.R|.=T t5 >2 tf {&./& Y> $; X> 4h 8. I. M. 8. /@ D7 yd I< Eb 4c i^ tf B> ~0 F' H$ 7. S|.V O. M. S|.}w T|.U|.qc &[ V|.H}.:(.[$.$D :j :j $D ~y bl V@.~y ~y V@.gi JZ V@.V@.}$.V@.}$.}$.n#.W|.([.d|.7(.X|.7|.1.,1.'1.zl 2k fU 0}.)1.B<.!P !P Gp Zq OG PM Ip hr B/.qy aD aD +G aD )F )F aD )F +G +G )F bD +G )F +G +G lB )F lB aD aD aD aD lB qy qy fz bD qy bD )F lB bD bD )F )F bD ", +"; ; ^% @ @ @ & n_ & & }6 n_ n_ n_ Y] Y] S1 S1 Hv n_ uy !1.uy ~1.T0 {1.|7 /% Se Re ]1.^1.d}./1.(1.MS pA [W D^.[W pA MS pA pA pA MS MS +$.+$.+$.+$..Y _X QY uJ yK _X uJ 6E 6E w$.2%.2%.`:.I^.w[.2*..<.L/.x[.m{.L<.w|._1.:1.<1.E].S'.Q<.Q<.P^.B[.I].N/.L O/.%<.F[.y|.[1.}1.-|.z|.A|.|1.z{.11.21.4F '|.><.F|.31.CC Q].A{.41.4S 51.61.71.81.FZ :|.<|.91.01.`J a1.{a /$ 'r ]R 1|.QH b1.y6 &$ >2 {h .21 |1 -K Yj 0h A!.V@.u .bh v+ 67 v+ R).4[.MV iG d|.1x Q~.j1.k1.l1.m1.n1.o1.p1.so D4 m>.q1.U}.r1.2~ Ds Es *..() *.._ .( ._ .*..0. 5J *..^~ _ ._ .R( _ ._ .*/ {# */ I= {+ ]+ )# (+ {+ ,# ,# !+ ,# W8 !+ &~ 1[ s1._~ _~ _~ W8 !+ ,# Y& '# {+ g, O; R. !~ W. T. T. T. K$ X. T. [#.VF hK :w #w lH Y@ M& M& `@ M& Y@ N& M& Y@ Z= 3+ t1.u1.v1.w1.#l Vq x1.B<.:o Cv Yq (p PM C;.ZN Is hr 'F .G qy lB aD aD )F )F )F )F C/.+G +G )F )F +G +G +G lB )F )F lB qy +G +G )F +G qy qy a}.=s a}.bD bD bD a}.bD bD lB ", +"Aa u+ u+ Aa y1.n_ n_ n_ n_ n_ n_ za n_ S1 n_ S1 n_ n_ Bw lU uy ~1.z1.b}.A1.|7 R0 R1 +|.B1.C1.D1./1.E1.[W MS D^.MS D^.[W pA pA pA .Y +$.pA MS QY QY QY QY pA QY QY uJ _X _X _X v$.F1.w$.2%. <.4..{+..<.R-.L/.D].^=.V(.P'.P'.:1.E].<1.A[.A[.Q<.G1.P^.L H1.O/.F[.%<.=|.y|.z|.*<.A|.z|.I1..:.87 U<.;<.J1.r}.E|.K1.U/.L1.21.T# M1.N1.E{.O1.P1.Q1.R1.g%.S1.:O L T1.U1.V1.N|.u{ @).II p! b1.NA ^@ c8 z >z :(.'/.W=.}$.}$.}$.Z1.W=.bl }$.}$.n#.}$.$D &^.jG jG H}.([.`1.`1.2.S^ R9 M, ou ,(.4U ,(.Ds _ .() () *..*..*..() *..*.._+ _+ _+ _+ _+ _+ _+ {# {# (+ Y& {+ )# ,# Y& ,# :~ :~ W8 W8 _~ ;/ ,2.6` W8 '2.(] (] '2._~ :~ ,# ,# [+ g, O; K$ R. K$ X. T. T. K$ K$ T. T. )Q tL #w #w )Q +| M& p: M& `@ p: Y@ M& p: p: %* X$ )2.!2.~2.|k dm (o ^p {2._o /p wu ZN B/.E<.:E qy .G .G aD )F lB aD )F +G +G +G +G +G +G bD )F )F )F lB bD )F )F lB qy lB lB lB bD qy fz =s =s a}.a}.]2.a}.bD u[.bD a}.", +"@ @ Aa @ & n_ n_ n_ x n_ n_ n_ n_ S1 n_ & Bw Bw uy }6 ^2.T0 /2..|.p| > Re /6 u$.XG AH (2.e}.[W [W MS [W [W [W pA [W MS MS .Y pA pA MS QY +$.+$.QY +$._X _X QY uJ _X 2%.w$.w$._2.!+..!.|~.V_.I<.1~.U(.V(.L<.L<.z[.<1.<1.:2.<2.Q<.Q<.P^.W(.&|.L O/.x|.F[.[2.-|.z|.}2.|1.|2.}1.|1.12.22.32.D|.42.r}.D|.52.62.72.(G 82.92.02.a2.6'.b2.b2.c2.jQ ++ d2.~!.e2.f2.g2.=_.<3 Q YJ RC QB h2.CZ j7 {&.Q n@ M. L. L. i2.6. i! +8 q9 f@ n! h' :@ o: V@ 8. M. 7. 0$ I. n@ j2.q@ O. DX ou k2.F4 hi a:.l2./_.8!.3w :(.[$.&^.$D &^.]).n#.$D $D }$.$D 1r 1r &^.[$.:j wF d|.m2.7|.X|..Qf r2 t2 t2 )y uF <$.~y YU cX MV [J 'T `T ~y n#.n2.ro (y o2.p2.q2.j_.r2.n1.s2.t2.u2.v2.w2.x2.y2.d$ d[.4U Cs Es G=.Es Ds Es Es _ .*..() _+ Es Ds _+ */ */ _+ Ds {# /+ `$ )# Y& ,# :~ !+ !+ _~ (] |~ (] (] ;/ _~ _~ (] '2.$6 $6 S( S( S( !+ [+ ^~ =~ K$ K$ R. K$ T. K$ K$ W. K$ K$ T. T. QN vL )Q T. W. `@ M& M& M& p: M& M& p: Y@ E. Y; &s z2.E1 g ^W Co {2._o Hs Yq Gp OG PM :E :E qy qy qy L}.+G )F aD lB )F [,.+G +G +G uH )F +G bD lB +G bD lB lB lB qy qy qy qy qy qy fz ]2.=s a}.]2.]2.a}.bD bD bD bD ", +"@ @ @ @ & * x S1 n_ u & x x n_ S1 & n_ & @ T0 z1.1%.A2./c Q0 ]5 c}.B2.k{.v[.E1.E1.(1.pA [W [W MS pA pA MS MS pA QY QY +$.QY +$._X +$.+$.QY _X _X _X _X Q_.Z:.B].`:.4W HT !.{+.R(.C2.m{.2~.^=.w|.M<.;-.E$.:2.D2.A[.G1.Q<.G1.P^.W(.L x|.x|.F[.y|.l}.l}.T<.z|..:.E2.A|.87 F2.G2.H2.I2.J2.q}.62.K2.I[.L2.M2.N2.wz +/.eR }+.O2.P2.Q2.R2.S2.T2.U2.V2.W2.9n X2.wV Y2.Z2.`2. + 3.QB i7 $(.4s .3.]H Y Z6 S8 H$ i@ M. S|.M. M. M. H$ ;$ la M9 Y> j! [. H$ M. O. q@ M. M. M. 6. 6. 6. 0$ (A +3.B8 /K ro ([.l2.@3.z~.:j X{.[$.&^.$D &^.$D n#.}$.$D $D 8!.8!.:(.vF :(.H}.dh m2.m2.#3.$3.7|.2_.c:.Zj Zj L} r2 |1 t2 ~T )y ~y V@.~y ch ch ch ch B` n#.%3.}1 4a &3.*3.=3.&2.-3.;3.>3.;2.,3.'3.)3.!3.~3.,(.wt d$ <#.Fs DX DX Ds Ds Cs Ds Es Cs ,(.,(.4U Cs Cs Ds {3.{3.]3.I= Y& '# '# ~+ !+ S( !+ W8 S( W8 I( $s $s ~+ ~+ '# Y& !+ W8 !+ 7 ^3.W8 }+ <+ !~ 5J =~ K$ K$ `@ K$ `@ K$ W. K$ `@ W. `@ T. X `@ K$ +| M& M& M& `@ `@ `@ p: M& Z= MM /3.(3._3.@4 :3.<3.6V B<.Co !P Gp Gp OG |%.kB kB qy qy lB L}.+G +G )F aD +G ==.+G )F lB NU +G +G qy bD )F )F )F bD bD qy qy qy qy qy qy qy =s =s ]2.=s a}.bD u[.bD bD bD ", +"^% @ @ @ # # x x x s & n_ x n_ n_ t+ uy @ b}.[3.1%.p| }3.Re |3.13.XG 23.v[.}*.33.MS [W [W [W [W MS pA pA pA pA pA QY MS +$..Y +$._X QY +$._X @$.v$._X _X Q_.S_.G^. <.C].M'.{+..<.~=.43.2~.L<.w|._1._1.53.O<.Q<.Q<.G1.P^.Q<.W(.&|.63.'4 %<.%<.-|.z|.73..:.T<.|2.|2.12.83.22.93.03.52.52.J[.C|.a3.a3.b3.,|.,|.c3.d3.e3.X'.Yt }+.}+.f3.w:.g3.h3.Y/.{r 6'.#+ i3.j3.k3.l3.lQ ^!.m3.i' y6 $(.a6 uf n3.vm Z6 $; &= 6= 6= o3.M. M. o3.q@ q@ 8. &= $; [. 6. , L. S|.M. M. M. M. 6. 6. [. , 3. bB lt p3.Q7 hi a:.a:.([.[/.X{.8!.$D [$.&^.&^.$D $D [$.:(.:(.:j :(.vF 6|.6|.([.dh b:.dh b:.hi 2_.Qf Qf .2.|1 q3.[(.<(.G}.$D gi bl ~y 'T 'T 'T a/.$D :(.mM P7 4d l0 =3.r3.s3.t3.u3.v3.w3.x3.y3.W*.p$.VQ d[.4U b= aH aH Ds Cs {3.=I 4U Ds {3.,(.wt d$ XW ,(.Ds Ds =I =I {3.=I z3.A3.1[ $s ~+ ~+ '# '# $s $s 1[ &] As '# ]] `$ `$ Y& '# HS HS |+ }+ S@ K$ K$ +| K$ K$ K$ K$ K$ K$ T. K$ `@ `@ K$ `@ `@ `@ `@ `@ !~ M& M& M& M& `@ M& p: M& p: cA .n mQ B3.C3.:3.%+.'1.D3.w@.>F (p Gp wu Zq B/..G qy qy lB L}.aD )F )F aD )F +G lB +G +G +G qy lB )F bD bD +G )F qy qy qy qy qy qy qy qy fz ]2.=s =s Mm =s a}.bD bD bD u[.", +"@ ^% @ * # & & & S1 u u x * & }6 T0 }6 b}./2.1%./5 v+ P# E3.U0 d}.nU e}.F3.33.k&.pA [W [W pA MS MS MS MS pA +$.pA +$.+$.pA _X QY QY QY +$.QY _X Q_.B].B].G^.G3.H3.M'.{+.V_.~=.T(.L/.V(.+<.M<.P'.N<.O<.P<.A[.A[.D2.A[.A[.&|.O/.L L I3.-|.-|.z|.73.J3.E2.|1..:.|2.F2.K3.L3.J[.03.J[.;<.21.,|.M3.T/.T/.C|.C|.62.62.LH N3.O3.x&.P3.Q3.9..Q3.R3.S3.P3.T3.U3.V3.W3.X3.p~.Y3.Z3.vl `3.V8 i' i' 4.]H Y %1 P$ 6( , 6= M. q@ M. es M. M. i@ 6= (& (& U. L. i@ 4. /. M. M. i@ 6. 6. es 8. K. JX .4.+4.q( @4.a:._[.#4.9{.H}.4.u2.,4.'4.)4.!4.M%.a. d[.a. iY 4U K=.~4.XW ]3.XW d[.d[.d[.XW d[.d[.,(.d[.4U d[.Ds Ds Bs 6; L2 1[ A: ~+ '# '# ]] `$ `$ I= {] I= I= I= /+ `$ `$ Y& }+ Sg }+ J( J. R. K$ !~ K$ `@ K$ K$ W. T. `@ W. `@ K$ K$ {4.`@ W. W. `@ !~ p: p: M& Y@ p: p: p: Y@ Y@ j1 `m >1.]4.^4.u|.jj /4.D3. |.Xq (p wu Zq PM C;.:E lB lB lB aD qy )F aD +G )F [,.+G )F +G +G j&.)F +G +G bD lB lB qy fz qy fz ~P qy fz fz Ax Mm =s =s =s =s (4.a}.a}.a}.bD ", +"@ @ @ Ba & @ @ * x n_ y u @ Ba }6 ^% b}.p| {9 R0 Q0 Re ]1._4..O /1.E1.MS D^.MS :4.MS D^.D^.[W MS MS +$.pA pA pA pA <4.<4.[4.<4.+$.QY QY _X Q_._X }4.`:.U_. <.|4.Q-..<.I<.C2.14.U(.m{.L<.T-.O<.O<.h}.A[.5~.Q<.A[.D2.P^.X(.X(.24.Z_.Z_.[2.73.}2.73.73.34.|2.P- E2.12.44.54.G2.G2.G2.62.21.,|.64.74.84.,|.C|.94.04.52.21.A{.a4.b4.U].Q3.6'.P3.c4.S3.d4.9..e4.%+ f4.X3.g4.g4.h4.vl R$ dd k#.tg i' i4.59 OA OA $; 6. , V. V. 6. q@ O. L. /. 1. L. T. `@ L. /. /. 4. i@ i@ i2.6= M. 8. 8. H. O .j4.z$ k4.l4.hi Y1.a:.Fg [/..&>.V>.J4.j].5}.#:.K4.L4.M4.N4.O4.P3 P4.h4.h4.vl R$ Y3.l3.Lc i' x{ x{ u` TK .I [. [. 8$ H$ H$ H$ , |. }. /. i@ /. 8. M. M. /. 4. /. /. i2.6= L. q@ H. Y*.Q4.R4.S4.T4.U4.ro ([.V4.//.#4.[/.Fg ([.H}./_./_./_.6|./_.dh <(.d|.H}.6|.6|.:j dh d|.L}.[(.W4.Ck Qf X4.1.>5.1#.rH vu Yq X#.X#.(p wu Zq C;.kB B/.:E .G aD aD aD )F )F lB )F lB +G )F )F qy qy lB bD bD bD qy qy bD qy qy ~P hr fz ~P ~P ~P Ax Mm =s =s =s ]2.'F a}.,5.bS bD ", +"u+ ; u+ @ @ Aa @ & Ba Ba @ s+ ^% u+ /2.A2.v+ R1 ]5 CL '5.XG AH v[.E1.D^.MS [W [W (1.(1.D^.33.MS pA /X pA pA pA pA +$.A4.[4.A4.<4.<4.QY QY Q_.Q_.QY Q_.)5. <.M'.V_.I<.~=.K^.1~.U(.2~.!5.M<.M<.O<.A[.Q<.s{.~5.{5.Q<.D4.Y_.Y_.Y(.R<.-|.z|..:.]5.|2.|2.P- |2.12.P- 12.^5.F2.F2.22.54.K3.L3./5.(5.T# 64.,|.^5.P- I[.c3._5.:5.A{.W'.<5.8'.[5.m/.}5.5}.9..T3.|5.15.*# 25.P3 Y6 P3 dd h4.vl n 35.45.dd j 4+.4+.TK 55.OA >e X H$ %; la M9 ;$ n@ }. }. }. 8. /. i2.M. M. L. 4. 6= i2.i2.9$ O. ,D 0. _+ 65.75.QE Gg l4.85.dh //.//.Fg bi dh ([./_.H}.:j H}.4<.95.hi $3.d|.Fg <(.:j dh d|.W4.05.<(.Ck s2 m4.:q [(.[(.//.9{.<(.#4.6|.6|.H}.<(.([.$3.a5.`4.b5.c5.d5.e5.f5.-3.@5.v3.g5.h5.,4.i5.j5.k5.HF l5.UQ &5.m5.3U ~3.x2.n5.M%.M%.VQ D$ /%.d[.d[.w4./) ]3.-5.d[.wt /) o5.;5./) w4.;5.)# (+ {# {# */ {# [+ ~# ~# ~# ~# Z. ]# !# !# !# }+ Z. W. !~ !~ K$ K$ X. K$ `@ K$ K$ `@ X. `@ W. W. W. K$ W. {4.{4.+| W. `@ +| M& M& Y@ p: Y@ Y@ S. l1 N& 7m 3+ p5.q5.r5.zL #n wu jU zx xt xt Zq PM kB E<..G .G qy .G qy )F +G lB lB qy )F +G +G bD qy aD lB )F bD lB lB bD ~P ~P fz qy qy Ax Ax Ax hr =s =s Mm Mm =s |M a}.bD s5.s5.", +"T0 u+ u+ u+ ^% Aa Aa y1.Aa ^% @ @ *G 1%.A2.U1 Se ^c [~.U0 XG AH ^Q Ay E1.MS MS [W [W D^.D^.33./X k&.k&.k&.k&.pA ,=.,=.$-.[4.[4.A4.QY QY Q_.QY t5.F^.Q_.G^.I/.M'.V_.~=.~=.K^.43.m{.L<.!5.u5.P'.z[.O<.A[.P^.B[.{5.v5.X(.D4.Y_.%<.Z(.T^.A|.w5.|2.|2.|2.12.P- |2.P- P- F2.P- a3.44.93.x5.y5.;<.T# C|.,|.,|.64.a3.>|.b3.z5.A{.A5.A5.B5.C5.D5.[5.E5.3}.y4.h3.F5.G5.H5.I5.J5. n P3 P3 xh h4.h4. n %% I2 P4.J2 P4.55.TK TK Q$ l3 U@ &= /@ F' `i 6( [. }. |. }. 8. 1. i@ /. }. 2. 2. i@ /. /. 1. 2. - ]+ ]# 5q +| !~ K$ R. K$ T. K$ `@ T. K$ `@ T. `@ `@ g, `@ `@ `@ `@ `@ `@ `@ W. +| `@ M& Y@ M& Z= S. Z= S. Z= `6 ,- X5.Y5.@4 4V B<.Hs wu fr OG PM C;.ZN kB Z5..G qy :E kB qy aD +G aD lB bD )F lB lB lB lB lB aD qy bD aD bD qy fz fz Ax Ax fz hr hr Ax hr Mm |M Mm Mm (4.U@.a}.a}.a}.,5.", +"T1 ^% T1 *G Aa @ Aa - u+ u+ u+ *G 57 } R1 ]5 [~.mb u$.^P `5.E1.MS MS MS `).pA MS MS pA MS D^.[W MS MS pA pA +$.+$.,=.pA QY +$.QY QY _X Q_.R_.Z:.B].G;. 6..6.R(.+6.J<.1~.K<.V(.M<.P'.M<.N<.:1.h}.:2.h}.<2.P^.X(.Y_.%<.%<.F[.l}.}2.|1.|2.12.|2.|2./> |2.P- P- ^5.|2.^5.K3.K3.22.C|.,|.C|.C|.,|.a3.,|.a3.@6.72.L2.O].O].=!.-:.+/.8'.O>.O>.8].;1.H(.#6.S!.w:.L4.$6.Lm W$ U$ je `m ;q xi 8m h4.%6.%6.Uk _S h4.&6.): j F' Q$ >e X> *6.Z6 J< o: j2.VK M' =6./. -6.5. 5. |. 9$ 4. -6.;6.;6.VK [@ >6.,6.'6.)6.!6.~6.{6.g; 9h ]6.5-.<(.^6.{].:q Ck :q :q Fg V|.n2.:q :q dh hi $3.7|.7|.$3.dh L} s2 Ck r2 }1 g1.%4.t2 q3.[(.q3.$3.g1.6<.^'.#2./6.x).(6._6.%2.:6.<6.R5.R5.[6.1I }6.|6.16.26.36.46.56.l5.KR X*.3U y2.UQ ~3.M%.M%.*5.*5.d[.d[.*5.66.]3.76.76.-5.w4.K=.86.~4.w4./) {+ `$ (+ I= I= {# ~# ~# g, ~# ~# g, g, ~# Z. [+ r, [+ r, [+ <+ Y@ +| !~ W. !~ T. K$ `@ T. T. T. `@ K$ K$ `@ Y@ `@ K$ +| +| W. `@ W. +| W. `@ M& p: M& Y@ p: p: Z= S. `6 E. `m xl 96.7}.%+.2k Xq vw Gp xt Ip Ip kB B/.hr hr Ip Is hr fz bD lB lB lB )F )F +G lB qy qy qy qy qy qy lB qy qy 06..G (4.a}.hr hr hr hr =s 'F (4.|M |M a6.U@.a}.a}.bD ", +"1%.T1 /5 *G ^% - b}.b}.b}.57 57 v+ q| P# b6.CL u$.XG c6.>R ^Q `).`).e}.e}.`).pA MS pA +$.[W [W /X pA /X (X QY .Y +$.pA pA pA +$.QY Q_.F^.Q_.R_.G^.G;.Q-.J/..<.K^.1~.m{.2~.y[.u5.3~.3~.:1.z[.P<.A[.:2.<2.X(.D4.d6.O/.*|.Z_.-|.}2.}2.|2.|2.12.12.F2.C[ /> F2.F2.^5.^5.22.K3.y5.22.64.a3.,|.64.C|.C|.@6.I[.@6.b3.B|.O].e6.f6.g6.h6.i6.O>.j6.l'.g3.M4.M4.9..S!.*# -+ d+ q) -# X$ 2+ E. P& 2+ vl -X _S h4.8m n {d q9 J< J< OA k6.7X PA v0 x{ Z6 l6.m6.sE o3./. 9$ 9$ i@ |. 1. 5. 9$ n6.M' q! 1. As o& K5.o6.p6.q6.u3.r6.M{ 7+.m#.q3.hi 5<.$3.$3.$3.g1.g1.g1.s2 g1.s2 7|.s6.`1.7|.2_.X|.s2 m4.m4.L} Qf t6.7|.t6.7|.$3.L} v>._1 P7 A9 N5.u6.v6.w6.x6.y6.z6.A6.B6.C6.D6.E6.F6.G6.H6.U5.=*.i5.I6.w2.l5.&5.X*.M%.y2.a. J6.J6.y2.M%.d[.e1.J6.d[.]3.K6.XW XW ~4.o5./) ~4.{3.;5.z3.{+ {+ Y& `$ ^# ~# ~# g, ar ~# ar ar ~# Z. Z. [+ }+ [+ [+ Z. =~ W. W. !~ !~ R. T. T. K$ T. K$ T. T. K$ K$ T. T. T. K$ +| W. W. `@ `@ W. W. X Y@ p: p: M& p: Z= Z= Y@ `6 -X m*.[# L6.wv 6}.%+.M6.;b ^p !P wu Zq xt Ip hr hr Is hr ~P qy )F +G )F )F )F lB +G )F qy qy qy fz qy qy bD bD a}.U@.U@.'F ~P Ax hr *s Is a6.Mm 'F |M |M 'F U@.bD a}.bD ", +"z1.b}.*G /2.- - /2./2.; .|. } _' P# nd N6.c` ^P nU #-.}~.`).`).`).E1.`).MS MS `).MS (X /X /X O6./X (X QY QY QY +$.+$.QY QY yK Q_.Q_.P(.S_.G;.I^.Q-..<.K^.T(.1~.U(.2~.V(.u5.N<.<1.<1.O<.Q<.A[.A[.A[.D4.D4.O/.[ %<.F[.z|.}2.P6.J3.P- |2.|2.12.^5.J3.^5.^5.44.^5.54.22.a3.K3.93.74.64.C|.74.T# 84.84.L2.Q6.R6.B|.S6.e6.T6.U6.V6.W6.#@.6'.9..X6.u,.Y6.Z6.#6.>~.]o d+ l+ pl He 1+ 2+ _S 2+ `6.l3 %6.h4.h4. n &6. j p! !:.TK 7.Z6 #; vm B> f@ %; q! /. /. 0$ /. 1. M' q! |. ;6.9$ n6.9$ .7.Ds 4 +7.@7.#7.$7.%7.&7._z l; *7.nQ =7.$3.7|.X|.`1.t6.`1.X|.X|.t6..E4 f_.;7./6.^].>7.xc ,7.'7.)7.!7.&2.~7.{7.]7.E6.!D ^7./7.(7._7.V5.:7.<7.%5.[7.~3.}7.y2.VQ M%.d[.d[.M%.d[.d[.4U YW ~4.]3.]3.Bs Bs {3.76.w4.Bs w4.Bs /) `$ `$ (+ (+ ^# ~# ar g, ar ~# ~# ~# ~# <+ <+ [+ [+ [+ [+ :+ 5J !~ K$ K$ !~ K$ K$ K$ `@ K$ `@ W. K$ `@ W. K$ T. `@ W. `@ K$ `@ K$ `@ K$ K$ M& Y@ T. M& Y@ M& M& p: M& p: `6 P& ;# o) 8b .< Yf 0{.dm Do Hs wu |%.|%.hr kB .G fz qy qy qy )F +G )F lB lB lB +G +G bD qy fz qy fz fz qy bD 06.U@.U@.'F hr hr *s gr Is =s Mm Mm |M (4.|7.a}.bD bD a}.", +"b}./2..|.57 - 17.27..|.37./c ]5 b6.CL c}.P-.AH ^Q }*.,=.47.|*.`).E1.E1.MS pA MS `).MS pA /X O6.O6.(X .Y 57.67.[4.+$.77.+$.uJ yK yK F^.87.97.4..Q-.R(..<.9N 07.2~.V(.!5.P'.z[.E$.-&.4~.4~.A[.C4.$|.X(.D4.a7.b7.F[.[2.l}.J3.P6.P6.J3.12.|2.F2.P- ^5.C[ 44.c7.d7.F2.^5.22.54.22.y5.74.C|.e7.64.84.I[.@6.>|.f7.e6.I;.T6.T6.h6.h6.g7.h7.i7.w:.j7.L4.k7.U3.l7.m7.n7._- d+ o7.b) dA %% Uk %s p7.;e P$ vl n 8m q7.r7.U OA `2.s7.#I %1 p9 /& r{ &f v0 [. n@ 5. t7.L. i2.M' q! q! }. 0$ 9$ () p+ D0 u7.v7.w7.x7.$7.y7.z7.A7.B7.aL 9|.C;.a|.|1 `1.C7.D7.E7.2_.F7.G7.H7.2_.t6.2_.2_.8|.2_.2_.t6.6<.6<.1^.I7.J7.E} j!.M5.]].K7.u6.L7.j1.M7.N7.O7.P7.Q7.R7.S7.T7.U7.V7.W7.X7.Y7.Z7.q+.`7.}` BX 8.%5.p$..8.3U 3U y2.M%.4U 4U +8.@8.d[.d[.d[.]3.~4.XW d[.Ds ]3.]3.w4.#8.$8.;5.Bs `$ Y& (+ {# {# ~# ar %8.z; &8.~# >P EY *8.~# ~# Z. Z. [+ ~# g, g, W. K$ X. T. T. `@ K$ K$ T. `@ `@ K$ T. T. K$ K$ `@ W. UF W. +| s: =8.-8.~Q X M& `@ Y@ Z= Y@ M& Y@ Z= ;8.S. j1 >8.,8.'8.)8.!8.'1.7q jB xt OG ZN B/.B/.kB :E kB .G qy qy bD lB lB lB )F bD lB )F lB qy ~P lB qy qy ~8.{8.Mm 'F |M Mm hr hr *s Is hr =s Mm gr Mm |M ]8.a}.bD ,5.bD ", +"U[ 37.A2.^8./8.(8._8.:8.U1 <8.b6.mb u$.4,.nU Ay ,=.[8.}8.|8.|*.`).`).MS MS pA pA MS pA pA (X (X 18.28.38.48.58.68.A4.A4.QY E^.E^.Q_.B].97.78.88.98.08.a8.b8.c8.d8.u5.S-.#|.E].:2.A[.Q<.Q<.A[.@<.e8.f8.g8.h8.i8.j8.l}.P6.P6.73.J3.J3.34.12.^5.12.k8.l8.m8.n8.n8.o8.54.K3.54.K3.G2.74.C|.p8.q8.r8.s8.t8.u8.v8.w8.B5.V6.U6.-q x8.y8.z8.6'.g3.-/.A8.B8.C8.D8.H, E8.Lm r|.[# b) ** 3+ ,- '- P$ >e #6 F8.G8.H8.I8.J8.K8.U g4.L8.m3.x{ s7 .).&$ v5 M8.N8.>] O8.C; P8.6= Q8.M. 6= }. 5. R8.2] t>.S8.T8.U8.V8.W8.X8.Y8.Z8.R}.|D `8. 9.*7.|1 X4..9.+9.@9.#9.$9.$9.%9.&9.1^.1^.*9.m2 E} E} 1^.1^.1^.^'.=9.-9.;9.>9.,9.'9.)9.!9.~9.{9.x6.y6.]9.^9./9.(9._9.:9.<9.[9.}9.|9.19.29.39.`7.n$.l@.t4.<7.49..8.59.J6.69.79.89.99.09.a9.b9.c9.4U =5.=5.]3.XW d[.-5.d9.e9.f9.g9.h9.i9.I= (+ I= {# /+ Z. ~# 6I j9.!] !] j9.j9.k9.l9.Z. Z. ^# Z. Z. S. W. W. K$ !~ T. K$ T. m9.G& T. T. K$ K$ K$ X. X. K$ `@ H; n9.U= 5; _[ _[ 5; o9.o9.p9.`@ M& M& p: S. Y@ q9.r9.s9.s9.t9.#* U& u9.>_ v9.v|.;b 0D Zq |%.C;.|%.|%.Ip Ip hr w9.x9.qy qy fz fz qy )F qy qy bD qy lB lB y9.z9.z9.z9.z9.A9.Mm Mm a6.Mm Mm gr *s gr a6.B9.C9.D9.E9.F9.G9.bD bD a}.", +"H9.^8..|.I9.J9.A2.K9.L9.P# E3.ib u$.XG M9.N* N9.O9.P9.Q9.R9.S9.MS MS MS MS pA pA pA pA +$.QY pA T9.U9.U9.V9.W9.A4.[4.<4.T_._X QY 87.I/.Q-.X9.Y9.Z9.`9. 0..0.+0.@0.N<.O<.D2.A[.Q<.Q<.Q<.<2.A[.#0.$0.$0.%0.&0.*0.=0.I1.J3.P6.P6.J3.J3.P- P- ^5.-0.m8.m8.m8.m8.;0.44.44.54.K3.x5.G2.64.64.>0.,0.'0.)0.!0.~0.{0.T6.T6.]0.V6.^0./0.(0._0.:0.<0.[0.}0.|0.|0.}0.10.20.30.>+ z, pH '+ '- `. 40.$; S8 50.I8.60.60.I8.Oz #6 # P3 ./.s7.x{ *$ YJ j' 70.80.90.90.[& 00.a0.6= T. X@ P 1) !] >P Z. Z. ^# ^# <+ 7m `6 g, g, Y@ a.U= _[ ,~ U= U= F; K$ T. K$ W. K$ K$ `@ T. T. SN U= _[ 5; 5; 5; 5; 5; .a.p: p: Y@ Y@ Y@ Z= Y@ gB s9.+a.+a.s9.@a.#a.U& G, ){.$a.%a.fU Co _o Gp - .&a.*a.=a.-a.;a.>a.lB qy qy bD qy lB lB lB bD qy qy ~8.z9.,a.z9.F9.'a.Mm Mm =s Mm a6.gr Is u:.k(.)a.!a.~a.{a.F9.]a.^a.(4.yP .k ", +"Z] /a.(a._a.:a.e ya.za.I8.Aa.,- l3 8D xh &(.h4.p! {&.]@ b.,b.'b.)b.!b.~b.{b.]b.^b./b.=*.y3.<7.%5.l5.l5.(b.x2._b.VQ :b.X0.|.L2.Jb.Kb.Lb.Mb.Nb.Ob.JT Pb.[+.Qb.Rb.Sb.Tb.15.Ub.ra.Vb.Wb.Xb.ta.Yb.Zb.`b. c._# .c.2+ '- 7m >e $; &= q` q` +c.60.H8.@c.:# '- P& -X 2+ h4.&6.w0 Cd 2e !0 /& +8 #c.A> +M j2.4. b= $c.nu X*.KX >k %c.x1.;b &c.*c.=c.-c.;c.,[ >c.,c.XD l|.bI ca 'c./, M{ R7 w3 )c.;9.Za.!c.~c.{c.]c.^c.j0 N5./6.f|./c.(c._c.:c..Kc.U9.Lc.S_.S_.`:.Mc.Nc..6.K/.S(.Oc.Pc..0.Qc.X>.Rc.Sc.O<.Tc.:2.5~.A[.A[.A[.<2.<2.Uc.Db.Fb.Vc.Wc.Xc.Yc.p}.Zc.Zc.]5.I+ C[ J3./> ^5.^5.F2.`c.Ib.m8. d.^5.44.y5.y5.K3.K3.54.a3.a3.>|..d.Kb.+d.c#.@d.#d.$d.%d.&d.*d.=d.oa.-d.;d.>d.,d.'d.)d.!d.~d.Xb.{d.]d.^d./d.`3.%* ,- `6 2; (d.$; q` (d._d.:d.60.+.MS [8.pA +$.MS ;e.>e.Q9.4a.,e.'e.)e.!e.+$.pA MS +$..Y pA ,;.~e.Hc.{e.Jc.48.]e.^e./e.G^.Mc.H3.|4..6.V_.wb.(e..0.c8._e.:e. I+ /> /> C[ 4e.^5.`c.5e.6e.7e.8e.9e.Ib.ia.p8.K3.22.E4.F2.P- %@ 0e.ae.be.b#.ce.de.ee.fe.ge.he.ie.je.ke.le.me.ne.oe.!d.pe. 7.qe.re.^d.se.%1 Z6 S8 .I $; te.ue.(d.ve.we.xe.ye.mF ze.Ae.Be.Ce.De.bd _S Z3.g4.1d.4s 3e Ee.Fe.Ge.He.Y #;.Y> IF Ie.Je.Ke.-*.Le.Me.(&.(4.wc.Ne.Oe.!a.Pe.Qe.Re.Se.Te.Ue.Ve.^ .We.Xe.Ye.q$ b& od.Ze.`e. f..f.+f.@f.#f.,7.$f.2x +{.w6.%f.&f.~9.*f.=f.-f.D0.;f.>f.xd.,f.5c.'f.)f.!f.~f.{f.]f.0w ^f./f.bc.(f.]b._f.:f.(7.Jd.}` 1.df.zl Xq xt PG Ip wc.ef.,a.ff.gf.hf.if.jf.bD bD qy qy qy qy bD qy x9.z9.kf.!L lf.mf.,a.oZ lf.Mm nf.a6.u:.eb.of.of.pf.qf.rf.~a.yc.zc.Au sf.Bu tf.", +"uf.vf.wf.xf.XG k{.AH ^Q yf.,=.[8.pA QY pA zf.qb.'e.,e.Af.Bf.Cf.58.Df.pA pA pA /X pA QY QY /X Ef.Ff.Gf.Hf.`:.`:. <.If.I^.R(..<.S(.J<.Jf.Kf.Lf.Mf.Nf.Cb.Of.Pf.A[.<2.A[.<2.A[.Y_.Y_.Y_.Qf.Rf.Gb.Sf.T<.T<.Yc.Tf..:.J3.C[ Uf./> Zc.Zc.I+ kl Vf.n8.n8.Wf.Xf.u_ Ib.Yf.Zf.Zf.`f.22. g.11.11.z{..g.+g.'$.@g.#g.$g.%g.g .=d.&g.*g.=g.-g.me.;g.>g.,g.'g.RC u` )g.!g.~g.{g.;e $; $; 6( $; &= S8 ]g.ya.I8.za.^g./g.I8.G8.(g._g.Xd.:g.8m p~.p~._$.Qb .8g.9g.0g.ag.bg.cg.dg.eg.fg.gg.hg.ig.jg.kg.lg.mg.ng.og.A. pg.qg.rg.sg.tg.tg.ug.vg.wg.xg.yg.zg.Ag.~z Bg.Cg.~z Dg.Eg.Fg.Gg.Hg.Ig.Jg.,f.Kg.Lg.7c.Mg.Ng.Og.Og.Pg.Qg.Rg.Sg.]A Tg.dc.Ug.Vg.Wg.Jd.Xg.1@.Yg.~C 0$.[f.Zg.`g. h.J6..h.Y0.+h.@h.kc.#h.aH <#.Fs Fs Es Ds *..*..$h.|b.3f.lc.{~ ar ar ^~ g, g, <+ ~# ar ~# ar ar ~# n, n, ~# %h.2) Ud.7f.~# `6 S. Y@ W. +| W. &h.*h.`^ +/ C& H; :[ 5; f, !~ !~ !~ +| a.U= s: W. +| nc.r9.+| +| +| W. =h. a.S. s& G$ 9f.o9.-h.Z= i'.;h.T& &* _# `3.O& >h.,h.'h.)h.fA Gp Ip PG !h.ef.E9.E9.~h.{h.{8.]h.x9.fz qy qy ~P qy cb.db.^h.^h./h.(h.,a._h.mf.:h.:h.e.$-.9h.5a.18.$-.pA pA MS pA /X (X (X (X 0h.U9.ah.bh.G3. <.M'.Q-.R(.ch.H;.dh.43.2~.:e.eh.fh.gh.hh.[e.ih.:2.Q<.A[.A[.X(.x|.%<.=|.jh.;|.kh.lh.Zc.3e.l8.Tf.]5.I+ ]5.mh.mh.w5.]5.C[ 7e.nh.oh.Wf.ph.Ib.Ib.qh.K3.K3.rh.c7.F2. g.B|.%@ sh.th.uh.vh.wh.xh.|{.yh.zh.Ah.;d.>d.Bh.,d.;g.Zb.Ch.Dh.RC b1./d.Eh.Fh.{g.Z6 Z6 6( $; 6( S8 $; S8 Gh.Hh.H8.Ih.Jh.za.Hh.Kh.%* Lh.Mh.Nh.Oh.Ph.ec Qb Qh.Rh.Sh.Th.{&.t5 /& ;a M9 Uh.Vh.Wh.Xh.Gk (&.Yh.a}.{P d+.u[.Zh.`h.6a i..i.+i.@i.#i.$i.[@ %i.J6.!6.&i.*i.=i.-i.;i.>i.,i.'i.)i.!i.#b.~i.{i.{i.B0.Fg.]i.Fg.^i./i.(i._i._i.:i. I+ I+ I+ I+ Wi.Xi.Yi.Zi.Ib.`c.`i.64.^5. j.ha.+:.z{.*!..j.'$.+j.@j.#j.$j.%j.&j.*j.;d.=j.le.-j.'d.;j.>j.,j.RC b1.b1.b1.~g.ye.'j.Z6 Z6 S8 $; 6( $; $; $; ;e )j.!j.~j.{j.za.:d.]j.^j.@8 `6 /j.(j..# T8 _j.o*.:j.k.2~.,k.ca.O<.'k.|e.)k.!k.}e.W(.D2.~k.Cb.~k.-|.z|.J3.P6.p}.p}.Zc.kl {k.5e.l8.I+ o/ C[ C[ I+ I+ o/ I+ o/ 2 ]k.^k.n8.ha./k.(k.;0._k.:k.l.,l.DX DX eC @, Kj.'l.Od.O+.Fs G=.G=.*.._ ._ .)l.!l.~l.5J ^~ =~ =~ g, ar ^~ =~ ar g, ^~ ~# ar n, j9.n, S; ~# ~# <+ Z. S; [[ S. Y@ Y@ +| Y@ !~ P( U= C& W. K$ K$ W. W. K$ W. +| Y@ +| +| Y@ oc.{l.3b.g, W. z%.UF z%.Y@ g, g, S. Z= Z= Z= Y@ ]l.^l./l.(l.E)._l.:l.5.[l.Zq kB ~P pI .e.,a.~h.qy qy qy qy lB aD lB qy fz fz qy qy qy #e.z9.}l.a}.Vj.sK oZ |l.1l.gb.yc.of.[h.2l.~a.3l.&e.4l.Ei.Ei.&q zt sf.5l.6l.", +"v[.Ay MS 7l.pA +$.QY QY +$.MS 8 .QY +$.QY pA pA !e.Hc.$-.k&.MS pA pA k&.k&.vb.}4.}4.8l.8l.9l.Li. <.n>.0l.n>.B4.al.dh.J<.J<.bl.Oi. |2.Zc.Uf.w5.Uf.Uf.7e.l8.C[ I+ C[ I+ I+ I+ ]k.]k.]k.o/ I+ ^k.nh.il./k./k.P- jl.kl.R/.y{.ll.+j.ml.Q'.nl.1k.ol.pl.ql.rl.sl.tl.'d.;j.Zb.ul.ul. 7.^d.U {g.Z6 vl.wl.xl.yl.]g.S8 S8 Zz :@ $; >e S8 ;e zl.P$ ;e Al.bk.Bl.S8 Cl. # Dl.hk. 7.!:.El.Fl.0O Gl.Hl.Il.Jl.lk.$(.v5 s7 x{ Kl.Ll.Ml.S, Nl.N5 =9.Ol.a).Pl.Ql.Rl.Sl.Tl.Ul.Vl.QO Wl.cj.Xl.Yl.;6.|. |. Zl.Zg.`l.A= m..m.+m.D@ @m.N7.#m.Ag.$m.Mk.%m.&m.*m.=m.*b.-m.;m.>m.Og.,m.vj.Zk.'m.)m.!m.~m.{m.Cj.]m.^m./m.(m._m.%l.:m.e .I S8 >e Qm.Rm.Jh.zl.)j.Sm. 7./d.OA !:.Fl.Tm.Tm.&_.Um.(} Vm.Wm.Xm.Ym.Zm.d^ `m. n.:g..n.+n.@n.#n.$n.%n.&n.*n.=n.-n.;n.>n.,n.'n.)n.Ak.Yl.!n.~n.1. }. 1. {n.[7.]n.^n./n.(n.+m.G9 _n.'7.Jk.:n.Mk.k.+<.:e.Pi.ca.Cb.h}.D2.d6.Kn.G[ vm.vm.Ln.Qf.f| Mn.}2.73.]5.]5.I+ ]5.Uf.mh./k.I+ I+ o/ I+ /> Nn.On.I+ Pn.3> 3> ]k./> F2.^5.44./k.>|.+:.o}.Qn.Rn.'$.&S a#.Sn.Tn.1k.Un.Vn.Wn.Xn.Yn.Zn.tl.'d.`n.Zb.>j.ul./d.^d.^d.~g.%1 wl.vl.wl.vl.v0 $; S8 S8 o..o.:@ S8 S8 vl.P$ ;e $; S8 $; $; S8 ~g.p7.+o.OA {g.p! 1d.@o.:|.#o.@o.]R YJ Cd $o._$.II %o.%o.b1.%1 ;e `$ vg &8 &o.*o.=o.-o.;o.>o.,o.Xk.'o.)o.!o.~o.~o.{o.!n.]o.^o./o.(o./. _o.T}.:o. Pn.On.I+ Pn.On.On.I+ ]k.]k.^5.^5.^5.^5.>|.O].=<.R/.R/.Ho.Ho._+.Io.Tn.Jo.Ko.Lo.Mo.Im.No.7k.Oo.ne.;j.,j.#I 9k.^d.^d.~g.U Z6 Z6 $; A> S8 $; $; $; la S8 $; ;e S8 S8 $; ;e OA ;e Zz vl.S8 vl.S8 ;e Po.Qo.>e v0 V8 R@.$L bP #o.PH @J *$ ]@ 0O Ro.4+.OA z> z> U %1 5e #;.g, aH So.To.Uo.Vo.,n.Wo.Xo.Yo.Zo.`o. p..p.{o.+p.+p.@p.#p.$p.6= o@ a. ew dy 9C r$ *) 81 %p.&p.*p.=p.-p.;p.4o.>p.,p.'p.)p.!p.~p.Zk.'m.{p.]p.co.%%.^C Yg.1&.Yg.:7.L .36.36.L .n$.^C :7.}` T0.<7.^p.p$.3U X*.d[.M%.<#.Fs G=._ .0. R( 0. (A (A 0. =~ =~ =~ 5J ^~ =~ =~ ^~ =~ =~ =~ g, Y@ S. +| +| +| Y@ g, Y@ Y@ [[ S. g, [[ [[ S. S. 5q [[ g, S. Y@ Y@ Y@ +| +| !~ !~ !~ !~ W. +| W. K$ W. W. !~ K$ K$ +| `@ `@ `@ W. +| g, Y@ `@ W. g, +| g, Z= >e ;e o: S. R; [# t_./p.1#.fU ]Q (p.r5._p.0+ )- Y; 1}.:p.xu 06.fz qy lB lB bD a}.qy lB qy bD qy bD qy bD lB qy lB Au dm.m[.m[.yt s<.to.`j.`j.`j.`j.4l.im.Ei. ^. ^.vo.&q jm.mB jm.wo.jm.km.km."}; diff -Nru gimageview-0.2.27/src/pixmaps/hand-closed-data.xbm gimageview-0.3.0-0.20101117/src/pixmaps/hand-closed-data.xbm --- gimageview-0.2.27/src/pixmaps/hand-closed-data.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/hand-closed-data.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,9 @@ +/* Made with Gimp */ +#define hand_closed_data_width 20 +#define hand_closed_data_height 20 +static char hand_closed_data_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x80, 0x3f, 0x00, + 0x80, 0xff, 0x00, 0x80, 0xff, 0x00, 0xb0, 0xff, 0x00, 0xf0, 0xff, 0x00, + 0xe0, 0xff, 0x00, 0xe0, 0x7f, 0x00, 0xc0, 0x7f, 0x00, 0x80, 0x3f, 0x00, + 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/pixmaps/hand-closed-mask.xbm gimageview-0.3.0-0.20101117/src/pixmaps/hand-closed-mask.xbm --- gimageview-0.2.27/src/pixmaps/hand-closed-mask.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/hand-closed-mask.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,9 @@ +/* Made with Gimp */ +#define hand_closed_mask_width 20 +#define hand_closed_mask_height 20 +static char hand_closed_mask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x80, 0x3f, 0x00, 0xc0, 0xff, 0x00, + 0xc0, 0xff, 0x01, 0xf0, 0xff, 0x01, 0xf8, 0xff, 0x01, 0xf8, 0xff, 0x01, + 0xf0, 0xff, 0x01, 0xf0, 0xff, 0x00, 0xe0, 0xff, 0x00, 0xc0, 0x7f, 0x00, + 0x80, 0x7f, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/pixmaps/hand-open-data.xbm gimageview-0.3.0-0.20101117/src/pixmaps/hand-open-data.xbm --- gimageview-0.2.27/src/pixmaps/hand-open-data.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/hand-open-data.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,9 @@ +/* Made with Gimp */ +#define hand_open_data_width 20 +#define hand_open_data_height 20 +static char hand_open_data_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, + 0x60, 0x36, 0x00, 0x60, 0x36, 0x00, 0xc0, 0x36, 0x01, 0xc0, 0xb6, 0x01, + 0x80, 0xbf, 0x01, 0x98, 0xff, 0x01, 0xb8, 0xff, 0x00, 0xf0, 0xff, 0x00, + 0xe0, 0xff, 0x00, 0xe0, 0x7f, 0x00, 0xc0, 0x7f, 0x00, 0x80, 0x3f, 0x00, + 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/pixmaps/hand-open-mask.xbm gimageview-0.3.0-0.20101117/src/pixmaps/hand-open-mask.xbm --- gimageview-0.2.27/src/pixmaps/hand-open-mask.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/hand-open-mask.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,9 @@ +/* Made with Gimp */ +#define hand_open_mask_width 20 +#define hand_open_mask_height 20 +static char hand_open_mask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x3f, 0x00, + 0xf0, 0x7f, 0x00, 0xf0, 0x7f, 0x01, 0xe0, 0xff, 0x03, 0xe0, 0xff, 0x03, + 0xd8, 0xff, 0x03, 0xfc, 0xff, 0x03, 0xfc, 0xff, 0x01, 0xf8, 0xff, 0x01, + 0xf0, 0xff, 0x01, 0xf0, 0xff, 0x00, 0xe0, 0xff, 0x00, 0xc0, 0x7f, 0x00, + 0x80, 0x7f, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff -Nru gimageview-0.2.27/src/pixmaps/Makefile.am gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.am --- gimageview-0.2.27/src/pixmaps/Makefile.am 2004-05-23 14:07:57.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -54,4 +54,11 @@ stop2.xpm \ eject.xpm -EXTRA_DIST = $(default_icon_DATA) +EXTRA_DIST = \ + $(default_icon_DATA) \ + hand-closed-data.xbm \ + hand-closed-mask.xbm \ + hand-open-data.xbm \ + hand-open-mask.xbm \ + void-data.xbm \ + void-mask.xbm diff -Nru gimageview-0.2.27/src/pixmaps/Makefile.in gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.in --- gimageview-0.2.27/src/pixmaps/Makefile.in 2004-12-28 04:01:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,541 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = src/pixmaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(default_icondir)" -default_iconDATA_INSTALL = $(INSTALL_DATA) -DATA = $(default_icon_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -default_icondir = $(DESTDIR)$(gimv_icondir)/default -default_icon_DATA = \ - alert.xpm \ - archive.xpm \ - back.xpm \ - close.xpm \ - dotfile.xpm \ - folder-go.xpm \ - folder-link.xpm \ - folder-link-open.xpm \ - folder-lock.xpm \ - folder-open.xpm \ - folder-up.xpm \ - folder.xpm \ - folder48.xpm \ - forward.xpm \ - fullscreen.xpm \ - gimageview.xpm \ - gimv_icon.xpm \ - image.xpm \ - home.xpm \ - leftarrow.xpm \ - nav_button.xpm \ - nfolder.xpm \ - no_zoom.xpm \ - paper.xpm \ - prefs.xpm \ - question.xpm \ - refresh.xpm \ - resize.xpm \ - rightarrow.xpm \ - rotate.xpm \ - search.xpm \ - skip.xpm \ - small_archive.xpm \ - small_close.xpm \ - small_home.xpm \ - small_refresh.xpm \ - small_up.xpm \ - up.xpm \ - stop.xpm \ - up.xpm \ - zoom.xpm \ - zoom_fit.xpm \ - zoom_in.xpm \ - zoom_out.xpm \ - next_t.xpm \ - prev_t.xpm \ - ff.xpm \ - rw.xpm \ - play.xpm \ - pause.xpm \ - stop2.xpm \ - eject.xpm - -EXTRA_DIST = $(default_icon_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pixmaps/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/pixmaps/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-default_iconDATA: $(default_icon_DATA) - @$(NORMAL_INSTALL) - test -z "$(default_icondir)" || $(mkdir_p) "$(DESTDIR)$(default_icondir)" - @list='$(default_icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(default_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(default_icondir)/$$f'"; \ - $(default_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(default_icondir)/$$f"; \ - done - -uninstall-default_iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(default_icon_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(default_icondir)/$$f'"; \ - rm -f "$(DESTDIR)$(default_icondir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(default_icondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-default_iconDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-default_iconDATA uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-default_iconDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-default_iconDATA \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/src/pixmaps/void-data.xbm gimageview-0.3.0-0.20101117/src/pixmaps/void-data.xbm --- gimageview-0.2.27/src/pixmaps/void-data.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/void-data.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,5 @@ +/* Created with The GIMP */ +#define void_data_width 1 +#define void_data_height 1 +static unsigned char void_data_bits[] = { + 0x00 }; diff -Nru gimageview-0.2.27/src/pixmaps/void-mask.xbm gimageview-0.3.0-0.20101117/src/pixmaps/void-mask.xbm --- gimageview-0.2.27/src/pixmaps/void-mask.xbm 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/pixmaps/void-mask.xbm 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,5 @@ +/* Created with The GIMP */ +#define void_mask_width 1 +#define void_mask_height 1 +static unsigned char void_mask_bits[] = { + 0x00 }; diff -Nru gimageview-0.2.27/src/prefs.c gimageview-0.3.0-0.20101117/src/prefs.c --- gimageview-0.2.27/src/prefs.c 2004-09-29 06:13:50.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs.c,v 1.81 2004/09/29 06:13:50 makeinu Exp $ + * $Id: prefs.c 1206 2009-01-13 02:15:04Z makeinu $ */ #include @@ -104,11 +104,7 @@ {"charset_locale", D_STRING, "default", &conf.charset_locale}, {"charset_internal", D_STRING, "default", &conf.charset_internal}, {"charset_auto_detect_lang", D_ENUM, "0", &conf.charset_auto_detect_lang}, -#ifdef USE_GTK2 {"charset_filename_mode", D_ENUM, "1", &conf.charset_filename_mode}, -#else - {"charset_filename_mode", D_ENUM, "0", &conf.charset_filename_mode}, -#endif {"charset_filename", D_STRING, "default", &conf.charset_filename}, /* filter */ @@ -306,13 +302,6 @@ }; -static ConfParam param_wallpaper [] = { - {"wallpaper_menu", D_STRING, - "GNOME1,background-properties-capplet;GNOME2,gnome-background-properties;KDE,kcmshell background;KDE(RedHat8),kcmshell kde-background", - &conf.wallpaper_menu}, - {NULL, D_NULL, NULL, NULL} -}; - static ConfParam param_progs [] = { {"progs[0]", D_STRING, "Gimp,gimp-remote -n,FALSE", &conf.progs[0]}, {"progs[1]", D_STRING, "XPaint,xpaint,FALSE", &conf.progs[1]}, @@ -414,7 +403,6 @@ {"Slide Show", param_slideshow}, {"Search", param_search}, {"Drag and Drop", param_dnd}, - {"Wallpaper", param_wallpaper}, {"External Program", param_progs}, {"Plugin", param_plugin}, {NULL, NULL}, diff -Nru gimageview-0.2.27/src/prefs.h gimageview-0.3.0-0.20101117/src/prefs.h --- gimageview-0.2.27/src/prefs.h 2004-09-22 14:26:23.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs.h,v 1.60 2004/09/22 14:26:23 makeinu Exp $ + * $Id: prefs.h 1039 2004-09-22 14:26:24Z makeinu $ */ #ifndef __PREFS_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/Makefile.am gimageview-0.3.0-0.20101117/src/prefs_ui/Makefile.am --- gimageview-0.2.27/src/prefs_ui/Makefile.am 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/Makefile.am 2010-11-17 06:10:11.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- -CLEANFILES = *~ .deps/* .*.swp .*.swo +CLEANFILES = *~ .*.swp .*.swo noinst_LTLIBRARIES = libgimv_prefs_ui.la diff -Nru gimageview-0.2.27/src/prefs_ui/Makefile.in gimageview-0.3.0-0.20101117/src/prefs_ui/Makefile.in --- gimageview-0.2.27/src/prefs_ui/Makefile.in 2004-12-28 04:01:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,612 +0,0 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- - -SOURCES = $(libgimv_prefs_ui_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -subdir = src/prefs_ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gdk-pixbuf.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnome.m4 \ - $(top_srcdir)/m4/gtk.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/imlib.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/libcharset.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwmf.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/xine.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgimv_prefs_ui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgimv_prefs_ui_la_OBJECTS = prefs_ui_common.lo prefs_ui_etc.lo \ - prefs_ui_imagewin.lo prefs_ui_movie.lo prefs_ui_progs.lo \ - prefs_ui_thumbalbum.lo prefs_ui_thumbwin.lo prefs_ui_plugin.lo -libgimv_prefs_ui_la_OBJECTS = $(am_libgimv_prefs_ui_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/prefs_ui_common.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_etc.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_imagewin.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_movie.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_plugin.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_progs.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_thumbalbum.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/prefs_ui_thumbwin.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgimv_prefs_ui_la_SOURCES) -DIST_SOURCES = $(libgimv_prefs_ui_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARCHIVER_PLUGIN_DIR = @ARCHIVER_PLUGIN_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BZLIB_CFLAGS = @BZLIB_CFLAGS@ -BZLIB_LIBS = @BZLIB_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLLOADER_CFLAGS = @DLLLOADER_CFLAGS@ -DLLLOADER_LIBS = @DLLLOADER_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_EXIF_FALSE = @ENABLE_EXIF_FALSE@ -ENABLE_EXIF_TRUE = @ENABLE_EXIF_TRUE@ -ENABLE_GDK_IMLIB_FALSE = @ENABLE_GDK_IMLIB_FALSE@ -ENABLE_GDK_IMLIB_TRUE = @ENABLE_GDK_IMLIB_TRUE@ -ENABLE_GDK_PIXBUF_FALSE = @ENABLE_GDK_PIXBUF_FALSE@ -ENABLE_GDK_PIXBUF_TRUE = @ENABLE_GDK_PIXBUF_TRUE@ -ENABLE_JPEG_FALSE = @ENABLE_JPEG_FALSE@ -ENABLE_JPEG_TRUE = @ENABLE_JPEG_TRUE@ -ENABLE_LIBRSVG_FALSE = @ENABLE_LIBRSVG_FALSE@ -ENABLE_LIBRSVG_TRUE = @ENABLE_LIBRSVG_TRUE@ -ENABLE_MNG_FALSE = @ENABLE_MNG_FALSE@ -ENABLE_MNG_TRUE = @ENABLE_MNG_TRUE@ -ENABLE_MPLAYER_FALSE = @ENABLE_MPLAYER_FALSE@ -ENABLE_MPLAYER_TRUE = @ENABLE_MPLAYER_TRUE@ -ENABLE_SPI_FALSE = @ENABLE_SPI_FALSE@ -ENABLE_SPI_TRUE = @ENABLE_SPI_TRUE@ -ENABLE_WMF_FALSE = @ENABLE_WMF_FALSE@ -ENABLE_WMF_TRUE = @ENABLE_WMF_TRUE@ -ENABLE_XINE_FALSE = @ENABLE_XINE_FALSE@ -ENABLE_XINE_TRUE = @ENABLE_XINE_TRUE@ -EXEEXT = @EXEEXT@ -EXIF_CFLAGS = @EXIF_CFLAGS@ -EXIF_LIBS = @EXIF_LIBS@ -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ -GDK_PIXBUF2_REQUIRED = @GDK_PIXBUF2_REQUIRED@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED = @GDK_PIXBUF_REQUIRED@ -GENCAT = @GENCAT@ -GIMV_IMAGELIB_CFLAGS = @GIMV_IMAGELIB_CFLAGS@ -GIMV_IMAGELIB_LIBS = @GIMV_IMAGELIB_LIBS@ -GLIB2_REQUIRED = @GLIB2_REQUIRED@ -GLIBC21 = @GLIBC21@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMODULE2_REQUIRED = @GMODULE2_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_CFLAGS = @GNOMEUI_CFLAGS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GTK2_REQUIRED = @GTK2_REQUIRED@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HAVE_BZLIB_FALSE = @HAVE_BZLIB_FALSE@ -HAVE_BZLIB_TRUE = @HAVE_BZLIB_TRUE@ -HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ -HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ -IMAGE_LOADER_PLUGIN_DIR = @IMAGE_LOADER_PLUGIN_DIR@ -IMAGE_SAVER_PLUGIN_DIR = @IMAGE_SAVER_PLUGIN_DIR@ -IMAGE_VIEW_PLUGIN_DIR = @IMAGE_VIEW_PLUGIN_DIR@ -IMLIB_CONFIG = @IMLIB_CONFIG@ -IMLIB_REQUIRED = @IMLIB_REQUIRED@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -IO_STREAM_PLUGIN_DIR = @IO_STREAM_PLUGIN_DIR@ -JPEG_CFLAGS = @JPEG_CFLAGS@ -JPEG_LIBS = @JPEG_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCHARSET = @LIBCHARSET@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBRSVG_REQUIRED = @LIBRSVG_REQUIRED@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWMF_CFLAGS = @LIBWMF_CFLAGS@ -LIBWMF_CONFIG = @LIBWMF_CONFIG@ -LIBWMF_LIBS = @LIBWMF_LIBS@ -LIBWMF_REQUIRED = @LIBWMF_REQUIRED@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -OAF_CFLAGS = @OAF_CFLAGS@ -OAF_LIBS = @OAF_LIBS@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THUMBNAIL_PLUGIN_DIR = @THUMBNAIL_PLUGIN_DIR@ -THUMBNAIL_VIEW_PLUGIN_DIR = @THUMBNAIL_VIEW_PLUGIN_DIR@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINE_ACFLAGS = @XINE_ACFLAGS@ -XINE_CFLAGS = @XINE_CFLAGS@ -XINE_CONFIG = @XINE_CONFIG@ -XINE_LIBS = @XINE_LIBS@ -XINE_REQUIRED = @XINE_REQUIRED@ -XML_CFLAGS = @XML_CFLAGS@ -XML_LIBS = @XML_LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZVT_LIBS = @ZVT_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -docdir = @docdir@ -exec_prefix = @exec_prefix@ -gimv_datadir = @gimv_datadir@ -gimv_docdir = @gimv_docdir@ -gimv_icondir = @gimv_icondir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -CLEANFILES = *~ .deps/* .*.swp .*.swo -noinst_LTLIBRARIES = libgimv_prefs_ui.la -INCLUDES = \ - $(GTK_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -libgimv_prefs_ui_la_LIBADD = \ - $(GTK_LIBS) - -libgimv_prefs_ui_la_SOURCES = \ - prefs_ui_common.c prefs_ui_common.h \ - prefs_ui_etc.c prefs_ui_etc.h \ - prefs_ui_imagewin.c prefs_ui_imagewin.h \ - prefs_ui_movie.c prefs_ui_movie.h \ - prefs_ui_progs.c prefs_ui_progs.h \ - prefs_ui_thumbalbum.c prefs_ui_thumbalbum.h \ - prefs_ui_thumbwin.c prefs_ui_thumbwin.h \ - prefs_ui_plugin.c prefs_ui_plugin.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/prefs_ui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/prefs_ui/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgimv_prefs_ui.la: $(libgimv_prefs_ui_la_OBJECTS) $(libgimv_prefs_ui_la_DEPENDENCIES) - $(LINK) $(libgimv_prefs_ui_la_LDFLAGS) $(libgimv_prefs_ui_la_OBJECTS) $(libgimv_prefs_ui_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_etc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_imagewin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_movie.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_progs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_thumbalbum.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs_ui_thumbwin.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_common.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_common.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_common.c 2004-09-22 14:26:23.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_common.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,25 +18,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_common.c,v 1.6 2004/09/22 14:26:23 makeinu Exp $ + * $Id: prefs_ui_common.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "charset.h" #include "gimv_elist.h" #include "fileload.h" /* #include "gimv_image.h" */ #include "gimv_mime_types.h" -#include "gtkutils.h" -#include "menu.h" #include "prefs.h" #include "prefs_ui_common.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" #include "utils.h" +#include "utils_char_code.h" +#include "utils_gtk.h" +#include "utils_menu.h" typedef struct PrefsWin_Tag { @@ -74,7 +74,6 @@ }; -#if HAVE_GDK_PIXBUF static const gchar *interpolation_items[] = { N_("Nearest"), N_("Tiles"), @@ -82,7 +81,6 @@ N_("Hyperbolic"), NULL }; -#endif /* HAVE_GDK_PIXBUF */ static const gchar *charset_to_internal_items[] = { @@ -515,7 +513,7 @@ GtkWidget *combo = data; config_changed->charset_filename_mode - = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); set_sensitive_filename_charset_mode (config_changed->charset_filename_mode, combo); @@ -532,9 +530,7 @@ prefs_common_page (void) { GtkWidget *main_vbox, *frame, *table, *vbox, *alignment; -#if HAVE_GDK_PIXBUF GtkWidget *hbox; -#endif /* HAVE_GDK_PIXBUF */ GtkWidget *label; GtkWidget *option_menu; GtkWidget *toggle, *radio0, *radio1, *radio2; @@ -615,11 +611,6 @@ _("Do not follow symbolic link")); gtk_box_pack_start (GTK_BOX (vbox), radio1, FALSE, FALSE, 0); -#ifndef USE_GTK2 - gtk_widget_set_uposition (GTK_WIDGET(radio0), 40, -1); - gtk_widget_set_uposition (GTK_WIDGET(radio1), 40, -1); -#endif - radio2 = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio1), _("Do not follow link to parent directory")); /* not implemented yet @@ -634,18 +625,17 @@ else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio1), TRUE); - gtk_signal_connect (GTK_OBJECT (radio0), "toggled", - GTK_SIGNAL_FUNC (cb_recursive_follow_symlink), - GINT_TO_POINTER(0)); - gtk_signal_connect (GTK_OBJECT (radio1), "toggled", - GTK_SIGNAL_FUNC (cb_recursive_follow_symlink), - GINT_TO_POINTER(1)); - gtk_signal_connect (GTK_OBJECT (radio2), "toggled", - GTK_SIGNAL_FUNC (cb_recursive_follow_symlink), - GINT_TO_POINTER(2)); + g_signal_connect (G_OBJECT (radio0), "toggled", + G_CALLBACK (cb_recursive_follow_symlink), + GINT_TO_POINTER(0)); + g_signal_connect (G_OBJECT (radio1), "toggled", + G_CALLBACK (cb_recursive_follow_symlink), + GINT_TO_POINTER(1)); + g_signal_connect (G_OBJECT (radio2), "toggled", + G_CALLBACK (cb_recursive_follow_symlink), + GINT_TO_POINTER(2)); -#if HAVE_GDK_PIXBUF /********************************************** * Image Frame **********************************************/ @@ -661,7 +651,6 @@ conf.interpolation, (gint *) &config_changed->interpolation); gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 5); -#endif /* HAVE_GDK_PIXBUF */ /********************************************** * Start up Frame @@ -744,7 +733,7 @@ entry = gimv_elist_create_entry (GIMV_ELIST (editlist), 0, NULL, FALSE); prefs_win.filter_ext_entry = entry; - gtk_widget_set_usize (entry, 100, -1); + gtk_widget_set_size_request (entry, 100, -1); gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, TRUE, 0); gtk_widget_show (entry); @@ -789,12 +778,12 @@ filter_set_value (); - gtk_signal_connect (GTK_OBJECT (editlist), "action_confirm", - GTK_SIGNAL_FUNC (cb_filter_editlist_confirm), - NULL); - gtk_signal_connect (GTK_OBJECT (editlist), "list_updated", - GTK_SIGNAL_FUNC (cb_filter_editlist_updated), - NULL); + g_signal_connect (G_OBJECT (editlist), "action_confirm", + G_CALLBACK (cb_filter_editlist_confirm), + NULL); + g_signal_connect (G_OBJECT (editlist), "list_updated", + G_CALLBACK (cb_filter_editlist_updated), + NULL); /* Ignore filename extension or not */ @@ -856,8 +845,8 @@ GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), conf.charset_locale); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_locale_charset_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO (combo)->entry), "changed", + G_CALLBACK (cb_locale_charset_changed), NULL); /* internal charset */ hbox = gtk_hbox_new (FALSE, 0); @@ -873,8 +862,8 @@ GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), conf.charset_internal); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_internal_charset_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO (combo)->entry), "changed", + G_CALLBACK (cb_internal_charset_changed), NULL); /* Language to detect */ hbox = gtk_hbox_new (FALSE, 0); @@ -900,13 +889,13 @@ /* filename charset */ combo = gtk_combo_new (); - gtk_widget_set_usize (combo, 120, -1); + gtk_widget_set_size_request (combo, 120, -1); gtk_combo_set_popdown_strings (GTK_COMBO (combo), charset_get_known_list(NULL)); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), conf.charset_filename); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_filename_charset_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO (combo)->entry), "changed", + G_CALLBACK (cb_filename_charset_changed), NULL); option_menu = create_option_menu (charset_to_internal_items, conf.charset_filename_mode, diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_common.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_common.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_common.h 2004-05-23 14:07:54.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_common.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_common.h,v 1.2 2003/06/13 09:43:43 makeinu Exp $ + * $Id: prefs_ui_common.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_COMMON_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_etc.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_etc.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_etc.c 2004-09-29 03:45:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_etc.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,25 +18,24 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_etc.c,v 1.9 2004/09/29 03:45:56 makeinu Exp $ + * $Id: prefs_ui_etc.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "charset.h" #include "gimv_comment.h" #include "gimv_elist.h" -#include "gtk2-compat.h" -#include "gtkutils.h" -#include "menu.h" #include "prefs.h" #include "prefs_ui_etc.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" #include "gimv_thumb_cache.h" #include "utils.h" +#include "utils_char_code.h" +#include "utils_gtk.h" +#include "utils_menu.h" typedef struct PrefsWin_Tag { @@ -86,7 +85,7 @@ menu_item = gtkutil_option_menu_get_current (option_menu); if (!menu_item) return; - label = gtk_object_get_data (GTK_OBJECT (menu_item), "label"); + label = g_object_get_data (G_OBJECT (menu_item), "label"); if (!label) return; if (gimv_thumb_cache_has_save_prefs (label)) { @@ -129,7 +128,7 @@ menu_item = GTK_OPTION_MENU (option_menu)->menu_item; if (!menu_item) return; - label = gtk_object_get_data (GTK_OBJECT (menu_item), "label"); + label = g_object_get_data (G_OBJECT (menu_item), "label"); if (!label) return; widget = gimv_thumb_cache_get_save_prefs (label, NULL); @@ -139,8 +138,8 @@ dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dialog), _("Preference - Cache Writing -")); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", - GTK_SIGNAL_FUNC (cb_dummy), NULL); + g_signal_connect (G_OBJECT (dialog), "delete_event", + G_CALLBACK (cb_dummy), NULL); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0); @@ -149,9 +148,9 @@ button = gtk_button_new_with_label (_("OK")); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, TRUE, TRUE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cb_cache_write_prefs_ok), - GTK_OBJECT (dialog)); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_cache_write_prefs_ok), + dialog); gtk_widget_show_all (dialog); @@ -370,7 +369,7 @@ if (!check_value (key, name)) { *flags |= GIMV_ELIST_CONFIRM_CANNOT_ADD; *flags |= GIMV_ELIST_CONFIRM_CANNOT_CHANGE; - gtk_signal_emit_stop_by_name (GTK_OBJECT (editlist), "action_confirm"); + g_signal_stop_emission_by_name (G_OBJECT (editlist), "action_confirm"); return; } @@ -402,7 +401,7 @@ GTK_WINDOW (gimv_prefs_win_get ())); *flags |= GIMV_ELIST_CONFIRM_CANNOT_ADD; *flags |= GIMV_ELIST_CONFIRM_CANNOT_CHANGE; - gtk_signal_emit_stop_by_name (GTK_OBJECT (editlist), "action_confirm"); + g_signal_stop_emission_by_name (G_OBJECT (editlist), "action_confirm"); } } @@ -509,7 +508,7 @@ cb_zoom_menu (GtkWidget *menu) { config_changed->slideshow_zoom = - GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(menu), "num")); + GPOINTER_TO_INT (g_object_get_data(G_OBJECT(menu), "num")); gtk_widget_set_sensitive (prefs_win.slideshow_scale_spin, config_changed->slideshow_zoom == 0 || @@ -568,9 +567,9 @@ if (!strcmp(text, conf.cache_write_type)) item = i; menu_item = gtk_menu_item_new_with_label (_(text)); - gtk_object_set_data (GTK_OBJECT (menu_item), "label", text); - gtk_signal_connect(GTK_OBJECT(menu_item), "activate", - GTK_SIGNAL_FUNC(cb_cache_write_type), text); + g_object_set_data (G_OBJECT (menu_item), "label", text); + g_signal_connect(G_OBJECT(menu_item), "activate", + G_CALLBACK(cb_cache_write_type), text); gtk_menu_append (GTK_MENU(menu), menu_item); gtk_widget_show (menu_item); } @@ -582,9 +581,9 @@ button1 = gtk_button_new_with_label (_("Preference")); prefs_win.cache_write_prefs = button1; gtk_box_pack_start (GTK_BOX (hbox), button1, FALSE, FALSE, 0); - gtk_signal_connect_object (GTK_OBJECT (button1),"clicked", - GTK_SIGNAL_FUNC (cb_cache_write_prefs_button_pressed), - GTK_OBJECT (option_menu)); + g_signal_connect (G_OBJECT (button1),"clicked", + G_CALLBACK (cb_cache_write_prefs_button_pressed), + option_menu); g_list_free (list); @@ -712,12 +711,12 @@ cb_editlist_get_row_data); set_default_comment_key_list (); - gtk_signal_connect (GTK_OBJECT (editlist), "action_confirm", - GTK_SIGNAL_FUNC (cb_comment_editlist_confirm), - NULL); - gtk_signal_connect (GTK_OBJECT (editlist), "list_updated", - GTK_SIGNAL_FUNC (cb_comment_editlist_updated), - NULL); + g_signal_connect (G_OBJECT (editlist), "action_confirm", + G_CALLBACK (cb_comment_editlist_confirm), + NULL); + g_signal_connect (G_OBJECT (editlist), "list_updated", + G_CALLBACK (cb_comment_editlist_updated), + NULL); /********************************************** @@ -738,8 +737,8 @@ charset_get_known_list(NULL)); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), conf.comment_charset); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (cb_comment_charset_changed), NULL); + g_signal_connect (G_OBJECT (GTK_COMBO (combo)->entry), "changed", + G_CALLBACK (cb_comment_charset_changed), NULL); gtk_widget_show_all (frame); return main_vbox; @@ -778,10 +777,10 @@ 0.0, 1.0, 0.01, 0.1, 0.0); spinner = gtkutil_create_spin_button (adj); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner), 2); - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &config_changed->search_similar_accuracy); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &config_changed->search_similar_accuracy); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); /********************************************** @@ -853,11 +852,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.slideshow_interval, 0.0, 7200.0, 0.01, 0.1, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); + gtk_widget_set_size_request(spinner, 70, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner), 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &config_changed->slideshow_interval); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &config_changed->slideshow_interval); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("[sec]")); @@ -958,11 +957,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.slideshow_img_scale, 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); + gtk_widget_set_size_request(spinner, 50, -1); prefs_win.slideshow_scale_spin = spinner; - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->slideshow_img_scale); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->slideshow_img_scale); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("%")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_etc.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_etc.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_etc.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_etc.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_etc.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_etc.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_ETC_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_imagewin.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_imagewin.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_imagewin.c 2004-09-29 03:45:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_imagewin.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_imagewin.c,v 1.8 2004/09/29 03:45:56 makeinu Exp $ + * $Id: prefs_ui_imagewin.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include @@ -26,14 +26,13 @@ #include "gimageview.h" #include "gimv_image.h" -#include "gtk2-compat.h" -#include "gtkutils.h" -#include "menu.h" -#include "prefs.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" -#include "prefs_ui_imagewin.h" #include "gimv_image_win.h" +#include "prefs.h" +#include "prefs_ui_imagewin.h" +#include "utils_gtk.h" +#include "utils_menu.h" typedef struct PrefsWin_Tag { @@ -115,7 +114,7 @@ cb_zoom_menu (GtkWidget *menu) { config_changed->imgview_default_zoom = - GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(menu), "num")); + GPOINTER_TO_INT (g_object_get_data(G_OBJECT(menu), "num")); gtk_widget_set_sensitive (prefs_win.image_scale_spin, config_changed->imgview_default_zoom == 0 || @@ -195,10 +194,10 @@ 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); prefs_win.imgwin_width_spin = spinner; - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->imgwin_width); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->imgwin_width); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("height")); @@ -207,10 +206,10 @@ 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); prefs_win.imgwin_height_spin = spinner; - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->imgwin_height); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->imgwin_height); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); /* Auto resize window to image size */ @@ -298,25 +297,25 @@ radio[0] = gtk_radio_button_new_with_label (NULL, _("Show")); gtk_box_pack_start (GTK_BOX (hbox3), radio[0], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[0]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleShow)); + g_signal_connect (G_OBJECT (radio[0]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleShow)); prefs_win.imgwin_player_radio[0] = radio[0]; radio[1] = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio[0]), _("Hide")); gtk_box_pack_start (GTK_BOX (hbox3), radio[1], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[1]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleHide)); + g_signal_connect (G_OBJECT (radio[1]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleHide)); prefs_win.imgwin_player_radio[1] = radio[1]; radio[2] = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio[1]), _("Auto")); gtk_box_pack_start (GTK_BOX (hbox3), radio[2], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[2]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleAuto)); + g_signal_connect (G_OBJECT (radio[2]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleAuto)); prefs_win.imgwin_player_radio[2] = radio[2]; switch (config_changed->imgview_player_visible) { @@ -448,11 +447,11 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.imgview_scale, 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); + gtk_widget_set_size_request(spinner, 50, -1); prefs_win.image_scale_spin = spinner; - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &config_changed->imgview_scale); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &config_changed->imgview_scale); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("%")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -520,15 +519,15 @@ if (iw->iv) { if (!dest->imgview_default_zoom) { - gtk_object_set (GTK_OBJECT (iw->iv), - "x_scale", dest->imgview_scale, - "y_scale", dest->imgview_scale, - NULL); + g_object_set (G_OBJECT (iw->iv), + "x_scale", dest->imgview_scale, + "y_scale", dest->imgview_scale, + NULL); } - gtk_object_set (GTK_OBJECT (iw->iv), - "default_zoom", dest->imgview_default_zoom, - "default_rotation", dest->imgview_default_rotation, - NULL); + g_object_set (G_OBJECT (iw->iv), + "default_zoom", dest->imgview_default_zoom, + "default_rotation", dest->imgview_default_rotation, + NULL); } } diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_imagewin.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_imagewin.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_imagewin.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_imagewin.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_imagewin.h,v 1.3 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_imagewin.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_IMAGEWIN_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_movie.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_movie.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_movie.c 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_movie.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,15 +18,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_movie.c,v 1.3 2003/07/06 16:46:21 makeinu Exp $ + * $Id: prefs_ui_movie.c 1180 2007-10-23 14:16:14Z makeinu $ */ #include "prefs_ui_movie.h" #include #include "gimv_image_view.h" -#include "menu.h" #include "prefs.h" +#include "utils_menu.h" extern Config *config_changed; extern Config *config_prechanged; @@ -40,7 +40,7 @@ { gint idx; - idx = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + idx = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); g_return_if_fail (idx >=0 && idx < movie_view_modes_len); if (config_changed->movie_default_view_mode != config_prechanged->movie_default_view_mode) diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_movie.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_movie.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_movie.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_movie.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_movie.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_movie.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_MOVIE_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_plugin.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_plugin.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_plugin.c 2004-09-22 15:37:12.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_plugin.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,20 +18,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_plugin.c,v 1.4 2004/09/22 15:37:12 makeinu Exp $ + * $Id: prefs_ui_plugin.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "charset.h" -#include "gtkutils.h" #include "gimv_plugin.h" -#include "prefs.h" -#include "prefs_ui_plugin.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" +#include "prefs.h" +#include "prefs_ui_plugin.h" +#include "utils_char_code.h" +#include "utils_gtk.h" extern Config *config_changed; @@ -104,6 +104,7 @@ gchar *titles[] = {N_("Plugin Name"), N_("Version"), N_("Module Name")}; gint titles_num = sizeof (titles)/ sizeof (gchar *); gchar *text[32]; + GtkListStore *store; hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 0); @@ -111,81 +112,53 @@ scrollwin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#ifdef USE_GTK2 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin), GTK_SHADOW_IN); -#endif /* USE_GTK2 */ gtk_container_set_border_width(GTK_CONTAINER(scrollwin), 5); gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0); - gtk_widget_set_usize (scrollwin, -1, 200); + gtk_widget_set_size_request (scrollwin, -1, 200); -#ifdef ENABLE_TREEVIEW - { - GtkListStore *store; + store = gtk_list_store_new (titles_num, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING); + clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); + gtk_container_add (GTK_CONTAINER (scrollwin), clist); - store = gtk_list_store_new (titles_num, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); - clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (clist), TRUE); - gtk_container_add (GTK_CONTAINER (scrollwin), clist); - - /* set columns */ - for (i = 0; i < titles_num; i++) { - GtkTreeViewColumn *col; - GtkCellRenderer *render; - - col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_title (col, _(titles[i])); - if (i == 0) { - gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (col, 200); - } - render = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, render, TRUE); - gtk_tree_view_column_add_attribute (col, render, "text", i); - gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); - } + /* set columns */ + for (i = 0; i < titles_num; i++) { + GtkTreeViewColumn *col; + GtkCellRenderer *render; - for (list = plugin_list; list; list = g_list_next (list)) { - GModule *module = list->data; - GtkTreeIter iter; - - text[0] = _(gimv_plugin_get_name (module)); - text[1] = _(gimv_plugin_get_version_string (module)); - text[2] = _(gimv_plugin_get_module_name (module)); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - 0, text[0], - 1, text[1], - 2, text[2], - -1); + col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_resizable (col, TRUE); + gtk_tree_view_column_set_title (col, _(titles[i])); + if (i == 0) { + gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width (col, 200); } + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, TRUE); + gtk_tree_view_column_add_attribute (col, render, "text", i); + gtk_tree_view_append_column (GTK_TREE_VIEW (clist), col); } -#else /* ENABLE_TREEVIEW */ - clist = gtk_clist_new (titles_num); - for (i = 0; i < titles_num; i++) { - gtk_clist_set_column_title (GTK_CLIST (clist), i, _(titles[i])); - gtk_clist_set_column_auto_resize (GTK_CLIST (clist), i, TRUE); - } - gtk_clist_column_titles_show (GTK_CLIST (clist)); - gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_SINGLE); - gtk_container_add (GTK_CONTAINER (scrollwin), clist); - /* set default value */ for (list = plugin_list; list; list = g_list_next (list)) { GModule *module = list->data; + GtkTreeIter iter; text[0] = _(gimv_plugin_get_name (module)); text[1] = _(gimv_plugin_get_version_string (module)); text[2] = _(gimv_plugin_get_module_name (module)); - gtk_clist_append (GTK_CLIST (clist), text); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, text[0], + 1, text[1], + 2, text[2], + -1); } -#endif /* ENABLE_TREEVIEW */ return hbox; } diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_plugin.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_plugin.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_plugin.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_plugin.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_plugin.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_plugin.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_PLUGIN_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_progs.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_progs.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_progs.c 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_progs.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,20 +18,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_progs.c,v 1.3 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_progs.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "charset.h" #include "gimv_elist.h" -#include "gtkutils.h" -#include "prefs.h" -#include "prefs_ui_progs.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" +#include "prefs.h" +#include "prefs_ui_progs.h" +#include "utils_char_code.h" +#include "utils_gtk.h" typedef struct PrefsWin_Tag @@ -212,8 +212,8 @@ editlist = gimv_elist_new_with_titles (titles_num, titles); set_default_progs_list (GIMV_ELIST (editlist)); gtk_box_pack_start (GTK_BOX (frame_vbox), editlist, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (editlist), "list_updated", - GTK_SIGNAL_FUNC (cb_editlist_updated), NULL); + g_signal_connect (G_OBJECT (editlist), "list_updated", + G_CALLBACK (cb_editlist_updated), NULL); /* * create edit area @@ -233,7 +233,7 @@ entry = gimv_elist_create_entry (GIMV_ELIST (editlist), 0, NULL, FALSE); - gtk_widget_set_usize (entry, 100, -1); + gtk_widget_set_size_request (entry, 100, -1); gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, TRUE, 0); /* command entry */ @@ -277,8 +277,8 @@ tmpstr = charset_locale_to_internal (conf.web_browser); gtk_entry_set_text (GTK_ENTRY (entry), tmpstr); g_free (tmpstr); - gtk_signal_connect (GTK_OBJECT (entry),"changed", - GTK_SIGNAL_FUNC (cb_web_browser_command_changed), NULL); + g_signal_connect (G_OBJECT (entry),"changed", + G_CALLBACK (cb_web_browser_command_changed), NULL); /********************************************** @@ -305,8 +305,8 @@ tmpstr = charset_locale_to_internal (conf.text_viewer); gtk_entry_set_text (GTK_ENTRY (entry), tmpstr); g_free (tmpstr); - gtk_signal_connect (GTK_OBJECT (entry),"changed", - GTK_SIGNAL_FUNC (cb_text_view_command_changed), NULL); + g_signal_connect (G_OBJECT (entry),"changed", + G_CALLBACK (cb_text_view_command_changed), NULL); gtk_widget_set_sensitive (prefs_win.text_viewer_command, !config_changed->text_viewer_use_internal); diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_progs.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_progs.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_progs.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_progs.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_progs.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_progs.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_PROGS_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbalbum.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbalbum.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbalbum.c 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbalbum.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,14 +18,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_thumbalbum.c,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_thumbalbum.c 1179 2007-10-23 02:18:13Z makeinu $ */ +#include + #include "gimv_prefs_ui_utils.h" -#include "gtkutils.h" -#include "intl.h" +#include "utils_gtk.h" #include "prefs.h" -#include +#include "prefs_ui/prefs_ui_thumbalbum.h" extern Config *config_changed; @@ -64,9 +65,9 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.thumbalbum_row_space, 0.0, 255.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbalbum_row_space); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbalbum_row_space); gtk_table_attach (GTK_TABLE (table), spinner, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); @@ -78,9 +79,9 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.thumbalbum_col_space, 0.0, 255.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbalbum_col_space); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbalbum_col_space); gtk_table_attach (GTK_TABLE (table), spinner, 3, 4, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbalbum.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbalbum.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbalbum.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbalbum.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_thumbalbum.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_thumbalbum.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_THUMBALBUM_H__ diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbwin.c gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbwin.c --- gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbwin.c 2004-09-29 03:45:56.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbwin.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,23 +18,22 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_thumbwin.c,v 1.15 2004/09/29 03:45:56 makeinu Exp $ + * $Id: prefs_ui_thumbwin.c 1179 2007-10-23 02:18:13Z makeinu $ */ #include #include "gimageview.h" -#include "dirview.h" +#include "gimv_dir_view.h" #include "gimv_prefs_ui_utils.h" #include "gimv_prefs_win.h" #include "gimv_thumb_view.h" #include "gimv_thumb_win.h" -#include "gtkutils.h" -#include "gtk2-compat.h" -#include "menu.h" #include "prefs.h" #include "prefs_ui_thumbwin.h" +#include "utils_gtk.h" +#include "utils_menu.h" typedef struct PrefsWin_Tag { @@ -130,26 +129,6 @@ }; -#ifndef ENABLE_TREEVIEW -static const gchar *ctree_line_style_items[] = { - N_("None"), - N_("Solid"), - N_("Dotted"), - N_("Tabbed"), - NULL -}; - - -static const gchar *ctree_expander_style_items[] = { - N_("None"), - N_("Square"), - N_("Triangle"), - N_("Circular"), - NULL -}; -#endif /* ENABLE_TREEVIEW */ - - static const gchar *thumbview_mouse_items[] = { N_("None"), N_("Popup menu"), @@ -351,7 +330,7 @@ const gchar *tmpstr; gint disp_mode; - disp_mode = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "num")); + disp_mode = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); tmpstr = gimv_thumb_view_num_to_label (disp_mode); if (tmpstr) config_changed->thumbwin_disp_mode = (gchar *) tmpstr; @@ -364,7 +343,7 @@ cb_zoom_menu (GtkWidget *menu) { config_changed->preview_zoom = - GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(menu), "num")); + GPOINTER_TO_INT (g_object_get_data(G_OBJECT(menu), "num")); set_sensitive_preview(); } @@ -389,8 +368,8 @@ main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5); - gtk_signal_connect (GTK_OBJECT (main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_thumbwin_page_destroy), NULL); + g_signal_connect (G_OBJECT (main_vbox), "destroy", + G_CALLBACK (cb_thumbwin_page_destroy), NULL); /********************************************** @@ -414,10 +393,10 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.thumbwin_width, 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = prefs_win.thumbwin_width_spin = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbwin_width); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbwin_width); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("height")); @@ -425,10 +404,10 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.thumbwin_height, 1.0, 10000.0, 1.0, 5.0, 0.0); spinner = prefs_win.thumbwin_height_spin = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbwin_height); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbwin_height); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); /* Toolbar Style */ @@ -519,25 +498,25 @@ radio[0] = gtk_radio_button_new_with_label (NULL, _("Show")); gtk_box_pack_start (GTK_BOX (hbox3), radio[0], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[0]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleShow)); + g_signal_connect (G_OBJECT (radio[0]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleShow)); prefs_win.thumbwin_player_radio[0] = radio[0]; radio[1] = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio[0]), _("Hide")); gtk_box_pack_start (GTK_BOX (hbox3), radio[1], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[1]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleHide)); + g_signal_connect (G_OBJECT (radio[1]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleHide)); prefs_win.thumbwin_player_radio[1] = radio[1]; radio[2] = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio[1]), _("Auto")); gtk_box_pack_start (GTK_BOX (hbox3), radio[2], FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (radio[2]), "toggled", - GTK_SIGNAL_FUNC (cb_player_visible), - GINT_TO_POINTER(GimvImageViewPlayerVisibleAuto)); + g_signal_connect (G_OBJECT (radio[2]), "toggled", + G_CALLBACK (cb_player_visible), + GINT_TO_POINTER(GimvImageViewPlayerVisibleAuto)); prefs_win.thumbwin_player_radio[2] = radio[2]; switch (config_changed->preview_player_visible) { @@ -589,10 +568,10 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.thumbwin_redraw_interval, 1.0, 1000.0, 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbwin_redraw_interval); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbwin_redraw_interval); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("files")); @@ -650,8 +629,8 @@ main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5); - gtk_signal_connect (GTK_OBJECT (main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_thumbwin_tab_page_destroy), NULL); + g_signal_connect (G_OBJECT (main_vbox), "destroy", + G_CALLBACK (cb_thumbwin_tab_page_destroy), NULL); /********************************************** @@ -730,8 +709,8 @@ main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5); - gtk_signal_connect (GTK_OBJECT (main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_thumbview_page_destroy), NULL); + g_signal_connect (G_OBJECT (main_vbox), "destroy", + G_CALLBACK (cb_thumbview_page_destroy), NULL); /********************************************** @@ -788,9 +767,9 @@ 1.0, 5.0, 0.0); spinner = gtkutil_create_spin_button (adj); prefs_win.thumbview_thumb_size = spinner; - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->thumbwin_thumb_size); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_int_cb), + &config_changed->thumbwin_thumb_size); gtk_box_pack_start(GTK_BOX(hbox), spinner, FALSE, TRUE, 0); @@ -838,8 +817,8 @@ main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5); - gtk_signal_connect (GTK_OBJECT (main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_dirview_page_destroy), NULL); + g_signal_connect (G_OBJECT (main_vbox), "destroy", + G_CALLBACK (cb_dirview_page_destroy), NULL); /********************************************** @@ -875,103 +854,6 @@ &config_changed->dirview_show_parent_dir); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - -#ifndef ENABLE_TREEVIEW -{ - GtkWidget *hbox; - GtkWidget *label, *spinner; - GtkAdjustment *adj; - GtkWidget *option_menu; - - /********************************************** - * Style Frame - **********************************************/ - gimv_prefs_ui_create_frame (_("Style"), frame, vbox, main_vbox, FALSE); - - /* tree line style */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER (hbox), 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new (_("Tree line style")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5); - option_menu = create_option_menu_simple (ctree_line_style_items, - conf.dirview_line_style, - (gint *) &config_changed->dirview_line_style); - gtk_widget_set_usize (option_menu, 100, -1); - gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 5); - - /* tree expander style */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER (hbox), 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new (_("Tree expander style")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5); - option_menu = create_option_menu_simple (ctree_expander_style_items, - conf.dirview_expander_style, - (gint *) &config_changed->dirview_expander_style); - gtk_widget_set_usize (option_menu, 100, -1); - gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 5); - - - /********************************************** - * Drag and Drop Frame - **********************************************/ - gimv_prefs_ui_create_frame (_("Drag and Drop"), frame, vbox, main_vbox, FALSE); - - /* auto scroll */ - toggle = gtkutil_create_check_button (_("Enable auto scroll."), - conf.dirview_auto_scroll, - gtkutil_get_data_from_toggle_cb, - &config_changed->dirview_auto_scroll); - gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - - /* auto scroll interval */ - hbox = gtk_hbox_new (FALSE, 5); - gtk_container_set_border_width (GTK_CONTAINER(hbox), 5); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new (_("Auto scroll interval")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - adj = (GtkAdjustment *) gtk_adjustment_new (conf.dirview_auto_scroll_time, - 0, 1000, - 5.0, 10.0, 0.0); - spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->dirview_auto_scroll_time); - gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); - - label = gtk_label_new (_("[ms]")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - - /* auto expand */ - toggle = gtkutil_create_check_button (_("Enable auto expand directory tree."), - conf.dirview_auto_expand, - gtkutil_get_data_from_toggle_cb, - &config_changed->dirview_auto_expand); - gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - - /* auto expand time */ - hbox = gtk_hbox_new (FALSE, 5); - gtk_container_set_border_width (GTK_CONTAINER(hbox), 5); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new (_("Lag time for auto expand")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - adj = (GtkAdjustment *) gtk_adjustment_new (conf.dirview_auto_expand_time, - 0, 60000, - 100.0, 500.0, 0.0); - spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 70, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_int_cb), - &config_changed->dirview_auto_expand_time); - gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); - - label = gtk_label_new (_("[ms]")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); -} -#endif /* ENABLE_TREEVIEW */ - gtk_widget_show_all (main_vbox); return main_vbox; @@ -1014,8 +896,8 @@ main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5); - gtk_signal_connect (GTK_OBJECT (main_vbox), "destroy", - GTK_SIGNAL_FUNC (cb_preview_page_destroy), NULL); + g_signal_connect (G_OBJECT (main_vbox), "destroy", + G_CALLBACK (cb_preview_page_destroy), NULL); /********************************************** @@ -1078,10 +960,10 @@ adj = (GtkAdjustment *) gtk_adjustment_new (conf.preview_scale, 1.0, 10000.0, 1.0, 5.0, 0.0); prefs_win.preview_scale_spin = spinner = gtkutil_create_spin_button (adj); - gtk_widget_set_usize(spinner, 50, -1); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gtkutil_get_data_from_adjustment_by_float_cb), - &config_changed->preview_scale); + gtk_widget_set_size_request(spinner, 50, -1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gtkutil_get_data_from_adjustment_by_float_cb), + &config_changed->preview_scale); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); label = gtk_label_new (_("%")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -1200,21 +1082,6 @@ break; } -#ifndef ENABLE_TREEVIEW - { - GList *node; - for (node = gimv_thumb_win_get_list(); node; node = g_list_next (node)) { - GimvThumbWin *tw = node->data; - if (tw->dv) { - gtk_ctree_set_line_style (GTK_CTREE (tw->dv->dirtree), - dest->dirview_line_style); - gtk_ctree_set_expander_style (GTK_CTREE (tw->dv->dirtree), - dest->dirview_expander_style); - } - } - } -#endif /* ENABLE_TREEVIEW */ - return FALSE; } @@ -1241,18 +1108,18 @@ if (tw->iv) { if (dest->preview_zoom == 0) { - gtk_object_set (GTK_OBJECT (tw->iv), - "x_scale", dest->preview_scale, - "y_scale", dest->preview_scale, - NULL); + g_object_set (G_OBJECT (tw->iv), + "x_scale", dest->preview_scale, + "y_scale", dest->preview_scale, + NULL); } - gtk_object_set (GTK_OBJECT (tw->iv), - "default_zoom", dest->preview_zoom, - "default_rotation", dest->preview_rotation, - "keep_aspect", dest->preview_keep_aspect, - "keep_buffer", dest->preview_buffer, - "show_scrollbar", dest->preview_scrollbar, - NULL); + g_object_set (G_OBJECT (tw->iv), + "default_zoom", dest->preview_zoom, + "default_rotation", dest->preview_rotation, + "keep_aspect", dest->preview_keep_aspect, + "keep_buffer", dest->preview_buffer, + "show_scrollbar", dest->preview_scrollbar, + NULL); } } diff -Nru gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbwin.h gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbwin.h --- gimageview-0.2.27/src/prefs_ui/prefs_ui_thumbwin.h 2004-05-23 14:07:53.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/prefs_ui/prefs_ui_thumbwin.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: prefs_ui_thumbwin.h,v 1.2 2003/06/13 09:43:44 makeinu Exp $ + * $Id: prefs_ui_thumbwin.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __PREFS_UI_THUMBWIN_H__ diff -Nru gimageview-0.2.27/src/text_viewer.c gimageview-0.3.0-0.20101117/src/text_viewer.c --- gimageview-0.2.27/src/text_viewer.c 2004-05-23 14:07:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/text_viewer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,182 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: text_viewer.c,v 1.8 2003/06/13 09:43:38 makeinu Exp $ - */ - -#include - -#include "gimageview.h" -#include "charset.h" -#include "prefs.h" -#include "text_viewer.h" - -static void -cb_text_viewer_destroy (GtkWidget *widget, TextViewer *text_viewer) -{ - g_return_if_fail (text_viewer); - - if (text_viewer->filename) - g_free (text_viewer->filename); - - g_free (text_viewer); -} - - -gboolean -text_viewer_load_file (TextViewer *text_viewer, gchar *filename) -{ - FILE *textfile; - gchar *tmpstr; - gchar buf[BUF_SIZE]; - - g_return_val_if_fail (text_viewer && filename, FALSE); - - if (text_viewer->filename) { -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_viewer->textbox)); - gtk_text_buffer_set_text (buffer, "\0", -1); - } -#else - { - GtkText *text = GTK_TEXT (text_viewer->textbox); - gtk_text_backward_delete (text, gtk_text_get_length(text)); - } -#endif - g_free (text_viewer->filename); - text_viewer->filename = NULL; - } - - textfile = fopen (filename, "r"); - if (!textfile) { - g_warning (_("Can't open text file: %s\n"), filename); - return FALSE; - } - -#ifdef USE_GTK2 - { - GtkTextBuffer *buffer; - gchar *text; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_viewer->textbox)); - - text = g_strdup (""); - while (fgets (buf, sizeof(buf), textfile)) { - gchar *tmpstr, *prev; - tmpstr = charset_to_internal (buf, NULL, NULL, - CHARSET_TO_INTERNAL_LOCALE); - prev = text; - text = g_strconcat (text, tmpstr, NULL); - g_free (prev); - } - gtk_text_buffer_set_text (buffer, text, -1); - g_free (text); - } -#else - { - GtkText *text = GTK_TEXT (text_viewer->textbox); - GdkFont *font; - - if (conf.textentry_font && *conf.textentry_font) - font = gdk_fontset_load (conf.textentry_font); - else - font = NULL; - - gtk_text_freeze (text); - while (fgets (buf, sizeof(buf), textfile)) { - gtk_text_insert (text, font, NULL, NULL, buf, -1); - } - gtk_text_thaw (text); - - if (font) - gdk_font_unref (font); - } -#endif - - fclose (textfile); - - tmpstr = g_strconcat (_("File Name: "), filename, NULL); - gtk_statusbar_push(GTK_STATUSBAR (text_viewer->statusbar), 1, tmpstr); - g_free (tmpstr); - - text_viewer->filename = g_strdup (filename); - - return TRUE; -} - - -TextViewer * -text_viewer_create (gchar *filename) -{ - TextViewer *text_viewer; - GtkWidget *window, *vbox; - GtkWidget *scrolledwin, *text; - GtkWidget *statusbar; - - text_viewer = g_new0 (TextViewer, 1); - text_viewer->filename = NULL; - - /* window */ - text_viewer->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window), GIMV_PROG_NAME" -Text Viewer-"); - gtk_window_set_default_size (GTK_WINDOW(window), 600, 500); - gtk_widget_show (window); - gtk_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC (cb_text_viewer_destroy), text_viewer); - - /* main vbox */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_widget_show (vbox); - - /* text box */ - scrolledwin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), - GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - gtk_box_pack_start (GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0); - gtk_widget_show (scrolledwin); - -#ifdef USE_GTK2 - text = gtk_text_view_new (); -#else - text = gtk_text_new (gtk_scrolled_window_get_hadjustment - (GTK_SCROLLED_WINDOW (scrolledwin)), - gtk_scrolled_window_get_vadjustment - (GTK_SCROLLED_WINDOW (scrolledwin))); -#endif - text_viewer->textbox = text; - gtk_container_add (GTK_CONTAINER (scrolledwin), text); - gtk_widget_show (text); - - /* statusbar */ - text_viewer->statusbar = statusbar = gtk_statusbar_new (); - gtk_container_border_width (GTK_CONTAINER (statusbar), 1); - gtk_box_pack_start (GTK_BOX (vbox), statusbar, FALSE, TRUE, 0); - gtk_statusbar_push(GTK_STATUSBAR (statusbar), 1, "New Window"); - gtk_widget_show (statusbar); - - /* set text from file */ - if (filename) - text_viewer_load_file (text_viewer, filename); - - return text_viewer; -} diff -Nru gimageview-0.2.27/src/text_viewer.h gimageview-0.3.0-0.20101117/src/text_viewer.h --- gimageview-0.2.27/src/text_viewer.h 2004-05-23 14:07:51.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/text_viewer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: text_viewer.h,v 1.3 2002/10/03 12:27:37 makeinu Exp $ - */ - - -#ifndef __TEXT_VIEWER_H__ -#define __TEXT_VIEWER_H__ - -#include - -typedef struct TextViewer_Tag -{ - GtkWidget *window; - GtkWidget *textbox; - GtkWidget *menubar; - GtkWidget *statusbar; - - gchar *filename; -} TextViewer; - - -gboolean text_viewer_load_file (TextViewer *text_viewer, - gchar *filename); -TextViewer *text_viewer_create (gchar *filename); - -#endif /* __TEXT_VIEWER_H__ */ diff -Nru gimageview-0.2.27/src/thumbnail_view_album.c gimageview-0.3.0-0.20101117/src/thumbnail_view_album.c --- gimageview-0.2.27/src/thumbnail_view_album.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/thumbnail_view_album.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,880 +0,0 @@ -/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ - -/* - * GImageView - * Copyright (C) 2001 Takuro Ashie - * - * 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: thumbnail_view_album.c,v 1.16 2004/09/21 08:44:32 makeinu Exp $ - */ - -#include - -#include "gimageview.h" - -#include "dnd.h" -#include "gimv_thumb.h" -#include "gimv_thumb_view.h" -#include "gimv_thumb_win.h" -#include "gimv_zalbum.h" -#include "gtk2-compat.h" -#include "gtkutils.h" -#include "prefs.h" - - -#define THUMBALBUM_LABEL "Album" -#define THUMBALBUM2_LABEL "Album 2" -#define THUMBALBUM3_LABEL "Album 3" - - -static void thumbalbum_freeze (GimvThumbView *tv); -static void thumbalbum_thaw (GimvThumbView *tv); -static void thumbalbum_append_thumb_frame (GimvThumbView *tv, - GimvThumb *thumb, - const gchar *dest_mode); -static void thumbalbum_update_thumbnail (GimvThumbView *tv, - GimvThumb *thumb, - const gchar *dest_mode); -static GList *thumbalbum_get_load_list (GimvThumbView *tv); -static void thumbalbum_remove_thumbnail (GimvThumbView *tv, - GimvThumb *thumb); -static void thumbalbum_adjust (GimvThumbView *tv, - GimvThumb *thumb); -static GtkWidget *thumbalbum_create (GimvThumbView *tv, - const gchar *dest_mode); -static gboolean thumbalbum_set_selection (GimvThumbView *tv, - GimvThumb *thumb, - gboolean select); -static void thumbalbum_set_focus (GimvThumbView *tv, - GimvThumb *thumb); -static GimvThumb *thumbalbum_get_focus (GimvThumbView *tv); -static gboolean thumbalbum_thumbnail_is_in_viewport (GimvThumbView *tv, - GimvThumb *thumb); - -GimvThumbViewPlugin thumbalbum_modes[] = -{ - {GIMV_THUMBNAIL_VIEW_IF_VERSION, - N_("Album"), - 0, - thumbalbum_create, - thumbalbum_freeze, - thumbalbum_thaw, - thumbalbum_append_thumb_frame, - thumbalbum_update_thumbnail, - thumbalbum_remove_thumbnail, - thumbalbum_get_load_list, - thumbalbum_adjust, - thumbalbum_set_selection, - thumbalbum_set_focus, - thumbalbum_get_focus, - thumbalbum_thumbnail_is_in_viewport}, - - {GIMV_THUMBNAIL_VIEW_IF_VERSION, - N_("Album 2"), - 10, - thumbalbum_create, - thumbalbum_freeze, - thumbalbum_thaw, - thumbalbum_append_thumb_frame, - thumbalbum_update_thumbnail, - thumbalbum_remove_thumbnail, - thumbalbum_get_load_list, - thumbalbum_adjust, - thumbalbum_set_selection, - thumbalbum_set_focus, - thumbalbum_get_focus, - thumbalbum_thumbnail_is_in_viewport}, - - {GIMV_THUMBNAIL_VIEW_IF_VERSION, - N_("Album 3"), - 20, - thumbalbum_create, - thumbalbum_freeze, - thumbalbum_thaw, - thumbalbum_append_thumb_frame, - thumbalbum_update_thumbnail, - thumbalbum_remove_thumbnail, - thumbalbum_get_load_list, - thumbalbum_adjust, - thumbalbum_set_selection, - thumbalbum_set_focus, - thumbalbum_get_focus, - thumbalbum_thumbnail_is_in_viewport}, -}; -gint thumbalbum_modes_num - = sizeof (thumbalbum_modes) / sizeof (GimvThumbViewPlugin); - - -typedef struct ThumbViewData_Tag -{ - GtkWidget *album; -} ThumbViewData; - - -/* defined in thumbview_list.c */ -void album_create_title_idx_list (void); -gchar *album_create_label_str (GimvThumb *thumb); - - -/****************************************************************************** - * - * Callback functions. - * - ******************************************************************************/ -static gboolean -cb_album_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - GimvThumbView *tv = data; - gint row; - GimvThumb *thumb; - gboolean retval = event->button == 3 ? TRUE : FALSE; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), retval); - - row = gimv_zlist_cell_index_from_xy (GIMV_ZLIST (widget), event->x, event->y); - if (row < 0) { - gtk_drag_source_unset (widget); - gtk_object_set_data (GTK_OBJECT (widget), "drag-unset", GINT_TO_POINTER (1)); - gimv_thumb_win_notebook_drag_src_unset (tv->tw); /* FIXME!! */ - return retval; - } - - thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), row); - if (!thumb) return retval; - - retval = gimv_thumb_view_thumb_button_press_cb (widget, event, thumb); - - return retval; -} - - -static gboolean -cb_album_button_release (GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - GimvThumbView *tv = data; - GimvThumb *thumb; - gint row; - gpointer dnd_unset; - gboolean retval; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - dnd_unset = gtk_object_get_data (GTK_OBJECT (widget), "drag-unset"); - if (dnd_unset) - dnd_src_set (widget, dnd_types_uri, dnd_types_uri_num); - dnd_unset = FALSE; - - row = gimv_zlist_cell_index_from_xy (GIMV_ZLIST (widget), event->x, event->y); - if (row < 0) { - gimv_thumb_win_notebook_drag_src_reset (tv->tw); /* FIXME!! */ - return FALSE; - } - - thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), row); - if (!thumb) return FALSE; - - retval = gimv_thumb_view_thumb_button_release_cb (widget, event, thumb); - - gtk_widget_grab_focus (widget); - thumbalbum_set_focus (tv, thumb); - - return retval; -} - - -static void -cb_select_cell (GimvZAlbum *album, gint idx, GimvThumbView *tv) -{ - GimvThumb *thumb; - - g_return_if_fail (GIMV_IS_ZALBUM (album)); - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (album), idx); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - thumb->selected = TRUE; -} - -static void -cb_unselect_cell (GimvZAlbum *album, gint idx, GimvThumbView *tv) -{ - GimvThumb *thumb; - - g_return_if_fail (GIMV_IS_ZALBUM (album)); - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (album), idx); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - thumb->selected = FALSE; -} - - -static gboolean -cb_album_key_press (GtkWidget *widget, - GdkEventKey *event, - GimvThumbView *tv) -{ - GimvThumb *thumb = NULL; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - - if (GIMV_ZLIST (widget)->focus >= 0) - thumb = gimv_zalbum_get_cell_data (GIMV_ZALBUM (widget), - GIMV_ZLIST (widget)->focus); - - if (gimv_thumb_view_thumb_key_press_cb(widget, event, thumb)) - return FALSE; - - { - switch (event->keyval) { - case GDK_Left: - case GDK_Right: - case GDK_Up: - case GDK_Down: - if (event->state & GDK_SHIFT_MASK) { - gimv_thumb_view_set_selection_all (tv, FALSE); - gimv_thumb_view_set_selection (thumb, TRUE); - gimv_thumb_view_open_image (tv, thumb, - GIMV_THUMB_VIEW_OPEN_IMAGE_PREVIEW); - } - return TRUE; - case GDK_Return: - if (!thumb) break; - if (event->state & GDK_SHIFT_MASK || event->state & GDK_CONTROL_MASK) { - /* is there somteing to do? */ - } else { - gimv_thumb_view_set_selection_all (tv, FALSE); - } - gimv_thumb_view_set_selection (thumb, TRUE); - gimv_thumb_view_open_image (tv, thumb, - GIMV_THUMB_VIEW_OPEN_IMAGE_AUTO); - break; - case GDK_space: - if (!thumb) break; - gimv_thumb_view_set_selection (thumb, !thumb->selected); - break; - case GDK_Delete: - gimv_thumb_view_delete_files (tv); - break; - default: - break; - } - } - - return FALSE; -} - - -/****************************************************************************** - * - * private functions. - * - ******************************************************************************/ -static ThumbViewData * -thumbalbum_new (GimvThumbView *tv) -{ - ThumbViewData *tv_data; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - if (!tv_data) { - tv_data = g_new0 (ThumbViewData, 1); - tv_data->album = NULL; - gtk_object_set_data_full (GTK_OBJECT (tv), THUMBALBUM_LABEL, tv_data, - (GtkDestroyNotify) g_free); - } - - return tv_data; -} - - - -/****************************************************************************** - * - * public functions. - * - ******************************************************************************/ -static void -thumbalbum_freeze (GimvThumbView *tv) -{ - ThumbViewData *tv_data; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data && GIMV_IS_ZALBUM (tv_data->album)); - - gimv_zalbum_freeze (tv_data->album); -} - - -static void -thumbalbum_thaw (GimvThumbView *tv) -{ - ThumbViewData *tv_data; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data && GIMV_IS_ZALBUM (tv_data->album)); - - gimv_zalbum_thawn (tv_data->album); -} - - -static void -thumbalbum_append_thumb_frame (GimvThumbView *tv, GimvThumb *thumb, - const gchar *dest_mode) -{ - ThumbViewData *tv_data; - const gchar *filename; - gchar *label; - GdkPixmap *pixmap = NULL; - GdkBitmap *mask = NULL; - gint pos; - guint idx; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data); - - pos = g_list_index (tv->thumblist, thumb); - - filename = g_basename(gimv_image_info_get_path (thumb->info)); - - if (!strcmp (dest_mode, THUMBALBUM3_LABEL)) { - label = album_create_label_str (thumb); - } else { - label = gimv_filename_to_internal (filename); - } - - idx = gimv_zalbum_insert (GIMV_ZALBUM (tv_data->album), pos, label); - g_free (label); - - gimv_zalbum_set_cell_data (GIMV_ZALBUM (tv_data->album), idx, thumb); - - thumbalbum_set_selection (tv, thumb, thumb->selected); - - if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { - gimv_thumb_get_icon (thumb, &pixmap, &mask); - } else { - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - } - - if (pixmap) - gimv_zalbum_set_pixmap (GIMV_ZALBUM (tv_data->album), idx, pixmap, mask); -} - - -static void -thumbalbum_update_thumbnail (GimvThumbView *tv, GimvThumb *thumb, - const gchar *dest_mode) -{ - ThumbViewData *tv_data; - GdkPixmap *pixmap = NULL; - GdkBitmap *mask = NULL; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data && tv_data->album); - - pos = g_list_index (tv->thumblist, thumb); - - /* set thumbnail */ - if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { - gimv_thumb_get_icon (thumb, &pixmap, &mask); - } else { - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - } - if (pixmap) - gimv_zalbum_set_pixmap (GIMV_ZALBUM (tv_data->album), pos, pixmap, mask); -} - - -static GList * -thumbalbum_get_load_list (GimvThumbView *tv) -{ - GList *loadlist = NULL, *node; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - for (node = tv->thumblist; node; node = g_list_next (node)) { - GimvThumb *thumb = node->data; - GdkPixmap *pixmap = NULL; - GdkBitmap *mask = NULL; - - if (!strcmp (THUMBALBUM2_LABEL, tv->summary_mode)) { - gimv_thumb_get_icon (thumb, &pixmap, &mask); - } else { - gimv_thumb_get_thumb (thumb, &pixmap, &mask); - } - if (!pixmap) - loadlist = g_list_append (loadlist, thumb); - } - - return loadlist; -} - - -static void -thumbalbum_remove_thumbnail (GimvThumbView *tv, GimvThumb *thumb) -{ - ThumbViewData *tv_data; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - g_return_if_fail (GIMV_IS_THUMB (thumb)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data && tv_data->album); - - pos = g_list_index (tv->thumblist, thumb); - g_return_if_fail (pos >= 0); - - gimv_zalbum_remove (GIMV_ZALBUM (tv_data->album), pos); -} - - -static gboolean -thumbalbum_set_selection (GimvThumbView *tv, GimvThumb *thumb, gboolean select) -{ - ThumbViewData *tv_data; - gint pos; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); - - if (g_list_length (tv->thumblist) < 1) return FALSE; - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_val_if_fail (tv_data && tv_data->album, FALSE); - - pos = g_list_index (tv->thumblist, thumb); - - if (pos >= 0) { - thumb->selected = select; - if (thumb->selected) - gimv_zlist_cell_select (GIMV_ZLIST (tv_data->album), pos); - else - gimv_zlist_cell_unselect (GIMV_ZLIST (tv_data->album), pos); - } - - return TRUE; -} - - -static void -thumbalbum_set_focus (GimvThumbView *tv, GimvThumb *thumb) -{ - ThumbViewData *tv_data; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data && tv_data->album); - - pos = g_list_index (tv->thumblist, thumb); - - if (pos < 0) - gimv_zlist_cell_unset_focus (GIMV_ZLIST (tv_data->album)); - else - gimv_zlist_cell_set_focus (GIMV_ZLIST (tv_data->album), pos); -} - - -static GimvThumb * -thumbalbum_get_focus (GimvThumbView *tv) -{ - ThumbViewData *tv_data; - gint pos; - GList *node; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_val_if_fail (tv_data && tv_data->album, NULL); - - pos = GIMV_ZLIST (tv_data->album)->focus; - if (pos < 0) return NULL; - - node = g_list_nth (tv->thumblist, pos); - if (node) - return node->data; - - return NULL; -} - - -static gboolean -thumbalbum_thumbnail_is_in_viewport (GimvThumbView *tv, GimvThumb *thumb) -{ - ThumbViewData *tv_data; - GList *node; - gint index; - gboolean success; - GdkRectangle area, cell_area, intersect_area; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), FALSE); - g_return_val_if_fail (GIMV_IS_THUMB (thumb), FALSE); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_val_if_fail (tv_data, FALSE); - - node = g_list_find (tv->thumblist, thumb); - index = g_list_position (tv->thumblist, node); - - /* widget area */ - gtkutil_get_widget_area (tv_data->album, &area); - - /* cell area */ - success = gimv_zlist_get_cell_area (GIMV_ZLIST (tv_data->album), index, &cell_area); - g_return_val_if_fail (success, FALSE); - - /* intersect? */ - if (gdk_rectangle_intersect (&area, &cell_area, &intersect_area)) - return TRUE; - else - return FALSE; -} - - -static void -thumbalbum_adjust (GimvThumbView *tv, GimvThumb *thumb) -{ - ThumbViewData *tv_data; - GList *node; - gint pos; - - g_return_if_fail (GIMV_IS_THUMB_VIEW (tv)); - - node = g_list_find (gimv_thumb_view_get_list(), tv); - if (!node) return; - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - g_return_if_fail (tv_data); - - pos = g_list_index (tv->thumblist, thumb); - - gimv_zlist_moveto (GIMV_ZLIST (tv_data->album), pos); - - return; -} - - -static GtkWidget * -thumbalbum_create (GimvThumbView *tv, const gchar *dest_mode) -{ - ThumbViewData *tv_data; - - g_return_val_if_fail (GIMV_IS_THUMB_VIEW (tv), NULL); - - tv_data = gtk_object_get_data (GTK_OBJECT (tv), THUMBALBUM_LABEL); - if (!tv_data) { - tv_data = thumbalbum_new (tv); - g_return_val_if_fail (tv_data, NULL); - } - - /* create zalbum widget */ - tv_data->album = gimv_zalbum_new (); - - if (!strcmp (THUMBALBUM2_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->album, "List2IconMode"); - gimv_zlist_set_to_horizontal (GIMV_ZLIST (tv_data->album)); - gimv_zalbum_set_label_position (GIMV_ZALBUM (tv_data->album), - GIMV_ZALBUM_CELL_LABEL_RIGHT); - gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), - ICON_SIZE, ICON_SIZE); - } else if (!strcmp (THUMBALBUM3_LABEL, dest_mode)) { - gtk_widget_set_name (tv_data->album, "List2ThumbMode"); - album_create_title_idx_list (); - gimv_zlist_set_to_horizontal (GIMV_ZLIST (tv_data->album)); - gimv_zalbum_set_label_position (GIMV_ZALBUM (tv_data->album), - GIMV_ZALBUM_CELL_LABEL_RIGHT); - gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), - tv->thumb_size, - tv->thumb_size); - } else { - gtk_widget_set_name (tv_data->album, "Thumbnail2Mode"); - gimv_zalbum_set_min_pixmap_size (GIMV_ZALBUM (tv_data->album), - tv->thumb_size, - tv->thumb_size); - } - - gimv_scrolled_set_auto_scroll (GIMV_SCROLLED (tv_data->album), - GIMV_SCROLLED_AUTO_SCROLL_BOTH - | GIMV_SCROLLED_AUTO_SCROLL_DND - | GIMV_SCROLLED_AUTO_SCROLL_MOTION); - - gimv_scrolled_set_h_auto_scroll_resolution (GIMV_SCROLLED (tv_data->album), - 20, 10); - gimv_scrolled_set_v_auto_scroll_resolution (GIMV_SCROLLED (tv_data->album), - 20, 10); - - gimv_zlist_set_selection_mode (GIMV_ZLIST (tv_data->album), - GTK_SELECTION_EXTENDED); - - if (!strcmp (THUMBALBUM_LABEL, dest_mode)) { - gimv_zlist_set_cell_padding (GIMV_ZLIST (tv_data->album), - conf.thumbalbum_col_space, - conf.thumbalbum_row_space); - } else { - gimv_zlist_set_cell_padding (GIMV_ZLIST (tv_data->album), 5, 5); - } - - gtk_widget_show (tv_data->album); - - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "button_press_event", - GTK_SIGNAL_FUNC (cb_album_button_press), tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "button_release_event", - GTK_SIGNAL_FUNC (cb_album_button_release), tv); - SIGNAL_CONNECT_TRANSRATE_SCROLL (tv_data->album); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "key-press-event", - GTK_SIGNAL_FUNC (cb_album_key_press), tv); - - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "cell_select", - GTK_SIGNAL_FUNC (cb_select_cell), tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "cell_unselect", - GTK_SIGNAL_FUNC (cb_unselect_cell), tv); - - /* Drag and Drop */ - dnd_src_set (tv_data->album, dnd_types_uri, dnd_types_uri_num); - dnd_dest_set (tv_data->album, dnd_types_uri, dnd_types_uri_num); - gtk_object_set_data (GTK_OBJECT (tv_data->album), "gimv-tab", tv); - - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "drag_begin", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_begin_cb), - tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "drag_data_get", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_data_get_cb), - tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "drag_data_received", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_data_received_cb), - tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "drag-data-delete", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_data_delete_cb), - tv); - gtk_signal_connect_after (GTK_OBJECT (tv_data->album), "drag_end", - GTK_SIGNAL_FUNC (gimv_thumb_view_drag_end_cb), tv); - - /* append thumbnail frames */ - if (tv->thumblist) { - GList *node; - - for (node = tv->thumblist; node; node = g_list_next (node)) - thumbalbum_append_thumb_frame (tv, node->data, dest_mode); - - gimv_zlist_cell_set_focus (GIMV_ZLIST (tv_data->album), 0); - } - - return tv_data->album; -} - - - - - -#include "fileutil.h" -#define DEFAULT_DATA_ORDER "Name,Size,Time" -static gboolean show_data_title = FALSE; -static const gchar *data_order = DEFAULT_DATA_ORDER; -static gchar * -label_filename (GimvThumb *thumb) -{ - const gchar *filename; - gchar *tmpstr; - gchar buf[BUF_SIZE]; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - filename = g_basename(gimv_image_info_get_path (thumb->info)); - - tmpstr = gimv_filename_to_internal (filename); - - if (show_data_title) - g_snprintf (buf, BUF_SIZE, _("Name : %s"), tmpstr); - else - return tmpstr; - - g_free (tmpstr); - - return g_strdup (buf); -} - - -static gchar * -label_size (GimvThumb *thumb) -{ - gchar *size_str, buf[BUF_SIZE]; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - size_str = fileutil_size2str (thumb->info->st.st_size, FALSE); - if (show_data_title) - g_snprintf (buf, BUF_SIZE, _("Size : %s bytes"), size_str); - else - g_snprintf (buf, BUF_SIZE, _("%s bytes"), size_str); - g_free (size_str); - - return g_strdup (buf); -} - - -static gchar * -label_mtime (GimvThumb *thumb) -{ - gchar *time_str, *str; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - time_str = fileutil_time2str (thumb->info->st.st_mtime); - if (show_data_title) - str = g_strconcat (_("Time : "), time_str, NULL); - else - return time_str; - g_free (time_str); - - return str; -} - - -static gchar * -label_image_type (GimvThumb *thumb) -{ - gchar buf[BUF_SIZE]; - const gchar *filename; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - filename = gimv_image_info_get_path (thumb->info); - if (show_data_title) - g_snprintf (buf, BUF_SIZE, _("Type: %s"), - gimv_image_detect_type_by_ext (filename)); - else - return g_strdup (gimv_image_detect_type_by_ext (filename)); - - return g_strdup (buf); -} -typedef gchar *(*AlbumDataStr) (GimvThumb *thumb); -typedef struct _AlbumDisplayData -{ - gchar *title; - AlbumDataStr func; -} AlbumDisplayData; -static const gchar *config_order_string = NULL; -static GList *album_title_idx_list = NULL; -static gint album_title_idx_list_num = 0; -static AlbumDisplayData album_display_data [] = -{ - {N_("Name"), label_filename}, - {N_("Size"), label_size}, - {N_("Time"), label_mtime}, - {N_("Type"), label_image_type}, -}; -static gint album_display_data_num -= sizeof (album_display_data) / sizeof (AlbumDisplayData); -gchar * -album_create_label_str (GimvThumb *thumb) -{ - GList *node; - gchar *label; - - g_return_val_if_fail (GIMV_IS_THUMB (thumb), NULL); - - /* create icon label string */ - node = album_title_idx_list; - label = NULL; - while (node) { - gchar *tmpstr, *oldstr; - gint idx = GPOINTER_TO_INT (node->data); - - if (!label) { - label = album_display_data[idx].func (thumb); - } else { - tmpstr = album_display_data[idx].func (thumb); - oldstr = label; - label = g_strconcat (label, "\n", tmpstr, NULL); - g_free (tmpstr); - g_free (oldstr); - } - - node = g_list_next (node); - } - - return label; -} -static gint -album_get_title_idx (const gchar *title) -{ - gint i; - - g_return_val_if_fail (title, -1); - - for (i = 0; i < album_display_data_num; i++) { - if (!album_display_data[i].title) continue; - if (!strcmp (album_display_data[i].title, title)) - return i; - } - - return -1; -} -void -album_create_title_idx_list (void) -{ - gchar **titles; - gint i = 0; - - if (!data_order) { - config_order_string = NULL; - if (album_title_idx_list) - g_list_free (album_title_idx_list); - album_title_idx_list_num = 0; - return; - } - - if (data_order == config_order_string) return; - - if (album_title_idx_list) g_list_free (album_title_idx_list); - album_title_idx_list = NULL; - - titles = g_strsplit (data_order, ",", -1); - - g_return_if_fail (titles); - - album_title_idx_list_num = 0; - config_order_string = data_order; - - while (titles[i]) { - gint idx; - idx = album_get_title_idx (titles[i]); - if (idx >= 0) { - album_title_idx_list = g_list_append (album_title_idx_list, - GINT_TO_POINTER (idx)); - album_title_idx_list_num++; - } - i++; - } - - g_strfreev (titles); -} diff -Nru gimageview-0.2.27/src/utils_auto_comp.c gimageview-0.3.0-0.20101117/src/utils_auto_comp.c --- gimageview-0.2.27/src/utils_auto_comp.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_auto_comp.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,466 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_auto_comp.c 1214 2009-02-08 14:52:57Z makeinu $ + */ + +/* + * These codes are mostly taken from gThumb. + * gThumb code Copyright (C) 2001 The Free Software Foundation, Inc. + * gThumb author: Paolo Bacchilega + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "prefs.h" +#include "utils_auto_comp.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_file_gtk.h" + +#define MAX_VISIBLE_ROWS 8 +#define CLIST_ROW_PAD 5 + +static gchar *ac_dir = NULL; +static gchar *ac_path = NULL; +static gchar ac_show_dot = FALSE; +static GList *ac_subdirs = NULL; +static GList *ac_alternatives = NULL; + +static GtkWidget *ac_window = NULL; +static GtkWidget *ac_clist = NULL; +static GtkWidget *ac_entry = NULL; +static GtkListStore *ac_list_store = NULL; + +static void +ac_dir_free (void) +{ + if (!ac_dir) return; + + g_free (ac_dir); + ac_dir = NULL; +} + + +static void +ac_path_free (void) +{ + if (!ac_path) return; + + g_free (ac_path); + ac_path = NULL; +} + + +static void +ac_subdirs_free (void) +{ + if (!ac_subdirs) return; + + g_list_foreach (ac_subdirs, (GFunc) g_free, NULL); + g_list_free (ac_subdirs); + ac_subdirs = NULL; +} + + +static void +ac_alternatives_free (void) +{ + if (!ac_alternatives) return; + + g_list_foreach (ac_alternatives, (GFunc) g_free, NULL); + g_list_free (ac_alternatives); + ac_alternatives = NULL; +} + + +void +auto_compl_reset (void) +{ + ac_dir_free (); + ac_path_free (); + ac_subdirs_free (); + ac_alternatives_free (); +} + + +gint +auto_compl_get_n_alternatives (const gchar *path) +{ + gchar *dir; + const gchar *filename; + gint path_len; + GList *scan; + gint n; + gint flags = GETDIR_FOLLOW_SYMLINK; + gboolean show_dot; + + if (path == NULL) return 0; + + filename = g_basename (path); + if (filename && filename[0] == '.') { + show_dot = TRUE; + flags = flags | GETDIR_READ_DOT; + } else { + show_dot = FALSE; + } + + if (strcmp (path, "/") == 0) + dir = g_strdup ("/"); + else + dir = g_dirname (path); + + if (!isdir (dir)) { + g_free (dir); + return 0; + } + + if ((ac_dir == NULL) || strcmp (dir, ac_dir) || ac_show_dot != show_dot) { + ac_dir_free (); + ac_subdirs_free (); + + ac_dir = charset_to_internal (dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + if (!ac_dir && dir) + ac_dir = g_strdup (dir); + + get_dir (dir, flags, NULL, &ac_subdirs); + if (ac_show_dot != show_dot) + ac_show_dot = show_dot; + } + + ac_path_free (); + ac_alternatives_free (); + + ac_path = g_strdup (path); + path_len = strlen (ac_path); + n = 0; + + for (scan = ac_subdirs; scan; scan = scan->next) { + const gchar *subdir = (gchar*) scan->data; + gchar *subdir_internal; + + subdir_internal = charset_to_internal (subdir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + if (!subdir_internal && subdir) + subdir_internal = g_strdup (subdir); + + if (strncmp (path, subdir_internal, path_len) != 0) { + g_free (subdir_internal); + continue; + } + + ac_alternatives = g_list_prepend (ac_alternatives, + subdir_internal); + + n++; + } + + g_free (dir); + ac_alternatives = g_list_reverse (ac_alternatives); + + return n; +} + + +static gint +get_common_prefix_length (void) +{ + gint n; + GList *scan; + gchar c1, c2; + + g_return_val_if_fail (ac_path != NULL, 0); + g_return_val_if_fail (ac_alternatives != NULL, 0); + + /* if the number of alternatives is 1 return its length. */ + if (ac_alternatives->next == NULL) + return strlen ((gchar*) ac_alternatives->data); + + n = strlen (ac_path); + while (TRUE) { + scan = ac_alternatives; + + c1 = ((gchar*) scan->data) [n]; + + if (c1 == 0) + return n; + + /* check that all other alternatives have the same + * character at position n. */ + + scan = scan->next; + + for (; scan; scan = scan->next) { + c2 = ((gchar*) scan->data) [n]; + if (c1 != c2) + return n; + } + + n++; + } + + return -1; +} + + +gchar * +auto_compl_get_common_prefix (void) +{ + gchar *alternative; + gint n; + + if (ac_path == NULL) + return NULL; + + if (ac_alternatives == NULL) + return NULL; + + n = get_common_prefix_length (); + alternative = (gchar*) ac_alternatives->data; + + return g_strndup (alternative, n); +} + + +GList * +auto_compl_get_alternatives (void) +{ + return ac_alternatives; +} + + +static gboolean +ac_window_button_press_cb (GtkWidget *widget, + GdkEventButton *event, + gpointer *data) +{ + GtkWidget *event_widget; + gint x, y, w, h; + + event_widget = gtk_get_event_widget ((GdkEvent *)event); + + gdk_window_get_origin (ac_window->window, &x, &y); + gdk_window_get_size (ac_window->window, &w, &h); + + /* Checks if the button press happened inside the window, + * if not closes the window. */ + if ((event->x >= 0) && (event->x <= w) + && (event->y >= 0) && (event->y <= h)) { + /* In window. */ + return FALSE; + } + + auto_compl_hide_alternatives (); + + return TRUE; +} + + +static gboolean +ac_window_key_press_cb (GtkWidget *widget, + GdkEventKey *event, + gpointer *data) +{ + if (event->keyval == GDK_Escape) { + auto_compl_hide_alternatives (); + return TRUE; + } + + /* allow keyboard navigation in the alternatives clist */ + if (event->keyval == GDK_Up + || event->keyval == GDK_Down + || event->keyval == GDK_Page_Up + || event->keyval == GDK_Page_Down + || event->keyval == GDK_space) + return FALSE; + + if (event->keyval == GDK_Return) { + event->keyval = GDK_space; + return FALSE; + } + + auto_compl_hide_alternatives (); + gtk_widget_event (ac_entry, (GdkEvent*) event); + return TRUE; +} + + +static void +cb_tree_cursor_changed (GtkTreeView *treeview, gpointer data) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + gchar *text, *full_path; + gboolean success; + + g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); + + selection = gtk_tree_view_get_selection (treeview); + success = gtk_tree_selection_get_selected (selection, &model, &iter); + if (!success) return; + + gtk_tree_model_get (model, &iter, + 0, &text, + -1); + if (!text) return; + + full_path = g_strconcat (ac_dir, "/", text, NULL); + gtk_entry_set_text (GTK_ENTRY (ac_entry), full_path); + + g_free (text); + g_free (full_path); + + gtk_editable_set_position (GTK_EDITABLE (ac_entry), -1); +} + + +/* displays a list of alternatives under the entry widget. */ +void +auto_compl_show_alternatives (GtkWidget *entry) +{ + gint x, y, w, h; + GList *scan; + gint n, width; + GtkTreeIter iter; + + if (ac_window == NULL) { + GtkWidget *scroll; + GtkWidget *frame; + GtkTreeViewColumn *col; + GtkCellRenderer *render; + + ac_window = gtk_window_new (GTK_WINDOW_POPUP); + + ac_list_store = gtk_list_store_new (1, G_TYPE_STRING); + ac_clist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (ac_list_store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (ac_clist), TRUE); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ac_clist), FALSE); + + col = gtk_tree_view_column_new(); + render = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, render, FALSE); + gtk_tree_view_column_add_attribute (col, render, "text", 0); + + gtk_tree_view_append_column (GTK_TREE_VIEW (ac_clist), col); + + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + + gtk_container_add (GTK_CONTAINER (ac_window), frame); + gtk_container_add (GTK_CONTAINER (frame), scroll); + gtk_container_add (GTK_CONTAINER (scroll), ac_clist); + + g_signal_connect (G_OBJECT (ac_window), + "button-press-event", + G_CALLBACK (ac_window_button_press_cb), + NULL); + g_signal_connect (G_OBJECT (ac_window), + "key-press-event", + G_CALLBACK (ac_window_key_press_cb), + NULL); + + g_signal_connect (G_OBJECT (ac_clist), + "cursor_changed", + G_CALLBACK (cb_tree_cursor_changed), + NULL); + } + + ac_entry = entry; + width = 0; + n = 0; + + gtk_list_store_clear (ac_list_store); + + for (scan = ac_alternatives; scan; scan = scan->next) { + gtk_list_store_append (ac_list_store, &iter); + gtk_list_store_set (ac_list_store, &iter, + 0, g_basename (scan->data), + -1); + + if (n == 0) { + GtkTreeSelection *selection; + GtkTreePath *treepath; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ac_clist)); + treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (ac_list_store), + &iter); + gtk_tree_selection_select_path (selection, treepath); + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (ac_clist), + treepath, NULL, + TRUE, 0.0, 0.0); + gtk_tree_path_free (treepath); + } + + n++; + } + + gdk_window_get_geometry (entry->window, &x, &y, &w, &h, NULL); + gdk_window_get_deskrelative_origin (entry->window, &x, &y); + gtk_widget_set_uposition (ac_window, x, y + h); + gtk_widget_set_size_request (ac_window, w, 200); + + gtk_widget_show_all (ac_window); + gdk_pointer_grab (ac_window->window, + TRUE, + (GDK_POINTER_MOTION_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK), + NULL, + NULL, + GDK_CURRENT_TIME); + gdk_keyboard_grab (ac_window->window, + FALSE, + GDK_CURRENT_TIME); + gtk_grab_add (ac_window); +} + + +void +auto_compl_hide_alternatives (void) +{ + if (ac_window && GTK_WIDGET_VISIBLE (ac_window)) { + gdk_pointer_ungrab (GDK_CURRENT_TIME); + gdk_keyboard_ungrab (GDK_CURRENT_TIME); + gtk_grab_remove (ac_window); + gtk_widget_hide (ac_window); + } +} diff -Nru gimageview-0.2.27/src/utils_auto_comp.h gimageview-0.3.0-0.20101117/src/utils_auto_comp.h --- gimageview-0.2.27/src/utils_auto_comp.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_auto_comp.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,44 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GThumb + * + * Copyright (C) 2001 The 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 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 Street #330, Boston, MA 02111-1307, USA. + * + * $Id: utils_auto_comp.h 1178 2007-10-23 01:01:40Z makeinu $ + */ + +#ifndef AUTO_COMPLETION_H +#define AUTO_COMPLETION_H + +#include +#include + +void auto_compl_reset (void); + +gint auto_compl_get_n_alternatives (const gchar *path); + +gchar * auto_compl_get_common_prefix (void); + +GList * auto_compl_get_alternatives (void); + +void auto_compl_show_alternatives (GtkWidget *entry); + +void auto_compl_hide_alternatives (void); + + +#endif /* AUTO_COMPLETION_H */ diff -Nru gimageview-0.2.27/src/utils.c gimageview-0.3.0-0.20101117/src/utils.c --- gimageview-0.2.27/src/utils.c 2004-09-21 08:44:32.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils.c 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: utils.c,v 1.4 2004/09/21 08:44:32 makeinu Exp $ + * $Id: utils.c 1036 2004-09-21 08:44:33Z makeinu $ */ #ifdef HAVE_CONFIG_H diff -Nru gimageview-0.2.27/src/utils_char_code.c gimageview-0.3.0-0.20101117/src/utils_char_code.c --- gimageview-0.2.27/src/utils_char_code.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_char_code.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,433 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_char_code.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#include +#include +#include "utils_char_code.h" +#include "utils_japanese.h" + +CharsetDetectLocaleFn charset_locale_fn_table[] = { + japanese_locale_charset, +}; + + +static gboolean +is_default_codeset (const gchar *charset) +{ + if (!charset && !*charset) + return TRUE; + + if (!g_strcasecmp ("default", charset) + || !g_strcasecmp ("none", charset) + || !g_strcasecmp ("auto", charset) + || !g_strcasecmp ("auto detect", charset) + || !g_strcasecmp ("auto-detect", charset) + || !g_strcasecmp ("auto_detect", charset)) + { + return TRUE; + } + + return FALSE; +} + + +/****************************************************************************** + * + * known character set list + * + ******************************************************************************/ +static const gchar *knwon_charset_items[] = { + "default", + CHARSET_ASCII, + CHARSET_JIS, + CHARSET_EUC_JP, + CHARSET_SJIS, + CHARSET_UTF8, +}; + +static GList *known_charset_list = NULL; + +/* FIXME */ +GList * +charset_get_known_list (const gchar *lang) +{ + gint i, num = sizeof (knwon_charset_items) / sizeof (gchar *); + + if (known_charset_list) return known_charset_list; + + for (i = 0; i < num; i++) { + known_charset_list = g_list_append (known_charset_list, + (gpointer) knwon_charset_items[i]); + } + + return known_charset_list; +} + + +/****************************************************************************** + * + * auto detect method for each language. + * + ******************************************************************************/ +CharsetAutoDetectFn auto_detect_fn_table[] ={ + NULL, + japanese_detect_charset, +}; + +const gchar *charset_auto_detect_labels[] = { + N_("None"), + N_("Japanese"), + NULL +}; + + +CharsetAutoDetectFn +charset_get_auto_detect_func (CharsetAutoDetectType type) +{ + guint num = sizeof (auto_detect_fn_table) / sizeof (CharsetAutoDetectFn); + + if (type < 0 || type > num) return NULL; + + return auto_detect_fn_table[type]; +} + + +/****************************************************************************** + * + * detecting locale & internal charset. + * + ******************************************************************************/ +gchar *charset_locale = NULL; +gchar *charset_internal = NULL; + + +const gchar * +get_lang (void) +{ + const gchar *lang = NULL; + + lang = g_getenv ("LANGUAGE"); + + if (!lang) + lang = g_getenv ("LC_ALL"); + + if (!lang) + lang = g_getenv ("LC_CTYPE"); + + if (!lang) + lang = g_getenv ("LC_MESSAGES"); + + if (!lang) + lang = g_getenv ("LANG"); + + if (!lang) + lang = "C"; + + return lang; +} + + +void +charset_set_locale_charset (const gchar *charset) +{ + if (charset_locale) + g_free (charset_locale); + + if (charset && *charset) { + if (is_default_codeset (charset)) { + charset_locale = NULL; + } else { + charset_locale = g_strdup (charset); + } + } else { + charset_locale = NULL; + } +} + + +void +charset_set_internal_charset (const gchar *charset) +{ + if (charset_internal) + g_free (charset_internal); + + if (charset && *charset) { + if (is_default_codeset (charset)) { + charset_internal = NULL; + } else { + charset_internal = g_strdup (charset); + } + } else { + charset_internal = NULL; + } +} + + +const gchar * +charset_get_locale (void) +{ + const gchar *charset; + + if (charset_locale && *charset_locale) + return charset_locale; + + if (!g_get_charset (&charset)) + charset = NULL; + + if (!charset || !*charset) { + gint i, num = sizeof (charset_locale_fn_table) / sizeof (CharsetDetectLocaleFn); + const gchar *lang; + + lang = get_lang (); + + for (i = 0; i < num; i++) { + charset = charset_locale_fn_table[i] (lang); + if (charset) break; + } + } + + if (charset && *charset) { + if (charset_locale) + g_free (charset_locale); + charset_locale = g_strdup (charset); + + return charset_locale; + } + + return CHARSET_ASCII; +} + + +const gchar * +charset_get_internal (void) +{ + const gchar *charset; + + if (charset_internal && *charset_internal) + return charset_internal; + + charset = CHARSET_UTF8; + + if (charset && *charset) { + if (charset_internal) + g_free (charset_internal); + charset_internal = g_strdup (charset); + + return charset_internal; + + } else { + return CHARSET_ASCII; + } +} + + + +/****************************************************************************** + * + * any code -> internal converter + * + ******************************************************************************/ +gchar * +charset_to_internal (const gchar *src, + const gchar *src_codeset, + CharsetAutoDetectFn func, + CharsetToInternalTypes type) +{ + g_return_val_if_fail (src, NULL); + + switch (type) { + case CHARSET_TO_INTERNAL_NEVER: + return g_strdup (src); + case CHARSET_TO_INTERNAL_LOCALE: + return charset_locale_to_internal (src); + case CHARSET_TO_INTERNAL_AUTO: + return charset_to_internal_auto (src, func); + case CHARSET_TO_INTERNAL_ANY: + if (is_default_codeset (src_codeset)) { + src_codeset = charset_get_locale (); + } + return charset_conv (src, src_codeset, charset_get_internal ()); + default: + break; + } + + return g_strdup (src); +} + + +gchar * +charset_locale_to_internal (const gchar *src) +{ + gssize len = -1; + gsize bytes_read, bytes_written; + + g_return_val_if_fail (src, NULL); + + return g_locale_to_utf8 (src, len, &bytes_read, &bytes_written, NULL); +} + + +gchar * +charset_to_internal_auto (const gchar *src, CharsetAutoDetectFn func) +{ + const gchar *charset = charset_get_internal(); + if (charset) + return charset_conv_auto (src, charset, func); + + return g_strdup (src); +} + + + +/****************************************************************************** + * + * any code -> locale converter + * + ******************************************************************************/ +gchar * +charset_to_locale (const gchar *src, + const gchar *src_codeset, + CharsetAutoDetectFn func, + CharsetToLocaleTypes type) +{ + g_return_val_if_fail (src, NULL); + + switch (type) { + case CHARSET_TO_LOCALE_NEVER: + return g_strdup (src); + case CHARSET_TO_LOCALE_INTERNAL: + return charset_internal_to_locale (src); + case CHARSET_TO_LOCALE_AUTO: + return charset_to_locale_auto (src, func); + case CHARSET_TO_LOCALE_ANY: + if (is_default_codeset (src_codeset)) + src_codeset = charset_get_internal (); + return charset_conv (src, src_codeset, charset_get_locale ()); + default: + break; + } + + return g_strdup (src); +} + + +gchar * +charset_internal_to_locale (const gchar *src) +{ + gssize len = -1; + gsize bytes_read, bytes_written; + + g_return_val_if_fail (src, NULL); + + return g_locale_from_utf8 (src, len, &bytes_read, &bytes_written, NULL); +} + + +gchar * +charset_to_locale_auto (const gchar *src, CharsetAutoDetectFn func) +{ + const gchar *dest_charset; + + dest_charset = charset_get_locale (); + if (dest_charset) + return charset_conv_auto (src, dest_charset, func); + else + return g_strdup (src); + + return g_strdup (src); +} + + + +/****************************************************************************** + * + * internal -> any code converter + * + ******************************************************************************/ +gchar * +charset_from_internal (const gchar *src, + const gchar *dest_codeset) +{ + g_return_val_if_fail (src, NULL); + g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); + + return charset_conv (src, charset_get_internal (), dest_codeset); +} + + + +/****************************************************************************** + * + * locale -> any code converter + * + ******************************************************************************/ +gchar * +charset_from_locale (const gchar *src, + const gchar *dest_codeset) +{ + g_return_val_if_fail (src, NULL); + g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); + + return charset_conv (src, charset_get_locale (), dest_codeset); +} + + + +/****************************************************************************** + * + * any -> any code converter + * + ******************************************************************************/ +gchar * +charset_conv (const gchar *src, + const gchar *src_codeset, + const gchar *dest_codeset) +{ + gint rbytes, wbytes; + + g_return_val_if_fail (src, NULL); + g_return_val_if_fail (src_codeset && *src_codeset, g_strdup (src)); + g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); + + return g_convert (src, -1, dest_codeset, src_codeset, + &rbytes, &wbytes, NULL); +} + + +gchar * +charset_conv_auto (const gchar *src, + const gchar *dest_codeset, + CharsetAutoDetectFn func) +{ + const gchar *src_codeset; + + g_return_val_if_fail (src, NULL); + g_return_val_if_fail (func, g_strdup (src)); + g_return_val_if_fail (dest_codeset && *dest_codeset, g_strdup (src)); + + src_codeset = func (src); + + g_return_val_if_fail (src_codeset && *src_codeset, g_strdup (src)); + + return charset_conv (src, src_codeset, dest_codeset); +} diff -Nru gimageview-0.2.27/src/utils_char_code.h gimageview-0.3.0-0.20101117/src/utils_char_code.h --- gimageview-0.2.27/src/utils_char_code.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_char_code.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,139 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_char_code.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifndef __CHARSET_H__ +#define __CHARSET_H__ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + + +#define CHARSET_ASCII "US-ASCII" +#define CHARSET_UTF8 "UTF-8" + +/* japanese character set */ +#define CHARSET_SJIS "SHIFT_JIS" +#define CHARSET_EUC_JP "EUC-JP" +#define CHARSET_JIS "ISO-2022-JP" + +/* for detecting locale charset */ +typedef const gchar *(*CharsetDetectLocaleFn) (const gchar *locale); +/* for auto detecting charset */ +typedef const gchar *(*CharsetAutoDetectFn) (const gchar *string); +/* for alternative character set conversion method */ +typedef gchar *(*CharsetConvFn) (const gchar *string, + const gchar *src_codeset, + const gchar *dest_codeset); + + +typedef enum { + CHARSET_TO_INTERNAL_NEVER, /* do not convert */ + CHARSET_TO_INTERNAL_LOCALE, /* convert to locale charset */ + CHARSET_TO_INTERNAL_AUTO, /* use auto detect function */ + CHARSET_TO_INTERNAL_ANY /* convert from specified charset */ +} CharsetToInternalTypes; + +typedef enum { + CHARSET_TO_LOCALE_NEVER, + CHARSET_TO_LOCALE_INTERNAL, + CHARSET_TO_LOCALE_AUTO, + CHARSET_TO_LOCALE_ANY +} CharsetToLocaleTypes; + +typedef enum { + CHARSET_AUTODETECT_NONE, + CHARSET_AUTODETECT_JAPANESE +} CharsetAutoDetectType; + +extern const gchar *charset_auto_detect_labels[]; + + +GList *charset_get_known_list (const gchar *lang); +const gchar *get_lang (void); + +/* wrapper for nl_langinfo() */ +void charset_set_locale_charset (const gchar *charset); +void charset_set_internal_charset (const gchar *charset); +const gchar *charset_get_locale (void); +const gchar *charset_get_internal (void); +CharsetAutoDetectFn charset_get_auto_detect_func (CharsetAutoDetectType type); + + +/* + * any code -> internal converter + */ + +/* wrapper for all converter */ +/* src_codeset can be NULL if type is not CHARSET_TO_INTERNAL_ANY */ +/* func can be NULL if type is not CHARSET_TO_INTERNAL_AUTO */ +gchar *charset_to_internal (const gchar *src, + const gchar *src_codeset, + CharsetAutoDetectFn func, + CharsetToInternalTypes type); + +gchar *charset_locale_to_internal (const gchar *src); +gchar *charset_to_internal_auto (const gchar *src, + CharsetAutoDetectFn func); + +/* + * any code -> locale converter + */ + +/* wrapper for all converter */ +/* src_codeset can be NULL if type is not CHARSET_TO_INTERNAL_ANY */ +/* func can be NULL if type is not CHARSET_TO_INTERNAL_AUTO */ +gchar *charset_to_locale (const gchar *src, + const gchar *src_codeset, + CharsetAutoDetectFn func, + CharsetToLocaleTypes type); + +gchar *charset_internal_to_locale (const gchar *src); +gchar *charset_to_locale_auto (const gchar *src, + CharsetAutoDetectFn func); + +/* + * internal -> any code converter + */ +gchar *charset_from_internal (const gchar *src, + const gchar *dest_codeset); + +/* + * locale -> any code converter + */ +gchar *charset_from_locale (const gchar *src, + const gchar *dest_codeset); + +/* + * any -> any code converter + */ +gchar *charset_conv (const gchar *src, + const gchar *src_codeset, + const gchar *dest_codeset); +gchar *charset_conv_auto (const gchar *src, + const gchar *dest_codeset, + CharsetAutoDetectFn func); + +#endif /* __CHARSET_H__ */ diff -Nru gimageview-0.2.27/src/utils_dnd.c gimageview-0.3.0-0.20101117/src/utils_dnd.c --- gimageview-0.2.27/src/utils_dnd.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_dnd.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,244 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_dnd.c 1213 2009-01-14 09:24:51Z makeinu $ + */ + +#include + +#include "gimageview.h" + +#include "gimv_thumb.h" +#include "gimv_thumb_view.h" +#include "gimv_thumb_win.h" +#include "prefs.h" +#include "utils_dnd.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_gtk.h" +#include "utils_menu.h" + + +GtkTargetEntry dnd_types_all[] = { + {"GTK_NOTEBOOK_TAB", 0, TARGET_GIMV_TAB}, + {"GIMV_COMPONENT", 0, TARGET_GIMV_COMPONENT}, + {"GIMV_ARCHIVE_MEMBER_LIST", 0, TARGET_GIMV_ARCHIVE_MEMBER_LIST}, + {"text/uri-list", 0, TARGET_URI_LIST}, + {"property/bgimage", 0, TARGET_URI_LIST}, +}; +const gint dnd_types_all_num = sizeof(dnd_types_all) / sizeof(GtkTargetEntry); + +GtkTargetEntry *dnd_types_uri = &dnd_types_all[3]; +const gint dnd_types_uri_num = 1; + +GtkTargetEntry *dnd_types_archive = &dnd_types_all[2]; +const gint dnd_types_archive_num = 2; + +GtkTargetEntry *dnd_types_tab_component = &dnd_types_all[0]; +const gint dnd_types_tab_component_num = 2; + +GtkTargetEntry *dnd_types_component = &dnd_types_all[1]; +const gint dnd_types_component_num = 1; + + +GtkItemFactoryEntry dnd_file_popup_items [] = +{ + {N_("/Open in new tab"), NULL, menu_modal_cb, GDK_ACTION_PRIVATE, NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/Move"), NULL, menu_modal_cb, GDK_ACTION_MOVE, NULL}, + {N_("/Copy"), NULL, menu_modal_cb, GDK_ACTION_COPY, NULL}, + {N_("/Symbolic Link"), NULL, menu_modal_cb, GDK_ACTION_LINK , NULL}, + {N_("/---"), NULL, NULL, 0, ""}, + {N_("/Cancel"), NULL, NULL, 0, NULL}, + {NULL, NULL, NULL, 0, NULL}, +}; + + +/* + * dnd_get_file_list: + * @ convert string URI list to GList format. + * + * string : file list (string format) + * Return : file list (GList format) + */ +GList * +dnd_get_file_list (const gchar *string, gint len) +{ + gchar *file; + gchar *ptr, *uri; + GList *list = NULL; + gint pos = 0; + + uri = ptr = g_memdup (string, len); + + while (*ptr && (pos < len)) { + if (!strncmp(ptr, "file:", 5)) { + ptr += 5; + pos += 5; + } + if (!strncmp(ptr, "//", 2)){ + ptr += 2; + pos += 2; + } + + file = ptr; + + while (*ptr != '\r' && *ptr != '\n' && *ptr != '\0') { + ptr++; + pos++; + } + *ptr++ = '\0'; + pos++; + + while (*ptr == '\r' || *ptr == '\n') { + ptr++; + pos++; + } + + if (file && file[0] != '\r' && file[0] != '\n' && file[0] != '\0') + list = g_list_append (list, g_strdup(file)); + } + + g_free (uri); + + return list; +} + + +/* + * dnd_src_set: + * @ + * + * widget : widget to set DnD (source side). + */ +void +dnd_src_set (GtkWidget *widget, const GtkTargetEntry *entry, gint num) +{ + /* FIXME */ + if (conf.dnd_enable_to_external) + dnd_types_all[3].flags = 0; + else + dnd_types_all[3].flags = GTK_TARGET_SAME_APP; + + gtk_drag_source_set(widget, + GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK, + entry, num, + GDK_ACTION_ASK | GDK_ACTION_COPY + | GDK_ACTION_MOVE | GDK_ACTION_LINK); +} + + +/* + * dnd_dest_set: + * @ + * + * widget : widget to set DnD (destination side). + */ +void +dnd_dest_set (GtkWidget *widget, const GtkTargetEntry *entry, gint num) +{ + if (conf.dnd_enable_from_external) + dnd_types_all[3].flags = 0; + else + dnd_types_all[3].flags = GTK_TARGET_SAME_APP; + + gtk_drag_dest_set(widget, + GTK_DEST_DEFAULT_ALL, + /* GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, */ + entry, num, + GDK_ACTION_ASK | GDK_ACTION_COPY + | GDK_ACTION_MOVE | GDK_ACTION_LINK); +} + + +/* + * dnd_file_operation: + * @ Open DnD context menu and do specified file operation when data + * received. This function will called by "drag_data_received" signal's + * callback function. + * + * dest_dir : destination directory to move/copy/link specified files. + * context : DnD context. + * seldata : URI list (string format). + * time : time when drag data received. + * tw : Pointer to parent ThumbWindow. + */ +void +dnd_file_operation (const gchar *dest_dir, GdkDragContext *context, + GtkSelectionData *seldata, guint time, GimvThumbWin *tw) +{ + GtkWidget *dnd_popup; + GList *list; + GimvThumbView *tv; + gboolean dnd_success = TRUE, dnd_delete = FALSE; + gint n_menu_items, action; + + g_return_if_fail (dest_dir && context && seldata); + + list = dnd_get_file_list (seldata->data, seldata->length); + + /* create popup menu */ + n_menu_items = sizeof (dnd_file_popup_items) + / sizeof (dnd_file_popup_items[0]) - 1; + dnd_popup = menu_create_items (NULL, dnd_file_popup_items, + n_menu_items, "", + NULL); + + g_object_ref (G_OBJECT (dnd_popup)); + gtk_object_sink (GTK_OBJECT (dnd_popup)); + + /* popup menu */ + action = menu_popup_modal (dnd_popup, NULL, NULL, NULL, NULL); + + gtk_widget_unref (dnd_popup); + + if (action == GDK_ACTION_PRIVATE) { + open_images_dirs (list, tw, LOAD_CACHE, FALSE); + } else { + GtkWindow *window = tw ? GTK_WINDOW (tw) : NULL; + switch (action) { + case GDK_ACTION_MOVE: + files2dir (list, dest_dir, FILE_MOVE, window); + dnd_delete = TRUE; + break; + case GDK_ACTION_COPY: + files2dir (list, dest_dir, FILE_COPY, window); + break; + case GDK_ACTION_LINK: + files2dir (list, dest_dir, FILE_LINK, window); + break; + default: + dnd_success = FALSE; + break; + } + } + + gtk_drag_finish(context, dnd_success, dnd_delete, time); + + /* update dest side file list */ + tv = gimv_thumb_view_find_opened_dir (dest_dir); + if (tv) { + gimv_thumb_view_refresh_list (tv); + gtk_idle_add (gimv_thumb_view_refresh_list_idle, tv); + } + + g_list_foreach (list, (GFunc) g_free, NULL); + g_list_free (list); +} diff -Nru gimageview-0.2.27/src/utils_dnd.h gimageview-0.3.0-0.20101117/src/utils_dnd.h --- gimageview-0.2.27/src/utils_dnd.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_dnd.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,74 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_dnd.h 1178 2007-10-23 01:01:40Z makeinu $ + */ + +#ifndef __DND_H__ +#define __DND_H__ + +#include "gimageview.h" + +typedef enum +{ + TARGET_URI_LIST, + TARGET_TEXT, + TARGET_GIMV_TAB, + TARGET_GIMV_COMPONENT, + TARGET_GIMV_ARCHIVE_MEMBER_LIST +} TargetType; + + +extern GtkTargetEntry dnd_types_all[]; +extern const gint dnd_types_all_num; + +extern GtkTargetEntry *dnd_types_uri; +extern const gint dnd_types_uri_num; + +extern GtkTargetEntry *dnd_types_archive; +extern const gint dnd_types_archive_num; + +extern GtkTargetEntry *dnd_types_tab_component; +extern const gint dnd_types_tab_component_num; + +extern GtkTargetEntry *dnd_types_component; +extern const gint dnd_types_component_num; + +/* + extern GtkTargetEntry dnd_com_types[]; + extern const gint dnd_com_types_num; +*/ + + +GList *dnd_get_file_list (const gchar *string, + gint len); +void dnd_src_set (GtkWidget *widget, + const GtkTargetEntry *entry, + gint num); +void dnd_dest_set (GtkWidget *widget, + const GtkTargetEntry *entry, + gint num); +void dnd_file_operation (const gchar *dest_dir, + GdkDragContext *context, + GtkSelectionData *seldata, + guint time, + GimvThumbWin *tw); + +#endif /* __DND_H__ */ diff -Nru gimageview-0.2.27/src/utils_file.c gimageview-0.3.0-0.20101117/src/utils_file.c --- gimageview-0.2.27/src/utils_file.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_file.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,595 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_file.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utils_file.h" + +#ifndef FALSE +# define FALSE (0) +#endif + +#ifndef TRUE +# define TRUE (!FALSE) +#endif + +#ifndef BUF_SIZE +# define BUF_SIZE 4096 +#endif + +#ifndef MAX_PATH_LEN +# define MAX_PATH_LEN 1024 +#endif + + +/* + * file_exists: + * @ check whether path is exist. + * + * path : path to check. + * Return : return TRUE if exist, and return FALSE if not exist. + */ +int +file_exists (const char *path) +{ + struct stat st; + + if ((!path) || (!*path)) + return FALSE; + if (stat(path, &st) < 0) + return FALSE; + return TRUE; +} + + +/* + * isfile: + * @ check whether path is file. + * + * path : path to check. + * Return : return TRUE if path is file, and return FALSE if not. + */ +int +isfile (const char *path) +{ + struct stat st; + + if ((!path) || (!*path)) + return FALSE; + if (stat(path, &st) < 0) + return FALSE; + if (S_ISREG(st.st_mode)) + return TRUE; + return FALSE; +} + + +/* + * isdir: + * @ check whether path is directory. + * + * path : path to check. + * Return : return TRUE if path is directory, and return FALSE if not. + */ +int +isdir (const char *path) +{ + struct stat st; + + if ((!path) || (!*path)) + return FALSE; + if (stat(path, &st) < 0) + return FALSE; + if (S_ISDIR(st.st_mode)) + return TRUE; + return FALSE; +} + + +/* + * islink: + * @ check whether path is link. + * + * path : path to check. + * Return : return 1 if path is link, and return 0 if not. + */ +int +islink(const char *path) +{ + struct stat st; + + if (lstat(path, &st) < 0) + return FALSE; + if (S_ISLNK(st.st_mode)) + return TRUE; + return FALSE; +} + + +/* + * iswritable: + * @ check whether path is writable. + * + * path : path to check. + * Return : return TRUE if path is writable, and return FALSE if not. + */ +int +iswritable (const char *path) +{ + uid_t uid = getuid(); + gid_t gid = getgid(); + struct stat st; + + if (stat(path, &st)) + return FALSE; + + if (!S_ISDIR (st.st_mode)) + return FALSE; + + if(uid == st.st_uid && (st.st_mode & S_IWUSR)) + return TRUE; + else if (gid == st.st_gid && (st.st_mode & S_IWGRP)) + return TRUE; + else if (st.st_mode & S_IWOTH) + return TRUE; + + return FALSE; +} + + +int +isexecutable (const char *path) +{ + struct stat st; + + if (stat(path, &st)) + return FALSE; + + if (st.st_mode & S_IXUSR + || st.st_mode & S_IXGRP + || st.st_mode & S_IXOTH) + { + return TRUE; + } + + return FALSE; +} + + +/* + * Return: negative value if it is not directory. + * 0 if has no sub directory. + positive value if has sub directory. + */ +int +has_subdirs (const char *path) +{ + struct stat st; + + if ((!path) || (!*path)) + return -1; + if (stat(path, &st) < 0) + return -1; + if (!S_ISDIR(st.st_mode)) + return -1; + + return st.st_nlink - 2; +} + + +/* + * fileutil_makedir: + * @ make one directory. + * + * dir : directory to make. + * Return : return TURE if success, and return FALSE if fail. + */ +int +makedir (const char *dir) +{ + if ((!dir) || (!*dir)) + return FALSE; + if (!mkdir(dir, S_IRWXU)) + return TRUE; + return FALSE; +} + + +/* + * mkdirs: + * @ make directory recursively. similar to "mkdir -p" shell command. + * @ The path string until last "/" character will be intented as directory. + * + * path : src path. + * Return : return TRUE if success, and return FALSE if fail. + */ +int +mkdirs (const char *path) +{ + char ss[MAX_PATH_LEN]; + int i, ii; + + i = 0; + ii = 0; + while (path[i] && i < MAX_PATH_LEN) { + ss[ii++] = path[i]; + ss[ii] = '\0'; + if (i + 1 < MAX_PATH_LEN && path[i + 1] == '/') { + if (!file_exists(ss)) { + if (!makedir(ss)) + return FALSE; + } else if (!isdir(ss)) + return FALSE; + } + i++; + } + return TRUE; +} + + +int +ensure_dir_exists (const char *a_path) +{ + if (!a_path) return FALSE; + + if (!isdir (a_path)) { + char *path = g_strdup (a_path); + char *p = path; + + while (*p != '\0') { + p++; + if ((*p == '/') || (*p == '\0')) { + int end = TRUE; + + if (*p != '\0') { + *p = '\0'; + end = FALSE; + } + + if (!isdir (path)) { + if (mkdir (path, 0755) < 0) { + g_free (path); + return FALSE; + } + } + if (!end) *p = '/'; + } + } + g_free (path); + } + + return TRUE; +} + + +int +get_file_mtime (const char *path) +{ + struct stat st; + + if (! path || ! *path) return 0; + + if (stat(path, &st)) + return 0; + + return st.st_mtime; +} + + +/* + * fileutile_size2str: + * @ add comma. + * size : + * space : + * Return : + */ +char * +fileutil_size2str (size_t size, int space) +{ + unsigned int i = 0, j = 0, n_digit = 0; + char tmp[14]; + char comma[14]; + char buf[14]; + + i = size; + + /* detect digit num */ + while (i > 0) { + i = i/10; + n_digit++; + } + + sprintf (tmp, "%d", size); + + if (strlen (tmp) < 4) + return g_strdup (tmp); + + /* until first comma */ + if (n_digit % 3 != 0) { + for (i = 0; i < n_digit % 3; i++) + comma[j++] = tmp[i]; + if (i != strlen (tmp)) + comma[j++] = ','; + } + + /* until end of string */ + while (tmp[i] != '\0'){ + comma[j++] = tmp[i++]; + comma[j++] = tmp[i++]; + comma[j++] = tmp[i++]; + if(tmp[i] != '\0') + comma[j++] = ','; + } + + /* end of string */ + comma[j] = '\0'; + + if (space) { + g_snprintf (buf, 14, "%13s", comma); + return g_strdup (buf); + } else { + return g_strdup(comma); + } +} + + +/* + * fileutile_time2str: + * time : + * Return : + */ +char * +fileutil_time2str (time_t time) +{ + struct tm *jst = localtime (&time); + char *week[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + char timestamp[256]; + + g_snprintf (timestamp, 256, "%4d/%02d/%02d %s %02d:%02d", + jst->tm_year+1900, jst->tm_mon+1, jst->tm_mday, + week[jst->tm_wday], jst->tm_hour, jst->tm_min); + + return g_strdup (timestamp); +} + + +/* + * fileutile_uid2str: + * uid : + * Return : + */ +char * +fileutil_uid2str (uid_t uid) +{ + struct passwd *pw = getpwuid (uid); + char buf[16]; + + if (pw) { + return g_strdup (pw->pw_name); + } else { + g_snprintf (buf, 16, "%d", uid); + return g_strdup (buf); + } +} + + +/* + * fileutile_gid2str: + * gid : + * Return : + */ +char * +fileutil_gid2str (gid_t gid) +{ + struct group *gr = getgrgid (gid); + char buf[16]; + + if (gr) { + return g_strdup (gr->gr_name); + } else { + g_snprintf (buf, 16, "%d", gid); + return g_strdup (buf); + } +} + + +/* + * fileutile_mode2str: + * mode : + * Return : + */ +char * +fileutil_mode2str (mode_t mode) +{ + char permission[11] = {"----------"}; + + switch (mode & S_IFMT){ + case S_IFREG: + permission[0] = '-'; + break; + case S_IFLNK: + permission[0] = 'l'; + break; + case S_IFDIR: + permission[0] = 'd'; + break; + default: + permission[0] = '?'; + break; + } + + if (mode & S_IRUSR) + permission[1] = 'r'; + if (mode & S_IWUSR) + permission[2] = 'w'; + if (mode & S_IXUSR) + permission[3] = 'x'; + + if (mode & S_IRGRP) + permission[4] = 'r'; + if (mode & S_IWGRP) + permission[5] = 'w'; + if (mode & S_IXGRP) + permission[6] = 'x'; + + if (mode & S_IROTH) + permission[7] = 'r'; + if (mode & S_IWOTH) + permission[8] = 'w'; + if (mode & S_IXOTH) + permission[9] = 'x'; + + if (mode & S_ISUID) + permission[3] = 'S'; + if (mode & S_ISGID) + permission[6] = 'S'; + if (mode & S_ISVTX) + permission[9] = 'T'; + + permission[11] = 0; + + return g_strdup (permission); +} + + +/* + * fileutil_home2tilde: + * @ If path string include HOME DIR, convert it to "~/". + * @ The returned string should be freed when no longer needed. + * + * path : src path. + * Return : Short path. + * @ If HOME DIR is not included in path string , return src path. + */ +char * +fileutil_home2tilde (const char *path) +{ + char *home = NULL; + char buf[MAX_PATH_LEN]; + char *retval; + size_t len; + + home = getenv("HOME"); + + len = strlen (home); + if (strlen (path) > len + && !strncmp (path, home, len) + && (path[len] == '/' || path[len] == '\0')) + { + g_snprintf (buf, BUF_SIZE, "~/%s", path + len + 1); + retval = g_strdup (buf); + } else { + retval = g_strdup (path); + } + + return retval; +} + + +/* + * fileutil_dir_basename: + * @ Return directory name (strip parent direcory name). + * @ The returned string should be freed when no longer needed. + * + * path : src path. + * Return : Base directory name. + */ +char * +fileutil_dir_basename (const char *path) +{ + char *basename = NULL; + char *tmpstr = NULL, *endchr = NULL; + char *retval; + + if (!path) + return NULL; + + tmpstr = g_strdup (path); + endchr = strrchr(tmpstr, '/'); + + if (endchr && endchr + 1) { + basename = endchr + 1; + } else if (endchr) { + *endchr = '\0'; + endchr = strrchr(tmpstr, '/'); + if (endchr && endchr + 1) + basename = endchr + 1; + } else { + return NULL; + } + + retval = g_strdup (basename); + g_free (tmpstr); + + return retval; +} + + +char * +fileutil_get_extention (const char *filename) +{ + char *ext; + + if (!filename) + return NULL; + + ext = strrchr(filename, '.'); + if (ext) + ext = ext + 1; + else + return NULL; + + if (ext == "\0") + return NULL; + else + return ext; +} + + +int +fileutil_extension_is (const char *filename, const char *ext) +{ + int len1, len2; + + if (!filename) return FALSE; + if (!*filename) return FALSE; + if (!ext) return FALSE; + if (!*ext) return FALSE; + + len1 = strlen (filename); + len2 = strlen (ext); + + if (len1 < len2) return FALSE; + + return !g_strcasecmp (filename + len1 - len2, ext); +} diff -Nru gimageview-0.2.27/src/utils_file_gtk.c gimageview-0.3.0-0.20101117/src/utils_file_gtk.c --- gimageview-0.2.27/src/utils_file_gtk.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_file_gtk.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,1966 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_file_gtk.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "fr-archive.h" +#include "gimv_comment.h" +#include "gimv_image.h" +#include "gimv_thumb.h" +#include "gimv_thumb_cache.h" +#include "prefs.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_file_gtk.h" +#include "utils_gtk.h" + +#ifndef BUF_SIZE +#define BUF_SIZE 4096 +#endif + +#ifndef MAX_PATH_LEN +#define MAX_PATH_LEN 1024 +#endif + + +gchar * +add_slash (const gchar *path) +{ + g_return_val_if_fail (path, NULL); + + if (!*path) return g_strdup ("/"); + + if (path [strlen (path) - 1] == '/') + return g_strdup (path); + else + return g_strconcat (path, "/", NULL); +} + + +gchar * +remove_slash (const gchar *path) +{ + g_return_val_if_fail (path, NULL); + g_return_val_if_fail (*path, g_strdup (path)); + + if (path[strlen (path) - 1] == '/') + return g_dirname (path); + else + return g_strdup (path); +} + + +gboolean getting_dir = FALSE; +gboolean stop_getting_dir = FALSE; +static gchar* tmpdir = NULL; + + +gchar * +get_temp_dir_name (void) +{ + if (tmpdir) return tmpdir; + + tmpdir = g_strdup_printf ("%s%s.%d", + g_get_tmp_dir (), + "/gimv", + getpid ()); + return tmpdir; +} + + +void +remove_dir (const gchar *dirname) +{ + GList *node, *list; + + if (!isdir(dirname)) return; + + list = get_dir_all (dirname); + + for (node = list; node; node = g_list_next (node)) + remove (node->data); + + if (list) { + remove (dirname); + g_list_foreach (list, (GFunc) g_free, NULL); + g_list_free (list); + } +} + + +void +remove_temp_dir (void) +{ + if (!tmpdir) return; + + remove_dir (tmpdir); + + g_free (tmpdir); + tmpdir = NULL; +} + + +/* + * get_dir: + * @ Get image files in specified directory. + * + * dirname : Directory to scan. + * files : Pointer to OpenFiles struct for store directory list. + */ +void +get_dir (const gchar *dirname, GetDirFlags flags, + GList **filelist_ret, GList **dirlist_ret) +{ + DIR *dp; + struct dirent *entry; + gchar buf[MAX_PATH_LEN], *path; + GList *filelist = NULL, *dirlist = NULL, *list; + + g_return_if_fail (dirname && *dirname); + + getting_dir = TRUE; + + if (flags & GETDIR_DISP_STDERR) + fprintf (stderr, _("scandir = %s\n"), dirname); + else if (flags & GETDIR_DISP_STDOUT) + fprintf (stdout, _("scandir = %s\n"), dirname); + + if ((dp = opendir (dirname))) { + while ((entry = readdir (dp))) { + if (flags & GETDIR_ENABLE_CANCEL) { + while (gtk_events_pending()) gtk_main_iteration(); + if (stop_getting_dir) break; + } + + /* ignore dot file */ + if (!(flags & GETDIR_READ_DOT) && entry->d_name[0] == '.') + continue; + + /* get full path */ + if (dirname [strlen (dirname) - 1] == '/') + g_snprintf (buf, MAX_PATH_LEN, "%s%s", dirname, entry->d_name); + else + g_snprintf (buf, MAX_PATH_LEN, "%s/%s", dirname, entry->d_name); + + /* if path is file */ + if (!isdir (buf) || (!(flags & GETDIR_FOLLOW_SYMLINK) && islink (buf))) { + if (!filelist_ret) continue; + + if (!(flags & GETDIR_DETECT_EXT) + || gimv_image_detect_type_by_ext (buf) + || ((flags & GETDIR_GET_ARCHIVE) + && fr_archive_utils_get_file_name_ext (buf))) + { + path = g_strdup (buf); + + if (flags & GETDIR_DISP_STDERR) + fprintf (stderr, _("filename = %s\n"), path); + else if (flags & GETDIR_DISP_STDOUT) + fprintf (stdout, _("filename = %s\n"), path); + + filelist = g_list_append (filelist, path); + } + + /* if path is dir */ + } else if (isdir(buf)) { + if (dirlist_ret && strcmp(entry->d_name, ".") + && strcmp(entry->d_name, "..")) + { + path = g_strdup (buf); + + if (flags & GETDIR_DISP_STDERR) + fprintf (stderr, _("dirname = %s\n"), path); + else if (flags & GETDIR_DISP_STDOUT) + fprintf (stdout, _("dirname = %s\n"), path); + + dirlist = g_list_append (dirlist, path); + } + } + } + closedir (dp); + if (filelist) + filelist = g_list_sort (filelist, gtkutil_comp_spel); + if (dirlist) + dirlist = g_list_sort (dirlist, gtkutil_comp_spel); + } else { + g_warning ("cannot open directory: %s", dirname); + } + + /* recursive get */ + if (flags & GETDIR_RECURSIVE) { + GList *tmplist = g_list_copy (dirlist); + gint tmp_flags = flags | GETDIR_RECURSIVE_IS_BRANCH; + + list = tmplist; + while (list) { + GList *tmp_filelist = NULL, *tmp_dirlist = NULL; + if (flags & GETDIR_ENABLE_CANCEL) { + while (gtk_events_pending()) gtk_main_iteration(); + if (stop_getting_dir) break; + } + get_dir ((const gchar *) list->data, tmp_flags, + &tmp_filelist, &tmp_dirlist); + filelist = g_list_concat (filelist, tmp_filelist); + dirlist = g_list_concat (dirlist, tmp_dirlist); + list = g_list_next (list); + } + g_list_free (tmplist); + } + + /* return value */ + if (filelist_ret) + *filelist_ret = filelist; + if (dirlist_ret) + *dirlist_ret = dirlist; + + if (!(flags & GETDIR_RECURSIVE_IS_BRANCH)) { + getting_dir = FALSE; + stop_getting_dir = FALSE; + } +} + + +void +get_dir_stop (void) +{ + if (getting_dir) + stop_getting_dir = TRUE; +} + + +/* + * get_dir_all: + * @ + * + * dirname : + * Return : + */ +GList * +get_dir_all (const gchar *dirname) +{ + GList *filelist, *dirlist, *sub_dirlist, *node; + gchar *sub_dirname; + + get_dir (dirname, GETDIR_READ_DOT, &filelist, &dirlist); + + if (dirlist) { + node = dirlist; + while (node) { + sub_dirname = node->data; + sub_dirlist = get_dir_all (sub_dirname); + if (sub_dirlist) + filelist = g_list_concat (sub_dirlist, filelist); + node = g_list_next (node); + } + filelist = g_list_concat (filelist, dirlist); + } + return filelist; +} + + +/* + * get_dir_all_file: + * @ + * + * dirname : + * Return : + */ +static GList * +get_dir_all_file (const gchar *dirname) +{ + GList *filelist, *dirlist, *sub_dirlist, *node; + gchar *sub_dirname; + + get_dir (dirname, GETDIR_READ_DOT, &filelist, &dirlist); + + if (dirlist) { + node = dirlist; + while (node) { + sub_dirname = node->data; + sub_dirlist = get_dir_all_file (sub_dirname); + if (sub_dirlist) + filelist = g_list_concat (sub_dirlist, filelist); + node = g_list_next (node); + } + } + return filelist; +} + + +/* + * merge from misc/misc.c in Text maid (Copyright(C) Kazuki Iwamoto). + */ +gchar * +relpath2abs (const gchar *path) +{ + gchar *dir, *dest; + gint i,j,len; + + g_return_val_if_fail (path && *path, NULL); + + if (path[0] != '/') { + dir = g_get_current_dir (); + dest = g_strjoin ("/", dir, path, NULL); + g_free (dir); + } else { + dest = g_strdup (path); + } + + len = strlen (dest) + 1; + i = 0; + while (i < len - 2) { + if (dest[i] == '/' && dest[i + 1] == '.' + && (dest[i + 2] == '/' || dest[i + 2] == '\0')) + { + len -= 2; + memmove (dest + i, dest + i + 2, len - i); + } + + i++; + } + + i = 0; + while (i < len - 3) { + if (dest[i] == '/' && dest[i + 1] == '.' && dest[i + 2] == '.' + && (dest[i + 3] == '/' || dest[i + 3] == '\0')) + { + len -= 3; + memmove (dest + i, dest + i + 3, len - i); + for (j = i - 1; j >= 0; j--) { + if (dest[j] == '/') + break; + } + if (j >= 0) { + memmove (dest + j, dest + i, len - i); + len -= i - j; + i = j; + } + } + + i++; + } + + return dest; +} + + +gchar * +link2abs (const gchar *path) +{ + gchar *retval = NULL, **dirs, buf[MAX_PATH_LEN], *tmpstr; + gint i, num; + + g_return_val_if_fail (path && *path, NULL); + g_return_val_if_fail (path[0] == '/', g_strdup (path)); + + if (!strcmp (path, "/")) return g_strdup (path); + + dirs = g_strsplit (path, "/", -1); + g_return_val_if_fail (dirs, g_strdup (path)); + + retval = g_strdup(""); + for (i = 0; dirs[i]; i++) { + gchar *endchr; + + if (!*dirs[i]) continue; + + tmpstr = g_strconcat (retval, "/", dirs[i], NULL); + g_free (retval); + retval = tmpstr; + + num = readlink (retval, buf, MAX_PATH_LEN); + if (num < 1) continue; + + buf[num] = '\0'; + if (buf[0] == '/') { + g_free (retval); + retval = g_strdup (buf); + } else { + endchr = strrchr (retval, '/'); + if (!endchr) { + g_free (retval); + retval = g_strdup (path); + break; + } + *endchr = '\0'; + /* FIXME: what about link to link? */ + tmpstr = g_strconcat (retval, "/", buf, NULL); + g_free (retval); + retval = tmpstr; + } + } + + g_strfreev (dirs); + + if (!retval) { + g_warning ("invalid link: %s\n", path); + } else { + tmpstr = relpath2abs (retval); + g_free (retval); + retval = tmpstr; + } + + return retval; +} + + +static gboolean +move_file_check_path (const gchar *from_path, + struct stat *from_st, + const gchar *dir, + gboolean show_error, + GtkWindow *window) +{ + gchar *from_dir, error_message[BUF_SIZE]; + gchar *from_path_internal, *dir_internal; + gboolean retval = FALSE; + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + dir_internal = charset_to_internal (dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /******************** + * check source file + ********************/ + if (lstat (from_path, from_st)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't find source file :\n%s"), + from_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + + /***************** + * check dest dir + *****************/ + if (!iswritable (dir)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't move file : %s\n" + "Permission denied: %s\n"), + from_path_internal, dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + + /******************* + * check source dir + *******************/ + from_dir = g_dirname (from_path); + if (!iswritable (from_dir)) { + if (show_error) { + gchar *from_dir_internal; + + from_dir_internal = charset_to_internal (from_dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + g_snprintf (error_message, BUF_SIZE, + _("Can't move file : %s\n" + "Permission denied: %s\n"), + from_path_internal, from_dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + + g_free (from_dir_internal); + } + g_free (from_dir); + goto ERROR; + } + g_free (from_dir); + + retval = TRUE; + +ERROR: + g_free (from_path_internal); + g_free (dir_internal); + return retval; +} + + +static gboolean +move_file_check_over_write (const gchar *from_path, + struct stat *from_st, + const gchar *to_path, + struct stat *to_st, + gchar *new_path, gint new_path_len, + ConfirmType *action, + gboolean show_error, + GtkWindow *window) +{ + gchar error_message[BUF_SIZE], *to_path_internal; + gint exist; + gboolean retval = FALSE; + + if (new_path) + new_path[0] = '\0'; + + to_path_internal = charset_to_internal (to_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + exist = !lstat(to_path, to_st); + if (exist && (!strcmp (from_path, to_path) + || from_st->st_ino == to_st->st_ino)) + { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Same file :\n%s"), to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + + } else if (exist && *action == CONFIRM_ASK) { + if (isdir (from_path)) { + g_snprintf (error_message, BUF_SIZE, + _("File exist : %s"), to_path_internal); + gtkutil_message_dialog (_("ERROR!!"), error_message, window); + + } else { + g_snprintf (error_message, BUF_SIZE, + _("The file exists : %s\n" + "Overwrite?"), + to_path_internal); + *action = gtkutil_overwrite_confirm_dialog (_("File exist!!"), error_message, + to_path, from_path, + new_path, MAX_PATH_LEN, + ConfirmDialogMultipleFlag, + window); + } + } + + if (new_path && *new_path) { + retval = TRUE; + } else { + switch (*action) { + case CONFIRM_YES: + case CONFIRM_YES_TO_ALL: + retval = TRUE; + break; + case CONFIRM_NO: + case CONFIRM_CANCEL: + retval = FALSE; + break; + case CONFIRM_NO_TO_ALL: + if (exist) + retval = FALSE; + else + retval = TRUE; + break; + default: + if (!exist) + retval = TRUE; + else + retval = FALSE; + break; + } + } + +ERROR: + g_free (to_path_internal); + return retval; +} + + +/* + * move_file: + * @ + * + * from_path : + * dir : + * action : + * show_error : + * Return : TRUE if success to move file. + */ +gboolean +move_file (const gchar *from_path, const gchar *dir, + ConfirmType *action, gboolean show_error, + GtkWindow *window) +{ + gchar *to_path, error_message[BUF_SIZE]; + struct stat from_st, to_st, todir_st; + struct utimbuf ut; + gboolean move_file = FALSE, move_faild = FALSE, copy_success = FALSE, retval; + gchar *from_path_internal, *to_path_internal, new_path[MAX_PATH_LEN]; + + new_path[0] = '\0'; + + g_return_val_if_fail (action, FALSE); + + retval = move_file_check_path (from_path, &from_st, dir, show_error, window); + if (!retval) return FALSE; + + /* set dest path */ + to_path = g_strconcat (dir, g_basename (from_path), NULL); + + move_file = move_file_check_over_write (from_path, &from_st, + to_path, &to_st, + new_path, MAX_PATH_LEN, + action, show_error, + window); + if (!move_file) { + retval = FALSE; + goto ERROR0; + } + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + if (*new_path) { + g_free (to_path); + to_path = g_strdup (new_path); + } + to_path_internal = charset_to_internal (to_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /************** + * move file!! + **************/ + stat (dir, &todir_st); + if (from_st.st_dev != todir_st.st_dev) { + copy_success = copy_file_to_file (from_path, to_path, action, show_error, + window); + if (copy_success) { + /* reset new file's time info */ + ut.actime = from_st.st_atime; + ut.modtime = from_st.st_mtime; + utime(to_path, &ut); + + /* remove old file */ + if (remove (from_path) < 0) { /* faild to remove file */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Faild to remove file :\n" + "%s"), + from_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR1; + } + } else { + move_faild = TRUE; + } + } else { + move_faild = rename (from_path, to_path); + } + + /************************ + * if faild to move file + ************************/ + if (move_faild) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Faild to move file :\n" + "From : %s\n" + "To : %s"), + from_path_internal, to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + } + +ERROR1: + g_free (from_path_internal); + g_free (to_path_internal); +ERROR0: + g_free (to_path); + return retval; +} + + +static gboolean +copy_dir_check_source (const gchar *from_dir, gboolean show_error, + GtkWindow *window) +{ + gchar error_message[BUF_SIZE], *from_dir_internal; + gboolean retval = TRUE; + + from_dir_internal = charset_to_internal (from_dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + if (islink (from_dir)) { /* check path is link or not */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("%s is link!!.\n"), + from_dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR; + } + + if (!file_exists (from_dir)) { /* check path exists or not */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't find source file :\n%s"), + from_dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR; + } + + if (!isdir (from_dir)) { /* check path is directory or not */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("%s is not directory!!.\n"), + from_dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR; + } + +ERROR: + g_free (from_dir_internal); + return TRUE; +} + + +static gboolean +copy_dir_check_dest (const gchar *from_path, const gchar *dirname, + const gchar *to_dir, gboolean show_error, + GtkWindow *window) +{ + gchar error_message[BUF_SIZE]; + gchar *from_path_internal, *dirname_internal, *to_dir_internal; + gboolean retval = TRUE; + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + dirname_internal = charset_to_internal (dirname, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + to_dir_internal = charset_to_internal (to_dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + if (!iswritable (dirname)) { /* check permission */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't copy directory : %s\n" + "Permission denied: %s\n"), + from_path_internal, + dirname_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR; + } + + if (file_exists (to_dir)) { /* check dest path */ + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("File exists!! : %s\n"), + to_dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + retval = FALSE; + goto ERROR; + } + +ERROR: + g_free (from_path_internal); + g_free (dirname_internal); + g_free (to_dir_internal); + + return retval; +} + + +/* + * copy_dir: + * @ + * + * from_path : + * dir : + * action : + * show_error : + * Return : TRUE if success to copy directory. + */ +static gboolean +copy_dir (const gchar *from_path, const gchar *dir, + ConfirmType *action, gboolean show_error, + GtkWindow *window) +{ + GtkWidget *progress_win; + gchar message[BUF_SIZE]; + GList *filelist, *node; + gchar *from_dir, *to_dir, *to_path, *dirname; + ConfirmType confirm; + gboolean result, cancel = FALSE; + gfloat progress; + gint pos, length; + + from_dir = g_strdup (from_path); + if (from_dir[strlen (from_dir) - 1] == '/') + from_dir[strlen (from_dir) - 1] = '\0'; + + dirname = g_strdup (dir); + if (dirname[strlen (dirname) - 1] == '/') + dirname[strlen (dirname) - 1] = '\0'; + + to_dir = g_strconcat (dirname, "/", g_basename (from_dir), NULL); + + /******************* + * check source dir + *******************/ + result = copy_dir_check_source (from_dir, show_error, window); + if (!result) goto ERROR; + + /***************** + * check dest dir + *****************/ + result = copy_dir_check_dest (from_path, dirname, to_dir, show_error, window); + g_free (dirname); + if (!result) goto ERROR; + + + /**************** + * do copy files + ****************/ + filelist = node = get_dir_all_file (from_path); + confirm = CONFIRM_YES_TO_ALL; + + progress_win = gtkutil_create_progress_window (_("Copy directory"), "...", + &cancel, 300, -1, window); + gtk_grab_add (progress_win); + length = g_list_length (filelist); + + while (node) { + guint len; + gchar *filename = node->data; + gchar *tmpstr; + + while (gtk_events_pending()) gtk_main_iteration(); + + pos = g_list_position (filelist, node); + progress = (gfloat) pos / (gfloat) length; + + { /********** convert charset **********/ + gchar *filename_internal; + + filename_internal = charset_to_internal (filename, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + g_snprintf (message, BUF_SIZE, _("Copying %s ..."), + filename_internal); + + g_free (filename_internal); + } + + gtkutil_progress_window_update (progress_win, _("Copying directory"), + message, NULL, progress); + + len = strlen (from_path); + + if (strlen (filename) > len) { + tmpstr = filename + len; + if (tmpstr[0] == '/') tmpstr++; + to_path = g_strconcat (to_dir, "/", tmpstr, NULL); + + /* realy do copy :-) */ + mkdirs (to_path); + copy_file_to_file (filename, to_path, &confirm, show_error, window); + + g_free (to_path); + } + + node = g_list_next (node); + } + + gtk_grab_remove (progress_win); + gtk_widget_destroy (progress_win); + + g_list_foreach (filelist, (GFunc) g_free, NULL); + g_list_free (filelist); + + g_free (from_dir); + g_free (to_dir); + + return TRUE; + +ERROR: + g_free (from_dir); + g_free (to_dir); + return FALSE; +} + + +/* + * copy_file_to_file: + * @ + * + * from_path : + * to_path : + * action : + * show_error : + * Return : TRUE if success to copy file. + */ +gboolean +copy_file_to_file (const gchar *from_path, const gchar *to_path, + ConfirmType *action, gboolean show_error, + GtkWindow *window) +{ + gint b; + gchar buf[BUFSIZ], *from_path_internal, *to_path_internal; + gchar error_message[BUF_SIZE]; + FILE *from, *to; + struct stat from_st, to_st; + gint exist; + gchar new_path[MAX_PATH_LEN]; + + new_path[0] = '\0'; + + g_return_val_if_fail (action, FALSE); + + /******************** + * check source file + ********************/ + if (isdir (from_path)) { + return copy_dir (from_path, to_path, action, show_error, window); + } + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + to_path_internal = charset_to_internal (to_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + if (lstat (from_path, &from_st)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't find source file :\n%s"), + from_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + + /****************** + * check dest file + ******************/ + exist = !lstat(to_path, &to_st); + if (exist && (!strcmp (from_path, to_path) + || from_st.st_ino == to_st.st_ino)) + { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Same file :\n%s"), + to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + + } else if (exist && *action == CONFIRM_ASK) { + g_snprintf (error_message, BUF_SIZE, + _("The file exists : %s\n" + "Overwrite?"), + to_path_internal); + *action = gtkutil_overwrite_confirm_dialog (_("File exist!!"), error_message, + to_path, from_path, + new_path, MAX_PATH_LEN, + ConfirmDialogMultipleFlag, + window); + } + + if (*new_path) { + g_free (to_path_internal); + to_path = new_path; + to_path_internal = charset_to_internal (to_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + } else { + switch (*action) { + case CONFIRM_YES: + case CONFIRM_YES_TO_ALL: + break; + case CONFIRM_NO: + case CONFIRM_CANCEL: + goto ERROR; + break; + case CONFIRM_NO_TO_ALL: + if (exist) + goto ERROR; + break; + default: + if (exist) + goto ERROR; + break; + } + } + + /********** + * do copy + **********/ + from = fopen (from_path, "rb"); + if (!from) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't open file for read :\n%s"), + to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + + to = fopen (to_path, "wb"); + if (!to) { + fclose (from); + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't open file for write :\n%s"), + to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + + while ((b = fread (buf, sizeof (char), BUFSIZ, from)) > 0) { + fwrite (buf, sizeof (char), b, to); + if (ferror (to)) { + fclose (from); + fclose (to); + + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("An error occured while copying file :\n%s"), + to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR; + } + } + + fclose (from); + fclose (to); + + g_free (to_path_internal); + g_free (from_path_internal); + return TRUE; + +ERROR: + g_free (to_path_internal); + g_free (from_path_internal); + return FALSE; +} + + +/* + * copy_file: + * @ + * + * from_path : + * dir : + * action : + * show_error : + * Return : TRUE if success to copy file. + */ +gboolean +copy_file (const gchar *from_path, const gchar *dir, + ConfirmType *action, gboolean show_error, + GtkWindow *window) +{ + gchar *to_path; + gboolean retval; + gchar error_message[BUF_SIZE]; + + g_return_val_if_fail (action, FALSE); + + /* check source file is directory or not */ + if (isdir (from_path)) { + return copy_dir (from_path, dir, action, show_error, window); + } + + /***************** + * check dest dir + *****************/ + if (!iswritable (dir)) { + if (show_error) { + gchar *from_path_internal, *dir_internal; + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + dir_internal = charset_to_internal (dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + g_snprintf (error_message, BUF_SIZE, + _("Can't copy file : %s\n" + "Permission denied: %s\n"), + from_path_internal, dir_internal); + + gtkutil_message_dialog (_("Error!!"), error_message, window); + + g_free (from_path_internal); + g_free (dir_internal); + } + return FALSE; + } + + to_path = g_strconcat (dir, g_basename (from_path), NULL); + retval = copy_file_to_file (from_path, to_path, action, show_error, window); + g_free (to_path); + + return retval; +} + + +/* + * link_file: + * @ + * + * from_path : + * dir : + * action : + * show_error : + * Return : TRUE if success to link file. + */ +gboolean +link_file (const gchar *from_path, const gchar *dir, + gboolean show_error, GtkWindow *window) +{ + gchar *to_path, *to_path_internal, *from_path_internal, *dir_internal; + struct stat from_st, to_st; + gboolean link_faild; + gchar error_message[BUF_SIZE]; + + from_path_internal = charset_to_internal (from_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + dir_internal = charset_to_internal (dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /******************** + * check source file + ********************/ + if (lstat (from_path, &from_st)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't find source file :\n%s"), + from_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR0; + } + + /***************** + * check dest dir + *****************/ + if (!iswritable (dir)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Can't create link : %s\n" + "Permission denied: %s\n"), + from_path_internal, dir_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR0; + } + + to_path = g_strconcat(dir_internal, g_basename(from_path), NULL); + to_path_internal = charset_to_internal (to_path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /****************** + * check dest path + ******************/ + if (!lstat (to_path, &to_st)) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("File exist : %s"), + to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR1; + } + + link_faild = symlink(from_path, to_path); + + if (link_faild) { + if (show_error) { + g_snprintf (error_message, BUF_SIZE, + _("Faild to create link :\n" + "From : %s\n" + "To : %s"), + from_path_internal, to_path_internal); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + goto ERROR1; + } + + g_free (to_path); + g_free (to_path_internal); + g_free (from_path_internal); + g_free (dir_internal); + return TRUE; + +ERROR1: + g_free (to_path); + g_free (to_path_internal); +ERROR0: + g_free (from_path_internal); + g_free (dir_internal); + return FALSE; +} + + + +static gchar * +get_dest_cache_dir (const gchar *src_file, + const gchar *dest_dir, + const gchar *cache_type) +{ + gchar *dest_file, *dest_cache_dir; + + if (!src_file || !dest_dir || !cache_type) return NULL; + + dest_file = g_strconcat (dest_dir, g_basename (src_file), NULL); + dest_cache_dir = gimv_thumb_cache_get_path (dest_file, cache_type); + + if (dest_cache_dir) { + gchar *endchr; + + endchr = strrchr (dest_cache_dir, '/'); + if (endchr) { + *(endchr + 1) = '\0'; + mkdirs (dest_cache_dir); + } else { + g_free (dest_cache_dir); + dest_cache_dir = NULL; + } + } + g_free (dest_file); + + return dest_cache_dir; +} + + +static gchar * +get_dest_comment_dir (const gchar *src_file, + const gchar *dest_dir) +{ + gchar *dest_file, *dest_comment_dir; + + if (!src_file || !dest_dir) return NULL; + + dest_file = g_strconcat (dest_dir, g_basename (src_file), NULL); + dest_comment_dir = gimv_comment_get_path (dest_file); + + if (dest_comment_dir) { + gchar *endchr; + + endchr = strrchr (dest_comment_dir, '/'); + if (endchr) { + *(endchr + 1) = '\0'; + mkdirs (dest_comment_dir); + } else { + g_free (dest_comment_dir); + dest_comment_dir = NULL; + } + } + g_free (dest_file); + + return dest_comment_dir; +} + + +static gboolean +do_file_operate (const gchar *src_file, + const gchar *dest_dir, + ConfirmType *over_write, + FileOperateType action, + GtkWidget *progress_win, + gfloat progress, + GtkWindow *window) +{ + gchar *src_cache, *dest_cache_dir; + gchar *src_comment, *dest_comment_dir; + gchar *cache_type; + gchar *src_file_internal; + struct stat src_st, dest_st; + ConfirmType cache_over_write = CONFIRM_YES_TO_ALL; + gboolean success = TRUE, delete_src = FALSE, result; + gchar message[BUF_SIZE]; + + /* FIXME!! */ /* get cache file & dir */ + src_cache = gimv_thumb_find_thumbcache (src_file, &cache_type); + dest_cache_dir = get_dest_cache_dir (src_file, dest_dir, cache_type); + src_comment = gimv_comment_find_file (src_file); + dest_comment_dir = get_dest_comment_dir (src_file, dest_dir); + + /* if move to different file system, change to copy */ + lstat (src_file, &src_st); + lstat (dest_dir, &dest_st); + if (src_st.st_dev != dest_st.st_dev && action == FILE_MOVE ) { + action = FILE_COPY; + delete_src = TRUE; + } + + src_file_internal = charset_to_internal (src_file, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + switch (action) { + case FILE_MOVE: + g_snprintf (message, BUF_SIZE, + _("Moving %s ..."), src_file_internal); + gtkutil_progress_window_update (progress_win, _("Moving files"), + message, NULL, progress); + result = move_file (src_file, dest_dir, over_write, TRUE, window); + + if (!result) + success = FALSE; + + /* FIXME!! */ /* move cache file */ + if (result && src_cache && dest_cache_dir) + move_file (src_cache, dest_cache_dir, &cache_over_write, FALSE, window); + if (result && src_comment && dest_comment_dir) + move_file (src_comment, dest_comment_dir, &cache_over_write, FALSE, window); + + break; + + case FILE_COPY: + { + gboolean delete_src_cache = FALSE, delete_src_comment = FALSE; + + g_snprintf (message, BUF_SIZE, + _("Copying %s ..."), src_file_internal); + gtkutil_progress_window_update (progress_win, _("Copying files"), + message, NULL, progress); + result = copy_file (src_file, dest_dir, over_write, TRUE, window); + + if (!result) + success = FALSE; + + /* FIXME!! */ /* copy cache file */ + if (result && src_cache && dest_cache_dir) { + if (copy_file (src_cache, dest_cache_dir, &cache_over_write, FALSE, window)) + delete_src_cache = TRUE; + } + if (result && src_comment && dest_comment_dir) { + if (copy_file (src_comment, dest_comment_dir, &cache_over_write, FALSE, window)) + delete_src_comment = TRUE; + } + + /* FIXME: delete src? */ + if (result && delete_src) { + GList *delete_file_list = NULL; + delete_file_list = g_list_append (delete_file_list, (gpointer) src_file); + if (delete_src_cache) + delete_file_list = g_list_append (delete_file_list, src_cache); + if (delete_src_comment) + delete_file_list = g_list_append (delete_file_list, src_comment); + if (delete_file_list) + delete_files (delete_file_list, CONFIRM_YES, window); + g_list_free (delete_file_list); + } + + break; + } + case FILE_LINK: + g_snprintf (message, BUF_SIZE, + _("Creating Link %s ..."), src_file_internal); + gtkutil_progress_window_update (progress_win, _("Creating Links"), + message, NULL, progress); + result = link_file (src_file, dest_dir, TRUE, window); + + if (!result) + success = FALSE; + + /* FIXME!! */ /* link cache file */ + if (result && src_cache && dest_cache_dir) + link_file (src_cache, dest_cache_dir, FALSE, window); + if (result && src_comment && dest_comment_dir) + link_file (src_comment, dest_comment_dir, FALSE, window); + + break; + + default: + success = FALSE; + break; + } + + g_free (src_file_internal); + + /* FIXME!! */ + g_free (src_cache); + g_free (dest_cache_dir); + g_free (src_comment); + g_free (dest_comment_dir); + + return success; +} + + +gboolean +files2dir (GList *filelist, const gchar *dir, FileOperateType action, GtkWindow *window) +{ + GtkWidget *progress_win; + GList *node; + ConfirmType over_write = CONFIRM_ASK; + gboolean success = TRUE, cancel = FALSE, result; + gchar message[BUF_SIZE], *src_file, *dest_dir, *dir_internal; + gint length, pos; + gfloat progress; + + g_return_val_if_fail (filelist, FALSE); + g_return_val_if_fail (dir, FALSE); + + dir_internal = charset_to_internal (dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /***************** + * check dest dir + *****************/ + if (!file_exists (dir)) { + g_snprintf (message, BUF_SIZE, + _("Directory doesn't exist!!: %s"), + dir_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + goto ERROR; + } + if (!iswritable (dir)) { + g_snprintf (message, BUF_SIZE, + _("Permission denied!!: %s"), + dir_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + goto ERROR; + } + + /* add "/" character */ + if (dir[strlen(dir) - 1] == '/') + dest_dir = g_strdup (dir); + else + dest_dir = g_strconcat (dir, "/", NULL); + + /* create progress window */ + progress_win = gtkutil_create_progress_window ("File Operation", "...", + &cancel, 300, -1, window); + gtk_grab_add (progress_win); + + /* do file operation */ + length = g_list_length (filelist); + for (node = filelist; node; node = g_list_next (node)) { + src_file = node->data; + + while (gtk_events_pending()) gtk_main_iteration(); + + pos = g_list_position (filelist, node); + progress = (gfloat) pos / (gfloat) length; + + result = do_file_operate (src_file, dest_dir, &over_write, action, + progress_win, progress, window); + if (!result) + success = FALSE; + + /* cancel */ + if (cancel || (over_write == CONFIRM_CANCEL)) break; + + /* reset to CONFIRM_ASK mode */ + if (over_write != CONFIRM_YES_TO_ALL && over_write != CONFIRM_NO_TO_ALL) { + over_write = CONFIRM_ASK; + } + } + + gtk_grab_remove (progress_win); + gtk_widget_destroy (progress_win); + + g_free (dest_dir); + g_free (dir_internal); + + return success; + +ERROR: + g_free (dir_internal); + return FALSE; +} + + +gboolean +files2dir_with_dialog (GList *filelist, gchar **default_dir, FileOperateType action, + GtkWindow *window) +{ + gchar *dir; + gboolean retval = FALSE; + gchar *title, *label, *tmpstr; + + g_return_val_if_fail (filelist, FALSE); + g_return_val_if_fail (default_dir, FALSE); + + if (!*default_dir) + *default_dir = g_strdup (g_getenv("HOME")); + + switch (action) { + case FILE_MOVE: + title = _("Move files to..."); + label = _("Move files to: "); + break; + case FILE_COPY: + title = _("Copy files to..."); + label = _("Copy files to: "); + break; + case FILE_LINK: + title = _("Link files to..."); + label = _("Link files to: "); + break; + default: + dir = *default_dir; + goto FUNC_END; + break; + } + + tmpstr = charset_to_internal (*default_dir, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + dir = gtkutil_modal_file_dialog (title, tmpstr, MODAL_FILE_DIALOG_DIR_ONLY, window); + g_free (tmpstr); + tmpstr = NULL; + + if (dir) { + if (dir[strlen(dir) - 1] != '/') { + tmpstr = dir; + dir = g_strconcat (dir, "/", NULL); + g_free (tmpstr); + } + + tmpstr = dir; + dir = charset_internal_to_locale (dir); + g_free (tmpstr); + + retval = files2dir (filelist, dir, action, window); + } + +FUNC_END: + if (*default_dir != dir) + g_free (*default_dir); + *default_dir = dir; + + return retval; +} + + +gboolean +delete_dir (const gchar *path, GtkWindow *window) +{ + gboolean exist, cancel, not_empty = FALSE; + struct stat st; + gchar message[BUF_SIZE], *path_internal; + GList *filelist, *listnode; + gint length, pos; + gfloat progress; + GtkWidget *progress_win; + ConfirmType action; + + g_return_val_if_fail (path && *path, FALSE); + + path_internal = charset_to_internal (path, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + /* check direcotry exist or not */ + exist = !lstat (path, &st); + if (!exist) { + g_snprintf (message, BUF_SIZE, + _("Directory not exist : %s"), path_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + goto ERROR; + } + + /* check path is link or not */ + if (islink (path)) { + g_snprintf (message, BUF_SIZE, + _("%s is symbolic link.\n" + "Remove link ?"), path_internal); + action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), + message, 0, window); + if (action == CONFIRM_YES) { + remove (path); + } + goto SUCCESS; + } + + /* confirm */ + g_snprintf (message, BUF_SIZE, + _("Delete %s\n" + "OK?"), path_internal); + action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), + message, 0, window); + if (action != CONFIRM_YES) goto ERROR; + + /* remove sub directories recursively */ + filelist = get_dir_all (path); + if (filelist) { + g_snprintf (message, BUF_SIZE, + _("%s is not empty\n" + "Delete all files under %s ?"), + path_internal, path_internal); + action = gtkutil_confirm_dialog (_("Confirm Deleting Directory"), + message, 0, window); + if (action != CONFIRM_YES) goto ERROR; + + /* create progress bar */ + progress_win = gtkutil_create_progress_window ("Delete File", "Deleting Files", + &cancel, 300, -1, window); + gtk_grab_add (progress_win); + + length = g_list_length (filelist); + listnode = filelist; + + while (listnode) { + + /* update progress */ + pos = g_list_position (filelist, listnode); + if ((pos % 50) == 0) { + while (gtk_events_pending()) gtk_main_iteration(); + + pos = g_list_position (filelist, listnode); + progress = (gfloat) pos / (gfloat) length; + + { /********** convert charset **********/ + gchar *tmpstr; + tmpstr = charset_to_internal (listnode->data, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + g_snprintf (message, BUF_SIZE, + _("Deleting %s ..."), + tmpstr); + g_free (tmpstr); + } + + gtkutil_progress_window_update (progress_win, NULL, + message, NULL, progress); + } + + /* remove a file */ + if (remove ((gchar *) listnode->data) < 0) + not_empty = TRUE; + listnode = g_list_next (listnode); + + /* cancel */ + if (cancel) break; + } + gtk_grab_remove (progress_win); + gtk_widget_destroy (progress_win); + + g_list_foreach (filelist, (GFunc) g_free, NULL); + g_list_free (filelist); + } + + /* remove the directory */ + if (not_empty) { + g_snprintf (message, BUF_SIZE, + _("Faild to remove directory :\n" + "%s is not empty."), path_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + } else if (remove (path) < 0) { + g_snprintf (message, BUF_SIZE, + _("Faild to remove directory : %s"), path_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + } + +SUCCESS: + g_free (path_internal); + return TRUE; + +ERROR: + g_free (path_internal); + return FALSE; +} + + +gboolean +delete_files (GList *filelist, ConfirmType confirm, GtkWindow *window) +{ + GtkWidget *progress_win = NULL; + GList *node; + gboolean cancel = FALSE, dialog = FALSE; + gint pos, length; + gfloat progress; + gchar message[BUF_SIZE], *dirname; + + g_return_val_if_fail (filelist, FALSE); + + length = g_list_length (filelist); + + if (confirm == CONFIRM_ASK) + dialog = TRUE; + + if (dialog) { + g_snprintf (message, BUF_SIZE, + _("Delete these %d files.\n" + "OK?"), + length); + confirm = gtkutil_confirm_dialog (_("Confirm Deleting Files"), + message, 0, window); + } + + if (!(confirm == CONFIRM_YES || confirm == CONFIRM_YES_TO_ALL)) { + return FALSE; + } + + if (dialog) { + progress_win = gtkutil_create_progress_window (_("Delete File"), + _("Deleting Files"), + &cancel, 300, -1, window); + gtk_grab_add (progress_win); + } + + node = filelist; + while (node) { + gchar *filename = node->data, *filename_internal, *dirname_internal; + + node = g_list_next (node); + if (!filename || !*filename) continue; + + filename_internal = charset_to_internal (filename, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + while (gtk_events_pending()) gtk_main_iteration(); + + pos = g_list_position (filelist, node); + progress = (gfloat) pos / (gfloat) length; + + if (dialog && progress_win) { + g_snprintf (message, BUF_SIZE, _("Deleting %s ..."), + filename_internal); + gtkutil_progress_window_update (progress_win, NULL, + message, NULL, progress); + } + + dirname = g_dirname (filename); + dirname_internal = charset_to_internal (dirname, + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + + if (!iswritable (dirname)) { + g_snprintf (message, BUF_SIZE, + _("Permission denied : %s"), dirname_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + + } else { /* remove file!! */ + gboolean success; + gint ret; + + if (isdir (filename)) { + success = delete_dir (filename, window); + } else { + ret = remove (filename); + if (ret < 0) + success = FALSE; + else + success = TRUE; + } + + if (!success) { + g_snprintf (message, BUF_SIZE, + _("Faild to delete file :\n%s"), + filename_internal); + gtkutil_message_dialog (_("Error!!"), message, window); + } + } + + g_free (dirname); + g_free (dirname_internal); + g_free (filename_internal); + dirname = NULL; + dirname_internal = NULL; + filename_internal = NULL; + + /* cancel */ + if (cancel) break; + } + + if (dialog && progress_win) { + gtk_grab_remove (progress_win); + gtk_widget_destroy (progress_win); + } + + return TRUE; +} + +gboolean +make_dir_dialog (const gchar *parent_dir, GtkWindow *window) +{ + gchar *dirname, *path, *parent_path, *tmpstr; + gboolean success = FALSE, exist; + struct stat st; + gchar error_message[BUF_SIZE]; + + g_return_val_if_fail (parent_dir && *parent_dir, FALSE); + + parent_path = add_slash (parent_dir); + + if (!iswritable (parent_path)) { + g_snprintf (error_message, BUF_SIZE, + _("Permission denied : %s"), parent_path); + gtkutil_message_dialog (_("Error!!"), error_message, window); + goto ERROR0; + } + + dirname = gtkutil_popup_textentry (_("Make directory"), + _("New directory name: "), + NULL, NULL, -1, 0, window); + if (!dirname) goto ERROR0; + + tmpstr = charset_internal_to_locale (dirname); + g_free (dirname); + dirname = tmpstr; + path = g_strconcat (parent_path, dirname, NULL); + + exist = !lstat (path, &st); + if (exist) { + if (isdir (path)) + g_snprintf (error_message, BUF_SIZE, + _("Directory exist : %s"), path); + else + g_snprintf (error_message, BUF_SIZE, + _("File exist : %s"), path); + gtkutil_message_dialog (_("Error!!"), error_message, window); + g_free (path); + goto ERROR1; + } + + success = makedir (path); + if (!success) { + g_snprintf (error_message, BUF_SIZE, + _("Faild to create directory : %s"), path); + gtkutil_message_dialog (_("Error!!"), error_message, window); + } + + ERROR1: + g_free (path); + ERROR0: + g_free (parent_path); + + return success; +} + + +gboolean +rename_dir_dialog (const gchar *dir, GtkWindow *window) +{ + gboolean exist, success = FALSE; + struct stat st; + gchar message[BUF_SIZE]; + gchar *path, *parent_dir, *dirname, *src_path, *src_file_internal; + gchar *dest_path, *tmpstr; + + g_return_val_if_fail (dir && *dir, FALSE); + + path = add_slash (dir); + + /* check direcotry */ + exist = !lstat (path, &st); + if (!exist) { + g_snprintf (message, BUF_SIZE, + _("Directory not exist :%s"), path); + gtkutil_message_dialog (_("Error!!"), message, window); + goto ERROR0; + } + + src_path = remove_slash (path); + parent_dir = g_dirname (src_path); + + /* popup rename directory dialog */ + src_file_internal = charset_locale_to_internal (g_basename (src_path)); + dirname = gtkutil_popup_textentry (_("Rename directory"), + _("New directory name: "), + src_file_internal, + NULL, -1, 0, window); + g_free (src_file_internal); + if (!dirname) goto ERROR1; + + tmpstr = charset_internal_to_locale (dirname); + g_free (dirname); + dirname = tmpstr; + + dest_path = g_strconcat (parent_dir, "/", dirname, NULL); + + if (rename (src_path, dest_path) < 0) { + g_snprintf (message, BUF_SIZE, + _("Faild to rename directory : %s"), src_path); + gtkutil_message_dialog (_("Error!!"), message, window); + } else { + success = TRUE; + } + + g_free (dirname); + g_free (dest_path); + ERROR1: + g_free (src_path); + g_free (parent_dir); + ERROR0: + g_free (path); + + return success; +} diff -Nru gimageview-0.2.27/src/utils_file_gtk.h gimageview-0.3.0-0.20101117/src/utils_file_gtk.h --- gimageview-0.2.27/src/utils_file_gtk.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_file_gtk.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,110 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_file_gtk.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifndef __GFILEUTIL_H__ +#define __GFILEUTIL_H__ + +#include + +#include "utils_gtk.h" + + +typedef enum +{ + GETDIR_READ_DOT = 1 << 0, + GETDIR_FOLLOW_SYMLINK = 1 << 1, + GETDIR_DETECT_EXT = 1 << 2, + GETDIR_GET_ARCHIVE = 1 << 3, /* use with GETDIR_DETECT_EXT */ + GETDIR_DISP_STDOUT = 1 << 4, + GETDIR_DISP_STDERR = 1 << 5, + GETDIR_ENABLE_CANCEL = 1 << 6, + GETDIR_RECURSIVE = 1 << 7, + GETDIR_RECURSIVE_IS_BRANCH = 1 << 8 /* for internal use */ +} GetDirFlags; + + +typedef enum +{ + FILE_COPY, + FILE_MOVE, + FILE_LINK, + FILE_HLINK, + FILE_REMOVE, + FILE_RENAME +} FileOperateType; + + +gchar *add_slash (const gchar *path); +gchar *remove_slash (const gchar *path); + +gchar *get_temp_dir_name (void); +void remove_temp_dir (void); +void get_dir (const gchar *dirname, + GetDirFlags flags, + GList **filelist, + GList **dirlist); +void get_dir_stop (void); +GList *get_dir_all (const gchar *dirname); +gchar *relpath2abs (const gchar *path); +gchar *link2abs (const gchar *path); + + +void remove_dir (const char *dirname); +gboolean move_file (const gchar *from_path, + const gchar *dir, + ConfirmType *action, + gboolean show_error, + GtkWindow *window); +gboolean copy_file_to_file (const gchar *from_path, + const gchar *to_path, + ConfirmType *action, + gboolean show_error, + GtkWindow *window); +gboolean copy_file (const gchar *from_path, + const gchar *dir, + ConfirmType *action, + gboolean show_error, + GtkWindow *window); +gboolean link_file (const gchar *from_path, + const gchar *dir, + gboolean show_error, + GtkWindow *window); +gboolean files2dir (GList *filelist, + const gchar *dir, + FileOperateType type, + GtkWindow *window); +gboolean files2dir_with_dialog (GList *filelist, + gchar **dir, + FileOperateType action, + GtkWindow *window); +gboolean delete_dir (const gchar *path, + GtkWindow *window); +gboolean delete_files (GList *filelist, + ConfirmType confirm, + GtkWindow *window); + +gboolean make_dir_dialog (const gchar *parent_dir, + GtkWindow *window); +gboolean rename_dir_dialog (const gchar *dir, + GtkWindow *window); +#endif diff -Nru gimageview-0.2.27/src/utils_file.h gimageview-0.3.0-0.20101117/src/utils_file.h --- gimageview-0.2.27/src/utils_file.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_file.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,69 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_file.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifndef __FILEUTIL_H__ +#define __FILEUTIL_H__ + +#include +#include + +typedef enum +{ + SIZE_BYTE, + SIZE_KBYTE, + SIZE_MBYTE, + SIZE_GBYTE, + SIZE_BIT, + SIZE_KBIT, + SIZE_MBIT, + SIZE_GBIT +} SIZE_UNIT; + +int file_exists (const char *path); +int isfile (const char *path); +int isdir (const char *path); +int islink (const char *path); +int iswritable (const char *path); +int isexecutable (const char *path); + +int has_subdirs (const char *path); +int makedir (const char *dir); +int mkdirs (const char *path); + +int ensure_dir_exists (const char *a_path); +int get_file_mtime (const char *path); + +char *fileutil_size2str (size_t size, + int space); +char *fileutil_time2str (time_t time); +char *fileutil_uid2str (uid_t uid); +char *fileutil_gid2str (gid_t gid); +char *fileutil_mode2str (mode_t mode); + +char *fileutil_home2tilde (const char *path); +char *fileutil_dir_basename (const char *path); +char *fileutil_get_extention (const char *path); +int fileutil_extension_is (const char *filename, + const char *ext); + +#endif /* __FILEUTIL_H__ */ diff -Nru gimageview-0.2.27/src/utils_gtk.c gimageview-0.3.0-0.20101117/src/utils_gtk.c --- gimageview-0.2.27/src/utils_gtk.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_gtk.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,1368 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_gtk.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include "gimv_icon_stock.h" +#include "prefs.h" +#include "utils_auto_comp.h" +#include "utils_char_code.h" +#include "utils_file.h" +#include "utils_gtk.h" + +#ifndef BUF_SIZE +#define BUF_SIZE 4096 +#endif + +/* callback functions for confirm dialog */ +static gint cb_dummy (GtkWidget *button, + gpointer data); +static void cb_confirm_yes (GtkWidget *button, + ConfirmType *type); +static void cb_confirm_yes_to_all (GtkWidget *button, + ConfirmType *type); +static void cb_confirm_no (GtkWidget *button, + ConfirmType *type); +static void cb_confirm_cancel (GtkWidget *button, + ConfirmType *type); + +/* callback functions for message dialog */ +static void cb_message_dialog_quit (GtkWidget *button, + gpointer data); + +/* callback functions for progress bar window */ +static void cb_progress_win_cancel (GtkWidget *button, + gboolean *cancel_pressed); + +/* callback functions for text entry window */ +static void cb_textpop_enter (GtkWidget *button, + gboolean *ok_pressd); +static void cb_textpop_ok_button (GtkWidget *button, + gboolean *ok_pressd); +static void cb_textpop_cancel_button (GtkWidget *button, + gboolean *ok_pressd); + + + +/****************************************************************************** + * + * misc + * + ******************************************************************************/ +const gchar * +boolean_to_text (gboolean boolval) +{ + if (boolval) + return "TRUE"; + else + return "FALSE"; +} + + +gboolean +text_to_boolean (gchar *text) +{ + g_return_val_if_fail (text && *text, FALSE); + + if (!g_strcasecmp (text, "TRUE") || !g_strcasecmp (text, "ENABLE")) + return TRUE; + else + return FALSE; +} + + +void +gtkutil_get_widget_area (GtkWidget *widget, + GdkRectangle *area) +{ + g_return_if_fail (widget); + g_return_if_fail (area); + + area->x = widget->allocation.x; + area->y = widget->allocation.y; + area->width = widget->allocation.width; + area->height = widget->allocation.height; + + /* FIXME? */ + area->x = 0; + area->y = 0; + /* END FIXME? */ +} + + +/* + * create_toggle_button: + * @ Create toggle button widget. + * + * label : Label text for toggle button. + * def_val : Default value. + * Return : Toggle button widget. + */ +GtkWidget * +gtkutil_create_check_button (const gchar *label_text, gboolean def_val, + gpointer func, gpointer data) +{ + GtkWidget *toggle; + + toggle = gtk_check_button_new_with_label (_(label_text)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(toggle), def_val); + + if (func) + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (func), data); + + return toggle; +} + + +GtkWidget * +gtkutil_create_toolbar (void) +{ + GtkWidget *toolbar; + + toolbar = gtk_toolbar_new (); + + return toolbar; +} + + +GtkWidget * +gtkutil_create_spin_button (GtkAdjustment *adj) +{ + GtkWidget *spinner = gtk_spin_button_new (adj, 0, 0); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); + + return spinner; +} + + +GtkWidget * +gtkutil_option_menu_get_current (GtkWidget *option_menu) +{ + g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), NULL); + + { + GtkWidget *menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu)); + gint nth = gtk_option_menu_get_history (GTK_OPTION_MENU (option_menu)); + GList *node = g_list_nth (GTK_MENU_SHELL (menu)->children, nth); + if (!node) return NULL; + return node->data; + } +} + + +GList * +gtkutil_list_insert_sorted (GList *list, + gpointer data, + GCompareFunc func, + gboolean reverse) +{ + GList *tmp_list = list; + GList *new_list; + gint cmp; + + g_return_val_if_fail (func != NULL, list); + + if (!list) { + new_list = g_list_alloc(); + new_list->data = data; + return new_list; + } + + cmp = (*func) (data, tmp_list->data); + + while ((tmp_list->next) && + ((!reverse && cmp > 0) || (reverse && cmp <= 0))) + { + tmp_list = tmp_list->next; + cmp = (*func) (data, tmp_list->data); + } + + new_list = g_list_alloc(); + new_list->data = data; + + if ((!tmp_list->next) && (cmp > 0)) { + tmp_list->next = new_list; + new_list->prev = tmp_list; + return list; + } + + if (tmp_list->prev) { + tmp_list->prev->next = new_list; + new_list->prev = tmp_list->prev; + } + new_list->next = tmp_list; + tmp_list->prev = new_list; + + if (tmp_list == list) + return new_list; + else + return list; +} + + +guint +gtkutil_paned_which_is_hidden (GtkPaned *paned) +{ + g_return_val_if_fail (GTK_IS_PANED (paned), 0); + g_return_val_if_fail (paned->child1 && paned->child2, 0); + + if (!GTK_WIDGET_VISIBLE (paned->child1) + && GTK_WIDGET_VISIBLE (paned->child2)) + { + return 1; + + } else if (GTK_WIDGET_VISIBLE (paned->child1) + && !GTK_WIDGET_VISIBLE (paned->child2)) + { + return 2; + + } else { + return 0; + } +} + + + +/****************************************************************************** + * + * Confirm Dialog Window + * + ******************************************************************************/ +static gint +cb_dummy (GtkWidget *button, gpointer data) +{ + return TRUE; +} + + +static void +cb_confirm_yes (GtkWidget *button, ConfirmType *type) +{ + *type = CONFIRM_YES; + gtk_main_quit (); +} + + +static void +cb_confirm_yes_to_all (GtkWidget *button, ConfirmType *type) +{ + *type = CONFIRM_YES_TO_ALL; + gtk_main_quit (); +} + + +static void +cb_confirm_no (GtkWidget *button, ConfirmType *type) +{ + *type = CONFIRM_NO; + gtk_main_quit (); +} + + +static void +cb_confirm_no_to_all (GtkWidget *button, ConfirmType *type) +{ + *type = CONFIRM_NO_TO_ALL; + gtk_main_quit (); +} + + +static void +cb_confirm_cancel (GtkWidget *button, ConfirmType *type) +{ + *type = CONFIRM_CANCEL; + gtk_main_quit (); +} + + +ConfirmType +gtkutil_confirm_dialog (const gchar *title, const gchar *message, + ConfirmDialogFlags flags, GtkWindow *parent) +{ + ConfirmType retval = CONFIRM_NO; + GtkWidget *window; + GtkWidget *vbox, *hbox, *button, *label; + GtkWidget *icon; + + window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (window), parent); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_default_size (GTK_WINDOW (window), 300, 120); + /* gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->vbox), 5); */ + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + /* message area */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); + gtk_widget_show (vbox); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_widget_show (hbox); + + /* icon */ + icon = gimv_icon_stock_get_widget ("question"); + gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, TRUE, 0); + gtk_widget_show (icon); + + /* message */ + label = gtk_label_new (message); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + /* buttons */ + button = gtk_button_new_with_label (_("Yes")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_yes), + &retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + gtk_widget_grab_focus (button); + + if (flags & ConfirmDialogMultipleFlag) { + button = gtk_button_new_with_label (_("Yes to All")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_yes_to_all), + &retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + } + + button = gtk_button_new_with_label (_("No")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_no), + &retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + if (flags & ConfirmDialogMultipleFlag) { + button = gtk_button_new_with_label (_("Cancel")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_cancel), + &retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + } + + gtk_widget_show (window); + + gtk_grab_add (window); + gtk_main (); + gtk_grab_remove (window); + gtk_widget_destroy (window); + + return retval; +} + + +#include "gimv_image_view.h" + +typedef struct OverWriteDialog_Tag +{ + GimvImageInfo *info1, *info2; + GtkWidget *window, *iv1, *iv2, *show_compare_button, *compare_area, *entry; + gchar *new_path; + gint new_path_len; + ConfirmType retval; +} OverWriteDialog; + + +static void +cb_show_compare (GtkButton *button, OverWriteDialog *dialog) +{ + gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv1), dialog->info1); + gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv2), dialog->info2); +} + + +static void +cb_show_image1 (GtkButton *button, OverWriteDialog *dialog) +{ + gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv1), dialog->info1); +} + + + +static void +cb_show_image2 (GtkButton *button, OverWriteDialog *dialog) +{ + gimv_image_view_change_image (GIMV_IMAGE_VIEW (dialog->iv2), dialog->info2); +} + + +static void +overwrite_confirm_rename (OverWriteDialog *dialog) +{ + const gchar *filename_internal + = g_basename (gtk_entry_get_text (GTK_ENTRY (dialog->entry))); + gchar *dirname, *filename; + + if (!filename_internal && *filename_internal) return; + g_return_if_fail (dialog->new_path && dialog->new_path_len > 0); + + dirname = g_dirname (gimv_image_info_get_path (dialog->info1)); + g_return_if_fail (dirname); + if (!*dirname) g_free (dirname); + g_return_if_fail (*dirname); + + filename = charset_internal_to_locale (filename_internal); + g_return_if_fail (filename); + if (!*filename) g_free (filename); + g_return_if_fail (*filename); + + g_snprintf (dialog->new_path, dialog->new_path_len, "%s/%s", + dirname, filename); + + /* check the new path */ + if (file_exists (dialog->new_path)) { + gchar error_message[BUF_SIZE]; + g_snprintf (error_message, BUF_SIZE, + _("The file exists : %s"), + dialog->new_path); + gtkutil_message_dialog (_("Error!!"), error_message, + GTK_WINDOW (dialog->window)); + g_free (dirname); + g_free (filename); + return; + } + + g_free (dirname); + g_free (filename); + + dialog->retval = CONFIRM_NO; + + gtk_main_quit (); +} + + +static void +cb_confirm_rename (GtkButton *button, OverWriteDialog *dialog) +{ + overwrite_confirm_rename (dialog); +} + + +static void +cb_confirm_rename_enter (GtkEntry *entry, OverWriteDialog *dialog) +{ + overwrite_confirm_rename (dialog); +} + + +ConfirmType +gtkutil_overwrite_confirm_dialog (const gchar *title, const gchar *message, + const gchar *dest_file, const gchar *src_file, + gchar *new_path, gint new_path_len, + ConfirmDialogFlags flags, + GtkWindow *parent) +{ + OverWriteDialog dialog; + GtkWidget *window; + GtkWidget *vbox, *hbox, *button, *label, *entry; + GtkWidget *icon; + GtkWidget *vbox2; + gchar *filename; + + dialog.retval = CONFIRM_NO; + dialog.info1 = gimv_image_info_get (dest_file); + dialog.info2 = gimv_image_info_get (src_file); + dialog.new_path = new_path; + dialog.new_path_len = new_path_len; + + dialog.window = window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (window), parent); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_default_size (GTK_WINDOW (window), 300, 120); + /* gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->vbox), 5); */ + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + /* message area */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); + gtk_widget_show (vbox); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_widget_show (hbox); + + /* icon */ + icon = gimv_icon_stock_get_widget ("question"); + gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, TRUE, 0); + gtk_widget_show (icon); + + /* message */ + label = gtk_label_new (message); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + /* compare area */ + { + /* show image buttons */ + hbox = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + hbox, FALSE, FALSE, 2); + gtk_widget_show (hbox); + + label = gtk_button_new_with_label (_("Show destination")); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2); + g_signal_connect (G_OBJECT (label), "clicked", + G_CALLBACK (cb_show_image1), + &dialog); + gtk_widget_show (label); + + button = gtk_button_new_with_label (_("Show both images")); + dialog.show_compare_button = button; + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 2); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_show_compare), + &dialog); + gtk_widget_show (button); + + label = gtk_button_new_with_label (_("Show source")); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2); + g_signal_connect (G_OBJECT (label), "clicked", + G_CALLBACK (cb_show_image2), + &dialog); + gtk_widget_show (label); + + /* view */ + dialog.compare_area = hbox = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show (hbox); + + /* destination */ + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 2); + gtk_widget_show (vbox2); + + dialog.iv1 = gimv_image_view_new (NULL); + g_object_set (G_OBJECT (dialog.iv1), + "default_zoom", 3, + "default_rotation", 0, + "keep_aspect", TRUE, + NULL); + gimv_image_view_hide_scrollbar (GIMV_IMAGE_VIEW (dialog.iv1)); + gtk_widget_set_size_request (dialog.iv1, -1, 150); + gtk_box_pack_start (GTK_BOX (vbox2), dialog.iv1, TRUE, TRUE, 0); + gtk_widget_show (dialog.iv1); + + /* gimv_image_view_set_text (dialog.iv1, information) */ + + + /* source */ + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 2); + gtk_widget_show (vbox2); + + dialog.iv2 = gimv_image_view_new (NULL); + g_object_set (G_OBJECT (dialog.iv2), + "default_zoom", 3, + "default_rotation", 0, + "keep_aspect", TRUE, + NULL); + gimv_image_view_hide_scrollbar (GIMV_IMAGE_VIEW (dialog.iv2)); + gtk_widget_set_size_request (dialog.iv2, -1, 150); + gtk_box_pack_start (GTK_BOX (vbox2), dialog.iv2, TRUE, TRUE, 0); + gtk_widget_show (dialog.iv2); + + /* gimv_image_view_set_text (dialog.iv2, information) */ + } + + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + vbox, FALSE, FALSE, 0); + gtk_widget_show (vbox); + + /* rename entry */ + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show (hbox); + + dialog.entry = entry = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (entry), "activate", + G_CALLBACK (cb_confirm_rename_enter), &dialog); + filename = charset_to_internal (g_basename (src_file), + conf.charset_filename, + conf.charset_auto_detect_fn, + conf.charset_filename_mode); + gtk_entry_set_text (GTK_ENTRY (entry), filename); + g_free (filename); + filename = NULL; + gtk_widget_show (entry); + + button = gtk_button_new_with_label (_("Rename")); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_rename), + &dialog); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + /* buttons */ + hbox = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + hbox, TRUE, TRUE, 0); + gtk_widget_show (hbox); + + button = gtk_button_new_with_label (_("Yes")); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_yes), + &dialog.retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + gtk_widget_grab_focus (button); + + if (flags & ConfirmDialogMultipleFlag) { + button = gtk_button_new_with_label (_("Yes to All")); + gtk_box_pack_start (GTK_BOX (hbox),button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_yes_to_all), + &dialog.retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + } + + button = gtk_button_new_with_label (_("Skip")); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_no), + &dialog.retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + button = gtk_button_new_with_label (_("Skip all")); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_no_to_all), + &dialog.retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + if (flags & ConfirmDialogMultipleFlag) { + button = gtk_button_new_with_label (_("Cancel")); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_confirm_cancel), + &dialog.retval); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + } + + gtk_widget_show (window); + + gtk_grab_add (window); + gtk_main (); + gtk_grab_remove (window); + gtk_widget_destroy (window); + + if (dialog.info1) gimv_image_info_unref (dialog.info1); + if (dialog.info2) gimv_image_info_unref (dialog.info2); + + return dialog.retval; +} + + + +/****************************************************************************** + * + * Message Dialog Window + * + ******************************************************************************/ +static void +cb_message_dialog_quit (GtkWidget *button, gpointer data) +{ + gtk_main_quit (); +} + + +void +gtkutil_message_dialog (const gchar *title, const gchar *message, GtkWindow *parent) +{ + GtkWidget *window; + GtkWidget *button, *label, *vbox, *hbox; + GtkWidget *alert_icon; + + window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (window), parent); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + /* message area */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, + TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 15); + gtk_widget_show (vbox); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_widget_show (hbox); + + /* icon */ + alert_icon = gimv_icon_stock_get_widget ("alert"); + gtk_box_pack_start (GTK_BOX (hbox), alert_icon, TRUE, TRUE, 0); + gtk_widget_show (alert_icon); + + /* message */ + label = gtk_label_new (message); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + /* button */ + button = gtk_button_new_with_label (_("OK")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_message_dialog_quit), NULL); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + gtk_widget_grab_focus (button); + + gtk_widget_show (window); + + gtk_grab_add (window); + gtk_main (); + gtk_grab_remove (window); + gtk_widget_destroy (window); +} + + + +/****************************************************************************** + * + * Progress Bar Window + * + ******************************************************************************/ +static void +cb_progress_win_cancel (GtkWidget *button, gboolean *cancel_pressed) +{ + *cancel_pressed = TRUE; +} + + +void +gtkutil_progress_window_update (GtkWidget *window, + gchar *title, gchar *message, + gchar *progress_text, gfloat progress) +{ + GtkWidget *label; + GtkWidget *progressbar; + + g_return_if_fail (window); + + label = g_object_get_data (G_OBJECT (window), "label"); + progressbar = g_object_get_data (G_OBJECT (window), "progressbar"); + + g_return_if_fail (label && progressbar); + + if (title) + gtk_window_set_title (GTK_WINDOW (window), _(title)); + if (message) + gtk_label_set_text (GTK_LABEL (label), message); + if (progress_text) + gtk_progress_set_format_string(GTK_PROGRESS (progressbar), + progress_text); + if (progress > 0.0 && progress < 1.0) + gtk_progress_bar_update (GTK_PROGRESS_BAR (progressbar), progress); +} + + +GtkWidget * +gtkutil_create_progress_window (gchar *title, gchar *initial_message, + gboolean *cancel_pressed, + gint width, gint height, GtkWindow *parent) +{ + GtkWidget *window; + GtkWidget *vbox; + GtkWidget *label; + GtkWidget *progressbar; + GtkWidget *button; + + g_return_val_if_fail (title && initial_message && cancel_pressed, NULL); + + *cancel_pressed = FALSE; + + /* create dialog window */ + window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (window), parent); + gtk_container_border_width (GTK_CONTAINER (window), 3); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + gtk_window_set_default_size (GTK_WINDOW (window), width, height); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + /* message area */ + vbox = gtk_vbox_new (FALSE, 5); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, + TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_widget_show (vbox); + + /* label */ + label = gtk_label_new (initial_message); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); + + /* progress bar */ + progressbar = gtk_progress_bar_new(); + gtk_progress_set_show_text(GTK_PROGRESS(progressbar), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), progressbar, FALSE, FALSE, 0); + + /* cancel button */ + button = gtk_button_new_with_label (_("Cancel")); + gtk_container_border_width (GTK_CONTAINER (button), 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button, + TRUE, TRUE, 0); + g_signal_connect (G_OBJECT(button), "clicked", + G_CALLBACK(cb_progress_win_cancel), cancel_pressed); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + + g_object_set_data (G_OBJECT (window), "label", label); + g_object_set_data (G_OBJECT (window), "progressbar", progressbar); + + gtk_widget_show_all (window); + + return window; +} + + + +/****************************************************************************** + * + * Text Entry Window + * + ******************************************************************************/ +static void +cb_textpop_enter (GtkWidget *button, gboolean *ok_pressd) +{ + *ok_pressd = TRUE; + gtk_main_quit (); +} + + +static void +cb_textpop_ok_button (GtkWidget *button, gboolean *ok_pressd) +{ + *ok_pressd = TRUE; + gtk_main_quit (); +} + + +static void +cb_textpop_cancel_button (GtkWidget *button, gboolean *ok_pressd) +{ + *ok_pressd = FALSE; + gtk_main_quit (); +} + + +static gint +cb_textpop_key_press (GtkWidget *widget, + GdkEventKey *event, + gboolean *ok_pressd) +{ + const gchar *path; + gchar *text; + gint n, len; + guint comp_key1, comp_key2; + GdkModifierType comp_mods1, comp_mods2; + + if (akey.common_auto_completion1) + gtk_accelerator_parse (akey.common_auto_completion1, + &comp_key1, &comp_mods1); + if (akey.common_auto_completion2) + gtk_accelerator_parse (akey.common_auto_completion2, + &comp_key2, &comp_mods2); + + if (event->keyval == GDK_Tab + || (event->keyval == comp_key1 && (!comp_mods1 || (event->state & comp_mods1))) + || (event->keyval == comp_key2 && (!comp_mods1 || (event->state & comp_mods2)))) + { + path = gtk_entry_get_text (GTK_ENTRY (widget)); + n = auto_compl_get_n_alternatives (path); + + if (n < 1) return TRUE; + + text = auto_compl_get_common_prefix (); + + if (n == 1) { + auto_compl_hide_alternatives (); + gtk_entry_set_text (GTK_ENTRY (widget), text); + if (text[strlen(text) - 1] != '/') + gtk_entry_append_text (GTK_ENTRY (widget), "/"); + } else { + gtk_entry_set_text (GTK_ENTRY (widget), text); + auto_compl_show_alternatives (widget); + } + + if (text) + g_free (text); + return TRUE; + + } else { + switch (event->keyval) { + case GDK_Return: + case GDK_KP_Enter: + path = gtk_entry_get_text (GTK_ENTRY (widget)); + + if (!isdir (path)) return FALSE; + + len = strlen (path); + if (path[len - 1] != '/') { + text = g_strconcat (path, "/", NULL); + } else { + text = g_strdup (path); + } + g_free (text); + break; + case GDK_Right: + case GDK_Left: + case GDK_Up: + case GDK_Down: + break; + case GDK_Escape: + *ok_pressd = FALSE; + gtk_main_quit (); + break; + default: + break; + } + } + + return FALSE; +} + + +gchar * +gtkutil_popup_textentry (const gchar *title, + const gchar *label_text, + const gchar *entry_text, + GList *text_list, + gint entry_width, + TextEntryFlags flags, + GtkWindow *parent) +{ + GtkWidget *window, *box, *hbox, *vbox, *button, *label, *combo, *entry; + gboolean ok_pressed = FALSE; + gchar *str = NULL; + + /* dialog window */ + window = gtk_dialog_new (); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (window), parent); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + /* main area */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_widget_show (vbox); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_widget_show (hbox); + + /* label */ + label = gtk_label_new (label_text); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); + + /* entry */ + if (flags & TEXT_ENTRY_WRAP_ENTRY) + box = vbox; + else + box = hbox; + + combo = gtk_combo_new(); + entry = GTK_COMBO (combo)->entry; + + if (text_list) + gtk_combo_set_popdown_strings (GTK_COMBO (combo), text_list); + else + gtk_widget_hide (GTK_COMBO (combo)->button); + + gtk_box_pack_start (GTK_BOX (box), combo, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (entry), "activate", + G_CALLBACK (cb_textpop_enter), &ok_pressed); + if (entry_text) + gtk_entry_set_text (GTK_ENTRY (entry), entry_text); + if (flags & TEXT_ENTRY_CURSOR_TOP) + gtk_entry_set_position (GTK_ENTRY (entry), 0); + if (entry_width > 0) + gtk_widget_set_size_request (combo, entry_width, -1); + if (flags & TEXT_ENTRY_AUTOCOMP_PATH) + g_signal_connect_after (G_OBJECT(entry), "key-press-event", + G_CALLBACK(cb_textpop_key_press), + &ok_pressed); + gtk_widget_show (combo); + + if (flags & TEXT_ENTRY_NO_EDITABLE) + gtk_entry_set_editable (GTK_ENTRY (entry), FALSE); + + gtk_widget_grab_focus (entry); + + /* button */ + button = gtk_button_new_with_label (_("OK")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT(button), "clicked", + G_CALLBACK(cb_textpop_ok_button), &ok_pressed); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + button = gtk_button_new_with_label (_("Cancel")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT(button), "clicked", + G_CALLBACK(cb_textpop_cancel_button), &ok_pressed); + GTK_WIDGET_SET_FLAGS(button,GTK_CAN_DEFAULT); + gtk_widget_show (button); + + gtk_widget_show (window); + + gtk_grab_add (window); + gtk_main (); + gtk_grab_remove (window); + + if (ok_pressed) + str = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); + + gtk_widget_destroy (window); + + return str; +} + + +/****************************************************************************** + * + * modal file dialog + * + ******************************************************************************/ +static void +cb_filesel_ok (GtkWidget *button, gboolean *retval) +{ + *retval = TRUE; + gtk_main_quit (); +} + + +static void +cb_filesel_cancel (GtkWidget *button, gboolean *retval) +{ + *retval = FALSE; + gtk_main_quit (); +} + + +gchar * +gtkutil_modal_file_dialog (const gchar *title, + const gchar *default_path, + ModalFileDialogFlags flags, + GtkWindow *parent) +{ + GtkWidget *filesel = gtk_file_selection_new (title); + GtkWidget *button; + gchar *filename = NULL; + gboolean retval = FALSE; + + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (filesel), parent); + + gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_CENTER); + g_signal_connect (G_OBJECT (filesel), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + button = GTK_FILE_SELECTION (filesel)->ok_button; + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_filesel_ok), + &retval); + button = GTK_FILE_SELECTION (filesel)->cancel_button; + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_filesel_cancel), + &retval); + + if (default_path && *default_path) + gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), + default_path); + + if (flags & MODAL_FILE_DIALOG_DIR_ONLY) + gtk_widget_hide (GTK_FILE_SELECTION (filesel)->file_list->parent); + + if (flags & MODAL_FILE_DIALOG_HIDE_FILEOP) + gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); + + gtk_widget_show (filesel); + + gtk_grab_add (filesel); + gtk_main (); + + if (retval) { + const gchar *tmpstr; + tmpstr = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); + filename = g_strdup (tmpstr); + } + + gtk_grab_remove (filesel); + gtk_widget_destroy (filesel); + + return filename; +} + + + +/****************************************************************************** + * + * Color selection button + * + ******************************************************************************/ +static void +cb_colorsel_ok (GtkWidget *button, gboolean *retval) +{ + *retval = TRUE; + gtk_main_quit (); +} + + +static void +cb_colorsel_cancel (GtkWidget *button, gboolean *retval) +{ + *retval = FALSE; + gtk_main_quit (); +} + + +static void +cb_choose_color (GtkWidget *widget, gint color[3]) +{ + GtkWidget *dialog, *button, *csel; + gboolean retval = FALSE; + gdouble selcol[4]; + + g_return_if_fail (color); + + dialog = gtk_color_selection_dialog_new (_("Choose Color")); + selcol[0] = (gdouble) color[0] / 0xffff; + selcol[1] = (gdouble) color[1] / 0xffff; + selcol[2] = (gdouble) color[2] / 0xffff; + selcol[3] = 0.0; + csel = GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel; + gtk_color_selection_set_color (GTK_COLOR_SELECTION (csel), selcol); + g_signal_connect (G_OBJECT (dialog), "delete_event", + G_CALLBACK (cb_dummy), NULL); + + button = GTK_COLOR_SELECTION_DIALOG (dialog)->ok_button; + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_colorsel_ok), + &retval); + button = GTK_COLOR_SELECTION_DIALOG (dialog)->cancel_button; + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (cb_colorsel_cancel), + &retval); + button = GTK_COLOR_SELECTION_DIALOG (dialog)->help_button; + gtk_widget_hide (button); + gtk_widget_show (dialog); + + gtk_grab_add (dialog); + gtk_main (); + if (retval) { + gtk_color_selection_get_color (GTK_COLOR_SELECTION (csel), selcol); + color[0] = selcol[0] * 0xffff; + color[1] = selcol[1] * 0xffff; + color[2] = selcol[2] * 0xffff; + } + gtk_grab_remove (dialog); + gtk_widget_destroy (dialog); +} + + +GtkWidget * +gtkutil_color_sel_button (const gchar *label, gint color[3]) +{ + GtkWidget *button; + + button = gtk_button_new_with_label (label); + g_signal_connect (G_OBJECT (button),"clicked", + G_CALLBACK (cb_choose_color), + color); + + return button; +} + + +/****************************************************************************** + * + * Compare functions + * + ******************************************************************************/ +gint +gtkutil_comp_spel (gconstpointer data1, gconstpointer data2) +{ + const gchar *str1 = data1; + const gchar *str2 = data2; + + return strcmp (str1, str2); +} + + +gint +gtkutil_comp_casespel (gconstpointer data1, gconstpointer data2) +{ + const gchar *str1 = data1; + const gchar *str2 = data2; + + return g_strcasecmp (str1, str2); +} + + +/****************************************************************************** + * + * simple callback functions + * + ******************************************************************************/ +void +gtkutil_get_data_from_toggle_cb (GtkWidget *toggle, gboolean *data) +{ + g_return_if_fail (data); + + *data = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(toggle)); +} + + +void +gtkutil_get_data_from_toggle_negative_cb (GtkWidget *toggle, gboolean *data) +{ + g_return_if_fail (data); + + *data = !(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(toggle))); +} + + +void +gtkutil_get_data_from_adjustment_by_int_cb (GtkWidget *widget, gint *data) +{ + g_return_if_fail (data); + + *data = GTK_ADJUSTMENT(widget)->value; +} + + +void +gtkutil_get_data_from_adjustment_by_float_cb (GtkWidget *widget, gfloat *data) +{ + g_return_if_fail (data); + + *data = GTK_ADJUSTMENT(widget)->value; +} + +gboolean +gtkutil_scroll_to_button_cb (GtkWidget *widget, + GdkEventScroll *se, + gpointer data) +{ + GdkEventButton be; + gboolean retval; + + g_return_val_if_fail (GTK_IS_WIDGET(widget), FALSE); + + be.type = GDK_BUTTON_PRESS; + be.window = se->window; + be.send_event = se->send_event; + be.time = se->time; + be.x = se->x; + be.y = se->y; + be.axes = NULL; + be.state = se->state; + be.device = se->device; + be.x_root = se->x_root; + be.y_root = se->y_root; + switch ((se)->direction) { + case GDK_SCROLL_UP: + be.button = 4; + break; + case GDK_SCROLL_DOWN: + be.button = 5; + break; + case GDK_SCROLL_LEFT: + be.button = 6; + break; + case GDK_SCROLL_RIGHT: + be.button = 7; + break; + default: + g_warning ("invalid scroll direction!"); + be.button = 0; + break; + } + + g_signal_emit_by_name (G_OBJECT(widget), "button-press-event", + &be, &retval); + be.type = GDK_BUTTON_RELEASE; + g_signal_emit_by_name (G_OBJECT(widget), "button-release-event", + &be, &retval); + + return retval; +} diff -Nru gimageview-0.2.27/src/utils_gtk.h gimageview-0.3.0-0.20101117/src/utils_gtk.h --- gimageview-0.2.27/src/utils_gtk.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_gtk.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,155 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_gtk.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifndef __GTKUTILS_H__ +#define __GTKUTILS_H__ + +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + +#include + + +typedef enum { + CONFIRM_ERROR = -1, + CONFIRM_YES, + CONFIRM_YES_TO_ALL, + CONFIRM_NO, + CONFIRM_NO_TO_ALL, + CONFIRM_CANCEL, + CONFIRM_ASK +} ConfirmType; + + +typedef enum { + ConfirmDialogMultipleFlag = 1 << 0 +} ConfirmDialogFlags; + + +typedef enum { + TEXT_ENTRY_AUTOCOMP_PATH = 1 << 1, + TEXT_ENTRY_WRAP_ENTRY = 1 << 2, + TEXT_ENTRY_CURSOR_TOP = 1 << 3, + TEXT_ENTRY_NO_EDITABLE = 1 << 4 +} TextEntryFlags; + + +typedef enum { + MODAL_FILE_DIALOG_DIR_ONLY = 1 << 0, + MODAL_FILE_DIALOG_HIDE_FILEOP = 1 << 1 +} ModalFileDialogFlags; + + +const gchar *boolean_to_text (gboolean boolval); +gboolean text_to_boolean (gchar *text); +void gtkutil_get_widget_area (GtkWidget *widget, + GdkRectangle *area); + +GtkWidget *gtkutil_create_check_button (const gchar *lebel_text, + gboolean def_val, + gpointer func, + gpointer data); +GtkWidget *gtkutil_create_toolbar (void); +GtkWidget *gtkutil_create_spin_button (GtkAdjustment *adj); +GtkWidget *gtkutil_option_menu_get_current(GtkWidget *option_menu); +GList *gtkutil_list_insert_sorted (GList *list, + gpointer data, + GCompareFunc func, + gboolean reverse); +guint gtkutil_paned_which_is_hidden (GtkPaned *paned); + +/* confirm dialog window */ +ConfirmType gtkutil_confirm_dialog (const gchar *title, + const gchar *message, + ConfirmDialogFlags flags, + GtkWindow *parent); +ConfirmType +gtkutil_overwrite_confirm_dialog (const gchar *title, const gchar *message, + const gchar *dest_file, const gchar *src_file, + gchar *new_path, gint new_path_len, + ConfirmDialogFlags flags, + GtkWindow *parent); + +/* message dialog window */ +void gtkutil_message_dialog (const gchar *title, + const gchar *message, + GtkWindow *parent); + +/* progress bar window */ +GtkWidget *gtkutil_create_progress_window (gchar *title, + gchar *initial_message, + gboolean *cancel_pressed, + gint width, + gint height, + GtkWindow *parent); +void gtkutil_progress_window_update (GtkWidget *window, + gchar *title, + gchar *message, + gchar *progress_text, + gfloat progress); + +/* text entry window */ +gchar *gtkutil_popup_textentry (const gchar *title, + const gchar *label_text, + const gchar *entry_text, + GList *text_list, + gint entry_width, + TextEntryFlags flags, + GtkWindow *parent); + +/* modal file selection */ +gchar *gtkutil_modal_file_dialog (const gchar *title, + const gchar *default_path, + ModalFileDialogFlags flags, + GtkWindow *parent); + +/* color selection button */ +GtkWidget *gtkutil_color_sel_button (const gchar *label, + gint color[3]); + +/* compare functions */ +gint gtkutil_comp_spel (gconstpointer data1, + gconstpointer data2); +gint gtkutil_comp_casespel (gconstpointer data1, + gconstpointer data2); + +/* simple callback functions */ +void gtkutil_get_data_from_toggle_cb (GtkWidget *toggle, + gboolean *data); +void gtkutil_get_data_from_toggle_negative_cb (GtkWidget *toggle, + gboolean *data); +void gtkutil_get_data_from_adjustment_by_int_cb (GtkWidget *widget, + gint *data); +void gtkutil_get_data_from_adjustment_by_float_cb (GtkWidget *widget, + gfloat *data); +gboolean gtkutil_scroll_to_button_cb (GtkWidget *widget, + GdkEventScroll *event, + gpointer data); + +#define SIGNAL_CONNECT_TRANSRATE_SCROLL(obj) \ + g_signal_connect (G_OBJECT(obj), "scroll-event", \ + G_CALLBACK(gtkutil_scroll_to_button_cb), \ + NULL); + +#endif /* __GTKUTILS_H__ */ diff -Nru gimageview-0.2.27/src/utils.h gimageview-0.3.0-0.20101117/src/utils.h --- gimageview-0.2.27/src/utils.h 2004-05-23 14:07:55.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils.h 2010-11-17 06:10:11.000000000 +0000 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: utils.h,v 1.3 2003/06/13 09:43:40 makeinu Exp $ + * $Id: utils.h 931 2003-06-13 09:43:48Z makeinu $ */ #ifndef __UTILS_H__ diff -Nru gimageview-0.2.27/src/utils_japanese.c gimageview-0.3.0-0.20101117/src/utils_japanese.c --- gimageview-0.2.27/src/utils_japanese.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_japanese.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,278 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_japanese.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#include +#include +#include + +#include "utils_char_code.h" +#include "utils_japanese.h" + +/* force convert hankaku SJIS character to zenkaku */ +#undef NO_HANKAKU_SJIS + +#define NUL 0 +#define LF 10 +#define FF 12 +#define CR 13 +#define ESC 27 +#define SS2 142 + +#ifndef FALSE +#define FALSE (0) +#endif + +#ifndef TRUE +#define TRUE (!FALSE) +#endif + +enum +{ + KC_ASCII, + KC_EUC, + KC_JIS, + KC_SJIS, + KC_EUCORSJIS, + KC_UTF8 +}; + + +static const gchar *locale_euc[] = { + "ja", "ja_JP", "ja_JP.ujis", "ja_JP.EUC", "ja_JP.eucJP", "ja_JP.eucjp", +}; +static const gchar *locale_jis[] = { + "ja_JP.JIS", "ja_JP.jis", "ja_JP.iso-2022-jp", +}; +static const gchar *locale_sjis[] = { + "ja_JP.SJIS", "ja_JP.sjis", "ja_JP.Shift_JIS", +}; + + +const gchar * +japanese_locale_charset (const gchar *locale) +{ + gint i, n_locale_euc, n_locale_jis, n_locale_sjis; + + if (!locale || !*locale) return NULL; + + n_locale_euc = sizeof (locale_euc) / sizeof (gchar*); + for (i = 0; i < n_locale_euc; i++) + if (!g_strcasecmp (locale_euc[i], locale)) + return CHARSET_EUC_JP; + + n_locale_jis = sizeof (locale_jis) / sizeof (gchar*); + for (i = 0; i < n_locale_jis; i++) + if (!g_strcasecmp (locale_jis[i], locale)) + return CHARSET_JIS; + + n_locale_sjis = sizeof (locale_sjis) / sizeof (gchar*); + for (i = 0; i < n_locale_sjis; i++) + if (!g_strcasecmp (locale_sjis[i], locale)) + return CHARSET_SJIS; + + return NULL; +}; + + + +/****************************************************************************** + * + * these codes are mostly taken from kanji_conv.c + * + * Copyright (C) 2000 Takuo Kitame + * + *****************************************************************************/ +static int +detect_kanji (const guchar *str) +{ + int expected = KC_ASCII; + register int c; + int c1, c2; + int euc_c = 0, sjis_c = 0; + const guchar *ptr = str; + + g_return_val_if_fail (str && *str, 0); + + while ((c = *ptr)!= '\0') { + if (c == ESC) { + if ((c = *(++ptr)) == '\0') + break; + if (c == '$') { + if ((c = *(++ptr)) == '\0') + break; + if (c == 'B' || c == '@') + return KC_JIS; + } + ptr++; + continue; + } + + if ((c >= 0x81 && c <= 0x8d) || (c >= 0x8f && c <= 0x9f)) + return KC_SJIS; + + if (c == SS2) { + if ((c = *(++ptr)) == '\0') + break; + if ((c >= 0x40 && c <= 0x7e) + || (c >= 0x80 && c <= 0xa0) + || (c >= 0xe0 && c <= 0xfc)) + { + return KC_SJIS; + } + if (c >= 0xa1 && c <= 0xdf) + break; + + ptr++; + continue; + } + + if (c >= 0xa1 && c <= 0xdf) { + if ((c = *(++ptr)) == '\0') + break; + + if (c >= 0xe0 && c <= 0xfe) + return KC_EUC; + if (c >= 0xa1 && c <= 0xdf) { + expected = KC_EUCORSJIS; + ptr++; + continue; + } +#if 1 + if (c == 0xa0 || (0xe0 <= c && c <= 0xfe)) { + return KC_EUC; + } else { + expected = KC_EUCORSJIS; + ptr++; + continue; + } +#else + if (c <= 0x9f) + return KC_SJIS; + if (c >= 0xf0 && c <= 0xfe) + return KC_EUC; +#endif + + if (c >= 0xe0 && c <= 0xef) { + expected = KC_EUCORSJIS; + while(c >= 0x40) { + if(c >= 0x81) { + if(c <= 0x8d || (c >= 0x8f && c <= 0x9f)) { + return KC_SJIS; + } else if(c >= 0xfd && c <= 0xfe) { + return KC_EUC; + } + } + if((c = *(++ptr)) == '\0') + break; + } + ptr++; + continue; + } + + if (c >= 0xe0 && c <= 0xef) { + if ((c = *(++ptr)) == '\0') + break; + if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xa0)) + return KC_SJIS; + if (c >= 0xfd && c <= 0xfe) + return KC_EUC; + if (c >= 0xa1 && c <= 0xfc) + expected = KC_EUCORSJIS; + } + } +#if 1 + if (0xf0 <= c && c <= 0xfe) + return KC_EUC; +#endif + ptr++; + } + + ptr = str; + c2 = 0; + while ((c1 = *ptr++) != '\0') { + if (((c2 > 0x80 && c2 < 0xa0) || (c2 >= 0xe0 && c2 < 0xfd)) && + ((c1 >= 0x40 && c1 < 0x7f) || (c1 >= 0x80 && c1 < 0xfd))) + { + sjis_c++, c1 = *ptr++; + } + c2 = c1; + if (c1 == '\0') break; + } + +/* + if(sjis_c == 0) + expected = KC_EUC; + else { +*/ + { + ptr = str, c2 = 0; + while((c1 = *ptr++) != '\0') { + if((c2 > 0xa0 && c2 < 0xff) && + (c1 > 0xa0 && c1 < 0xff)) + { + euc_c++, c1 = *ptr++; + } + c2 = c1; + if (c1 == '\0') break; + } + if(sjis_c > euc_c) + expected = KC_SJIS; + else if (euc_c > 0) + expected = KC_EUC; + else + expected = KC_ASCII; + } + + /* FIXME!! nnnnm */ + if (g_utf8_validate (str, strlen (str), NULL)) + return KC_UTF8; + else + return expected; +} + + +const gchar * +japanese_detect_charset (const gchar *str) +{ + gint detected; + + if (g_utf8_validate (str, strlen (str), NULL)) + return CHARSET_UTF8; + + detected = detect_kanji (str); + + switch (detected) { + case KC_EUC: + return CHARSET_EUC_JP; + case KC_JIS: + return CHARSET_JIS; + case KC_SJIS: + return CHARSET_SJIS; + case KC_UTF8: + return CHARSET_UTF8; + default: + return CHARSET_ASCII; + } + + return NULL; +} diff -Nru gimageview-0.2.27/src/utils_japanese.h gimageview-0.3.0-0.20101117/src/utils_japanese.h --- gimageview-0.2.27/src/utils_japanese.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_japanese.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,33 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_japanese.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifndef __JAPANESE_H__ +#define __JAPANESE_H__ + +const gchar *japanese_locale_charset (const gchar *locale); +const gchar *japanese_detect_charset (const gchar *str); +gchar *japanese_conv (const gchar *src, + const gchar *src_codeset, + const gchar *dest_codeset); + +#endif /* __JAPANESE_H__ */ diff -Nru gimageview-0.2.27/src/utils_md5.c gimageview-0.3.0-0.20101117/src/utils_md5.c --- gimageview-0.2.27/src/utils_md5.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_md5.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,370 @@ +/* md5.c - Functions to compute MD5 message digest of files or memory blocks + according to the definition of MD5 in RFC 1321 from April 1992. + Copyright (C) 1995 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., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: utils_md5.c 1180 2007-10-23 14:16:14Z makeinu $ + +*/ + +/* Written by Ulrich Drepper . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#if STDC_HEADERS +# include +# include +#else +# ifndef HAVE_MEMCPY +# define memcpy(d, s, n) bcopy ((s), (d), (n)) +# endif +#endif + +#include "utils_md5.h" + +#ifdef WORDS_BIGENDIAN +# define SWAP(n) \ + (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +#else +# define SWAP(n) (n) +#endif + + +/* This array contains the bytes used to pad the buffer to the next + 64-byte boundary. (RFC 1321, 3.1: Step 1) */ +static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; + + +/* Initialize structure containing state of computation. + (RFC 1321, 3.3: Step 3) */ +void +md5_init_ctx (ctx) + struct md5_ctx *ctx; +{ + ctx->A = 0x67452301; + ctx->B = 0xefcdab89; + ctx->C = 0x98badcfe; + ctx->D = 0x10325476; +} + +/* Put result from CTX in first 16 bytes following RESBUF. The result must + be in little endian byte order. */ +void * +md5_read_ctx (ctx, resbuf) + const struct md5_ctx *ctx; + void *resbuf; +{ + ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A); + ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B); + ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C); + ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D); + + return resbuf; +} + +/* Compute MD5 message digest for bytes read from STREAM. The + resulting message digest number will be written into the 16 bytes + beginning at RESBLOCK. */ +int +md5_stream (stream, resblock) + FILE *stream; + void *resblock; +{ + /* Important: BLOCKSIZE must be a multiple of 64. */ +#define BLOCKSIZE 4096 + struct md5_ctx ctx; + md5_uint32 len[2]; + char buffer[BLOCKSIZE + 72]; + size_t pad, sum; + + /* Initialize the computation context. */ + md5_init_ctx (&ctx); + + len[0] = 0; + len[1] = 0; + + /* Iterate over full file contents. */ + while (1) + { + /* We read the file in blocks of BLOCKSIZE bytes. One call of the + computation function processes the whole buffer so that with the + next round of the loop another block can be read. */ + size_t n; + sum = 0; + + /* Read block. Take care for partial reads. */ + do + { + n = fread (buffer, 1, BLOCKSIZE - sum, stream); + + sum += n; + } + while (sum < BLOCKSIZE && n != 0); + if (n == 0 && ferror (stream)) + return 1; + + /* RFC 1321 specifies the possible length of the file up to 2^64 bits. + Here we only compute the number of bytes. Do a double word + increment. */ + len[0] += sum; + if (len[0] < sum) + ++len[1]; + + /* If end of file is reached, end the loop. */ + if (n == 0) + break; + + /* Process buffer with BLOCKSIZE bytes. Note that + BLOCKSIZE % 64 == 0 + */ + md5_process_block (buffer, BLOCKSIZE, &ctx); + } + + /* We can copy 64 byte because the buffer is always big enough. FILLBUF + contains the needed bits. */ + memcpy (&buffer[sum], fillbuf, 64); + + /* Compute amount of padding bytes needed. Alignment is done to + (N + PAD) % 64 == 56 + There is always at least one byte padded. I.e. even the alignment + is correctly aligned 64 padding bytes are added. */ + pad = sum & 63; + pad = pad >= 56 ? 64 + 56 - pad : 56 - pad; + + /* Put the 64-bit file length in *bits* at the end of the buffer. */ + *(md5_uint32 *) &buffer[sum + pad] = SWAP (len[0] << 3); + *(md5_uint32 *) &buffer[sum + pad + 4] = SWAP ((len[1] << 3) + | (len[0] >> 29)); + + /* Process last bytes. */ + md5_process_block (buffer, sum + pad + 8, &ctx); + + /* Construct result in desired memory. */ + md5_read_ctx (&ctx, resblock); + return 0; +} + +/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The + result is always in little endian byte order, so that a byte-wise + output yields to the wanted ASCII representation of the message + digest. */ +void * +md5_buffer (buffer, len, resblock) + const char *buffer; + size_t len; + void *resblock; +{ + struct md5_ctx ctx; + char restbuf[64 + 72]; + size_t blocks = len & ~63; + size_t pad, rest; + + /* Initialize the computation context. */ + md5_init_ctx (&ctx); + + /* Process whole buffer but last len % 64 bytes. */ + md5_process_block (buffer, blocks, &ctx); + + /* REST bytes are not processed yet. */ + rest = len - blocks; + /* Copy to own buffer. */ + memcpy (restbuf, &buffer[blocks], rest); + /* Append needed fill bytes at end of buffer. We can copy 64 byte + because the buffer is always big enough. */ + memcpy (&restbuf[rest], fillbuf, 64); + + /* PAD bytes are used for padding to correct alignment. Note that + always at least one byte is padded. */ + pad = rest >= 56 ? 64 + 56 - rest : 56 - rest; + + /* Put length of buffer in *bits* in last eight bytes. */ + *(md5_uint32 *) &restbuf[rest + pad] = (md5_uint32) SWAP (len << 3); + *(md5_uint32 *) &restbuf[rest + pad + 4] = (md5_uint32) SWAP (len >> 29); + + /* Process last bytes. */ + md5_process_block (restbuf, rest + pad + 8, &ctx); + + /* Put result in desired memory area. */ + return md5_read_ctx (&ctx, resblock); +} + + +/* These are the four functions used in the four steps of the MD5 algorithm + and defined in the RFC 1321. The first function is a little bit optimized + (as found in Colin Plumbs public domain implementation). */ +/* #define FF(b, c, d) ((b & c) | (~b & d)) */ +#define FF(b, c, d) (d ^ (b & (c ^ d))) +#define FG(b, c, d) FF (d, b, c) +#define FH(b, c, d) (b ^ c ^ d) +#define FI(b, c, d) (c ^ (b | ~d)) + +/* Process LEN bytes of BUFFER, accumulating context into CTX. + It is assumed that LEN % 64 == 0. */ + +void +md5_process_block (buffer, len, ctx) + const void *buffer; + size_t len; + struct md5_ctx *ctx; +{ + md5_uint32 correct_words[16]; + const md5_uint32 *words = buffer; + size_t nwords = len / sizeof (md5_uint32); + const md5_uint32 *endp = words + nwords; + md5_uint32 A = ctx->A; + md5_uint32 B = ctx->B; + md5_uint32 C = ctx->C; + md5_uint32 D = ctx->D; + + /* Process all bytes in the buffer with 64 bytes in each round of + the loop. */ + while (words < endp) + { + md5_uint32 *cwp = correct_words; + md5_uint32 A_save = A; + md5_uint32 B_save = B; + md5_uint32 C_save = C; + md5_uint32 D_save = D; + + /* First round: using the given function, the context and a constant + the next context is computed. Because the algorithms processing + unit is a 32-bit word and it is determined to work on words in + little endian byte order we perhaps have to change the byte order + before the computation. To reduce the work for the next steps + we store the swapped words in the array CORRECT_WORDS. */ + +#define OP(a, b, c, d, s, T) \ + do \ + { \ + a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ + ++words; \ + CYCLIC (a, s); \ + a += b; \ + } \ + while (0) + + /* It is unfortunate that C does not provide an operator for + cyclic rotation. Hope the C compiler is smart enough. */ +#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s))) + + /* Before we start, one word to the strange constants. + They are defined in RFC 1321 as + + T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 + */ + + /* Round 1. */ + OP (A, B, C, D, 7, 0xd76aa478); + OP (D, A, B, C, 12, 0xe8c7b756); + OP (C, D, A, B, 17, 0x242070db); + OP (B, C, D, A, 22, 0xc1bdceee); + OP (A, B, C, D, 7, 0xf57c0faf); + OP (D, A, B, C, 12, 0x4787c62a); + OP (C, D, A, B, 17, 0xa8304613); + OP (B, C, D, A, 22, 0xfd469501); + OP (A, B, C, D, 7, 0x698098d8); + OP (D, A, B, C, 12, 0x8b44f7af); + OP (C, D, A, B, 17, 0xffff5bb1); + OP (B, C, D, A, 22, 0x895cd7be); + OP (A, B, C, D, 7, 0x6b901122); + OP (D, A, B, C, 12, 0xfd987193); + OP (C, D, A, B, 17, 0xa679438e); + OP (B, C, D, A, 22, 0x49b40821); + + /* For the second to fourth round we have the possibly swapped words + in CORRECT_WORDS. Redefine the macro to take an additional first + argument specifying the function to use. */ +#undef OP +#define OP(f, a, b, c, d, k, s, T) \ + do \ + { \ + a += f (b, c, d) + correct_words[k] + T; \ + CYCLIC (a, s); \ + a += b; \ + } \ + while (0) + + /* Round 2. */ + OP (FG, A, B, C, D, 1, 5, 0xf61e2562); + OP (FG, D, A, B, C, 6, 9, 0xc040b340); + OP (FG, C, D, A, B, 11, 14, 0x265e5a51); + OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa); + OP (FG, A, B, C, D, 5, 5, 0xd62f105d); + OP (FG, D, A, B, C, 10, 9, 0x02441453); + OP (FG, C, D, A, B, 15, 14, 0xd8a1e681); + OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8); + OP (FG, A, B, C, D, 9, 5, 0x21e1cde6); + OP (FG, D, A, B, C, 14, 9, 0xc33707d6); + OP (FG, C, D, A, B, 3, 14, 0xf4d50d87); + OP (FG, B, C, D, A, 8, 20, 0x455a14ed); + OP (FG, A, B, C, D, 13, 5, 0xa9e3e905); + OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8); + OP (FG, C, D, A, B, 7, 14, 0x676f02d9); + OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a); + + /* Round 3. */ + OP (FH, A, B, C, D, 5, 4, 0xfffa3942); + OP (FH, D, A, B, C, 8, 11, 0x8771f681); + OP (FH, C, D, A, B, 11, 16, 0x6d9d6122); + OP (FH, B, C, D, A, 14, 23, 0xfde5380c); + OP (FH, A, B, C, D, 1, 4, 0xa4beea44); + OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9); + OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60); + OP (FH, B, C, D, A, 10, 23, 0xbebfbc70); + OP (FH, A, B, C, D, 13, 4, 0x289b7ec6); + OP (FH, D, A, B, C, 0, 11, 0xeaa127fa); + OP (FH, C, D, A, B, 3, 16, 0xd4ef3085); + OP (FH, B, C, D, A, 6, 23, 0x04881d05); + OP (FH, A, B, C, D, 9, 4, 0xd9d4d039); + OP (FH, D, A, B, C, 12, 11, 0xe6db99e5); + OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8); + OP (FH, B, C, D, A, 2, 23, 0xc4ac5665); + + /* Round 4. */ + OP (FI, A, B, C, D, 0, 6, 0xf4292244); + OP (FI, D, A, B, C, 7, 10, 0x432aff97); + OP (FI, C, D, A, B, 14, 15, 0xab9423a7); + OP (FI, B, C, D, A, 5, 21, 0xfc93a039); + OP (FI, A, B, C, D, 12, 6, 0x655b59c3); + OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92); + OP (FI, C, D, A, B, 10, 15, 0xffeff47d); + OP (FI, B, C, D, A, 1, 21, 0x85845dd1); + OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f); + OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0); + OP (FI, C, D, A, B, 6, 15, 0xa3014314); + OP (FI, B, C, D, A, 13, 21, 0x4e0811a1); + OP (FI, A, B, C, D, 4, 6, 0xf7537e82); + OP (FI, D, A, B, C, 11, 10, 0xbd3af235); + OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb); + OP (FI, B, C, D, A, 9, 21, 0xeb86d391); + + /* Add the starting values of the context. */ + A += A_save; + B += B_save; + C += C_save; + D += D_save; + } + + /* Put checksum in context given as argument. */ + ctx->A = A; + ctx->B = B; + ctx->C = C; + ctx->D = D; +} diff -Nru gimageview-0.2.27/src/utils_md5.h gimageview-0.3.0-0.20101117/src/utils_md5.h --- gimageview-0.2.27/src/utils_md5.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_md5.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,118 @@ +/* md5.h - Declaration of functions and data types used for MD5 sum + computing library functions. + Copyright (C) 1995 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 02111-1307, USA. + +$Id: utils_md5.h 1180 2007-10-23 14:16:14Z makeinu $ +*/ + +#ifndef _MD5_H +#define _MD5_H + +#include + +#if defined HAVE_LIMITS_H || _LIBC +# include +#endif + +/* The following contortions are an attempt to use the C preprocessor + to determine an unsigned integral type that is 32 bits wide. An + alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but + doing that would require that the configure script compile and *run* + the resulting executable. Locally running cross-compiled executables + is usually not possible. */ + +#if defined __STDC__ && __STDC__ +# define UINT_MAX_32_BITS 4294967295U +#else +# define UINT_MAX_32_BITS 0xFFFFFFFF +#endif + +/* If UINT_MAX isn't defined, assume it's a 32-bit type. + This should be valid for all systems GNU cares about because + that doesn't include 16-bit systems, and only modern systems + (that certainly have ) have 64+-bit integral types. */ + +#ifndef UINT_MAX +# define UINT_MAX UINT_MAX_32_BITS +#endif + +#if UINT_MAX == UINT_MAX_32_BITS + typedef unsigned int md5_uint32; +#else +# if USHRT_MAX == UINT_MAX_32_BITS + typedef unsigned short md5_uint32; +# else +# if ULONG_MAX == UINT_MAX_32_BITS + typedef unsigned long md5_uint32; +# else + /* The following line is intended to evoke an error. + Using #error is not portable enough. */ + "Cannot determine unsigned 32-bit data type." +# endif +# endif +#endif + +#undef __P +#if defined (__STDC__) && __STDC__ +#define __P(x) x +#else +#define __P(x) () +#endif + +/* Structure to save state of computation between the single steps. */ +struct md5_ctx +{ + md5_uint32 A; + md5_uint32 B; + md5_uint32 C; + md5_uint32 D; +}; + +/* + * The following three functions are build up the low level used in + * the functions `md5_stream' and `md5_buffer'. + */ + +/* Initialize structure containing state of computation. + (RFC 1321, 3.3: Step 3) */ +void md5_init_ctx __P ((struct md5_ctx *ctx)); + +/* Starting with the result of former calls of this function (or the + initialzation function update the context for the next LEN bytes + starting at BUFFER. + It is necessary that LEN is a multiple of 64!!! */ +void md5_process_block __P ((const void *buffer, size_t len, + struct md5_ctx *ctx)); + +/* Put result from CTX in first 16 bytes following RESBUF. The result is + always in little endian byte order, so that a byte-wise output yields + to the wanted ASCII representation of the message digest. */ +void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf)); + + +/* Compute MD5 message digest for bytes read from STREAM. The + resulting message digest number will be written into the 16 bytes + beginning at RESBLOCK. */ +int md5_stream __P ((FILE *stream, void *resblock)); + +/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The + result is always in little endian byte order, so that a byte-wise + output yields to the wanted ASCII representation of the message + digest. */ +void *md5_buffer __P ((const char *buffer, size_t len, void *resblock)); + +#endif diff -Nru gimageview-0.2.27/src/utils_menu.c gimageview-0.3.0-0.20101117/src/utils_menu.c --- gimageview-0.2.27/src/utils_menu.c 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_menu.c 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,446 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_menu.c 1179 2007-10-23 02:18:13Z makeinu $ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include "utils_menu.h" + + +static void cb_get_data_from_menuitem (GtkWidget *widget, + gint *conf); +static void menu_shell_deactivated (GtkMenuShell *menu_shell, + gpointer data); + + + +/* + * menu_count_ifactory_entry_num: + * @ Count NULL terminated GtkItemFactoryEntry array length. + * + * Return : length of array. + */ +gint +menu_count_ifactory_entry_num (GtkItemFactoryEntry *entries) +{ + gint i; + + if (!entries) return -1; + + for (i = 0; entries[i].path; i++) {continue;} + return i; +} + + +static void +cb_menu_destroy (GtkWidget *widget, GtkItemFactory *factory) +{ + g_return_if_fail (factory); + g_return_if_fail (GTK_IS_ITEM_FACTORY (factory)); + + g_object_unref (G_OBJECT (factory)); +} + + +/* + * menu_create: + * @ Create menu bar widget. + * + * window : Window widget that attach accel group. + * entries : Menu item entries. + * n_entries : Number of menu items. + * path : Root menu path. + * data : User data for menu callback. + * Return : Menubar widget. + */ +GtkWidget * +menubar_create (GtkWidget *window, + GtkItemFactoryEntry *entries, + guint n_entries, + const gchar *path, + gpointer data) +{ + GtkItemFactory *factory; + GtkAccelGroup *accel_group; + GtkWidget *widget; + + accel_group = gtk_accel_group_new (); + factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, path, accel_group); +#ifdef ENABLE_NLS + gtk_item_factory_set_translate_func (factory, (GtkTranslateFunc) gettext, + NULL, NULL); +#endif /* ENABLE_NLS */ + gtk_item_factory_create_items (factory, n_entries, entries, data); + gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); + + widget = gtk_item_factory_get_widget (factory, path); + g_signal_connect (G_OBJECT (widget), "destroy", + G_CALLBACK (cb_menu_destroy), factory); + + return widget; +} + + +/* + * menu_create_items: + * @ Create menu item for menu widget (like a popup menu). + * + * window : Window widget that attach accel group. + * entries : Menu item entries. + * n_entries : Number of menu items. + * path : Root menu path. + * data : User data for menu callback. + * Return : menu widget. + */ +GtkWidget * +menu_create_items (GtkWidget *window, + GtkItemFactoryEntry *entries, + guint n_entries, + const gchar *path, + gpointer data) +{ + GtkItemFactory *factory; + GtkAccelGroup *accel_group = NULL; + GtkWidget *widget; + + if (window) + accel_group = gtk_accel_group_new (); + + factory = gtk_item_factory_new (GTK_TYPE_MENU, path, accel_group); +#ifdef ENABLE_NLS + gtk_item_factory_set_translate_func (factory, (GtkTranslateFunc) gettext, + NULL, NULL); +#endif /* ENABLE_NLS */ + gtk_item_factory_create_items (factory, n_entries, entries, data); + + if (window) + gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); + + widget = gtk_item_factory_get_widget (factory, path); + g_signal_connect (G_OBJECT (widget), "destroy", + G_CALLBACK (cb_menu_destroy), factory); + + return widget; +} + + +void +menu_item_set_sensitive (GtkWidget *widget, gchar *path, gboolean sensitive) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + gtk_widget_set_sensitive (menuitem, sensitive); +} + + +/* + * menu_set_check_item: + * @ Set check menu item's value (TRUE or FALSE). + * + * widget : Menu widget that contains check menu item. + * path : Menu path to check menu item. + * active : Value for set. + */ +void +menu_check_item_set_active (GtkWidget *widget, gchar *path, gboolean active) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menuitem), active); +} + + +/* + * menu_set_check_item: + * @ Set check menu item's value (TRUE or FALSE). + * + * widget : Menu widget that contains check menu item. + * path : Menu path to check menu item. + * active : Value for set. + */ +gboolean +menu_check_item_get_active (GtkWidget *widget, gchar *path) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + return GTK_CHECK_MENU_ITEM(menuitem)->active; +} + + +/* + * menu_set_submenu: + * @ Set sub menu. + * + * widget : Menu widget to set sub menu. + * path : Menu path to check menu item. + * submenu : Submenu widget. + */ +void +menu_set_submenu (GtkWidget *widget, const gchar *path, GtkWidget *submenu) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + gtk_menu_item_set_submenu (GTK_MENU_ITEM(menuitem), submenu); +} + + +GtkWidget * +menu_get_submenu (GtkWidget *widget, const gchar *path) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + g_return_val_if_fail (menuitem, NULL); + return GTK_MENU_ITEM(menuitem)->submenu; +} + + +/* + * menu_remove_submenu: + * @ Set sub menu. + * + * widget : Menu widget to set sub menu. + * path : Menu path to check menu item. + * submenu : Submenu widget. + */ +void +menu_remove_submenu (GtkWidget *widget, const gchar *path, GtkWidget *submenu) +{ + GtkWidget *menuitem; + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget (widget); + menuitem = gtk_item_factory_get_item (ifactory, path); + gtk_menu_item_remove_submenu (GTK_MENU_ITEM (menuitem)); +} + + + +/****************************************************************************** + * + * option menu + * + ******************************************************************************/ +/* + * create_option_menu_simple: + * @ Create option menu widget. Return val will store to data. + * + * menu_items : Menu entries. + * def_val : Default value. + * data : Pointer to gint for store return value when a menuitem has been + * selected. + * Return : Option menu widget. + */ +GtkWidget * +create_option_menu_simple (const gchar **menu_items, gint def_val, gint *data) +{ + GtkWidget *option_menu; + GtkWidget *menu_item; + GtkWidget *menu; + gint i; + + option_menu = gtk_option_menu_new(); + menu = gtk_menu_new(); + + for (i = 0; menu_items[i]; i++) { + menu_item = gtk_menu_item_new_with_label (_(menu_items[i])); + g_object_set_data (G_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); + g_signal_connect(G_OBJECT(menu_item), "activate", + G_CALLBACK(cb_get_data_from_menuitem), + data); + gtk_menu_append (GTK_MENU(menu), menu_item); + gtk_widget_show (menu_item); + } + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); + gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), def_val); + + return option_menu; +} + + +/* + * create_option_menu: + * @ Create option menu widget. + * + * menu_items : Menu entries. + * def_val : Default value. + * func : Callback function for each menu items. + * data : Pointer to user data for callback function. + * Return : Option menu widget. + */ +GtkWidget * +create_option_menu (const gchar **menu_items, gint def_val, + gpointer func, gpointer data) +{ + GtkWidget *option_menu; + GtkWidget *menu_item; + GtkWidget *menu; + gint i; + + option_menu = gtk_option_menu_new(); + gtk_widget_set_name (option_menu, "/ThumbWin/DispModeOptionMenu"); + menu = gtk_menu_new(); + + for (i = 0; menu_items[i]; i++) { + menu_item = gtk_menu_item_new_with_label (_(menu_items[i])); + g_object_set_data (G_OBJECT (menu_item), "num", GINT_TO_POINTER(i)); + g_signal_connect(G_OBJECT(menu_item), "activate", + G_CALLBACK(func), + data); + gtk_menu_append (GTK_MENU(menu), menu_item); + gtk_widget_show (menu_item); + } + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); + gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), def_val); + + return option_menu; +} + + + +/****************************************************************************** + * + * modal popup menu + * + ******************************************************************************/ +static void +cb_get_data_from_menuitem (GtkWidget *widget, gint *conf) +{ + *conf = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "num")); +} + + +void +menu_modal_cb (gpointer data, guint action, GtkWidget *menuitem) +{ + g_object_set_data (G_OBJECT (menuitem->parent), "return_val", + GINT_TO_POINTER (action)); +} + + +static void +menu_shell_deactivated (GtkMenuShell *menu_shell, gpointer data) +{ + gtk_main_quit (); +} + + +/* + * menu_popup_modal: + * @runs the popup menu modally and returns the callback_action value of the + * selected item entry, or -1 if none.. + * + * popup : GtkMenu widget to popup. + * pos_func : + * pos_data : + * event : + * user_data : not used yet. + * Return : selected value. + */ +gint +menu_popup_modal (GtkWidget *popup, + GtkMenuPositionFunc pos_func, + gpointer pos_data, + GdkEventButton *event, + gpointer user_data) +{ + guint id; + guint button; + guint32 timestamp; + gint retval; + + g_return_val_if_fail (popup != NULL, -1); + g_return_val_if_fail (GTK_IS_WIDGET (popup), -1); + + g_object_set_data (G_OBJECT (popup), "return_val", GINT_TO_POINTER (-1)); + + id = g_signal_connect (G_OBJECT (popup), "deactivate", + G_CALLBACK (menu_shell_deactivated), + NULL); + + if (event) { + button = event->button; + timestamp = event->time; + } else { + button = 0; + timestamp = GDK_CURRENT_TIME; + } + + gtk_menu_popup (GTK_MENU (popup), NULL, NULL, + pos_func, pos_data, button, timestamp); + gtk_grab_add (popup); + gtk_main (); + gtk_grab_remove (popup); + + g_signal_handler_disconnect (G_OBJECT (popup), id); + + retval = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (popup), + "return_val")); + return retval; +} + + +void +menu_calc_popup_position (GtkMenu *menu, gint *x_ret, gint *y_ret, + gboolean *push_in, + gpointer data) +{ + GdkWindow *window = data; + gint x = 0, y = 0, w = 0, h = 0, cursor_x = 0, cursor_y = 0; + GdkModifierType mask; + + g_return_if_fail (x_ret && y_ret); + g_return_if_fail (window); + + gdk_window_get_pointer (window, &cursor_x, &cursor_y, &mask); + + gdk_window_get_origin (window, &x, &y); + gdk_window_get_size (window, &w, &h); + + if (cursor_x < 0 || cursor_x > w || cursor_y < 0 || cursor_y > h) + { + *x_ret = x + w / 2; + *y_ret = y + h / 2; + } else { + *x_ret = x + cursor_x; + *y_ret = y + cursor_y; + } +} diff -Nru gimageview-0.2.27/src/utils_menu.h gimageview-0.3.0-0.20101117/src/utils_menu.h --- gimageview-0.2.27/src/utils_menu.h 1970-01-01 00:00:00.000000000 +0000 +++ gimageview-0.3.0-0.20101117/src/utils_menu.h 2010-11-17 06:10:11.000000000 +0000 @@ -0,0 +1,86 @@ +/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */ + +/* + * GImageView + * Copyright (C) 2001 Takuro Ashie + * + * 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: utils_menu.h 1179 2007-10-23 02:18:13Z makeinu $ + */ + + +#ifndef __MENU_H__ +#define __MENU_H__ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +gint menu_count_ifactory_entry_num (GtkItemFactoryEntry *entries); +GtkWidget *menubar_create (GtkWidget *window, + GtkItemFactoryEntry *entries, + guint n_entries, + const gchar *path, + gpointer data); + +GtkWidget *menu_create_items (GtkWidget *window, + GtkItemFactoryEntry *entries, + guint n_entries, + const gchar *path, + gpointer data); + +void menu_item_set_sensitive (GtkWidget *widget, + gchar *path, + gboolean sensitive); +void menu_check_item_set_active (GtkWidget *widget, + gchar *path, + gboolean active); +gboolean menu_check_item_get_active (GtkWidget *widget, + gchar *path); +void menu_set_submenu (GtkWidget *widget, + const gchar *path, + GtkWidget *submenu); +GtkWidget *menu_get_submenu (GtkWidget *widget, + const gchar *path); +void menu_remove_submenu (GtkWidget *widget, + const gchar *path, + GtkWidget *submenu); +GtkWidget *create_option_menu_simple (const gchar **menu_items, + gint def_val, + gint *data); +GtkWidget *create_option_menu (const gchar **menu_items, + gint def_val, + gpointer func, + gpointer data); + + +void menu_modal_cb (gpointer data, + guint action, + GtkWidget *menuitem); +gint menu_popup_modal (GtkWidget *popup, + GtkMenuPositionFunc pos_func, + gpointer pos_data, + GdkEventButton *event, + gpointer user_data); +void menu_calc_popup_position (GtkMenu *menu, + gint *x_ret, + gint *y_ret, + gboolean *push_in, + gpointer data); + +#endif /* __MENU_H__ */

q c #5F5C6A", -",q c #5C5A68", -"'q c #605F6E", -")q c #9E9D8B", -"!q c #CCCDA5", -"~q c #C7C9A1", -"{q c #C4C69E", -"]q c #C7C7A0", -"^q c #D0CCA4", -"/q c #B5B88E", -"(q c #8C9070", -"_q c #CDCB9F", -":q c #CCCAA0", -"r c #E1B37A", -",r c #E1B67C", -"'r c #E4B87B", -")r c #E3B77A", -"!r c #E0AE82", -"~r c #D69B86", -"{r c #A77771", -"]r c #665757", -"^r c #635B65", -"/r c #5F5868", -"(r c #645F6A", -"_r c #626270", -":r c #605D67", -"s c #535826", -",s c #686535", -"'s c #827940", -")s c #959143", -"!s c #F8FC6B", -"~s c #E1AD6E", -"{s c #E2A673", -"]s c #DEA170", -"^s c #DFA273", -"/s c #DDA474", -"(s c #DFA871", -"_s c #E2AB75", -":s c #E0AD79", -"t c #C7DDA1", -",t c #C1CF92", -"'t c #55592A", -")t c #6A6634", -"!t c #A49D4B", -"~t c #E0A571", -"{t c #DE9874", -"]t c #DF9675", -"^t c #DD9473", -"/t c #DB9273", -"(t c #D78C6D", -"_t c #DA8F70", -":t c #DE9377", -"u c #C1C156", -",u c #DC9972", -"'u c #D07377", -")u c #CC7075", -"!u c #CD7077", -"~u c #BF6D76", -"{u c #BD717A", -"]u c #B7757C", -"^u c #AD757C", -"/u c #9C6C74", -"(u c #936974", -"_u c #886370", -":u c #715A69", -"v c #6E5968", -",v c #966679", -"'v c #BF7C81", -")v c #F3EF6E", -"!v c #EAEC81", -"~v c #D1CEA5", -"{v c #D2CDA5", -"]v c #D3CCA4", -"^v c #CECEA3", -"/v c #B8BA93", -"(v c #6A7358", -"_v c #656F59", -":v c #8A8F70", -"w c #A6A57A", -",w c #AEAF82", -"'w c #B2B486", -")w c #C2C395", -"!w c #CACC9F", -"~w c #C3C697", -"{w c #AAAA7D", -"]w c #88875C", -"^w c #8B8A5F", -"/w c #F1F76A", -"(w c #848F57", -"_w c #818F48", -":w c #BED284", -"x c #5F5C69", -",x c #62606D", -"'x c #666471", -")x c #5E5B67", -"!x c #62606C", -"~x c #5C5C67", -"{x c #595B68", -"]x c #5F6168", -"^x c #BCA870", -"/x c #F7F86C", -"(x c #EEF17A", -"_x c #DCDC92", -":x c #D4D39E", -" % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % > ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # , % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % , # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ' @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ) % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ! ~ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ~ ! . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . { ] % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ] { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ' @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^ % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . / @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ( _ % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % _ ( . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . : @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ : . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . < % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % < . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . [ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ [ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . | @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ | . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 1 , % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % , 1 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 2 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 2 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3 4 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 4 3 . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 5 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 5 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 6 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 6 . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 7 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 7 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % } . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 8 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 9 0 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 0 9 . . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 2 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 2 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . a b % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % b a . . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . & @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ & . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ( c % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % c ( . . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 5 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 5 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # d % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % d # . . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + . . . . . . . . . . . . . . . . . . . . . . . . . . . . { > % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % > { . . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . / @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ / . . . . . . . . . . . . . . . . . . . . . . . . . . . e % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % e . . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . . . f g h i i i i i h g . . . . . . . . . . . h h h h j . . . . . . . . . . . . . . . . . . . 7 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 7 . . . g h h h h . . . . . . . . . . . . g h h h h . e k k k k l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % e . . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . . f m i i i i i i i i i i i m . . . . . . . . . i i i i n . . . . . . . . . . . . . . . . . . . @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . . . j i i i i j . . . . . . . . . . . o i i i p { % i i i i q % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % { . . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . . n o i i i i i i i i i i i i i o j . . . . . . . i i i i n . . . . . . . . . . . . . . . . . . . @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . . . . o i i i m . . . . . . . . . . j i i i i r > % i i i i q % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % > # . . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . . n i i i i i i i i i i i i i i i i i n . . . . . . i i i i n . . . . . . . . . . . . . . . . . . . 7 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 7 . . . . m i i i i . . . . . . . . . . m i i i s d % % i i i i q % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % d ( . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . . n i i i i i i h n n n n m p i i i i i i n . . . . . i i i i n . . . . . . . . . . . . . . . . . . . / @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ / . . . . f i i i i n . . . . . . . . . o i i i t % % % q q q q u % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % c a . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . f o i i i i h f . . . . . . . j o i i i i o f . . . . i i i i n . . . . . . . . . . . . . . . . . . . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + . . . . . p i i i h . . . . . . . . j i i i i u % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % b 9 . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . . m i i i i h . . . . . . . . . . f o i i i i m . . . . i i i i n . . . g h h h j j p i i i o m f . . . v w i i i w x y @ @ @ @ @ @ @ @ @ @ y x w i i i w x y @ z A A A B @ @ @ @ @ @ B A w i i i w x y @ A A A A B @ @ @ @ @ @ @ z C i i i i A z @ @ 5 . . . . . n i i i i . . . . . . . . h i i i D % % % % k k k k l % % % % % % % l k i i i i D E u % % % % % l k k k k l % % % % % F k k E % % % % % l k k k k l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 0 . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . f i i i i p . . . . . . . . . . . . f n n n n j . . . . i i i i n . . . h i i i h i i i i i i i o f f o i i i i i i i i G @ @ @ @ @ @ @ @ x i i i i i i i i i G A i i i G @ @ @ @ @ A i i i i i i i i i G i i i i G @ @ @ @ @ G w i i i i i i i i w G & . . . . . . o i i i n . . . . . . . i i i i F % % % % i i i i q % % % % % u D i i i i i i i i i E % % % % % H i i i E % % % % % i i i i % % % % % F i i i i % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % } . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . g i i i i j . . . . . . . . . . . . . . . . . . . . . . i i i i n . . . h i i i i i i i i i i i i p o i i i i i i i i i i G @ @ @ @ @ @ A i i i i i i i i i i i w i i i G @ @ @ y w i i i i i i i i i i i i i i i G @ @ @ @ A i i i i i i i i i i i i I . . . . . . m i i i p . . . . . . n i i i i % % % % % i i i i q % % % % q i i i i i i i i i i i i k % % % % E i i i H % % % % l i i i i q % % % % D i i i E % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 6 . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . h i i i p . . . . . . . . . . . . . . . . . . . . . . . i i i i n . . . h i i i i i o h h o i i i i i i i i A A w i i i i w @ @ @ @ @ x i i i i i C A A C i i i i i i i G @ @ @ A i i i i i C A A w i i i i i i i G @ @ @ z i i i i i C A A C i i i i i j . . . . . j i i i i f . . . . . h i i i E % % % % % i i i i q % % % u i i i i i H k k k i i i i i E % % % l i i i i u % % % E i i i i E % % % u i i i i l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 3 . . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . i i i i m . . . . . . . . . . . . . . . . . . . . . . . i i i i n . . . h i i i i h . . . f h i i i i i o J @ @ @ A i i i i G @ @ @ B i i i i w G @ @ @ @ B w i i i i i G @ @ B i i i i w B @ @ @ @ G i i i i i i G @ @ y i i i i w B @ @ @ @ y C i i i o . . . . . . p i i i g . . . . . i i i i l % % % % % i i i i q % % % D i i i i F % % % % % E i i i i l % % % H i i i F % % % D i i i i H % % % q i i i H % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 4 1 . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . i i i i n . . . . . . . . . . . . . . . . . . . . . . . i i i i n . . . h i i i i f . . . . f i i i i i j 5 @ @ @ @ w i i i z @ @ @ A i i i i B @ @ @ @ @ @ y w i i i i G @ @ C i i i i y @ @ @ @ @ @ G i i i i i G @ @ x i i i w y @ @ @ @ @ @ @ w i i i n . . . . . g i i i p . . . . g i i i H % % % % % % i i i i q % % l i i i i q % % % % % % % E i i i k % % % F i i i k % % u i i i i i i u % % k i i i E % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % , . . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . i i i i n . . . . n i i i i i i i i i i i i i i i . . . i i i i n . . . h i i i h . . . . . . p i i i o . 2 @ @ @ @ A i i i A @ @ @ i i i i x @ @ @ @ @ @ @ @ z i i i i G @ @ i i i i x @ @ @ @ @ @ @ @ A i i i i G @ @ i i i i z @ @ @ @ @ @ @ @ G i i i h . . . . . . i i i i f . . . K i i i F % % % % % % i i i i q % % k i i i D % % % % % % % % % i i i i % % % u i i i i % % q i i i i i i q % % i i i i u % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % } . . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . i i i i n . . . . n i i i i i i i i i i i i i i i . . . i i i i n . . . h i i i h . . . . . . h i i i h . | @ @ @ @ A i i i A @ @ B i i i i B @ @ @ @ @ @ @ @ @ i i i i G @ G i i i i B @ @ @ @ @ @ @ @ G i i i i G @ B i i i i A A A A A A A A A A i i i i . . . . . . h i i i g . . L i i i i u % % % % % % i i i i q % % H i i i D k k k k k k k k k H i i i q % % % D i i i q % k i i k k i i k % q i i i D % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % < . . . . . . . ", -". . . . . . . . . . . . . . . . . . . . p i i i h . . . . n i i i i i i i i i i i i i i i . . . i i i i n . . . h i i i h . . . . . . h i i i h . . [ @ @ @ A i i i A @ @ G i i i i @ @ @ @ @ @ @ @ @ @ A i i i G @ G i i i i @ @ @ @ @ @ @ @ @ @ i i i i G @ G i i i i i i i i i i i i i i i i i i . . . . . . j i i i o . ( F i i i k % % % % % % % i i i i q % % i i i i i i i i i i i i i i i i i i q % % % F i i i k % H i i F F i i i % E i i i F % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ( . . . . . . ", -". . . . . . . . . . . . . . . . . . . . m i i i i f . . . n i i i i i i i i i i i i i i h . . . i i i i n . . . h i i i h . . . . . . h i i i h . . : @ @ @ A i i i A @ @ G i i i i @ @ @ @ @ @ @ @ @ @ A i i i G @ G i i i i @ @ @ @ @ @ @ @ @ @ i i i i G @ G i i i i i i i i i i i i i i i i i i . . . . . . . o i i i j _ D i i i q % % % % % % % i i i i q % % i i i i i i i i i i i i i i i i i i q % % % u i i i H l i i i u u i i i l H i i i u % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % _ . . . . . . ", -". . . . . . . . . . . . . . . . . . . . j i i i i m . . . . . . . . . . . . . p i i i i g . . . i i i i n . . . h i i i h . . . . . . h i i i h . . . / @ @ A i i i A @ @ G i i i i y @ @ @ @ @ @ @ @ @ w i i i G @ G i i i i y @ @ @ @ @ @ @ @ B i i i i G @ G i i i i i i i i i i i i i i i i i i . . . . . . . g i i i M u i i i H % % % % % % % % i i i i q % % i i i i i i i i i i i i i i i i i i q % % % % k i i i k i i D % % H i i k i i i D % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ^ . . . . . ", -". . . . . . . . . . . . . . . . . . . . . p i i i i n . . . . . . . . . . . m i i i i o . . . . i i i i n . . . h i i i h . . . . . . h i i i h . . . ' @ @ A i i i A @ @ @ i i i i z @ @ @ @ @ @ @ @ B i i i i G @ @ i i i i G @ @ @ @ @ @ @ @ z i i i i G @ @ i i i i G @ @ @ @ @ @ @ ' . . . . . . . . . . . . f i i i H F i i i E % % % % % % % % i i i i q % % k i i i k % % % % % % % % % % % % % % % % % % q i i i i i i E % % E i i i i i i q % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % { . . . . ", -". . . . . . . . . . . . . . . . . . . . . j i i i i i g . . . . . . . . . m i i i i i g . . . . i i i i n . . . h i i i h . . . . . . h i i i h . . . ! ~ @ A i i i A @ @ @ C i i i w @ @ @ @ @ @ @ @ A i i i i G @ @ C i i i C @ @ @ @ @ @ @ y w i i i i G @ @ C i i i C @ @ @ @ @ @ ~ ! n n n n j . . . . . . . . h i i i H i i i u % % % % % % % % i i i i q % % F i i i i u % % % % % % % l q q q q % % % % % % i i i i i i l % % l i i i i i i % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ] . . . . ", -". . . . . . . . . . . . . . . . . . . . . . m i i i i i o g f . . . f g o i i i i i p . . . . . i i i i n . . . h i i i h . . . . . . h i i i h . . . . ' @ A i i i A @ @ @ z i i i i A @ @ @ @ @ @ A i i i i i G @ @ z i i i i A @ @ @ @ @ y A i i i i i G @ @ B i i i i A @ @ @ @ @ ' h i i i i n . . . . . . . . n i i i i i i D % % % % % % % % % i i i i q % % % H i i i H u % % % % % q i i i i k % % % % % % k i i i i H % % % % i i i i i k % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ) . . . ", -". . . . . . . . . . . . . . . . . . . . . . . h i i i i i i i i i i i i i i i i i N O P Q R S T i i i i n . . . h i i i h . . . . . . h i i i h . . . . . + A i i i A @ @ @ @ w i i i i w z G G z w i i i i i i G @ @ @ w i i i i w z G G z w i i i i i i G @ @ @ A i i i i w z G G U o i i i i p . . . . . . . . . # H i i i i i F % % % % % % % % % i i i i q % % % q i i i i i E q q q D i i i i i u % % % % % % l i i i i k % % % % k i i i i l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % # . . ", -". . . . . . . . . . . . . . . . . . . . . . . . V i i i i i i i i i i i i i i i W X Y Y Y Y Y Y i i i i Z ` . . h i i i h . . . . . . h i i i h . . . . . - A i i i A @ @ @ @ y w i i i i i i i i i i i i i i i G @ @ @ y i i i i i i i i i i i i w i i i G @ @ @ @ w i i i i i i i i i i i i o f . . . . . . . . . , E i i i i i % % % % % % % % % % i i i i q % % % % E i i i i i i i i i i i i i q % % % % % % % % H i i i q % % % % q i i i H % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % , . . ", -". . . . . . . . . . . . . . . . . . . . . ...+.Y @.W i i i i i i i i i i i i #.Y Y Y Y Y Y Y Y i i i i @.Y +...$.i i i h . . . . . . h i i i h . . . . . . %.i i i A @ @ @ @ @ y w i i i i i i i i i A A i i i G @ @ @ @ B w i i i i i i i i i G A i i i G @ @ @ @ @ A i i i i i i i i i i p f . . . . . . . . . ; % u i i i i E % % % % % % % % % % i i i i q % % % % % q i i i i i i i i i i H q % % % % % % % % % E i i i % % % % % u i i i E % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ; . ", -". . . . . . . . . . . . . . . . . . &.S *.Y Y Y Y Y Y =.-.i i i i i i i W #.X Y Y Y Y Y Y Y Y Y i i i i @.Y Y Y ;.i i i h . . . . . . h i i i h . . . . . . h i i i A @ @ @ @ @ @ @ x w i i i i i w z @ A i i i G @ @ @ @ @ y x i i i i i i C B @ i i i i B @ @ @ @ @ @ B C i i i i i i o g . . . . . . . . . . * > % % D i i i l % % % % % % % % % % i i i i q % % % % % % u E i i i i i i i E u % % % % % % % % % % l i i D % % % % % % D i i l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % > * ", -". . . . . . . . . . . . . . . . >.,.Y Y Y Y Y Y Y Y Y Y Y Y @.@.@.@.@.X Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ,.>.. . . . . . . . . . . . . . . . . '.7 @ @ @ @ @ @ @ @ @ @ @ B G G G B @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ B G G G y @ @ B i i i i @ @ @ @ @ @ @ @ @ @ ).!.n n f . . . . . . . . . . . . = % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % l q q q l % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % = ", -". . . . . . . . . . . . . . ~.+.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.~.. . . . . . . . . . . . . . . . - @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ A A A A x @ @ @ @ @ @ @ @ C i i i C @ @ @ @ @ @ @ @ @ @ - . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . T P Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P T . . . . . . . . . . . . . . . 2 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ x i i i i C B @ @ @ @ y A i i i i G @ @ @ @ @ @ @ @ @ 2 . . . . . . . . . . . . . . . . $ % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . {.].Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ].{.. . . . . . . . . . . . . . 2 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ w i i i i i w A A C i i i i i A @ @ @ @ @ @ @ @ @ 2 . . . . . . . . . . . . . . . . ^.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . /.(.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (./.. . . . . . . . . . . . . 2 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ y w i i i i i i i i i i i i w y @ @ @ @ @ @ @ @ 2 . . . . . . . . . . . . . . . . . ] % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . _.:.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y :._.. . . . . . . . . . . . . - 7 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ y x i i i i i i i i i i x @ @ @ @ @ @ @ @ 7 - . . . . . . . . . . . . . . . . . < % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . (.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . '.+ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ y z A i i i i A z y @ @ @ @ @ @ @ @ + '.. . . . . . . . . . . . . . . . . . c % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . <.+.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.<.. . . . . . . . . . . . . & @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ & . . . . . . . . . . . . . . . . . . . [.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . T }.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y }.T . . . . . . . . . . . . . - + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + - . . . . . . . . . . . . . . . . . . . . c % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . |.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y |.. . . . . . . . . . . . . . ' ~ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ~ ' . . . . . . . . . . . . . . . . . . . . . < % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". (.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . ! ' / @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ / ' ! . . . . . . . . . . . . . . . . . . . . . . ] % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"R Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y R . . . . . . . . . . . . . . . . : [ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ [ : . . . . . . . . . . . . . . . . . . . . . . . . 1.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y 2.. . . . . . . . . . . . . . . . . | 2 5 7 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 7 5 2 | . . . . . . . . . . . . . . . . . . . . . . . . . . $ % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y R . . . . . . . . . . . . . . . . . . . . 8 2 & 5 + / 7 @ @ 7 / + 5 & 2 8 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . = % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y |.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ; % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y }.<.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ] % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y _.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 5.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y :./.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 6.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y {.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 7.> % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ].. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 9.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ~.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^ % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y >.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . , % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y &.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y S . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y *.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . b % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y .. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 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.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % B.L.M.N.O.P.% % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ... . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . { % % % % % % % % % % % % % % % % % % % % % % % Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+% % % % % % % % % % % % % % % % % % % % % % % % #+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+% % % % % % % % % % % % % % % % % % % % % (+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+% % % % % % % % % % % % % % % % % % % % % % % c+d+e+f+g+h+i+j+k+k+j+l+j+j+j+j+m+n+o+% % % % % % % % % % % % % % % % % % % % % p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+% % % % % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . E+% % % % % % % % % % % % % % % % % % % % F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+% % % % % % % % % % % % % % % % % % % `+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@% % % % % % % % % % % % % % % % (@_@[+[+[+[+[+:@}+<@[@3+}@|@1@2@3@4@3@3@5@6@7@% % % % % % % % % % % % % % % % % % % 8@9@0@h+f+0@h+a@k+j+j+k+j+k+j+l+j+j+k+k+b@c@% % % % % % % % % % % % % % % % % d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@% % % % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ` . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 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@`@ #.#*@+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#% % % % % % % % % % % % % (#_#:#<#[#:#}#:#|#1#2#[+3#4#5#6#7#8#2@2@|+|+|+9#0#a#b#% % % % % % % % % % % % % % % c#d#h+a@g+f+0@f+a@a@e#j+j+e#f#f#j+k+f#j+j+k+k+j+j+g#% % % % % % % % % % % % % h#j@i#j#k#l#t+m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#B#C#% % % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . c % % % % % % % % % % % % % % % % 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$8$9$[#0$a$b$c$d$e$f$g$h$i$j$k$9#9#1#1#a$a$a$l$m$n$b+% % % % % % % % % % % o+o$g+g+f+f+p$f+g+a@a@a@q$r$q$q$r$q$q$e#q$s$t$e#t$f#j+j+j+u$% % % % % % % % % v$o@w#w#w$x$y$z$A$B$C$D$E$F$G$w#q#H$I$w#w#J$K$L$M$B#N$N$O$% % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . a.% % % % % % % % % % % % % % % % P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%% % % % % % % % % % ]%!$^%/%(%_%:%<%[%}%|%1%2%3%4%%#&$5%6%7%8%9%0%a%b%c%d%e%f%g%h%% % % % % % % i%j%k%6$l%7$[#:#:#6$m%n%k%o%8$p%q%h$r%s%1#1#t%k%9#t%9#9#9#9#a$u%v%% % % % % % % % % o+w%f+a@g+g+a@p$x%p$a@g+a@r$t$t$r$e#r$r$t$t$e#t$t$e#i+j+f#j+j+y%% % % % % % % z%A%A%w#B%C%D%E%F%G%H%I%J%K%L%w#s#w#t#G%M%w#N%O%P%Q%A#R%R%R%S%% % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % T%U%V%W%X%Y%Z%`% &.&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&% % % % % % % <&_%[&&#-$+@-+%#'$@@}&|&'$1&2&3&4&5&6&$@7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&% % % % l&m&n&n&n&n&l%[#:#:#j%o&p&1#q&r&s&t&u&v&w&8#3@|+|+4@|+4@4@x&9#l$l$y&% % % % % % % % K.x%p$p$p$p$a@x%a@a@g+x%a@p$e#r$r$t$e#r$r$t$t$r$z&e#s$j+k+j+f#j+j+A&b+% % % % B&C&D&E&F&G&H&I&J&K&L&K&M&w#w#N&i@O&P&Q&R&z%L%S&T&U&J$V&B#w@R%N$W&% % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y X&. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . < % % % % % % % % % % % % % % Y&Z&`& *.*+*@*#*$*%*&***=*-*;*>*,*'*)*!*~*{*]*^*/*(*_*:*<*[*}*>%|*1*2*% % % % % 3*4*5*6*6*7*8*9*&$0*a*b*c*d*=+c*[&-+2&e*f*g*h*i*j*k*l*m*n*o*p*f&q*r*s*t*% % % u*3#v*n&j%n&n&j%6$:#6$j%o&n%1#w*r&p%x*y*z*A*|+|+B*|+C*4@C*D*E*F*a$l$E*G*v%% % % % % H*x%p$x%x%a@I*x%a@x%a@f+a@g+x%J*K*L*K*L*L*K*M*K*M*K*M*K*j+j+j+k+j+k+j+N*c#% % O*P*Q*R*S*T*U*V*L%w#W*W*W*X*w#W*Y*s#Z*`*w# =A%L%.=+=@=#=$=%=w@R%N$N$N$% % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y <.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0.% % % % % % % % % % % % % &=*===-=;=>=,='=)=!=~={=]=^=$*/=(=_=:=<=[=}=|=1=2=3=4=5=6=7=8=9=0=a=b=c=d=% % % <&:%4*e=f=!$g=+@)$;$0*h=i=j=9*|&k=l=m=2&+@n=o=}&p=q=r=s=t=u=v=w=x=y=z=A=B=C=D=l&3#v*n&j%n&j%6$n&E=E=6$6$o&F=1#G=H=p%I=y*r%J=K=}+L=L=M=F*N=O=P=P=N=O=l$l$Q=% % % % R=K*e#e#q$r$z&e#r$e#e#q$r$e#e#q$r$r$r$q$e#e#e#e#r$t$t$r$t$S=T=G.T=S=G.G.f+U=% V=W=X=Y=j@Z=`=w#W*W*W*L%L%w# -.-+-w#@-w#w#w$P&t##-w#$-%-&-*-=---B#R%R%w@R%% % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ;-% % % % % % % % % % % % >-,-'-)-!-~-{-]-^-/-(-_-:-<-[-}-,&|-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-f-g-h-i-j-k-% % l-+@-+m-_%!$!$)$n-)$|%i=i=o-+@p-$@+#q-|&j=~$r-*@s-t-u-v-w-x-y-z-A-B-C-D-E-F-G-m&n&v*n&n&n&j%H-I-k%J-I-j%|+n%1#G=K-L-M-N-r%w&O-}+L=F*P=F*P-F*P-P-Q-F*R-9#l$S-v%% o+M*M*r$q$z&r$r$r$r$e#e#t$t$s$t$r$e#r$q$e#t$r$e#e#e#s$r$t$r$s$t$T-T-T-T-U-h+h+V-W-X-Y-Z-N%`-M%v#w#w#w##-w$ ;w#o#.;+;@;w##; -w#$;v+W*%;&;D%*;=;-;;;R%w@w@w@>;% % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y S . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . c % % % % % % % % % % % ,;';);!;~;{;];^;/;(;_;:;<;[;};|;1;2;3;4;5;6;7;2;8;9;0;a;b;c;d;e;f;g;h;i;j;k;l;m;n;o;}%)$)$^%p;q;!$;$)$'$r;s;}&m=m=i=t;i=u;v;+@w;x;&+|&b*y;z;A;B;C;D;E;F;G;H;I;J;n&K;v*v*j%:#6$L;E=M;N;O;I-6$P;n%k$Q;R;S;T;U;V;W;X;P=N=N=Y;F*Z;`; >.>+>F*F*E*E*l$@>o+#>$>M*e#r$r$r$e#r$q$r$q$z&t$r$r$r$r$e#q$q$r$r$r$e#s$e#r$r$e#r$t$t$t$s$t$t$%>&>*>=>->;>E$E$>>,>,>$;'>)>!>~>~>{>]>^>/>(>_>:>w$L%<>y+J$[>}>|>1>2>3>4>R%5>R%R%5>C#% % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y R . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % % % % % % % % % % % 6>';7>8>9>0>a>!;b>c>d>e>f>g>h>i>f>$&j>k>l>(=m>n>o>p>e;q>r>F@s>t>u>v>w>x>y>z>A>B>C>D>E>}%F>o-G>H>d*I>n-0*0*s;t;+#J>K>J>L>M>r-u;+@4&N>}%~$O>+#P>Q>R>S>T>U>V>W>X>Y>Z>j%n&`>`>n&6$6$n&L; ,.,+,I-n&L;@,k$Q;R;:##,$,%,&,*,O=F*F*T&=,-,;,&->,,,*,P=P=9#a$9#',t$z&q$r$t$e#r$r$r$e#e#s$r$t$e#r$r$q$z&q$q$q$),r$e#q$e#z&t$t$M*!,!,!,t$t$!,~,N%z%{,3>],^,o#/,(,_,:,<,[,},},|,*>m#1,2,3,],4,;,5,6,$;w#<>7,8,9,0,a,b,M$c,c,R%R%5>% % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Q . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . a % % % % % % % % % % % d,e,f,g,h,i,j,k,l,m,n,];o,p,q,r,s,t,u,v,w,x,y,z,A,1;B,C,=&O@g;D,u,E,F,-&G,H,I,J,K,L,M,p-N,0*O,c*c*8*p-0*P,#@L>+#Q,R,S,T,r;h=U,N,h=i=V,W,W,##X,Y,Z,`, '.'e&+'@'#'j%j%n&B*$'B*%'&'*'='-';'>','''N;)'k$E=!'|+~'{']'^'X;P=/'('_':'<'['}'|'1'0$2'3'E*D*l$q$r$q$q$q$e#r$e#e#r$t$e#r$e#e#r$q$r$t$t$e#e#e#e#a@!,M*!,!,K*M*a@g+g+a@h+g+a@w#w#W*q#P&.-9,4'6,5'5'6'7'8'9'0'a'b'c'd'w#W*E$e'f'g'h'w$@-i'w$j'k'U&h'l'B#c,c,R%5>5>m'% % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % n'o'p'q'r's't'u'v'w'x'y'z'A'B'C'D'E'F'G'H'I'J'V+K'L'M'N'O'P'Q'R'S'^*T'U'V'W'X'Y'Z'`' ).)+)M,'$@)8*8*k=M,0*N,#)L>+)$)%)R,Q,J>&)&)*)#)}&+#=)K>'$-)v;;)>),)')))!)~){)v*K;n&])B*B*2@^)+=/)()_):)<)[)})B*|)t%1)l%2)3)4)5)P;P=/'6)Z;7)8)9)0)a)b)c)k$2'3'd)~,p$e#q$q$q$e#t$r$t$e#q$t$q$r$e#e#r$r$r$e#q$e#e#t$t$J*M*!,!,J*e)g+g+g+g+f+f+f)g)w#>>h)F$i)j)k)l)*,Y;m)n)o)p)q)r)s)L&t)L&A%u)v)w)E$w#w#w#x)j@y)h@>>u#z)A)B)5>5>m'5>m'C)% % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y :.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.% % % % % % % % % % D)E)F)G)H)I)J)K)L)M)c>N)O)P)Q)R)S+S)T)R@U)V)W)X)Y)Z)`)V' !.!+!@!#!$!%!&!*!=!-!;!>!,!'!)!!!~!{!]!u;0*0*i=r;^!#)+#+#/!(!_!R,:! )],z!A!B!H$G$q#C!D!|>+;'>$;E!w#q##-E$F!G!g)w#H!=>w#W*w#w#I!J!K!L!M!N!O!P!L$5>5>R%5>m'm'% % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Q!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ; % % % % % % % % % R!S!T!U!V!W!X!Y!Z!`! ~.~+~@~#~{=$~~&%~&~*~=~W'-~;~>~,~'~)~!~~~{~]~^~/~(~_~:~<~[~}~|~1~2~3~4~5~6~7~8~9~0~a~b~c~d~e~f~1!g~R,h~i~j~k~=)1%$@+#_!l~m~@@'$0*#)n~o~p~q~r~n&n&l%B*B*9!B*o&s~t~u~v~w~x~y~z~A~B~C~j!D~:#E~F~G~k!|)m!|+|+H~I~J~K~L~M~N~O~P~|#Q~R~S~T~S~T~j+T~U~S~a@e#e#x%G.y!S=V~V~T=W~X~Y~a@Z~G.G.`~ {i+.{e)g++{@{#{${%{e)&{M!/,*{={-{;{>{F! >,{'{){q)!{5,},_,~{P~{{]{^{O%/{p#P&P&W*w#w#({Q%_{:{R&D%<{[{R%}{5>5>5>5>5>|{% % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y }.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ) % % % % % % % % % 1{2{3{4{5{6{7{8{9{0{a{b{c{d{e{S#f{g{4;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{P{Q{R{S{T{U{V{W{X{;+Y{Z{`{ ].]+]n~@]#]$]=+%]&]*]=]-];]n&v*l%9!>]>]$'B*B*,]'])]!]~]{]]]^]/]B*(]j!_]:#:]<][]}]+>}+<#:#|]W-1]2]3]4]5]6]7+7]8]9]S~j+9]j+j+S~T~0]a@a]p$x%q$e#t$r$q$r$b]c]c]d]b]S~e]f]g]h]i]j]i]i]k]l]h]m]n]o]p]q]r]s]q#G$j)R&t]u]A!v]w]/,x]y]>,z]A]B]u+C]D]E]$;F]E$w$w#w#G]H]I]J]K]L]M]N]O]P]m'm'5>5>5>5>% % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8.% % % % % % % % % Q]R]S]T]U]V]W]X]Y]Z]`] ^.^+^@^#^$^%^&^*^=^-^;^>^,^'^)^!^~^{^]^^^/^(^_^:^<^[^}^|^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^}&]>]B*B*B*B*B*j%j%C^D^E^F^G^H^I^J^K^)'i!j!L^8+M^<]N^O^P^}+F=Q^R^E=S^T^U^V^W^X^Y^Z^`^S~S~j+9]S~ / / /./a@a@a]a@s$t$t$T-t$t$V~~,G.G.t$a@+/#{k]T=@/s$#/$/%/&/*/=/-/U*;/>/,/'/>{)/!/~/{/]/k#},^///(/_/:/J]m'5>5>5>5>% % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0 % % % % % % % % 8/9/0/a/b/c/d/e/a{#&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/P/Q/R/S/T/U/V/W/X/Y/Z/`/ (.(+(@(#($(%(&(*(=(-(;(>(,('()(!(~({(](^(/(((>]>]B*B*B*B*v*j%n&_(]):(<([(}(|(1(2(3((]J-4(l%5(<]6(O^7(7+8(F=9(k%R&0(a(b(}+c(7]d(e(S~U~9]T~T~j+S~U~ /a@e#a]g+t$r$t$t$s$e#T=J*t$G.G.f(g(k]h(i(j(k(l(m(n(o(p(q(r(s(t(u(N&>>G!j)v(t+q)w(!>x(y(|/z(A(B(P&C(X=D(Z;C%E(y]+=+-9)k)w$A%F(.,G(H(I(P]J(B)m'5>m'm'm'm'm'K(% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y }.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . _ % % % % % % % % L(M(N(O(P(Q(R(S(`%T(U(L)V(.^W(X(Y(Z(`( _._+_@_#_$_%_&_*_=_-_;_>_,_'_)_!_~_{_]_^_/_(___:_<_[_}_|_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_i^r_s_t_u_v_B*B*$'B*B*j%j%n&n&C^w_x_s]y_z_A_B_C_B*D_J-4(l%E_F_4)G_B*H_I_|+:#J_K_:@7+j%L_M_N_O_T~9]T~j+j+S~S~j+j+j+f+e#e#I*e#e#e#a]a]a@a]P_P_P_Q_R_S_T_U_V_W_X_Y_Z_`_ :.:+:@:#:$:%:w]&:w#*:p)=:-:;:l#>:,:':B(U&F!S&*'_,T*):~>):!:~:{:o]9)'/w#]:^:j@/:(:_:5>m'm'm'm'::m'::<:[:% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Q!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ] % % % % % % % % }:|: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:L/A:B:C:D:E:F:G:H:I:J:K:L:M:N:O:P:Q:R:S:T:U:c^V:W:0_O:X:Y:Z:`: <.<#(+<@<#<$<%<>]C_B*$'B*>]n&K;j%B*C^&<*<,<(]'W-D!m::m'::m'm'% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y :.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . E<% % % % % % % % F[,['[)[![~[{[$(][^[/[([_[:[<[[[}[|[1[2[3[ <4[5[6[7[8[9[0[a[b[c[d[e[f[a[g[h[i[j[k[l[m[n[B~o[,f+K[L[+{M[N[O[P[Q[R[W_S[T[U[V[W[X[Y[Z[`[ }.}+}@}#}$}2,k#D&h'B%P&&>I%%}D]&}>/*}=}y+-}U&;}>},}j@t+'}C$x])}O!!}t# ;~}{}H]]}^}w@/}5>R%5>5>m'm'm'::::m'm'% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 9.% % % % % % % (}_}:}<}<;[}}}T(|}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:G}N{H}I}J}5[K}L}M}N}O}P}Q}R}S}T}U}V}m_W}X}f[Y}Z}`} |.|+|@|C~I-v*v*`>K;n&6$:#6$#|$||]n&n&B*B*H_o[%|0!+=&|*|=|-|;|>|,|'|)|!|!|)|~|{|]|^|/|(|_|:|e]a@e#<|<|[|}|g+f+a@g+%>./f+O[||1|2|3|4|5|6|7|8|9|0|a|b|c|d|e|8|f|g|h|i|j|k|l|m|G(n|J%q#o|p|>,W-q|r|G&s|t|u|9){,v|w|x|C]y|z$z$!:Y=K]/,Z*z|A|B|C|D|L$R%R%R%w@5>5>B)P]B)::::m'::% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Q . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 % % % % % % % E|F|G|H|I|J|K|N1,1'1)1!1~1{1]1^1/1(1(1_1:1<1[1}1|111213141516171819101a1b1c1d1e1f1J{g1h1i1j1k1l1m1n1o1p1q1>,r1s1t1u1t1v1w1D&x1y1z1A1B1C1C1D1E1F1G1H1I1J1K1L1M1N1O1P1P1P1Q1R1R1S1T1U1V1W1X1Y1Z1`1 2|2,2'2)2!2~2{2]2^2/2(2_2:2<2[2}2|21222k#,}8'x>92t]t]02a26/!:b2O!c2E(d2z]i'],B%w$e2f2g2h2i2R%w@w@5>m'::m'm'm'::% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y R . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . > % % % % % % % j2k2l2m2~;n2o2p2q2r2s2t2u2v2w2x2y2z2A2B2C2D2E2F2G2H2I2J2K2L2M2N2O2P2Q2R2S2T2U2V2W2X2Y2Z2`2 3.3+3@3#3$3[[c_6[%3&3*3=3-3;3>3,3'3)3!3~3{3]3^3/3(3_3:3V:<3[3}3|313233343536373839303a3b3c3d3e3f3g3h3i3j3k3l3m3n3U1o3p3q3r3s3t3u3v3w3x3x3y3y3w3z3A3B3B3C3D3E3K[9]j+k+e#h+F3G3H3I3J3K3L3M3N3O3P3b|Q3R3S3T3U3V3W3X3Y3Z3`3 4.4+4@4#4#4$4%4&4B!*4/,P&=4z]-4;4>4,4'4)4!4~49)x<{4]4^4s+z$z$b2^:/4(4_4:4<4[4Q&}492|4&-14*'z|9,:>24R%3444545464m'% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y S . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % % % % % % % % 74849404a4b4c4p2d4e4f4g4h4i4$[j4k4l4m4n4o4p4q4r4s4t4u4v4w4x4y4z4A4B4C4D4E4f/F4G4H4I4J4K4L4G:M4N4O42_Z2P4:[Q4R4S4T4U4V4W4X4Y4Z471`4 5.5+5@5#5$5R4%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}5w3|51525354555z3657585|59505a5b5c5d5d5e5f5g5h5f5i5t$J*l]j5k5l5m5n5o5p5=2-2q5r5s5t5u5v5w5#}x5y5z5A5B5C5D5E5F5G5H5@4I5I5J5K5L5M]*}2/M5/,B%N5O5P5w]Q5R5,>32S5T5l)U5C]V5C]6/z$z$z$C]W5X5Y5w|Z5`5 6P&w#D]V5.66/+62/E$P&@6#6B)}{5>5>m'% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % % % % % % % % $6%6&6i/#^*6W!W(=6-6;6>6,6'6)6!6~6{6]6^6/6(6_6:6<6[6}6|616263646566676869606a6b6c6d6e6}_}_f6{1g6h6i6j6j6k6l6$(m6n6o6p6q6r6s6t631u6v6w6x6y6#5z6A6B6C6D6E6F6G6H6I6J6K6L6M6N6M6N6O6P6O6Q6R6S6T6U6V6W6X6Y6Z6`6`6 7.7+7@7#7$7%7&7*7=7-7;7>7,7'7)7!7~7{7]7^7/7(7_7:7<7[7}7|717273747576777879707a7b7c7d7e7f7I5I5g7h7i7j7k7l7K5m7n7o7p7q7H$r7n#s7p#t7;,u7v7R5$=w7y$x7y7P&F&C]V5z7A7x]C$x]!:B7C7^4D7.6E7F7p#w$G7H7I7L]z]],k)w#J7w#K7L7M7N75>% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y <.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % % % % % % % % O7P7Q7R7[}S7T7U7V7/=W7X7Y7Z7`7 8.8+8@8#8$8%8&8*8=8-8;8>8,8'8)8!8~8{8]8^8/8(8_8:8<8[8}89^|81828384858687888984808a8b8c8d8e8f8g8h8i8j8W}k8l8m8n8o8p8q8r8s8n1t8u8v8w8x8y8z8A8B8C8D8E8F8G8H8I8J8K8L8M8N8O8P8Q8R8S8S89'T8U8V8W8X8Y8Z8`8 9 9 9.9+9N5)4@9#9$9%9&9*9=9-9;9M3>9,9'9)9!9~9{9]9^9/9C5(9_9:9<9[9}9|919293949l759697989990999a9 ;b9c9d9E$e9f9H%g9M&h9O*c'`;i9I$j9k9x|!>x])}^:C]q|l9m9n9o9[4p9q9+6L%r9A]s9t9u9v99)>{q#q#B%.-w9A#w@% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y X&. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % % % % % % % % x9y9z9A9B9C9D93-E9F9G9H9I9e}J9K9L9M9N9O9P9Q9R9S9T9U9V9W9X9Y9Z9`9 0.0+0@0#0@0$0%0&0*0=0-0;0>0,0'0)0!0~0{0]0^0/0(0_0:0<0[0}0|010203040506070809000a0b0c0d0e0t8f0g0h0i0j0k0k0l0m0n0l0o0p0o#x#q0r0r0s0s0r0r0k$n&:@B_0!t0u0w[v0w0k0I_m0I_I_l0x0Q8y0{:t7t7z0A0B0C0D0E0F0G0H0I0J0K0L0M0N0O0P0Q0R0S0T0h7U0V0W0W0I5W0X0Y0Z0`0 a.a.a+a@a#a$aC!%au1&av+T&,4*a6,=a-a,/;a>aP&,a'at]{>'}b2,{O!O!)a!a~a{ar % % % % % % % % (a_a:ab>b>b,b'bB~,<)bo[=^bu&/b(b_b:b{b1b2b3bK34b5b6b7b8b9b0babbbH5o7I569I5cbdbebfbgbhbibjbkblbmbnbob99pb aqbrbsbtbubvbk#r0d9wbxb!ayb],zbAbB$Bb42CbM5DbEbW5~>)},{Fb = = =O5GbHb~>E7F7>}s0IbJbKbx|32[4LbT&E$q#w#>{J7Q&Mb% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 % % % % % % % % NbObPbQbRbSbTbUbVbWbXbYbZb`b c.c+c@c#c$c%c&c*c=c-c;c>c,c'c)c!c~c{c]c^c/c(c_c:cbB*>bn&])!}B*CcC~B_>b*,Dcp%_{EcFcGcHcb$IcJcKcLcMcNcNcOcPc/'QcRcScTcUcVcWcXcYcZc`c df7K5.d+d5959@d@djb@dibjbjb#d$dI5I5%d&d*d=d-d a;d>d+a,d'dr0)d!dd9,>5,1>~d6,{d]d^dv(N&/d(d_d:d{q#q#B%5d% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 9.% % % % % % % % 6d7d[a8d9d0dadbdcdddedfdgdhdidjdkdldmdndodpdqdrdsdtdudvdwdxdydzdAdBdCdDdEdFdGdHdIdJdKdLdMdNdOdPdQdRdSdTdUdVdWdXdYdZd`d e.e+e@e#e$e%e&e*e=e-e;e>e,e'e)evcwcxc!e~e{e]eC~]e]ep[]eC~'bC~k$^ek$/eC~+=C_+=|)r[>bBc(e_e:e]>`;i'+6Z5BeCe'{B%AbF%''N;^4y(Z5!:G(+6*a+6D%Deo9.6{dEe|eFeGeHeA4E$q#q#G!Ie% % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ` . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . E<% % % % % % % % JeKe(-LeMeNeOePeQeReSeTeUeVeWeXeYeZe`e f.f+f@f#f$f%f&f*f=f-f;f>f,f'f)f!f~f{f]f^f/f(f_f:fbBf(eC^CfDfEf}eB~X;FfGfh)HfIfJfKfLf6'd'F*+>MfNfo7OfqePfQf<9jejele49hecece49Rf<9SfTfUfp7S0qepeVfVf69S0WfXf-dWfYfZf`f g*d.g+g!dF$@g%}#gz!$g%g]dg@&g*gp]M5=g-g,,t<^4;g*>~a~a!aG%De>go9,g'g)g!g~g{g]g^gx|/gA$a2uH_%h&h*h=h-h;h/e>hJ-Bf,hf$'h)h!h~hzf:@{h]h^h/h(h_h:hk$[hjeke}h|h0e1h2hW02h493h4h5h6hmeS07h8h9h*d0h7hahUfUfVfVfUfWfbh-dchYf&ddhdhdhehfhr0w]r0t1/,#gghB$hhv]P-ihx(jh*,]>F%kh{:M5B$s+6//>V-g',}u<`5lh32mhnhohphw|qhrhrhshthg'i'>43>uh% % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ... . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . _ % % % % % % % % % :-_*vhwhxhyhzhAhBhChDhEhFhGhHhIhJhKhLhMhNhOhPhQhRhShSbThUhVhWhXhYhZh`h i.i+i@i#i$i%i&i*i=i-i;iDg>i,i'i)i!i~iTd{i]i^i/i(i_i:igihit0iijikilimi6)o#nioipiqirisitiuiBck$vi[9wixiK5qeh7yizi2hAiBiBiCiDiWfEichFiGiHi99ob-d`0S0S0}hOfXf=d7hobYfUf`0IireqeJit12/#g5,/,Z;Kir+m|*,F7k9a2:/y7s7 >LiMiNii'y|a2Oiq9/>PiQiB+RiRi:{GeSi-:t]Ti^4UiViWiXig'f'#=Yi% % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y .. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0 % % % % % % % % % Zi`i j.j+j@j#j$j%j&j*j=j-j;j>j,j'j)j!j~j{j]j^j/j(j_j:jKjxB*-|)H_YjZj`jme k[9.kZjAi+k@kn70e09Wf09=d#k a`0$kp7%kqeqe k&k*kUfWf`0%d=k#dpe-kL5R0;k6'f'F%5,>kd'Pi,k4dLitV5p];,D%V-t9sh):'kG%)k{dVi_4[{s(z7!k&:H]~kL!{k_4w|qhUix|<4,gb2/,% % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y *.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8.% % % % % % % % % % ]k^k/k(k_k:kl,l'l)l!l~l{l]l^lO-)'7+/l/l(l_l/l#d:lCin7XfA$Be;,#g!}Vix|k95l7l*'A]n<'}^:8l9l0lihal6'blcldlelw|^4rhsh`56/fl% % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y S . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ) % % % % % % % % % % glhliljlklllmlnlolplqlrlsltlulvlwlxlylzlAlBlClDlElFlGlHlIlJlKlLlMlNlOlPlQlRlSlTlUlVlWlXlYlZl`l m.m+m@m#m$m%m&m*m=m-m;m>m,m'm)m!m~m{m]m^m/mb0(mf0_m:m):hMm% % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y &.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ; % % % % % % % % % % % NmOmPmQmRmSmTmUmVmWmXmYmZm`m n.n+n@n#n$n%n&n*n=n-n;n>n,n'n)n!n~n{n]n^n/n(n_n:noKm,op]'o)ok902{d% % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.% % % % % % % % % % % % !o~o{o]o^o/o(o_o:ogi;<%p&p*p=p(e7+Ic|b-p.lx_;p>p,p'pB~ei,h)'mi)p!p.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % apbpcpdpepfpgphpipjpkplpmpnpopppqprpsptpupvpwpxpypzpApBpCpDpEpvpFpGpHpIpJp[nKpLp% MpNpOpPpQpRpSp`2Tp#3Up3[VpO}WpXpYpZp`p q.q+q@q#q_m$q%q&q*q=q}m-qq,q'q-q)qwfwfwfwfmiB*x&.>!q~q{q]qE%^qgi>bBc,h7$/q&p!h(qbm]/JcQcwf>]_q:q<><)'[q}q% |qwmWf1q2q3q09Wf4q5q=d):t9shr,r'r)rZ4!r~r{r]r^r/rb0(r_rBj:r`gbBfgi9r0rar*pbrr[crdrermi8#j!D_Bf]e'b$'9!9!frgr% % % hr6q$d#dAi@47hirjrzmkrlrPfmrPfnrorh7#d#dh7h7Rf:lXfTnZnBmwe0e6hheprqrrr[9<9kesr2/R&F(Lip|iqu|k94d/>4pa2;gA$v<>gtrurvrg'p|W-wri'xryrzrArCs,s's)s% % % !s~s{sRp]s^s/s9^(s_sW/:sO*t9Piz7z]flEsghm9f'FsGsHsIsJsF$KsLsMsQ5NsphdlOs% % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . c % % % % % % % % % % % % % % PsQsRsSsTsUsVsWsXsYsZs`s t.t+t@tgd#t$tZ&Y%Olta%t&tGq*t=t-t;t>t,t't)t!t% % % % % % ~t{t]t^t/t(t_t:t/iu% % % % % % % !s,u'u)u!u~u{u]u^u/u(u_u:uv,v'v)v% % % % % % % v%!vk$|)P~P~|)|)k$~v{v]v^vjsks|+/v(v_v:vx_/'Piz$x]8vF%z!~aF74d0l9v0v-oavbvcvl|$}Ar% % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y {.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . < % % % % % % % % % % % % % % % % % % dvevfvgvhvivjvkvlvmvnvov3;pvqvrvsvtvuvwp)cvvwvxvyvzvAv% % % % % % % % % % % % % BvCvDvEvDvFv`gGvHvv8IvJvKvLv-q>qMvMv&vNvOvKvPvQvRvSvTv_3% % % % % % % % % % % UvVvt%k$t%2@9!!'R;R;*'P~K=[+/v(vWvXvYvZvNcLcNc3e/'V*`v w% % % % % % % % % % % % % % .w+w|hUf*k@4@4%knbseZf aI51v@w<9*k`0eh#w$w%w&w*w=wZff7-w% % % % % % % % % % % ,}Li;w>w,w'wa2a2Li)}m9)wV-Lbf'De32!w@=~wFs{w]wl|#:^w$}% % % % % % % % % % % % % % % % % ", -"Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % % % % % /w(w_w:wdJwKwLw aMwv%% % % % % % % % % % % % % Nw5pOw~>*oB${wq9m9z]m9flDez]O5Lbz!O5Pw%gmxUk,x'x'x+b}m)xrn!x~x{x]x^x/x% % % % % % % % % % % % % % % % % % (x_x:x|)|)^<|)E= % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % q i q % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . /.(.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y (./.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 6.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % u q u % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . {.].Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ].{.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . T P Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y P T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 5.% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . . . ~.+.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +.~.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . . . . . >.,.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y ,.>.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . # % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . . . . . . . &.S *.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y *.S &.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ] % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % ", -". . . . . . . . . . . . . . . . . . . . . ...+.Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y +... .. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ; % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % "}; +"360 150 13457 3", +" c None", +". c #7F7E7D", +"+ c #7D7C7C", +"@ c #7D7D7D", +"# c #7E7E7F", +"$ c #7C7D7E", +"% c #7D7D7F", +"& c #7F7F7F", +"* c #7D7D7E", +"= c #7E7E7C", +"- c #7C7C7A", +"; c #7A7A7A", +"> c #777979", +", c #6E7174", +"' c #656A6E", +") c #585D62", +"! c #4F555C", +"~ c #4A5057", +"{ c #4A5058", +"] c #484F56", +"^ c #444C52", +"/ c #434A50", +"( c #3B4349", +"_ c #3C444A", +": c #3E464C", +"< c #41494E", +"[ c #444A4F", +"} c #4A4F54", +"| c #4D5257", +"1 c #52575C", +"2 c #55595E", +"3 c #585C60", +"4 c #5B5F63", +"5 c #5E6164", +"6 c #606467", +"7 c #63656A", +"8 c #65676D", +"9 c #67696E", +"0 c #67696D", +"a c #696A6E", +"b c #6B6D70", +"c c #6B6E71", +"d c #6E7073", +"e c #707274", +"f c #737476", +"g c #717374", +"h c #767677", +"i c #757677", +"j c #747576", +"k c #78797A", +"l c #78787A", +"m c #79797A", +"n c #7A7A7C", +"o c #7B7B7D", +"p c #7C7C7D", +"q c #7C7B7D", +"r c #7E7D7F", +"s c #7F7E80", +"t c #7F7D7F", +"u c #807F80", +"v c #807F81", +"w c #818082", +"x c #7F7F80", +"y c #7F7E7F", +"z c #7D7C7D", +"A c #7C7B7C", +"B c #767678", +"C c #6F7072", +"D c #6A6B6E", +"E c #65676A", +"F c #5B5F61", +"G c #464A4D", +"H c #373A41", +"I c #393A44", +"J c #3F3F4C", +"K c #464750", +"L c #43484D", +"M c #3E444A", +"N c #242634", +"O c #252735", +"P c #2B2E34", +"Q c #22232A", +"R c #24232B", +"S c #191720", +"T c #1D1D25", +"U c #1C1C1F", +"V c #151313", +"W c #1A1616", +"X c #171617", +"Y c #19191D", +"Z c #151314", +"` c #141114", +" . c #1D1A22", +".. c #373541", +"+. c #54555C", +"@. c #333540", +"#. c #343442", +"$. c #444452", +"%. c #2B2B39", +"&. c #26252F", +"*. c #1E1E27", +"=. c #232530", +"-. c #242632", +";. c #1A1D28", +">. c #1B1A2B", +",. c #343540", +"'. c #2F323D", +"). c #1D212A", +"!. c #191B1F", +"~. c #1D1A1E", +"{. c #16151C", +"]. c #222028", +"^. c #1A181C", +"/. c #111111", +"(. c #131116", +"_. c #1E1F2C", +":. c #232532", +"<. c #1A1A21", +"[. c #141315", +"}. c #121113", +"|. c #111012", +"1. c #111011", +"2. c #131112", +"3. c #141111", +"4. c #131111", +"5. c #121011", +"6. c #131314", +"7. c #121313", +"8. c #141314", +"9. c #171516", +"0. c #1A1717", +"a. c #201B1A", +"b. c #282220", +"c. c #312A26", +"d. c #342E29", +"e. c #3A332B", +"f. c #3E3730", +"g. c #47403A", +"h. c #4D463F", +"i. c #4E473F", +"j. c #524C43", +"k. c #524C42", +"l. c #554F44", +"m. c #504A40", +"n. c #585148", +"o. c #595249", +"p. c #544D45", +"q. c #4E473D", +"r. c #4F473D", +"s. c #4E463D", +"t. c #4C453C", +"u. c #49423A", +"v. c #3E372F", +"w. c #443B35", +"x. c #413A34", +"y. c #403832", +"z. c #3B342F", +"A. c #332C28", +"B. c #2E2826", +"C. c #231F1E", +"D. c #1E1B1C", +"E. c #201F20", +"F. c #1C1B1D", +"G. c #181618", +"H. c #161414", +"I. c #141213", +"J. c #191718", +"K. c #151213", +"L. c #131213", +"M. c #131313", +"N. c #141312", +"O. c #141313", +"P. c #151414", +"Q. c #151413", +"R. c #171615", +"S. c #1A1A1A", +"T. c #161616", +"U. c #161516", +"V. c #151415", +"W. c #181717", +"X. c #161515", +"Y. c #161514", +"Z. c #1D1C1C", +"`. c #202021", +" + c #2B2B2E", +".+ c #2F2F33", +"++ c #353539", +"@+ c #37383A", +"#+ c #37373A", +"$+ c #353638", +"%+ c #353537", +"&+ c #363537", +"*+ c #353436", +"=+ c #353435", +"-+ c #313031", +";+ c #302E2F", +">+ c #2C2B2B", +",+ c #282626", +"'+ c #252323", +")+ c #262425", +"!+ c #232120", +"~+ c #232020", +"{+ c #201E1D", +"]+ c #201F1E", +"^+ c #1D1C1A", +"/+ c #1E1C1B", +"(+ c #1F1D1C", +"_+ c #1C1A19", +":+ c #1C1B1A", +"<+ c #1D1B1B", +"[+ c #1F1D1D", +"}+ c #201F1F", +"|+ c #222020", +"1+ c #222021", +"2+ c #232223", +"3+ c #242324", +"4+ c #272627", +"5+ c #272526", +"6+ c #2B2B2B", +"7+ c #2C2B2A", +"8+ c #2E2D2C", +"9+ c #30302F", +"0+ c #2F2F2E", +"a+ c #2E2E2C", +"b+ c #2F2F2C", +"c+ c #31302F", +"d+ c #2F2E2E", +"e+ c #302E2E", +"f+ c #2F2C2C", +"g+ c #322F2F", +"h+ c #312E2E", +"i+ c #2D2B2A", +"j+ c #302E2D", +"k+ c #2F2D2D", +"l+ c #2E2C2D", +"m+ c #32302F", +"n+ c #353131", +"o+ c #343030", +"p+ c #353231", +"q+ c #343130", +"r+ c #363231", +"s+ c #7F7E7E", +"t+ c #7E7F7F", +"u+ c #7C7C7B", +"v+ c #797979", +"w+ c #6F7172", +"x+ c #64676A", +"y+ c #585C61", +"z+ c #4E5359", +"A+ c #494F56", +"B+ c #454C53", +"C+ c #40474E", +"D+ c #3D4449", +"E+ c #40474D", +"F+ c #444C51", +"G+ c #494E54", +"H+ c #4F5459", +"I+ c #52565B", +"J+ c #565B60", +"K+ c #595D62", +"L+ c #5C6064", +"M+ c #5E6266", +"N+ c #606367", +"O+ c #616468", +"P+ c #66696D", +"Q+ c #686A6F", +"R+ c #696B70", +"S+ c #707174", +"T+ c #747476", +"U+ c #767778", +"V+ c #797A7B", +"W+ c #79797B", +"X+ c #7B7C7E", +"Y+ c #7C7C7E", +"Z+ c #7D7C7E", +"`+ c #828082", +" @ c #828183", +".@ c #7C7B7B", +"+@ c #737375", +"@@ c #6A6B6D", +"#@ c #67686B", +"$@ c #626366", +"%@ c #525457", +"&@ c #3F4347", +"*@ c #3A3D44", +"=@ c #42434D", +"-@ c #4A4A55", +";@ c #3A3F45", +">@ c #32373E", +",@ c #20232F", +"'@ c #2E2F3B", +")@ c #25282D", +"!@ c #18181D", +"~@ c #1D1B20", +"{@ c #1F1D23", +"]@ c #23232A", +"^@ c #1D1E23", +"/@ c #161417", +"(@ c #1B181A", +"_@ c #19171A", +":@ c #171619", +"<@ c #151315", +"[@ c #131114", +"}@ c #1F1C25", +"|@ c #484752", +"1@ c #474850", +"2@ c #31333D", +"3@ c #383946", +"4@ c #403F4D", +"5@ c #282835", +"6@ c #21202B", +"7@ c #1F1F29", +"8@ c #262732", +"9@ c #1A1C28", +"0@ c #1F1F2F", +"a@ c #3D3E49", +"b@ c #292C37", +"c@ c #1A1C25", +"d@ c #1D1F23", +"e@ c #1A171B", +"f@ c #1B1A1F", +"g@ c #211F27", +"h@ c #171519", +"i@ c #121112", +"j@ c #161419", +"k@ c #252532", +"l@ c #252634", +"m@ c #191920", +"n@ c #131113", +"o@ c #121012", +"p@ c #141212", +"q@ c #141414", +"r@ c #2B2523", +"s@ c #312A28", +"t@ c #39322E", +"u@ c #3D3731", +"v@ c #413B34", +"w@ c #4A443D", +"x@ c #4F4842", +"y@ c #514B44", +"z@ c #524C44", +"A@ c #534D44", +"B@ c #555046", +"C@ c #595449", +"D@ c #565146", +"E@ c #585249", +"F@ c #575047", +"G@ c #514B41", +"H@ c #4D473D", +"I@ c #484138", +"J@ c #4A433A", +"K@ c #494139", +"L@ c #453D36", +"M@ c #3E362F", +"N@ c #463E38", +"O@ c #38312C", +"P@ c #2F2926", +"Q@ c #26201F", +"R@ c #221D1D", +"S@ c #1D1B1C", +"T@ c #1D1B1D", +"U@ c #19181A", +"V@ c #171618", +"W@ c #151214", +"X@ c #181617", +"Y@ c #191919", +"Z@ c #141413", +"`@ c #171717", +" # c #1D1D1F", +".# c #232326", +"+# c #2A292E", +"@# c #2F2F32", +"## c #323335", +"$# c #333335", +"%# c #303032", +"&# c #313131", +"*# c #323232", +"=# c #2E2C2E", +"-# c #2C2B2C", +";# c #292828", +"># c #242323", +",# c #22201F", +"'# c #221F1F", +")# c #201F1D", +"!# c #1F1E1D", +"~# c #1C1A1A", +"{# c #1D1B1A", +"]# c #1E1D1C", +"^# c #1E1C1C", +"/# c #1F1D1E", +"(# c #211F20", +"_# c #232323", +":# c #252525", +"<# c #282828", +"[# c #2B2929", +"}# c #2D2C2C", +"|# c #2D2C2B", +"1# c #2F2E2D", +"2# c #2F2E2C", +"3# c #302F2E", +"4# c #312F2F", +"5# c #2E2C2C", +"6# c #2E2B2B", +"7# c #2F2C2D", +"8# c #302D2E", +"9# c #333130", +"0# c #343131", +"a# c #35302F", +"b# c #353230", +"c# c #3A3735", +"d# c #7E7D7E", +"e# c #827879", +"f# c #877373", +"g# c #7B7C7C", +"h# c #6D6F71", +"i# c #5F6265", +"j# c #54595D", +"k# c #4A5055", +"l# c #474F55", +"m# c #464D54", +"n# c #434A51", +"o# c #47434A", +"p# c #433F46", +"q# c #3C4349", +"r# c #3E464B", +"s# c #464D52", +"t# c #4C5257", +"u# c #55595F", +"v# c #5B5F64", +"w# c #5C6165", +"x# c #5F6367", +"y# c #6D5C60", +"z# c #65686B", +"A# c #65686C", +"B# c #676A6D", +"C# c #696B6E", +"D# c #6C6E71", +"E# c #727375", +"F# c #796F71", +"G# c #846768", +"H# c #7B7273", +"I# c #777779", +"J# c #777879", +"K# c #986567", +"L# c #8E7071", +"M# c #956C6E", +"N# c #867B7D", +"O# c #8C7779", +"P# c #767676", +"Q# c #717173", +"R# c #706769", +"S# c #6B6365", +"T# c #57595C", +"U# c #47484C", +"V# c #3B3D43", +"W# c #46474F", +"X# c #55565F", +"Y# c #505059", +"Z# c #40414B", +"`# c #30343E", +" $ c #2C313B", +".$ c #292B37", +"+$ c #33353E", +"@$ c #2B181D", +"#$ c #17161A", +"$$ c #161317", +"%$ c #1B191D", +"&$ c #1A1A20", +"*$ c #1D1D23", +"=$ c #201E22", +"-$ c #171518", +";$ c #151416", +">$ c #141317", +",$ c #292831", +"'$ c #504F5B", +")$ c #373842", +"!$ c #32343D", +"~$ c #383A45", +"{$ c #343441", +"]$ c #23232F", +"^$ c #1D1D28", +"/$ c #252530", +"($ c #232531", +"_$ c #262935", +":$ c #212330", +"<$ c #2E2F3E", +"[$ c #3A3B47", +"}$ c #232631", +"|$ c #14161F", +"1$ c #1E1F25", +"2$ c #1D1015", +"3$ c #4B181C", +"4$ c #1A191F", +"5$ c #19181C", +"6$ c #2C2C3A", +"7$ c #1B1B21", +"8$ c #161416", +"9$ c #111010", +"0$ c #131212", +"a$ c #1D1213", +"b$ c #380F11", +"c$ c #181516", +"d$ c #201C1B", +"e$ c #342C29", +"f$ c #3B3430", +"g$ c #413A35", +"h$ c #463F38", +"i$ c #4F4741", +"j$ c #534C45", +"k$ c #555049", +"l$ c #59534C", +"m$ c #59544C", +"n$ c #734840", +"o$ c #59544A", +"p$ c #595549", +"q$ c #59554A", +"r$ c #5A554B", +"s$ c #5C564D", +"t$ c #585248", +"u$ c #504940", +"v$ c #514A41", +"w$ c #4B433C", +"x$ c #3B332D", +"y$ c #3F3731", +"z$ c #3E3731", +"A$ c #3B3530", +"B$ c #342D29", +"C$ c #2C2625", +"D$ c #231F1D", +"E$ c #1D1A1B", +"F$ c #1C1A1B", +"G$ c #191719", +"H$ c #161517", +"I$ c #1D1212", +"J$ c #420F0F", +"K$ c #171616", +"L$ c #301112", +"M$ c #311212", +"N$ c #311211", +"O$ c #431010", +"P$ c #1C1C1D", +"Q$ c #1E1D20", +"R$ c #232325", +"S$ c #252527", +"T$ c #2A292B", +"U$ c #292829", +"V$ c #2C2B2D", +"W$ c #2D2B2D", +"X$ c #2A2829", +"Y$ c #302525", +"Z$ c #511D1E", +"`$ c #201D1D", +" % c #1D1D1C", +".% c #1B1A19", +"+% c #421918", +"@% c #222121", +"#% c #212020", +"$% c #232222", +"%% c #262526", +"&% c #2A2828", +"*% c #352A29", +"=% c #472928", +"-% c #592525", +";% c #472727", +">% c #2C2A2A", +",% c #452C2B", +"'% c #383432", +")% c #383533", +"!% c #383532", +"~% c #8D6E6F", +"{% c #AC5252", +"]% c #8E7070", +"^% c #7C7C7C", +"/% c #797A7A", +"(% c #767779", +"_% c #717375", +":% c #66686D", +"<% c #5B5E62", +"[% c #4D5258", +"}% c #584A4F", +"|% c #6D4044", +"1% c #7F3438", +"2% c #5E3D42", +"3% c #5B383E", +"4% c #812B2F", +"5% c #7B3033", +"6% c #47444A", +"7% c #434A4F", +"8% c #4D5359", +"9% c #565B5F", +"0% c #6F5559", +"a% c #854C4F", +"b% c #864C50", +"c% c #8F4B4D", +"d% c #9B4345", +"e% c #8A5053", +"f% c #686B6E", +"g% c #6A6C6F", +"h% c #6A6D70", +"i% c #6E7072", +"j% c #747577", +"k% c #806D6F", +"l% c #A64C4D", +"m% c #A74E4E", +"n% c #A25354", +"o% c #8A6C6C", +"p% c #7A7B7C", +"q% c #936A6C", +"r% c #AD5253", +"s% c #AC5253", +"t% c #857A7C", +"u% c #8A7577", +"v% c #A45D5E", +"w% c #A95859", +"x% c #9F6263", +"y% c #AD5354", +"z% c #838284", +"A% c #917173", +"B% c #AE5354", +"C% c #917274", +"D% c #808082", +"E% c #946262", +"F% c #A25352", +"G% c #8B6363", +"H% c #855E5E", +"I% c #9D4545", +"J% c #914345", +"K% c #51474C", +"L% c #3B3B42", +"M% c #3D3E46", +"N% c #4A4C54", +"O% c #52535A", +"P% c #484951", +"Q% c #373843", +"R% c #442934", +"S% c #581F29", +"T% c #60272E", +"U% c #5F1B1F", +"V% c #670E11", +"W% c #4E1114", +"X% c #1B181C", +"Y% c #1F1D22", +"Z% c #1D1C24", +"`% c #20202B", +" & c #1A1A23", +".& c #19171E", +"+& c #19171F", +"@& c #43424B", +"#& c #464650", +"$& c #3B3C45", +"%& c #43444E", +"&& c #2B2C38", +"*& c #1C1B26", +"=& c #391B24", +"-& c #301D28", +";& c #292B38", +">& c #373847", +",& c #161922", +"'& c #1D1F24", +")& c #261114", +"!& c #55181C", +"~& c #21151B", +"{& c #1C1A1F", +"]& c #292935", +"^& c #1F202C", +"/& c #19191E", +"(& c #171718", +"_& c #2F1111", +":& c #4A0D0E", +"<& c #660C0D", +"[& c #670C0D", +"}& c #4D0F0F", +"|& c #312B26", +"1& c #433C35", +"2& c #4A433D", +"3& c #57463F", +"4& c #60453F", +"5& c #853B36", +"6& c #8E3A36", +"7& c #83433D", +"8& c #883E38", +"9& c #943731", +"0& c #774B43", +"a& c #5E5A4F", +"b& c #5D594E", +"c& c #5D584E", +"d& c #5C584F", +"e& c #5C574E", +"f& c #5B544A", +"g& c #5A544B", +"h& c #554F46", +"i& c #504A41", +"j& c #4F4841", +"k& c #4E4740", +"l& c #533832", +"m& c #522E28", +"n& c #38322C", +"o& c #37312E", +"p& c #312C29", +"q& c #292524", +"r& c #221E1F", +"s& c #1B191A", +"t& c #161415", +"u& c #301110", +"v& c #261111", +"w& c #271212", +"x& c #4B0F0F", +"y& c #1E1312", +"z& c #420F10", +"A& c #5E0E0E", +"B& c #550F0F", +"C& c #4E1111", +"D& c #301111", +"E& c #560F0F", +"F& c #441010", +"G& c #311313", +"H& c #3A1110", +"I& c #670C0C", +"J& c #680D0C", +"K& c #670D0C", +"L& c #1E1311", +"M& c #181718", +"N& c #1C1B1C", +"O& c #1F1E20", +"P& c #222022", +"Q& c #471E1F", +"R& c #691819", +"S& c #591C1D", +"T& c #591C1C", +"U& c #721717", +"V& c #711616", +"W& c #4E1B1B", +"X& c #232221", +"Y& c #211F1E", +"Z& c #281D1B", +"`& c #301B19", +" * c #5B1414", +".* c #631312", +"+* c #541616", +"@* c #5C1515", +"#* c #6E1313", +"$* c #421818", +"%* c #1F1F1F", +"&* c #252424", +"** c #262525", +"=* c #272626", +"-* c #3A2525", +";* c #5D1F1F", +">* c #5E201F", +",* c #6F1E1D", +"'* c #791E1E", +")* c #512828", +"!* c #302F2D", +"~* c #502626", +"{* c #781D1E", +"]* c #771C1C", +"^* c #761B1B", +"/* c #362B2B", +"(* c #322E2E", +"_* c #4C2B2B", +":* c #642524", +"<* c #652625", +"[* c #6F2624", +"}* c #802222", +"|* c #682929", +"1* c #3A3634", +"2* c #3C3937", +"3* c #8C6E6E", +"4* c #8E6F6F", +"5* c #7B7B7C", +"6* c #747677", +"7* c #6D6F72", +"8* c #4F535A", +"9* c #4B5058", +"0* c #484E55", +"a* c #4E4A50", +"b* c #7F3337", +"c* c #822E31", +"d* c #802B30", +"e* c #812C2F", +"f* c #822D30", +"g* c #6E383C", +"h* c #474D53", +"i* c #4A5056", +"j* c #51565B", +"k* c #53585D", +"l* c #5C6065", +"m* c #645E63", +"n* c #924447", +"o* c #9A4345", +"p* c #9B4346", +"q* c #97494B", +"r* c #766466", +"s* c #6B6E70", +"t* c #6C6E70", +"u* c #707173", +"v* c #717274", +"w* c #757678", +"x* c #A25253", +"y* c #A74D4E", +"z* c #847070", +"A* c #8F6767", +"B* c #A45455", +"C* c #9B6869", +"D* c #946B6D", +"E* c #877B7D", +"F* c #AE5355", +"G* c #838283", +"H* c #897E80", +"I* c #927374", +"J* c #827878", +"K* c #A45454", +"L* c #A44B4B", +"M* c #9F4747", +"N* c #9B4343", +"O* c #814648", +"P* c #404146", +"Q* c #3B3B43", +"R* c #494A53", +"S* c #474851", +"T* c #494A50", +"U* c #404249", +"V* c #37303B", +"W* c #6C1E28", +"X* c #711923", +"Y* c #782026", +"Z* c #681012", +"`* c #611115", +" = c #2F1A1F", +".= c #212028", +"+= c #24232C", +"@= c #262631", +"#= c #1C1D28", +"$= c #14151D", +"%= c #16161B", +"&= c #161617", +"*= c #240F12", +"== c #71161C", +"-= c #91363C", +";= c #702A31", +">= c #522B37", +",= c #583B43", +"'= c #51353D", +")= c #43262F", +"!= c #51141C", +"~= c #6F151C", +"{= c #65161F", +"]= c #292C3A", +"^= c #2A2C3A", +"/= c #262937", +"(= c #3D3F4D", +"_= c #252834", +":= c #23252F", +"<= c #1C1D26", +"[= c #1D1E25", +"}= c #1E1318", +"|= c #2E191D", +"1= c #3E1518", +"2= c #1A181B", +"3= c #1C191F", +"4= c #1A1B26", +"5= c #19171D", +"6= c #121213", +"7= c #381010", +"8= c #660C0C", +"9= c #680D0E", +"0= c #600F10", +"a= c #231616", +"b= c #1E1919", +"c= c #262220", +"d= c #302B27", +"e= c #352F2A", +"f= c #413A33", +"g= c #48413A", +"h= c #4F4740", +"i= c #5C4B44", +"j= c #8C3833", +"k= c #933631", +"l= c #963934", +"m= c #973A34", +"n= c #963933", +"o= c #8B423B", +"p= c #5F5B52", +"q= c #5E594F", +"r= c #5E5A50", +"s= c #5E5950", +"t= c #5D574E", +"u= c #5B554C", +"v= c #58524A", +"w= c #624941", +"x= c #8E2F2B", +"y= c #8F312B", +"z= c #88332F", +"A= c #8E302B", +"B= c #75342F", +"C= c #403A32", +"D= c #39332C", +"E= c #3C3631", +"F= c #3A342F", +"G= c #302B28", +"H= c #282423", +"I= c #1F1C1C", +"J= c #281315", +"K= c #391011", +"L= c #2F1011", +"M= c #301011", +"N= c #4B0D0E", +"O= c #5E0D0D", +"P= c #1E1313", +"Q= c #261212", +"R= c #670D0D", +"S= c #3A1112", +"T= c #1F1414", +"U= c #690E0E", +"V= c #4D1010", +"W= c #391110", +"X= c #141411", +"Y= c #151412", +"Z= c #1A191A", +"`= c #211F21", +" - c #341E1F", +".- c #701515", +"+- c #6F1415", +"@- c #5F1919", +"#- c #2B2020", +"$- c #1E1D1B", +"%- c #291E1C", +"&- c #651413", +"*- c #6D1211", +"=- c #6F1414", +"-- c #6F1413", +";- c #5C1615", +">- c #21201F", +",- c #202020", +"'- c #222222", +")- c #262626", +"!- c #661E1E", +"~- c #781C1C", +"{- c #791D1D", +"]- c #502725", +"^- c #312F2E", +"/- c #582525", +"(- c #4D2424", +"_- c #2E2E2E", +":- c #2C2C2C", +"<- c #2F2D2C", +"[- c #302D2D", +"}- c #312C2D", +"|- c #3C2E2D", +"1- c #742222", +"2- c #7E2221", +"3- c #7E2222", +"4- c #802221", +"5- c #782424", +"6- c #4A3331", +"7- c #3E3937", +"8- c #403B39", +"9- c #8B6D6F", +"0- c #A15A5B", +"a- c #A65656", +"b- c #AB5151", +"c- c #8C6E6F", +"d- c #686B6D", +"e- c #474D56", +"f- c #464C53", +"g- c #454C52", +"h- c #474449", +"i- c #713135", +"j- c #812D31", +"k- c #842F32", +"l- c #70393D", +"m- c #494F54", +"n- c #52575B", +"o- c #5A5E63", +"p- c #5D6166", +"q- c #5F6266", +"r- c #626569", +"s- c #765C5F", +"t- c #914D4F", +"u- c #9E4547", +"v- c #865658", +"w- c #6F7173", +"x- c #A84F50", +"y- c #8E6768", +"z- c #8B6D6D", +"A- c #AA5050", +"B- c #867273", +"C- c #9D6162", +"D- c #A85759", +"E- c #AF5455", +"F- c #8F7072", +"G- c #887D7E", +"H- c #9B6969", +"I- c #A45E5F", +"J- c #AA595A", +"K- c #877C7E", +"L- c #7E7474", +"M- c #9A5555", +"N- c #A14848", +"O- c #884D50", +"P- c #525559", +"Q- c #35373D", +"R- c #46464F", +"S- c #54555F", +"T- c #474952", +"U- c #55575E", +"V- c #3F4249", +"W- c #452A39", +"X- c #682530", +"Y- c #711A1E", +"Z- c #411213", +"`- c #1C1C23", +" ; c #20202A", +".; c #20212F", +"+; c #323442", +"@; c #1D1E27", +"#; c #141417", +"$; c #171719", +"%; c #161518", +"&; c #34151C", +"*; c #7A2028", +"=; c #813138", +"-; c #4C252D", +";; c #612632", +">; c #81272F", +",; c #7C2429", +"'; c #741B21", +"); c #6E131A", +"!; c #66151E", +"~; c #29212D", +"{; c #2D2F3D", +"]; c #232534", +"^; c #2C2F3D", +"/; c #3E414F", +"(; c #20222D", +"_; c #1E1F28", +":; c #6D1318", +"<; c #6B1014", +"[; c #631215", +"}; c #321316", +"|; c #201D23", +"1; c #19161A", +"2; c #181819", +"3; c #2D0F10", +"4; c #5D0D0D", +"5; c #6A0F0F", +"6; c #211D1D", +"7; c #262221", +"8; c #2E2A27", +"9; c #37322E", +"0; c #3E3832", +"a; c #47413A", +"b; c #4A443B", +"c; c #4F4A41", +"d; c #62554F", +"e; c #903D38", +"f; c #724F47", +"g; c #615C53", +"h; c #615B52", +"i; c #5F5A51", +"j; c #635D55", +"k; c #615B53", +"l; c #5F5951", +"m; c #5E584F", +"n; c #605149", +"o; c #8B3631", +"p; c #843A34", +"q; c #764039", +"r; c #88332E", +"s; c #57473F", +"t; c #4E4941", +"u; c #4C473E", +"v; c #3B342E", +"w; c #3D3732", +"x; c #393330", +"y; c #2C2725", +"z; c #371717", +"A; c #5F0F0F", +"B; c #391010", +"C; c #660B0C", +"D; c #680D0D", +"E; c #5F0E0E", +"F; c #4D1111", +"G; c #391111", +"H; c #3B1313", +"I; c #201514", +"J; c #311112", +"K; c #390F10", +"L; c #680C0C", +"M; c #4E1110", +"N; c #161513", +"O; c #171515", +"P; c #3D1D1E", +"Q; c #6F1314", +"R; c #1E1D1D", +"S; c #1D1C1B", +"T; c #1F1E1C", +"U; c #281C1B", +"V; c #6F1514", +"W; c #3C1C1C", +"X; c #222120", +"Y; c #292929", +"Z; c #2A2929", +"`; c #402929", +" > c #701E1E", +".> c #7A1E1D", +"+> c #492928", +"@> c #343231", +"#> c #32312F", +"$> c #353432", +"%> c #612424", +"&> c #7A1E1E", +"*> c #342F30", +"=> c #332F2F", +"-> c #363232", +";> c #4F2F2E", +">> c #6F2826", +",> c #7F2422", +"'> c #612B2A", +")> c #3D3837", +"!> c #413D3A", +"~> c #AA5051", +"{> c #AB5152", +"]> c #65696C", +"^> c #595E61", +"/> c #51555A", +"(> c #4C5057", +"_> c #474E56", +":> c #464C54", +"<> c #434950", +"[> c #3E454B", +"}> c #6C363A", +"|> c #852F33", +"1> c #723B3F", +"2> c #4F5559", +"3> c #54585D", +"4> c #616469", +"5> c #65676B", +"6> c #676A6E", +"7> c #9F4748", +"8> c #737576", +"9> c #896C6D", +"0> c #A94F50", +"a> c #847072", +"b> c #907173", +"c> c #A55E60", +"d> c #777778", +"e> c #945859", +"f> c #A14849", +"g> c #894F51", +"h> c #606267", +"i> c #484A4F", +"j> c #34353D", +"k> c #45454F", +"l> c #4F505B", +"m> c #494B53", +"n> c #464950", +"o> c #2D313A", +"p> c #2B2F3D", +"q> c #323747", +"r> c #353A47", +"s> c #6B1318", +"t> c #14161A", +"u> c #1E1E26", +"v> c #2A2E3E", +"w> c #343747", +"x> c #282A37", +"y> c #1E1F27", +"z> c #1B1C1F", +"A> c #18181B", +"B> c #1D1C22", +"C> c #2F252D", +"D> c #65333D", +"E> c #6B3039", +"F> c #323241", +"G> c #353641", +"H> c #4C2F37", +"I> c #6E151B", +"J> c #6C1119", +"K> c #311D29", +"L> c #202231", +"M> c #292B3A", +"N> c #222433", +"O> c #3C3F4D", +"P> c #393E4A", +"Q> c #2E2633", +"R> c #681920", +"S> c #64141B", +"T> c #3D141D", +"U> c #3C1E26", +"V> c #6B1114", +"W> c #25191C", +"X> c #141416", +"Y> c #151417", +"Z> c #242028", +"`> c #292835", +" , c #131214", +"., c #2F1112", +"+, c #670C0E", +"@, c #6C1010", +"#, c #201C1C", +"$, c #2F2B29", +"%, c #38332F", +"&, c #413C37", +"*, c #45403A", +"=, c #504B42", +"-, c #555047", +";, c #58534C", +">, c #82433F", +",, c #8A413B", +"', c #8C423B", +"), c #993C37", +"!, c #735048", +"~, c #625D55", +"{, c #605B52", +"], c #645F56", +"^, c #655F57", +"/, c #635E55", +"(, c #5F5952", +"_, c #5E5851", +":, c #5A544C", +"<, c #5B544D", +"[, c #6B4740", +"}, c #6A4740", +"|, c #7D3C36", +"1, c #4F4A42", +"2, c #4F4942", +"3, c #514C44", +"4, c #4E4840", +"5, c #443E37", +"6, c #3A332D", +"7, c #36312D", +"8, c #2B2725", +"9, c #272322", +"0, c #2B1E1D", +"a, c #481413", +"b, c #261211", +"c, c #3A1111", +"d, c #1D1313", +"e, c #540E0E", +"f, c #321313", +"g, c #1A1919", +"h, c #1E1213", +"i, c #311213", +"j, c #441211", +"k, c #161614", +"l, c #171514", +"m, c #221616", +"n, c #511414", +"o, c #6F1313", +"p, c #671616", +"q, c #3B1B1C", +"r, c #201E1E", +"s, c #541715", +"t, c #5D1615", +"u, c #3C1D1C", +"v, c #242322", +"w, c #242222", +"x, c #252423", +"y, c #272625", +"z, c #282726", +"A, c #2A2928", +"B, c #362A29", +"C, c #582323", +"D, c #732020", +"E, c #3C2D2D", +"F, c #34302F", +"G, c #582423", +"H, c #781E1E", +"I, c #472728", +"J, c #322E2F", +"K, c #373232", +"L, c #363131", +"M, c #353130", +"N, c #373331", +"O, c #393634", +"P, c #802422", +"Q, c #3B3735", +"R, c #3F3B38", +"S, c #423E3D", +"T, c #43403D", +"U, c #91696A", +"V, c #A94F4F", +"W, c #876A6B", +"X, c #737677", +"Y, c #616569", +"Z, c #4D5358", +"`, c #5F474C", +" ' c #474E55", +".' c #41494F", +"+' c #3E454C", +"@' c #40464D", +"#' c #613E43", +"$' c #873135", +"%' c #813639", +"&' c #545056", +"*' c #52585C", +"=' c #5F6267", +"-' c #606468", +";' c #686A6D", +">' c #A04749", +",' c #7F7677", +"'' c #A95050", +")' c #877374", +"!' c #9A6769", +"~' c #828283", +"{' c #A06365", +"]' c #9F6364", +"^' c #966C6E", +"/' c #848385", +"(' c #8A7576", +"_' c #777777", +":' c #8B6364", +"<' c #A44A4C", +"[' c #994B4D", +"}' c #675E62", +"|' c #595B61", +"1' c #3B3E44", +"2' c #2D2F38", +"3' c #43434E", +"4' c #53555F", +"5' c #50525B", +"6' c #383A43", +"7' c #292C38", +"8' c #303441", +"9' c #363C4A", +"0' c #2B313C", +"a' c #681015", +"b' c #1E1E25", +"c' c #414655", +"d' c #313443", +"e' c #232632", +"f' c #191921", +"g' c #131317", +"h' c #141418", +"i' c #202025", +"j' c #1F1E26", +"k' c #2B2B37", +"l' c #474854", +"m' c #383944", +"n' c #262733", +"o' c #30303E", +"p' c #2C2C39", +"q' c #642930", +"r' c #6B1218", +"s' c #381B25", +"t' c #292937", +"u' c #242637", +"v' c #363A47", +"w' c #282B39", +"x' c #494C5C", +"y' c #333844", +"z' c #3E222E", +"A' c #711820", +"B' c #431B23", +"C' c #64131A", +"D' c #4E1C24", +"E' c #6B1015", +"F' c #1B1A1D", +"G' c #25222C", +"H' c #232230", +"I' c #1D1F28", +"J' c #161519", +"K' c #1E1B20", +"L' c #1B1B1E", +"M' c #101011", +"N' c #2F1012", +"O' c #680C0E", +"P' c #6B0E0E", +"Q' c #701313", +"R' c #282222", +"S' c #2C2825", +"T' c #423D38", +"U' c #4C4741", +"V' c #4D4941", +"W' c #545047", +"X' c #5B564F", +"Y' c #714F49", +"Z' c #973A37", +"`' c #844540", +" ) c #5D5852", +".) c #85453F", +"+) c #993D38", +"@) c #74514B", +"#) c #655F58", +"$) c #635E56", +"%) c #625E55", +"&) c #645E57", +"*) c #615C55", +"=) c #58524B", +"-) c #6C4841", +";) c #5A4C44", +">) c #67463F", +",) c #594942", +"') c #4F4A43", +")) c #423C34", +"!) c #3E3831", +"~) c #3B3631", +"{) c #322C29", +"]) c #2E2725", +"^) c #292322", +"/) c #201D1C", +"() c #1C1919", +"_) c #680C0D", +":) c #43100F", +"<) c #1C1212", +"[) c #6A0E0F", +"}) c #611111", +"|) c #211516", +"1) c #511313", +"2) c #281C1C", +"3) c #711516", +"4) c #3C1D1B", +"5) c #711615", +"6) c #571918", +"7) c #561818", +"8) c #701514", +"9) c #3D1E1C", +"0) c #262524", +"a) c #2A2827", +"b) c #2B2828", +"c) c #3D2726", +"d) c #5E2120", +"e) c #7A1D1C", +"f) c #502524", +"g) c #3D2F2F", +"h) c #5D2727", +"i) c #7E2020", +"j) c #552928", +"k) c #373231", +"l) c #373332", +"m) c #373433", +"n) c #363332", +"o) c #363433", +"p) c #4A2929", +"q) c #2D2B2C", +"r) c #333030", +"s) c #343031", +"t) c #3D3A38", +"u) c #3C3835", +"v) c #44403D", +"w) c #8B6D6E", +"x) c #7C7D7D", +"y) c #896B6B", +"z) c #A64D4D", +"A) c #836668", +"B) c #5E6265", +"C) c #4C5259", +"D) c #494F55", +"E) c #4F4C52", +"F) c #5B4348", +"G) c #5E3C41", +"H) c #40464C", +"I) c #41474D", +"J) c #4B474D", +"K) c #883236", +"L) c #8B3438", +"M) c #784144", +"N) c #5C565B", +"O) c #766467", +"P) c #8A5A5C", +"Q) c #905658", +"R) c #A1484A", +"S) c #7B7C7D", +"T) c #867274", +"U) c #887475", +"V) c #AE5455", +"W) c #877D7E", +"X) c #A9595A", +"Y) c #AF5556", +"Z) c #857A7B", +"`) c #8E6F71", +" ! c #926A6B", +".! c #7C7272", +"+! c #A54B4C", +"@! c #A2484A", +"#! c #8B5052", +"$! c #645B61", +"%! c #505259", +"&! c #383B43", +"*! c #343640", +"=! c #4A4A56", +"-! c #585A62", +";! c #585962", +">! c #2C2E39", +",! c #4E3E4C", +"'! c #5D2F38", +")! c #592129", +"!! c #670E14", +"~! c #25242D", +"{! c #201F2C", +"]! c #3B3E4A", +"^! c #3B3F4C", +"/! c #222632", +"(! c #21222C", +"_! c #1B1B23", +":! c #191820", +"~ c #550E0E", +",~ c #600F0F", +"'~ c #680E0D", +")~ c #1F1313", +"!~ c #181716", +"~~ c #301211", +"{~ c #1A1918", +"]~ c #3A1A1B", +"^~ c #1A1818", +"/~ c #5F1716", +"(~ c #691717", +"_~ c #252322", +":~ c #232220", +"<~ c #581A19", +"[~ c #721716", +"}~ c #3F1F1E", +"|~ c #272524", +"1~ c #282625", +"2~ c #292626", +"3~ c #2C2929", +"4~ c #2B2928", +"5~ c #372C2A", +"6~ c #602222", +"7~ c #612322", +"8~ c #622423", +"9~ c #522827", +"0~ c #762423", +"a~ c #772424", +"b~ c #592D2C", +"c~ c #48302F", +"d~ c #383433", +"e~ c #393534", +"f~ c #383534", +"g~ c #383434", +"h~ c #4D2C2C", +"i~ c #7A1F1E", +"j~ c #6A2121", +"k~ c #382B2C", +"l~ c #791D1E", +"m~ c #722020", +"n~ c #392C2C", +"o~ c #373333", +"p~ c #4A3432", +"q~ c #632E2C", +"r~ c #6B2D2C", +"s~ c #832726", +"t~ c #413D3B", +"u~ c #413E3C", +"v~ c #46423F", +"w~ c #464340", +"x~ c #AA5151", +"y~ c #906969", +"z~ c #7A7B7B", +"A~ c #8A6363", +"B~ c #A24A4A", +"C~ c #7A5E5F", +"D~ c #595E60", +"E~ c #494F58", +"F~ c #65383D", +"G~ c #7E3236", +"H~ c #474D52", +"I~ c #8E373C", +"J~ c #7C4448", +"K~ c #5D575C", +"L~ c #8E4145", +"M~ c #635D62", +"N~ c #686A6E", +"O~ c #6A6C70", +"P~ c #825C5F", +"Q~ c #A2494B", +"R~ c #925759", +"S~ c #935859", +"T~ c #955A5B", +"U~ c #965B5D", +"V~ c #8C6566", +"W~ c #7A7C7C", +"X~ c #7A7B7D", +"Y~ c #A25C5C", +"Z~ c #A25C5D", +"`~ c #A75758", +" { c #946C6C", +".{ c #A85859", +"+{ c #966E70", +"@{ c #A06364", +"#{ c #8F797B", +"${ c #966D6E", +"%{ c #966E6F", +"&{ c #966464", +"*{ c #916060", +"={ c #A3494A", +"-{ c #8D5253", +";{ c #6A6164", +">{ c #8F4145", +",{ c #514950", +"'{ c #383A44", +"){ c #3E404B", +"!{ c #52535E", +"~{ c #5F6068", +"{{ c #4D4F57", +"]{ c #22232F", +"^{ c #4F2834", +"/{ c #872F39", +"({ c #782229", +"_{ c #561F25", +":{ c #52171F", +"<{ c #3D1D26", +"[{ c #422330", +"}{ c #72383F", +"|{ c #642B32", +"1{ c #3D181F", +"2{ c #23232C", +"3{ c #22222B", +"4{ c #20202C", +"5{ c #24252F", +"6{ c #1F1E27", +"7{ c #221F29", +"8{ c #463B49", +"9{ c #573039", +"0{ c #3C1F29", +"a{ c #20202F", +"b{ c #562E38", +"c{ c #781E27", +"d{ c #4B1A21", +"e{ c #241C27", +"f{ c #252536", +"g{ c #2B2E3E", +"h{ c #333846", +"i{ c #2F3341", +"j{ c #3D404F", +"k{ c #2C323E", +"l{ c #1D202E", +"m{ c #3A1C27", +"n{ c #4E1B23", +"o{ c #3B252F", +"p{ c #21222E", +"q{ c #331E25", +"r{ c #1B1A20", +"s{ c #282330", +"t{ c #22222F", +"u{ c #22232C", +"v{ c #16141A", +"w{ c #252128", +"x{ c #1C1C20", +"y{ c #141214", +"z{ c #690E0F", +"A{ c #4F1213", +"B{ c #741717", +"C{ c #7A1C1B", +"D{ c #3E3833", +"E{ c #433E35", +"F{ c #47423A", +"G{ c #504B44", +"H{ c #534F49", +"I{ c #59554F", +"J{ c #5D5853", +"K{ c #8F4541", +"L{ c #884844", +"M{ c #65615B", +"N{ c #894A46", +"O{ c #9B3F3B", +"P{ c #785651", +"Q{ c #67625B", +"R{ c #67625C", +"S{ c #69645E", +"T{ c #6B665F", +"U{ c #66615B", +"V{ c #685852", +"W{ c #893F39", +"X{ c #873E38", +"Y{ c #71453E", +"Z{ c #6C4943", +"`{ c #534E46", +" ] c #514C43", +".] c #49433C", +"+] c #433D37", +"@] c #403834", +"#] c #412F2C", +"$] c #502423", +"%] c #411F1E", +"&] c #221E1D", +"*] c #411717", +"=] c #680E0E", +"-] c #611010", +";] c #3D1413", +">] c #4C0F10", +",] c #1F1415", +"'] c #191918", +")] c #441111", +"!] c #6B1010", +"~] c #1C191A", +"{] c #1E1B1B", +"]] c #211E1E", +"^] c #611919", +"/] c #5A1C1C", +"(] c #262423", +"_] c #571A18", +":] c #731817", +"<] c #402120", +"[] c #2D2A29", +"}] c #312D2C", +"|] c #312E2D", +"1] c #302D2C", +"2] c #322F2E", +"3] c #442C2B", +"4] c #762222", +"5] c #403231", +"6] c #3A3635", +"7] c #3D302F", +"8] c #652726", +"9] c #7C2020", +"0] c #7B201F", +"a] c #732121", +"b] c #542929", +"c] c #7B1F20", +"d] c #6C2324", +"e] c #662627", +"f] c #652626", +"g] c #3F3031", +"h] c #393535", +"i] c #383333", +"j] c #5B2F2E", +"k] c #812524", +"l] c #6C2D2B", +"m] c #6D2F2C", +"n] c #573734", +"o] c #593836", +"p] c #6F312F", +"q] c #733432", +"r] c #663B38", +"s] c #847171", +"t] c #9C5858", +"u] c #975D5D", +"v] c #955B5C", +"w] c #A04849", +"x] c #984143", +"y] c #6B5054", +"z] c #505659", +"A] c #4C5359", +"B] c #464D53", +"C] c #5C4347", +"D] c #8A3336", +"E] c #76484C", +"F] c #595E62", +"G] c #974043", +"H] c #63666A", +"I] c #786669", +"J] c #766D6E", +"K] c #757778", +"L] c #896C6C", +"M] c #995D5E", +"N] c #8A7676", +"O] c #8F7172", +"P] c #9E6163", +"Q] c #838385", +"R] c #9B696A", +"S] c #A55E5F", +"T] c #858385", +"U] c #858486", +"V] c #A65F60", +"W] c #A16466", +"X] c #917374", +"Y] c #818182", +"Z] c #A84F4E", +"`] c #8B5A5C", +" ^ c #66686A", +".^ c #92393D", +"+^ c #72373D", +"@^ c #353743", +"#^ c #434551", +"$^ c #52535C", +"%^ c #5A5B63", +"&^ c #291720", +"*^ c #7E242C", +"=^ c #842D34", +"-^ c #3A3540", +";^ c #262A35", +">^ c #333444", +",^ c #3A3E48", +"'^ c #41262F", +")^ c #691017", +"!^ c #591D25", +"~^ c #24242E", +"{^ c #22222D", +"]^ c #1F1F28", +"^^ c #1A1923", +"/^ c #35323D", +"(^ c #43404C", +"_^ c #353540", +":^ c #751C24", +"<^ c #34222E", +"[^ c #4F333E", +"}^ c #6B1B24", +"|^ c #3C323D", +"1^ c #541820", +"2^ c #59131D", +"3^ c #262839", +"4^ c #292D3C", +"5^ c #313543", +"6^ c #414452", +"7^ c #3E414E", +"8^ c #2A2E3D", +"9^ c #2F1D28", +"0^ c #3A1B25", +"a^ c #311D28", +"b^ c #42242D", +"c^ c #68181F", +"d^ c #5A1417", +"e^ c #141215", +"f^ c #1D1A25", +"g^ c #23212C", +"h^ c #282735", +"i^ c #23232D", +"j^ c #141419", +"k^ c #262428", +"l^ c #1C1A1C", +"m^ c #581111", +"n^ c #531515", +"o^ c #292523", +"p^ c #781B1A", +"q^ c #7E201E", +"r^ c #3D3532", +"s^ c #433C37", +"t^ c #454038", +"u^ c #49443D", +"v^ c #55504A", +"w^ c #59554E", +"x^ c #5C5852", +"y^ c #76544F", +"z^ c #9E413D", +"A^ c #6B5D57", +"B^ c #66625C", +"C^ c #7B5854", +"D^ c #68645E", +"E^ c #68635E", +"F^ c #6A645F", +"G^ c #67625D", +"H^ c #655F59", +"I^ c #625E57", +"J^ c #73504B", +"K^ c #83433F", +"L^ c #5C5751", +"M^ c #674E49", +"N^ c #5F5049", +"O^ c #684F49", +"P^ c #56524A", +"Q^ c #534E45", +"R^ c #49433D", +"S^ c #3E3732", +"T^ c #362F2D", +"U^ c #781A19", +"V^ c #381F1F", +"W^ c #3D1C1C", +"X^ c #631112", +"Y^ c #211517", +"Z^ c #4D1012", +"`^ c #561010", +" / c #311111", +"./ c #311312", +"+/ c #57100F", +"@/ c #601010", +"#/ c #6A100F", +"$/ c #321413", +"%/ c #441110", +"&/ c #341414", +"*/ c #1D1A1A", +"=/ c #3F1E1E", +"-/ c #312524", +";/ c #262322", +">/ c #621919", +",/ c #731716", +"'/ c #422221", +")/ c #292625", +"!/ c #2B2826", +"~/ c #2C2928", +"{/ c #2E2B29", +"]/ c #2D2929", +"^/ c #302C2B", +"// c #332F2E", +"(/ c #5E2A29", +"_/ c #7E2120", +":/ c #403230", +"( c #592A33", +",( c #373A44", +"'( c #24232D", +")( c #31313B", +"!( c #5A141D", +"~( c #5A151F", +"{( c #292C3B", +"]( c #2B303F", +"^( c #2F3443", +"/( c #484C59", +"(( c #414552", +"_( c #66161E", +":( c #5C151D", +"<( c #6F151D", +"[( c #6A1B22", +"}( c #551820", +"|( c #16141B", +"1( c #1F1D28", +"2( c #252431", +"3( c #25242E", +"4( c #121217", +"5( c #232125", +"6( c #181719", +"7( c #281B1C", +"8( c #4E191A", +"9( c #4C2120", +"0( c #2F2C2A", +"a( c #822422", +"b( c #433C38", +"c( c #47413B", +"d( c #48433B", +"e( c #4A463E", +"f( c #4F4B44", +"g( c #5D5953", +"h( c #5F5B55", +"i( c #625E58", +"j( c #725955", +"k( c #844E4A", +"l( c #9B3E3B", +"m( c #9F413D", +"n( c #7C5956", +"o( c #65605B", +"p( c #645F5A", +"q( c #6B6560", +"r( c #6B6561", +"s( c #6A6560", +"t( c #725954", +"u( c #884943", +"v( c #854641", +"w( c #84443F", +"x( c #5E5953", +"y( c #5E5852", +"z( c #5B554E", +"A( c #57524A", +"B( c #524D44", +"C( c #4F4941", +"D( c #4A453D", +"E( c #464039", +"F( c #3A332F", +"G( c #721E1B", +"H( c #551F1F", +"I( c #262222", +"J( c #1E1C1D", +"K( c #1A1819", +"L( c #571011", +"M( c #3B1111", +"N( c #1F1513", +"O( c #271211", +"P( c #331413", +"Q( c #191617", +"R( c #1B1818", +"S( c #252222", +"T( c #282525", +"U( c #361F1F", +"V( c #501B1A", +"W( c #751918", +"X( c #442222", +"Y( c #2A2626", +"Z( c #2B2827", +"`( c #2C2828", +" _ c #2E2B2A", +"._ c #312C2B", +"+_ c #2F2C2B", +"@_ c #322E2D", +"#_ c #572C2A", +"$_ c #7F2222", +"%_ c #3C3837", +"&_ c #3A3736", +"*_ c #383635", +"=_ c #572D2D", +"-_ c #4F2E2E", +";_ c #572C2C", +">_ c #802424", +",_ c #3F3131", +"'_ c #6F2626", +")_ c #682A29", +"!_ c #3B3736", +"~_ c #3E3A38", +"{_ c #5C3230", +"]_ c #6D2E2C", +"^_ c #44403E", +"/_ c #433F3D", +"(_ c #474440", +"__ c #494541", +":_ c #4B4743", +"<_ c #853331", +"[_ c #65686A", +"}_ c #754749", +"|_ c #60474C", +"1_ c #4B5256", +"2_ c #474F54", +"3_ c #4C5256", +"4_ c #575256", +"5_ c #834143", +"6_ c #6C5256", +"7_ c #5B6064", +"8_ c #7A5559", +"9_ c #9B4446", +"0_ c #726264", +"a_ c #9D4547", +"b_ c #815C5E", +"c_ c #866062", +"d_ c #A44B4C", +"e_ c #8E5D5F", +"f_ c #A45556", +"g_ c #877274", +"h_ c #8F7071", +"i_ c #887D7F", +"j_ c #AA595B", +"k_ c #8D7879", +"l_ c #927475", +"m_ c #9C696B", +"n_ c #808080", +"o_ c #7A7A7B", +"p_ c #7E7475", +"q_ c #9C5757", +"r_ c #866869", +"s_ c #717174", +"t_ c #7A5357", +"u_ c #923A3D", +"v_ c #852D31", +"w_ c #3D2B35", +"x_ c #7E242D", +"y_ c #643E48", +"z_ c #4C4F58", +"A_ c #44464E", +"B_ c #23252E", +"C_ c #431D27", +"D_ c #832B34", +"E_ c #623340", +"F_ c #2C3240", +"G_ c #212634", +"H_ c #232634", +"I_ c #323543", +"J_ c #20242F", +"K_ c #1D1F29", +"L_ c #65151D", +"M_ c #72171E", +"N_ c #331D29", +"O_ c #1D1D27", +"P_ c #181921", +"Q_ c #22222C", +"R_ c #3A3844", +"S_ c #44444F", +"T_ c #32333F", +"U_ c #4C1C26", +"V_ c #5F252F", +"W_ c #262731", +"X_ c #65282F", +"Y_ c #6B1118", +"Z_ c #511F2A", +"`_ c #2F3241", +" : c #2E3341", +".: c #4D515E", +"+: c #414551", +"@: c #262A37", +"#: c #6E141B", +"$: c #401720", +"%: c #3B1D29", +"&: c #37242D", +"*: c #591D24", +"=: c #6B1013", +"-: c #17161B", +";: c #221F2B", +">: c #25242F", +",: c #22212E", +"': c #15161A", +"): c #201F23", +"!: c #1F1C1F", +"~: c #232022", +"{: c #282324", +"]: c #2B2525", +"^: c #392928", +"/: c #4C2927", +"(: c #802220", +"_: c #842624", +":: c #46403B", +"<: c #4A443F", +"[: c #56524B", +"}: c #5B5650", +"|: c #625E59", +"1: c #66615C", +"2: c #934945", +"3: c #7A5853", +"4: c #6A655F", +"5: c #6B6661", +"6: c #6D6864", +"7: c #69645F", +"8: c #67635D", +"9: c #76554F", +"0: c #874742", +"a: c #605B56", +"b: c #5D5752", +"c: c #59534D", +"d: c #5A554D", +"e: c #58534B", +"f: c #504B43", +"g: c #4A463F", +"h: c #45413A", +"i: c #413B37", +"j: c #622C29", +"k: c #622220", +"l: c #541617", +"m: c #161615", +"n: c #1A191B", +"o: c #1B1A1C", +"p: c #191819", +"q: c #441212", +"r: c #201615", +"s: c #3C1313", +"t: c #60100F", +"u: c #690F0E", +"v: c #291414", +"w: c #171716", +"x: c #171415", +"y: c #191716", +"z: c #272424", +"A: c #252120", +"B: c #252221", +"C: c #392321", +"D: c #631B19", +"E: c #442322", +"F: c #2E2928", +"G: c #2F2B2A", +"H: c #312E2C", +"I: c #35312F", +"J: c #36312F", +"K: c #413332", +"L: c #5F2B29", +"M: c #4F2E2C", +"N: c #3B3836", +"O: c #393736", +"P: c #393636", +"Q: c #612C2C", +"R: c #802322", +"S: c #443535", +"T: c #5B2E2E", +"U: c #782524", +"V: c #4A3333", +"W: c #403B3A", +"X: c #5E3332", +"Y: c #842726", +"Z: c #663230", +"`: c #454140", +" < c #474340", +".< c #474441", +"+< c #494641", +"@< c #4C4944", +"#< c #84312F", +"$< c #636669", +"%< c #5D6164", +"&< c #4E5358", +"*< c #61484D", +"=< c #5E464B", +"-< c #474E53", +";< c #43494E", +">< c #4A5156", +",< c #4D5357", +"'< c #6A5A5E", +")< c #8C494B", +"!< c #7B5F63", +"~< c #8F5556", +"{< c #786F71", +"]< c #9F5051", +"^< c #A05152", +"/< c #7A7273", +"(< c #767879", +"_< c #8A6D6D", +":< c #A65657", +"<< c #937475", +"[< c #986E70", +"}< c #868586", +"|< c #787979", +"1< c #816D6E", +"2< c #985354", +"3< c #994144", +"4< c #8E363A", +"5< c #4B2F36", +"6< c #31323D", +"7< c #832932", +"8< c #733942", +"9< c #4E5259", +"0< c #2A2D35", +"a< c #2B2E38", +"b< c #312936", +"c< c #7E313A", +"d< c #772B35", +"e< c #332F3D", +"f< c #272D3C", +"g< c #292C39", +"h< c #3B1F27", +"i< c #6A1920", +"j< c #201F29", +"k< c #161620", +"l< c #2E2D3A", +"m< c #474754", +"n< c #393A46", +"o< c #30313E", +"p< c #2B2E3B", +"q< c #44333E", +"r< c #591F27", +"s< c #5D2229", +"t< c #692329", +"u< c #491721", +"v< c #262938", +"w< c #2C313F", +"x< c #3D4150", +"y< c #4C4F5C", +"z< c #444854", +"A< c #282C39", +"B< c #491720", +"C< c #54171F", +"D< c #252531", +"E< c #292933", +"F< c #532128", +"G< c #461217", +"H< c #25232F", +"I< c #24232E", +"J< c #1D1C20", +"K< c #252225", +"L< c #292628", +"M< c #2C2728", +"N< c #312929", +"O< c #352E2C", +"P< c #38312F", +"Q< c #722824", +"R< c #852724", +"S< c #46413C", +"T< c #4D4741", +"U< c #4D4842", +"V< c #4F4A44", +"W< c #5F5C56", +"X< c #68655F", +"Y< c #68645F", +"Z< c #7C5955", +"`< c #825752", +" [ c #6E6964", +".[ c #6B6762", +"+[ c #706A65", +"@[ c #6D6762", +"#[ c #6B6662", +"$[ c #6A6562", +"%[ c #6E6865", +"&[ c #6C6763", +"*[ c #64605A", +"=[ c #834E49", +"-[ c #625D56", +";[ c #615B55", +">[ c #5C5650", +",[ c #59544D", +"'[ c #565149", +")[ c #524E47", +"![ c #48443E", +"~[ c #444039", +"{[ c #403B35", +"][ c #462D29", +"^[ c #622321", +"/[ c #5D1E1C", +"([ c #4B1717", +"_[ c #690F0F", +":[ c #331414", +"<[ c #341616", +"[[ c #1B1A1A", +"}[ c #2A1314", +"|[ c #181616", +"1[ c #23201F", +"2[ c #272323", +"3[ c #412220", +"4[ c #651E1C", +"5[ c #4D2322", +"6[ c #2C2927", +"7[ c #2E2A28", +"8[ c #312D2B", +"9[ c #332F2C", +"0[ c #373230", +"a[ c #373432", +"b[ c #423432", +"c[ c #523130", +"d[ c #423533", +"e[ c #3B3835", +"f[ c #3E3B38", +"g[ c #393735", +"h[ c #3B3737", +"i[ c #3A3636", +"j[ c #632E2E", +"k[ c #512F2F", +"l[ c #3B3635", +"m[ c #543131", +"n[ c #4A3332", +"o[ c #3E3A3A", +"p[ c #3D3A39", +"q[ c #3E3B39", +"r[ c #403D3B", +"s[ c #483B39", +"t[ c #7F2C2A", +"u[ c #7F2D2C", +"v[ c #4D403E", +"w[ c #4A4643", +"x[ c #494542", +"y[ c #4A4743", +"z[ c #61403C", +"A[ c #8B2F2C", +"B[ c #53595D", +"C[ c #505559", +"D[ c #4C5258", +"E[ c #4D4A50", +"F[ c #594147", +"G[ c #42494D", +"H[ c #444C50", +"I[ c #555B5F", +"J[ c #585D61", +"K[ c #616568", +"L[ c #736264", +"M[ c #7B5E61", +"N[ c #6F686C", +"O[ c #6D7072", +"P[ c #7F6365", +"Q[ c #7A686A", +"R[ c #7C7474", +"S[ c #926061", +"T[ c #9D5859", +"U[ c #995D5D", +"V[ c #995E5F", +"W[ c #9A5F60", +"X[ c #9F5A5B", +"Y[ c #837A7B", +"Z[ c #8A7E80", +"`[ c #8A7F81", +" } c #787978", +".} c #777878", +"+} c #757576", +"@} c #707074", +"#} c #746164", +"$} c #74585D", +"%} c #4C454C", +"&} c #262931", +"*} c #30323D", +"=} c #593C47", +"-} c #64525C", +";} c #484D52", +">} c #1A1D25", +",} c #343743", +"'} c #4B4553", +")} c #5E303B", +"!} c #66242F", +"~} c #5E2632", +"{} c #59212B", +"]} c #5B232B", +"^} c #5D1821", +"/} c #5B161D", +"(} c #4D1B21", +"_} c #2B1F27", +":} c #191925", +"<} c #383846", +"[} c #2F313D", +"}} c #323441", +"|} c #2E313E", +"1} c #2F323E", +"2} c #1F202B", +"3} c #2E2F39", +"4} c #292A34", +"5} c #23232E", +"6} c #333642", +"7} c #262936", +"8} c #373B48", +"9} c #4A4F5C", +"0} c #454955", +"a} c #232734", +"b} c #1D1F2A", +"c} c #332933", +"d} c #452731", +"e} c #55232B", +"f} c #61252C", +"g} c #430F12", +"h} c #2B151A", +"i} c #1F1D26", +"j} c #25232E", +"k} c #22202C", +"l} c #14141A", +"m} c #1C1A1D", +"n} c #29262A", +"o} c #2E2B2E", +"p} c #312A2B", +"q} c #342C2B", +"r} c #3B3432", +"s} c #3E3835", +"t} c #443F3A", +"u} c #59413C", +"v} c #61403A", +"w} c #574943", +"x} c #56524C", +"y} c #57524D", +"z} c #5D5954", +"A} c #65625C", +"B} c #67635E", +"C} c #6A6660", +"D} c #65615C", +"E} c #6B6862", +"F} c #746661", +"G} c #7D5B57", +"H} c #766763", +"I} c #6F6A66", +"J} c #6C6762", +"K} c #6F6A67", +"L} c #706C68", +"M} c #6A6662", +"N} c #665852", +"O} c #76544E", +"P} c #6A5C56", +"Q} c #605B55", +"R} c #5F5A54", +"S} c #5C5750", +"T} c #544F47", +"U} c #524D45", +"V} c #49443E", +"W} c #3E3834", +"X} c #393430", +"Y} c #35302E", +"Z} c #430F10", +"`} c #1C191C", +" | c #191618", +".| c #1F1413", +"+| c #191818", +"@| c #201314", +"#| c #201515", +"$| c #282323", +"%| c #292423", +"&| c #2A2826", +"*| c #342725", +"=| c #472523", +"-| c #482624", +";| c #3A2C29", +">| c #322E2C", +",| c #342F2E", +"'| c #383431", +")| c #4C3533", +"!| c #53312F", +"~| c #3D3937", +"{| c #3C3938", +"]| c #3B3937", +"^| c #453635", +"/| c #612B2B", +"(| c #3C3737", +"_| c #3D3838", +":| c #403B3B", +"<| c #413C3B", +"[| c #3F3B3A", +"}| c #403C3A", +"|| c #44413F", +"1| c #4D3F3D", +"2| c #6A3634", +"3| c #7A312F", +"4| c #743532", +"5| c #753634", +"6| c #773836", +"7| c #763834", +"8| c #7E3633", +"9| c #7E3532", +"0| c #713C39", +"a| c #4E5459", +"b| c #4F555A", +"c| c #4B5258", +"d| c #454C50", +"e| c #464C51", +"f| c #494F53", +"g| c #4E5458", +"h| c #52585B", +"i| c #5C6164", +"j| c #626769", +"k| c #6A6D6F", +"l| c #6E7173", +"m| c #707374", +"n| c #737676", +"o| c #757777", +"p| c #797A79", +"q| c #777877", +"r| c #717376", +"s| c #5C5F65", +"t| c #3D4048", +"u| c #21242E", +"v| c #4E4F5B", +"w| c #575961", +"x| c #33383D", +"y| c #1A1E24", +"z| c #3E4149", +"A| c #3F424D", +"B| c #3B404D", +"C| c #313644", +"D| c #323846", +"E| c #313745", +"F| c #202531", +"G| c #272C36", +"H| c #242831", +"I| c #1F1F2B", +"J| c #1B1A22", +"K| c #1E1C25", +"L| c #20212D", +"M| c #41414F", +"N| c #41434E", +"O| c #2E303D", +"P| c #363845", +"Q| c #292A33", +"R| c #3D404C", +"S| c #232633", +"T| c #3A3F4C", +"U| c #535764", +"V| c #434653", +"W| c #3E424E", +"X| c #252934", +"Y| c #1D1F2B", +"Z| c #2F2F39", +"`| c #2F303A", +" 1 c #2B2B34", +".1 c #171417", +"+1 c #23171C", +"@1 c #391A21", +"#1 c #3D1E27", +"$1 c #21202A", +"%1 c #1A1A1D", +"&1 c #2C292E", +"*1 c #312C2F", +"=1 c #362F30", +"-1 c #393130", +";1 c #3F3935", +">1 c #48433E", +",1 c #4C4843", +"'1 c #4C4942", +")1 c #584A44", +"!1 c #56504C", +"~1 c #5B5652", +"{1 c #5E5954", +"]1 c #5F5B56", +"^1 c #64615B", +"/1 c #66625D", +"(1 c #69655F", +"_1 c #6E6A65", +":1 c #706B67", +"<1 c #716C68", +"[1 c #706C67", +"}1 c #716D68", +"|1 c #6E6A67", +"11 c #706A68", +"21 c #6B6764", +"31 c #6A6661", +"41 c #625E56", +"51 c #615D55", +"61 c #655750", +"71 c #5F5B53", +"81 c #5D5952", +"91 c #5B564E", +"01 c #544F46", +"a1 c #524C45", +"b1 c #4E4841", +"c1 c #46403A", +"d1 c #433E38", +"e1 c #433D38", +"f1 c #38322F", +"g1 c #352F2D", +"h1 c #1D1A1D", +"i1 c #201D21", +"j1 c #1D1C1D", +"k1 c #151513", +"l1 c #1B1A1B", +"m1 c #291413", +"n1 c #2A2625", +"o1 c #2D2928", +"p1 c #322E2B", +"q1 c #342F2D", +"r1 c #35312D", +"s1 c #373431", +"t1 c #393532", +"u1 c #3A3533", +"v1 c #3D3836", +"w1 c #433533", +"x1 c #3B3837", +"y1 c #3D3938", +"z1 c #3E3A39", +"A1 c #413D3C", +"B1 c #433E3D", +"C1 c #45413E", +"D1 c #464240", +"E1 c #4A4744", +"F1 c #4C4945", +"G1 c #4D4A46", +"H1 c #4F4B47", +"I1 c #4E4B47", +"J1 c #4F4C48", +"K1 c #444B50", +"L1 c #555A5E", +"M1 c #5B6063", +"N1 c #5F6366", +"O1 c #64686B", +"P1 c #676A6C", +"Q1 c #686C6E", +"R1 c #767777", +"S1 c #808081", +"T1 c #7B7C7B", +"U1 c #767776", +"V1 c #565960", +"W1 c #353941", +"X1 c #21252F", +"Y1 c #383B46", +"Z1 c #565761", +"`1 c #52555C", +" 2 c #23282D", +".2 c #2C2F35", +"+2 c #4A4D55", +"@2 c #43454F", +"#2 c #373A46", +"$2 c #313743", +"%2 c #373D49", +"&2 c #2E333F", +"*2 c #1E232F", +"=2 c #282C35", +"-2 c #1F2329", +";2 c #1E1D26", +">2 c #1E1D25", +",2 c #1D1C25", +"'2 c #21212B", +")2 c #40414F", +"!2 c #31333E", +"~2 c #343641", +"{2 c #383A46", +"]2 c #21232F", +"^2 c #20212C", +"/2 c #2F3139", +"(2 c #191B26", +"_2 c #353844", +":2 c #252835", +"<2 c #3E4350", +"[2 c #4D4F5C", +"}2 c #464955", +"|2 c #414651", +"12 c #292D38", +"22 c #252632", +"32 c #35353F", +"42 c #40404A", +"52 c #32343E", +"62 c #26262F", +"72 c #1F1D25", +"82 c #23212B", +"92 c #202029", +"02 c #222129", +"a2 c #201F25", +"b2 c #211F22", +"c2 c #2C292D", +"d2 c #302D2F", +"e2 c #373031", +"f2 c #433E39", +"g2 c #4A4640", +"h2 c #4E4A44", +"i2 c #514F48", +"j2 c #5A5551", +"k2 c #67645E", +"l2 c #696560", +"m2 c #6C6863", +"n2 c #6A6761", +"o2 c #6B6761", +"p2 c #6A6760", +"q2 c #6D6964", +"r2 c #706B68", +"s2 c #726E6A", +"t2 c #716D6A", +"u2 c #656159", +"v2 c #615E56", +"w2 c #5E5951", +"x2 c #5C5850", +"y2 c #5A564F", +"z2 c #57534A", +"A2 c #544D46", +"B2 c #4A433E", +"C2 c #433E3A", +"D2 c #403B37", +"E2 c #3A3431", +"F2 c #3B3533", +"G2 c #171517", +"H2 c #232025", +"I2 c #262427", +"J2 c #222023", +"K2 c #1F1D1F", +"L2 c #282524", +"M2 c #282424", +"N2 c #36322F", +"O2 c #37322F", +"P2 c #37332F", +"Q2 c #393531", +"R2 c #3A3734", +"S2 c #3D3A37", +"T2 c #43403E", +"U2 c #484441", +"V2 c #4D4A45", +"W2 c #4F4B46", +"X2 c #4E4B46", +"Y2 c #4E4A46", +"Z2 c #495055", +"`2 c #484E52", +" 3 c #565C5F", +".3 c #626669", +"+3 c #676B6D", +"@3 c #696C6E", +"#3 c #6D7071", +"$3 c #50545A", +"%3 c #2E343C", +"&3 c #242833", +"*3 c #454752", +"=3 c #5B5C65", +"-3 c #4B4D55", +";3 c #20232B", +">3 c #41434A", +",3 c #55575F", +"'3 c #4A4C55", +")3 c #3E424C", +"!3 c #373C47", +"~3 c #343A46", +"{3 c #252935", +"]3 c #202431", +"^3 c #262933", +"/3 c #1E2026", +"(3 c #1C1D25", +"_3 c #1A1922", +":3 c #181820", +"<3 c #22232B", +"[3 c #2F2F3D", +"}3 c #32343F", +"|3 c #323540", +"13 c #343742", +"23 c #2D2F3B", +"33 c #262831", +"43 c #1B1D28", +"53 c #313340", +"63 c #282B38", +"73 c #424652", +"83 c #555762", +"93 c #4F525E", +"03 c #3C404C", +"a3 c #242731", +"b3 c #292A35", +"c3 c #43434D", +"d3 c #42434B", +"e3 c #353741", +"f3 c #1F1F27", +"g3 c #1C1B22", +"h3 c #222029", +"i3 c #1C1B23", +"j3 c #1C1B20", +"k3 c #1F1E21", +"l3 c #1E1D1F", +"m3 c #282629", +"n3 c #302C2F", +"o3 c #302C2D", +"p3 c #393131", +"q3 c #4F4C46", +"r3 c #55514A", +"s3 c #58554F", +"t3 c #5C5853", +"u3 c #5F5B58", +"v3 c #5E5955", +"w3 c #6B6760", +"x3 c #6E6965", +"y3 c #706A67", +"z3 c #726D6A", +"A3 c #5E5952", +"B3 c #59554C", +"C3 c #555048", +"D3 c #504A43", +"E3 c #4D4742", +"F3 c #3E3734", +"G3 c #3B3532", +"H3 c #2F2A29", +"I3 c #2B2626", +"J3 c #292525", +"K3 c #282425", +"L3 c #262324", +"M3 c #242122", +"N3 c #1E1D1E", +"O3 c #1D1B1E", +"P3 c #262528", +"Q3 c #242225", +"R3 c #181619", +"S3 c #151514", +"T3 c #2C2726", +"U3 c #2C2827", +"V3 c #302C29", +"W3 c #312E2B", +"X3 c #35312E", +"Y3 c #35322F", +"Z3 c #3A3532", +"`3 c #3A3632", +" 4 c #3A3633", +".4 c #3E3B3A", +"+4 c #45403E", +"@4 c #494643", +"#4 c #504D48", +"$4 c #484F53", +"%4 c #555C5E", +"&4 c #596062", +"*4 c #5C6265", +"=4 c #5F6365", +"-4 c #63676A", +";4 c #868587", +">4 c #818081", +",4 c #636569", +"'4 c #464A50", +")4 c #2E343D", +"!4 c #30353F", +"~4 c #555862", +"{4 c #606169", +"]4 c #43444C", +"^4 c #2B2C36", +"/4 c #4E5059", +"(4 c #595B64", +"_4 c #51535C", +":4 c #434750", +"<4 c #363B45", +"[4 c #323743", +"}4 c #212531", +"|4 c #222431", +"14 c #252631", +"24 c #191A20", +"34 c #1B1922", +"44 c #25232C", +"54 c #1B1C22", +"64 c #1D1F26", +"74 c #3A3A49", +"84 c #3E3E4C", +"94 c #30333D", +"04 c #30333E", +"a4 c #1B1C26", +"b4 c #272832", +"c4 c #24262F", +"d4 c #2C2E3B", +"e4 c #424552", +"f4 c #5C5E69", +"g4 c #494B56", +"h4 c #383B48", +"i4 c #272A34", +"j4 c #32333E", +"k4 c #4D4C56", +"l4 c #383840", +"m4 c #2D2E38", +"n4 c #1C1A20", +"o4 c #1E1D24", +"p4 c #1D1B21", +"q4 c #211D22", +"r4 c #322F31", +"s4 c #302B2C", +"t4 c #342C2C", +"u4 c #3E3735", +"v4 c #403A35", +"w4 c #4A4440", +"x4 c #514D47", +"y4 c #58544F", +"z4 c #615C58", +"A4 c #615D59", +"B4 c #625F5B", +"C4 c #696561", +"D4 c #67625E", +"E4 c #6E6A64", +"F4 c #716B68", +"G4 c #726C69", +"H4 c #615D56", +"I4 c #605B53", +"J4 c #5C574F", +"K4 c #5B554D", +"L4 c #534E48", +"M4 c #524C46", +"N4 c #4E4843", +"O4 c #403A37", +"P4 c #3A3432", +"Q4 c #2E2828", +"R4 c #29262B", +"S4 c #272529", +"T4 c #1F1D21", +"U4 c #1A171A", +"V4 c #312C2A", +"W4 c #36322E", +"X4 c #383430", +"Y4 c #3D3835", +"Z4 c #3B3734", +"`4 c #3E3A37", +" 5 c #403C3B", +".5 c #464341", +"+5 c #494442", +"@5 c #4C4845", +"#5 c #4B4844", +"$5 c #4C4A44", +"%5 c #504C47", +"&5 c #504D49", +"*5 c #4F4C47", +"=5 c #495053", +"-5 c #484F52", +";5 c #4A5054", +">5 c #4D5356", +",5 c #53595C", +"'5 c #5B6062", +")5 c #5D6265", +"!5 c #5F6567", +"~5 c #626568", +"{5 c #6C6F71", +"]5 c #747676", +"^5 c #828282", +"/5 c #7A7B7A", +"(5 c #373C43", +"_5 c #282E37", +":5 c #393E48", +"<5 c #5B5E67", +"[5 c #5B5D64", +"}5 c #31323B", +"|5 c #2E2F3C", +"15 c #565762", +"25 c #565863", +"35 c #3F434D", +"45 c #343843", +"55 c #313541", +"65 c #212532", +"75 c #232433", +"85 c #1A1B21", +"95 c #23222B", +"05 c #181A22", +"a5 c #222230", +"b5 c #434352", +"c5 c #383844", +"d5 c #2B2C37", +"e5 c #343741", +"f5 c #1B1B25", +"g5 c #22232D", +"h5 c #191821", +"i5 c #252731", +"j5 c #272A35", +"k5 c #2B2F3E", +"l5 c #494C59", +"m5 c #595A65", +"n5 c #535661", +"o5 c #40434F", +"p5 c #2B2D36", +"q5 c #474650", +"r5 c #37373E", +"s5 c #2D2E37", +"t5 c #1C1C22", +"u5 c #201E23", +"v5 c #19191F", +"w5 c #232229", +"x5 c #1F1E25", +"y5 c #1B191F", +"z5 c #201C1F", +"A5 c #3D3739", +"B5 c #3F3839", +"C5 c #3A3231", +"D5 c #413A37", +"E5 c #433D39", +"F5 c #47423D", +"G5 c #5A5550", +"H5 c #635E5B", +"I5 c #645F5C", +"J5 c #67635F", +"K5 c #686461", +"L5 c #67645F", +"M5 c #66625E", +"N5 c #6A6561", +"O5 c #6E6864", +"P5 c #716A68", +"Q5 c #6F6866", +"R5 c #58534A", +"S5 c #575149", +"T5 c #544E46", +"U5 c #4F4843", +"V5 c #504843", +"W5 c #4C443F", +"X5 c #433B38", +"Y5 c #3D3734", +"Z5 c #322C2B", +"`5 c #252122", +" 6 c #1F1C1D", +".6 c #1C1A1E", +"+6 c #252228", +"@6 c #28252B", +"#6 c #1D1C1E", +"$6 c #262323", +"%6 c #2E2927", +"&6 c #322F2C", +"*6 c #34302D", +"=6 c #3B3732", +"-6 c #3A3531", +";6 c #3C3834", +">6 c #3D3936", +",6 c #3D3B39", +"'6 c #4F4A46", +")6 c #514E49", +"!6 c #4B5255", +"~6 c #4E5558", +"{6 c #54595C", +"]6 c #585E61", +"^6 c #656A6C", +"/6 c #717474", +"(6 c #838383", +"_6 c #848485", +":6 c #838384", +"<6 c #858585", +"[6 c #858586", +"}6 c #7D7E7D", +"|6 c #323840", +"16 c #272D36", +"26 c #44474F", +"36 c #5A5C63", +"46 c #262832", +"56 c #5A5B67", +"66 c #53545E", +"76 c #565861", +"86 c #3B3E49", +"96 c #313542", +"06 c #222331", +"a6 c #201F26", +"b6 c #1B1C23", +"c6 c #282834", +"d6 c #393946", +"e6 c #32323E", +"f6 c #2C2C38", +"g6 c #353742", +"h6 c #2F323B", +"i6 c #1E2027", +"j6 c #17191F", +"k6 c #1F2127", +"l6 c #15161E", +"m6 c #23242E", +"n6 c #2B2D3A", +"o6 c #242734", +"p6 c #2B2E3C", +"q6 c #4A4C58", +"r6 c #595B65", +"s6 c #565963", +"t6 c #3D4049", +"u6 c #373740", +"v6 c #363740", +"w6 c #303139", +"x6 c #24252D", +"y6 c #1D1D22", +"z6 c #232128", +"A6 c #201E28", +"B6 c #201F24", +"C6 c #1E1D21", +"D6 c #1A171C", +"E6 c #242123", +"F6 c #443E40", +"G6 c #474040", +"H6 c #423A38", +"I6 c #4B4641", +"J6 c #54504A", +"K6 c #635F5B", +"L6 c #65615E", +"M6 c #696662", +"N6 c #686460", +"O6 c #5E5850", +"P6 c #534D46", +"Q6 c #504943", +"R6 c #4D4640", +"S6 c #463C3A", +"T6 c #433A38", +"U6 c #372F2E", +"V6 c #2E2827", +"W6 c #211F23", +"X6 c #2B292D", +"Y6 c #252427", +"Z6 c #19191C", +"`6 c #1C1C1C", +" 7 c #242121", +".7 c #2B2726", +"+7 c #2C2826", +"@7 c #342F2C", +"#7 c #36302D", +"$7 c #37332E", +"%7 c #38342F", +"&7 c #3B3733", +"*7 c #3D3834", +"=7 c #3D3935", +"-7 c #3E3A36", +";7 c #3F3C3A", +">7 c #423F3D", +",7 c #474240", +"'7 c #484341", +")7 c #4A4543", +"!7 c #4C4744", +"~7 c #4A4742", +"{7 c #4E4C46", +"]7 c #4F4D47", +"^7 c #504E49", +"/7 c #4F5558", +"(7 c #53595B", +"_7 c #575C5F", +":7 c #5A5F62", +"<7 c #6A6E70", +"[7 c #6F7373", +"}7 c #787A7A", +"|7 c #797B7A", +"17 c #797B7B", +"27 c #7D7E7E", +"37 c #878688", +"47 c #858485", +"57 c #7A7A79", +"67 c #7A797A", +"77 c #343841", +"87 c #505258", +"97 c #5F5F65", +"07 c #43464D", +"a7 c #5E5E68", +"b7 c #585A63", +"c7 c #363A45", +"d7 c #2F3441", +"e7 c #282C3A", +"f7 c #212431", +"g7 c #252633", +"h7 c #19181F", +"i7 c #1C1C21", +"j7 c #1E1E23", +"k7 c #17161D", +"l7 c #1D1E29", +"m7 c #2C2C37", +"n7 c #343541", +"o7 c #323340", +"p7 c #282A34", +"q7 c #191C21", +"r7 c #17191D", +"s7 c #191A1F", +"t7 c #272B38", +"u7 c #2A2E3B", +"v7 c #444552", +"w7 c #595C67", +"x7 c #545861", +"y7 c #383942", +"z7 c #36353D", +"A7 c #44464F", +"B7 c #282932", +"C7 c #19171C", +"D7 c #1C1B1F", +"E7 c #1D1B1F", +"F7 c #2C292C", +"G7 c #443E3E", +"H7 c #484140", +"I7 c #49413E", +"J7 c #443E3A", +"K7 c #4F4944", +"L7 c #524D48", +"M7 c #58534F", +"N7 c #595650", +"O7 c #635F5A", +"P7 c #6D6862", +"Q7 c #6F6A65", +"R7 c #68645D", +"S7 c #645F57", +"T7 c #5C564E", +"U7 c #5B564D", +"V7 c #4B4440", +"W7 c #443C38", +"X7 c #3D3533", +"Y7 c #352B2B", +"Z7 c #312828", +"`7 c #292223", +" 8 c #252328", +".8 c #28272B", +"+8 c #1A191D", +"@8 c #1A1A1B", +"#8 c #332E2B", +"$8 c #352F2C", +"%8 c #37302E", +"&8 c #39322F", +"*8 c #393530", +"=8 c #3B3632", +"-8 c #3F3A38", +";8 c #403D3A", +">8 c #413E3B", +",8 c #494543", +"'8 c #4A4442", +")8 c #4B4643", +"!8 c #4A4542", +"~8 c #4C4943", +"{8 c #4D4A44", +"]8 c #4D4B46", +"^8 c #514F49", +"/8 c #565B5E", +"(8 c #5F6466", +"_8 c #616668", +":8 c #6C7071", +"<8 c #787A7B", +"[8 c #848384", +"}8 c #787877", +"|8 c #7B7B7B", +"18 c #797978", +"28 c #31373F", +"38 c #383B44", +"48 c #5C5C64", +"58 c #2E313A", +"68 c #2F323C", +"78 c #5E5F68", +"88 c #595A63", +"98 c #343842", +"08 c #2D323D", +"a8 c #2B303D", +"b8 c #222532", +"c8 c #1B1B20", +"d8 c #15141C", +"e8 c #1D1D26", +"f8 c #32323D", +"g8 c #2B2B38", +"h8 c #323240", +"i8 c #181A20", +"j8 c #17181D", +"k8 c #1F1F2A", +"l8 c #2C2D3B", +"m8 c #292D3A", +"n8 c #555863", +"o8 c #3A3940", +"p8 c #4A4A53", +"q8 c #3E4049", +"r8 c #1F1F26", +"s8 c #18171B", +"t8 c #1A181D", +"u8 c #24222C", +"v8 c #25232A", +"w8 c #1A1A1E", +"x8 c #343133", +"y8 c #494443", +"z8 c #484240", +"A8 c #4A4340", +"B8 c #423B38", +"C8 c #4E4944", +"D8 c #55504C", +"E8 c #585450", +"F8 c #5C5854", +"G8 c #615E59", +"H8 c #605C57", +"I8 c #625F59", +"J8 c #6C6761", +"K8 c #68635C", +"L8 c #666159", +"M8 c #656059", +"N8 c #5F5A52", +"O8 c #514A43", +"P8 c #413B38", +"Q8 c #2F2826", +"R8 c #292323", +"S8 c #18181A", +"T8 c #262529", +"U8 c #2B292F", +"V8 c #1F1F23", +"W8 c #242221", +"X8 c #3A3430", +"Y8 c #39342F", +"Z8 c #3A3631", +"`8 c #3C3833", +" 9 c #3C3733", +".9 c #3E3935", +"+9 c #403E3B", +"@9 c #413F3C", +"#9 c #44413E", +"$9 c #4D4946", +"%9 c #4D4945", +"&9 c #4C4844", +"*9 c #4D4944", +"=9 c #504D47", +"-9 c #524F4A", +";9 c #53504B", +">9 c #5C6264", +",9 c #5F6465", +"'9 c #626668", +")9 c #65696B", +"!9 c #6E7172", +"~9 c #727575", +"{9 c #787A79", +"]9 c #6E6F70", +"^9 c #3D4149", +"/9 c #3F414A", +"(9 c #5C5E64", +"_9 c #505058", +":9 c #393B46", +"<9 c #5F606A", +"[9 c #5D5D66", +"}9 c #5D5F67", +"|9 c #595C65", +"19 c #3B3F49", +"29 c #323742", +"39 c #202331", +"49 c #232431", +"59 c #1A1A1F", +"69 c #18171F", +"79 c #22222E", +"89 c #373743", +"99 c #2E2E3A", +"09 c #262632", +"a9 c #292B34", +"b9 c #191A21", +"c9 c #1D1C23", +"d9 c #1E1D28", +"e9 c #2E2F3D", +"f9 c #383B4A", +"g9 c #292E3C", +"h9 c #383A48", +"i9 c #525461", +"j9 c #393A43", +"k9 c #403E46", +"l9 c #43444B", +"m9 c #3A3C44", +"n9 c #26242E", +"o9 c #23222A", +"p9 c #16161A", +"q9 c #1F1E22", +"r9 c #383538", +"s9 c #4B4746", +"t9 c #453F3D", +"u9 c #4C4643", +"v9 c #47433E", +"w9 c #4A4641", +"x9 c #57534E", +"y9 c #5D5955", +"z9 c #625E5A", +"A9 c #69655E", +"B9 c #6A655D", +"C9 c #67635C", +"D9 c #676158", +"E9 c #645E55", +"F9 c #625C53", +"G9 c #59534A", +"H9 c #564F47", +"I9 c #524B44", +"J9 c #4A443E", +"K9 c #342E2D", +"L9 c #221D1E", +"M9 c #1A191C", +"N9 c #242328", +"O9 c #2E2C32", +"P9 c #212024", +"Q9 c #1B191B", +"R9 c #383230", +"S9 c #3F3936", +"T9 c #42403D", +"U9 c #4C4644", +"V9 c #524E49", +"W9 c #52504A", +"X9 c #53514C", +"Y9 c #64686A", +"Z9 c #6B6F71", +"`9 c #828182", +" 0 c #6F7071", +".0 c #5F6166", +"+0 c #43444D", +"@0 c #5E5E67", +"#0 c #44454D", +"$0 c #292B35", +"%0 c #61616A", +"&0 c #595961", +"*0 c #343844", +"=0 c #1E1D23", +"-0 c #22212B", +";0 c #31323E", +">0 c #2D2D3A", +",0 c #2F2F3A", +"'0 c #282833", +")0 c #2B2D39", +"!0 c #1C1D23", +"~0 c #222025", +"{0 c #1D1B23", +"]0 c #1F1D29", +"^0 c #2B2C3A", +"/0 c #343745", +"(0 c #292E3B", +"_0 c #313341", +":0 c #4A4D5A", +"<0 c #484C56", +"[0 c #3C3D46", +"}0 c #47474D", +"|0 c #393941", +"10 c #30313A", +"20 c #201F28", +"30 c #1F1E23", +"40 c #23222D", +"50 c #3F3C3E", +"60 c #4D4948", +"70 c #443F3D", +"80 c #453F3C", +"90 c #494340", +"00 c #4C4743", +"a0 c #534F4B", +"b0 c #5F5C58", +"c0 c #625E5B", +"d0 c #65615D", +"e0 c #64605B", +"f0 c #6B655D", +"g0 c #6A655E", +"h0 c #6A665E", +"i0 c #67625A", +"j0 c #676259", +"k0 c #605950", +"l0 c #60594F", +"m0 c #5D574D", +"n0 c #5C554A", +"o0 c #595349", +"p0 c #575048", +"q0 c #504942", +"r0 c #3F3834", +"s0 c #2A2322", +"t0 c #252021", +"u0 c #201C20", +"v0 c #17171A", +"w0 c #232228", +"x0 c #29272C", +"y0 c #26252A", +"z0 c #37312F", +"A0 c #3C3532", +"B0 c #3E3936", +"C0 c #454240", +"D0 c #4B4744", +"E0 c #4C4946", +"F0 c #4D4745", +"G0 c #4D4A47", +"H0 c #504C48", +"I0 c #514D48", +"J0 c #524F49", +"K0 c #53504A", +"L0 c #55524C", +"M0 c #636769", +"N0 c #626567", +"O0 c #686D6E", +"P0 c #737675", +"Q0 c #767877", +"R0 c #777978", +"S0 c #818181", +"T0 c #7C7D7C", +"U0 c #6E7070", +"V0 c #626367", +"W0 c #5E5F67", +"X0 c #282A35", +"Y0 c #4D4F59", +"Z0 c #62626B", +"`0 c #58585F", +" a c #5B5C64", +".a c #565860", +"+a c #343744", +"@a c #252734", +"#a c #212025", +"$a c #272734", +"%a c #2C2D39", +"&a c #292A36", +"*a c #2D2D38", +"=a c #23242F", +"-a c #16161C", +";a c #18171C", +">a c #1D1B22", +",a c #22202B", +"'a c #282836", +")a c #3A3B4A", +"!a c #444752", +"~a c #46444B", +"{a c #2E2F38", +"]a c #201F27", +"^a c #23212A", +"/a c #1E1C22", +"(a c #3E3A3D", +"_a c #4F4B4A", +":a c #433D3A", +"b c #63605B", +",b c #625B52", +"'b c #615A50", +")b c #5C5449", +"!b c #554C42", +"~b c #554D42", +"{b c #4F473C", +"]b c #4B423B", +"^b c #413834", +"/b c #362E2C", +"(b c #2E2525", +"_b c #262122", +":b c #1F1B1E", +"c c #232226", +",c c #3C3533", +"'c c #484641", +")c c #4A4642", +"!c c #4F4A47", +"~c c #504C49", +"{c c #54514B", +"]c c #6C6F70", +"^c c #737575", +"/c c #777977", +"(c c #53535B", +"_c c #2E303B", +":c c #4C4D59", +"d c #3C3F49", +",d c #52535B", +"'d c #3A3A45", +")d c #36353F", +"!d c #3A3A46", +"~d c #2E2E37", +"{d c #232225", +"]d c #221F27", +"^d c #1F1D27", +"/d c #292731", +"(d c #28262A", +"_d c #232026", +":d c #201D22", +"e c #19191A", +",e c #29272B", +"'e c #221F23", +")e c #201E21", +"!e c #1E1B1E", +"~e c #383231", +"{e c #393432", +"]e c #55514C", +"^e c #56534E", +"/e c #56534D", +"(e c #868686", +"_e c #616266", +":e c #242431", +"f c #383741", +",f c #35353B", +"'f c #373539", +")f c #2F2C32", +"!f c #211F26", +"~f c #28252F", +"{f c #1F1D24", +"]f c #201D20", +"^f c #231D1F", +"/f c #262020", +"(f c #2E2726", +"_f c #3D3531", +":f c #453D37", +"g c #AEADAE", +",g c #BCBBBC", +"'g c #D7D6D7", +")g c #9F9FA0", +"!g c #BABABA", +"~g c #929192", +"{g c #909090", +"]g c #9C9C9C", +"^g c #A9A9AA", +"/g c #8B8B8B", +"(g c #A8A8A8", +"_g c #A6A6A7", +":g c #898989", +"h c #1F2029", +",h c #282734", +"'h c #3A3B48", +")h c #27262E", +"!h c #232328", +"~h c #19171B", +"{h c #22222A", +"]h c #39383F", +"^h c #4A474C", +"/h c #585458", +"(h c #58565C", +"_h c #4E4F58", +":h c #31313F", +"i c #4E4E52", +",i c #9E9EA2", +"'i c #C7C5C7", +")i c #5C5A5F", +"!i c #2B2E3A", +"~i c #2F2F3C", +"{i c #ABA9AC", +"]i c #BDBCBE", +"^i c #6B6B6E", +"/i c #666568", +"(i c #5C5A60", +"_i c #59575D", +":i c #242229", +"j c #323139", +",j c #29282F", +"'j c #686668", +")j c #2D2423", +"!j c #352C28", +"~j c #3B322C", +"{j c #645E59", +"]j c #A6A3A4", +"^j c #8A898A", +"/j c #7E7C7D", +"(j c #7D7A7B", +"_j c #7A7876", +":j c #777470", +"k c #262021", +",k c #271F20", +"'k c #1F1C20", +")k c #252227", +"!k c #322E34", +"~k c #282529", +"{k c #232023", +"]k c #201D1F", +"^k c #211E1F", +"/k c #252324", +"(k c #292728", +"_k c #383536", +":k c #4C4745", +"l c #292B39", +",l c #2B2C3B", +"'l c #40414A", +")l c #CCCCCD", +"!l c #4F4E50", +"~l c #8A8685", +"{l c #4C4848", +"]l c #555459", +"^l c #444751", +"/l c #313540", +"(l c #C3C3C5", +"_l c #303138", +":l c #2F2F37", +"m c #26232D", +",m c #25232D", +"'m c #666566", +")m c #302623", +"!m c #3F342F", +"~m c #524641", +"{m c #A7A3A1", +"]m c #E2E1E1", +"^m c #7E7A7A", +"/m c #D3D2D1", +"(m c #CBC9C7", +"_m c #4A4541", +":m c #2F2D2B", +"n c #747474", +",n c #6B6C6E", +"'n c #44464D", +")n c #43444F", +"!n c #65676F", +"~n c #D3D4D6", +"{n c #CECFD2", +"]n c #86888E", +"^n c #434550", +"/n c #333441", +"(n c #262836", +"_n c #252736", +":n c #333644", +"o c #AAA6A7", +",o c #E1E0DF", +"'o c #76716B", +")o c #6A625C", +"!o c #4C423D", +"~o c #362C29", +"{o c #2E2728", +"]o c #2F2E2F", +"^o c #4D4947", +"/o c #5F5C5B", +"(o c #605E5C", +"_o c #62605E", +":o c #615F5D", +"p c #E1E1E0", +",p c #B4B2B0", +"'p c #716A65", +")p c #625855", +"!p c #493F3D", +"~p c #2B2424", +"{p c #312F31", +"]p c #5F5D5B", +"^p c #615E5C", +"/p c #64615F", +"(p c #656461", +"_p c #656462", +":p c #89898A", +"