Imported Upstream version 2.6.2

This commit is contained in:
Ari Pollak
2010-08-11 01:26:11 -04:00
parent 0e546c590e
commit 96563501af
387 changed files with 51234 additions and 64985 deletions

194
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.1.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.2.
#
# 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.1'
PACKAGE_STRING='GIMP 2.6.1'
PACKAGE_VERSION='2.6.2'
PACKAGE_STRING='GIMP 2.6.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
ac_unique_file="app/core/gimp.c"
@ -1112,9 +1112,6 @@ MAIL
SCREENSHOT
HAVE_MAC_TWAIN_TRUE
HAVE_MAC_TWAIN_FALSE
CARBON_LDFLAGS
HAVE_CARBON_TRUE
HAVE_CARBON_FALSE
DESKTOP_DATADIR_TRUE
DESKTOP_DATADIR_FALSE
DESKTOP_DATADIR
@ -1711,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.1 to adapt to many kinds of systems.
\`configure' configures GIMP 2.6.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1785,7 +1782,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GIMP 2.6.1:";;
short | recursive ) echo "Configuration of GIMP 2.6.2:";;
esac
cat <<\_ACEOF
@ -2003,7 +2000,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GIMP configure 2.6.1
GIMP configure 2.6.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -2017,7 +2014,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.1, which was
It was created by GIMP $as_me 2.6.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2710,7 +2707,7 @@ fi
# Define the identity of the package.
PACKAGE='gimp'
VERSION='2.6.1'
VERSION='2.6.2'
# Some tools Automake needs.
@ -2852,11 +2849,11 @@ ac_config_headers="$ac_config_headers config.h"
GIMP_MAJOR_VERSION=2
GIMP_MINOR_VERSION=6
GIMP_MICRO_VERSION=1
GIMP_INTERFACE_AGE=1
GIMP_BINARY_AGE=601
GIMP_VERSION=2.6.1
GIMP_REAL_VERSION=2.6.1
GIMP_MICRO_VERSION=2
GIMP_INTERFACE_AGE=2
GIMP_BINARY_AGE=602
GIMP_VERSION=2.6.2
GIMP_REAL_VERSION=2.6.2
GIMP_API_VERSION=2.0
GIMP_APP_VERSION=2.6
GIMP_PLUGIN_VERSION=2.0
@ -2916,7 +2913,7 @@ fi
LT_VERSION_INFO="600:1:600"
LT_VERSION_INFO="600:2:600"
LT_CURRENT_MINUS_AGE=0
@ -4960,7 +4957,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4963 "configure"' > conftest.$ac_ext
echo '#line 4960 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -8307,11 +8304,11 @@ else
-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:8310: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8307: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8314: \$? = $ac_status" >&5
echo "$as_me:8311: \$? = $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.
@ -8597,11 +8594,11 @@ else
-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:8600: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8597: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8604: \$? = $ac_status" >&5
echo "$as_me:8601: \$? = $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.
@ -8701,11 +8698,11 @@ else
-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:8704: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:8708: \$? = $ac_status" >&5
echo "$as_me:8705: \$? = $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
@ -11078,7 +11075,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11081 "configure"
#line 11078 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11178,7 +11175,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11181 "configure"
#line 11178 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13579,11 +13576,11 @@ else
-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:13582: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13586: \$? = $ac_status" >&5
echo "$as_me:13583: \$? = $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.
@ -13683,11 +13680,11 @@ else
-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:13686: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13683: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:13690: \$? = $ac_status" >&5
echo "$as_me:13687: \$? = $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
@ -15281,11 +15278,11 @@ else
-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:15284: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15281: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15288: \$? = $ac_status" >&5
echo "$as_me:15285: \$? = $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.
@ -15385,11 +15382,11 @@ else
-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:15388: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15385: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15392: \$? = $ac_status" >&5
echo "$as_me:15389: \$? = $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
@ -17605,11 +17602,11 @@ else
-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:17608: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17605: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17612: \$? = $ac_status" >&5
echo "$as_me:17609: \$? = $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.
@ -17895,11 +17892,11 @@ else
-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:17898: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17895: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17902: \$? = $ac_status" >&5
echo "$as_me:17899: \$? = $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.
@ -17999,11 +17996,11 @@ else
-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:18002: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17999: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18006: \$? = $ac_status" >&5
echo "$as_me:18003: \$? = $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
@ -36382,13 +36379,36 @@ fi
############################################################
# Check for Mac OS X TWAIN framework (can't build on Darwin)
############################################################
####################
# Check for Mac OS X
####################
{ echo "$as_me:$LINENO: checking if compiling for Mac OS X" >&5
echo $ECHO_N "checking if compiling for Mac OS X... $ECHO_C" >&6; }
case "$target_or_host" in
*-*-darwin*)
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define PLATFORM_OSX 1
_ACEOF
;;
*)
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
;;
esac
####################################
# Check for Mac OS X TWAIN framework
####################################
mac_twain_ok=no
{ echo "$as_me:$LINENO: checking checking for Mac OS X TWAIN support" >&5
echo $ECHO_N "checking checking for Mac OS X TWAIN support... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking for Mac OS X TWAIN support" >&5
echo $ECHO_N "checking for Mac OS X TWAIN support... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@ -36437,70 +36457,6 @@ fi
#############################################################
# Check for Mac OS X Carbon framework (can't build on Darwin)
#############################################################
carbon_ok=no
{ echo "$as_me:$LINENO: checking checking for Mac OS X Carbon support" >&5
echo $ECHO_N "checking checking for Mac OS X Carbon support... $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 <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
_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
carbon_ok=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $carbon_ok" >&5
echo "${ECHO_T}$carbon_ok" >&6; }
if test "x$carbon_ok" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_CARBON 1
_ACEOF
CARBON_LDFLAGS="-framework Carbon"
fi
if test "x$carbon_ok" = "xyes"; then
HAVE_CARBON_TRUE=
HAVE_CARBON_FALSE='#'
else
HAVE_CARBON_TRUE='#'
HAVE_CARBON_FALSE=
fi
##########################################################
# Determine where to install the desktop & mime info files
##########################################################
@ -37213,13 +37169,6 @@ echo "$as_me: error: conditional \"HAVE_MAC_TWAIN\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_CARBON_TRUE}" && test -z "${HAVE_CARBON_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_CARBON\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"HAVE_CARBON\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${DESKTOP_DATADIR_TRUE}" && test -z "${DESKTOP_DATADIR_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DESKTOP_DATADIR\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@ -37590,7 +37539,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.1, which was
This file was extended by GIMP $as_me 2.6.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -37643,7 +37592,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
GIMP config.status 2.6.1
GIMP config.status 2.6.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -37752,8 +37701,8 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
gimp_major_ver=2
gimp_minor_ver=6
gimp_micro_ver=1
gimp_ver=2.6.1
gimp_micro_ver=2
gimp_ver=2.6.2
gimp_api_ver=2.0
@ -38435,9 +38384,6 @@ MAIL!$MAIL$ac_delim
SCREENSHOT!$SCREENSHOT$ac_delim
HAVE_MAC_TWAIN_TRUE!$HAVE_MAC_TWAIN_TRUE$ac_delim
HAVE_MAC_TWAIN_FALSE!$HAVE_MAC_TWAIN_FALSE$ac_delim
CARBON_LDFLAGS!$CARBON_LDFLAGS$ac_delim
HAVE_CARBON_TRUE!$HAVE_CARBON_TRUE$ac_delim
HAVE_CARBON_FALSE!$HAVE_CARBON_FALSE$ac_delim
DESKTOP_DATADIR_TRUE!$DESKTOP_DATADIR_TRUE$ac_delim
DESKTOP_DATADIR_FALSE!$DESKTOP_DATADIR_FALSE$ac_delim
DESKTOP_DATADIR!$DESKTOP_DATADIR$ac_delim
@ -38474,7 +38420,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5