Imported Upstream version 2.6.5

This commit is contained in:
Ari Pollak
2010-08-11 01:26:51 -04:00
parent 3cf24830db
commit 642a129e54
76 changed files with 29631 additions and 34613 deletions

48
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.4.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>.
#
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GIMP'
PACKAGE_TARNAME='gimp'
PACKAGE_VERSION='2.6.4'
PACKAGE_STRING='GIMP 2.6.4'
PACKAGE_VERSION='2.6.5'
PACKAGE_STRING='GIMP 2.6.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
ac_unique_file="app/core/gimp.c"
@ -1708,7 +1708,7 @@ 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 GIMP 2.6.4 to adapt to many kinds of systems.
\`configure' configures GIMP 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1782,7 +1782,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GIMP 2.6.4:";;
short | recursive ) echo "Configuration of GIMP 2.6.5:";;
esac
cat <<\_ACEOF
@ -2001,7 +2001,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GIMP configure 2.6.4
GIMP configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -2015,7 +2015,7 @@ 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 GIMP $as_me 2.6.4, which was
It was created by GIMP $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2708,7 +2708,7 @@ fi
# Define the identity of the package.
PACKAGE='gimp'
VERSION='2.6.4'
VERSION='2.6.5'
# Some tools Automake needs.
@ -2850,11 +2850,11 @@ ac_config_headers="$ac_config_headers config.h"
GIMP_MAJOR_VERSION=2
GIMP_MINOR_VERSION=6
GIMP_MICRO_VERSION=4
GIMP_INTERFACE_AGE=4
GIMP_BINARY_AGE=604
GIMP_VERSION=2.6.4
GIMP_REAL_VERSION=2.6.4
GIMP_MICRO_VERSION=5
GIMP_INTERFACE_AGE=5
GIMP_BINARY_AGE=605
GIMP_VERSION=2.6.5
GIMP_REAL_VERSION=2.6.5
GIMP_API_VERSION=2.0
GIMP_APP_VERSION=2.6
GIMP_PLUGIN_VERSION=2.0
@ -2914,7 +2914,7 @@ fi
LT_VERSION_INFO="600:4:600"
LT_VERSION_INFO="600:5:600"
LT_CURRENT_MINUS_AGE=0
@ -23756,19 +23756,19 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
;;
esac
if test -n "0.35.5"; then
{ echo "$as_me:$LINENO: checking for intltool >= 0.35.5" >&5
echo $ECHO_N "checking for intltool >= 0.35.5... $ECHO_C" >&6; }
if test -n "0.36.3"; then
{ echo "$as_me:$LINENO: checking for intltool >= 0.36.3" >&5
echo $ECHO_N "checking for intltool >= 0.36.3... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.5 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.36.3 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
{ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.5 or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool 0.35.5 or later." >&2;}
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.36.3 or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool 0.36.3 or later." >&2;}
{ (exit 1); exit 1; }; }
fi
@ -37596,7 +37596,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by GIMP $as_me 2.6.4, which was
This file was extended by GIMP $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -37649,7 +37649,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
GIMP config.status 2.6.4
GIMP config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -37758,8 +37758,8 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
gimp_major_ver=2
gimp_minor_ver=6
gimp_micro_ver=4
gimp_ver=2.6.4
gimp_micro_ver=5
gimp_ver=2.6.5
gimp_api_ver=2.0