Imported Upstream version 2.4.0~rc2
This commit is contained in:
Ari Pollak
101
configure
vendored
101
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for GIMP 2.4.0-rc1.
|
||||
# Generated by GNU Autoconf 2.61 for GIMP 2.4.0-rc2.
|
||||
#
|
||||
# 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.4.0-rc1'
|
||||
PACKAGE_STRING='GIMP 2.4.0-rc1'
|
||||
PACKAGE_VERSION='2.4.0-rc2'
|
||||
PACKAGE_STRING='GIMP 2.4.0-rc2'
|
||||
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
|
||||
|
||||
ac_unique_file="app/core/gimp.c"
|
||||
@ -1103,6 +1103,8 @@ 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
|
||||
@ -1688,7 +1690,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.4.0-rc1 to adapt to many kinds of systems.
|
||||
\`configure' configures GIMP 2.4.0-rc2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1762,7 +1764,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of GIMP 2.4.0-rc1:";;
|
||||
short | recursive ) echo "Configuration of GIMP 2.4.0-rc2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1968,7 +1970,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
GIMP configure 2.4.0-rc1
|
||||
GIMP configure 2.4.0-rc2
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1982,7 +1984,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.4.0-rc1, which was
|
||||
It was created by GIMP $as_me 2.4.0-rc2, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2655,7 +2657,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='gimp'
|
||||
VERSION='2.4.0-rc1'
|
||||
VERSION='2.4.0-rc2'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@ -2800,7 +2802,7 @@ GIMP_MINOR_VERSION=4
|
||||
GIMP_MICRO_VERSION=0
|
||||
GIMP_INTERFACE_AGE=0
|
||||
GIMP_BINARY_AGE=400
|
||||
GIMP_VERSION=2.4.0-rc1
|
||||
GIMP_VERSION=2.4.0-rc2
|
||||
GIMP_REAL_VERSION=2.4.0
|
||||
GIMP_API_VERSION=2.0
|
||||
GIMP_APP_VERSION=2.4
|
||||
@ -4791,7 +4793,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4794 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4796 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7824,11 +7826,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:7827: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7829: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7831: \$? = $ac_status" >&5
|
||||
echo "$as_me:7833: \$? = $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.
|
||||
@ -8114,11 +8116,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:8117: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8121: \$? = $ac_status" >&5
|
||||
echo "$as_me:8123: \$? = $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.
|
||||
@ -8218,11 +8220,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:8221: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8223: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8225: \$? = $ac_status" >&5
|
||||
echo "$as_me:8227: \$? = $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
|
||||
@ -10580,7 +10582,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10583 "configure"
|
||||
#line 10585 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10680,7 +10682,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10683 "configure"
|
||||
#line 10685 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13100,11 +13102,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:13103: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13105: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13107: \$? = $ac_status" >&5
|
||||
echo "$as_me:13109: \$? = $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.
|
||||
@ -13204,11 +13206,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:13207: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13209: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13211: \$? = $ac_status" >&5
|
||||
echo "$as_me:13213: \$? = $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
|
||||
@ -14781,11 +14783,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:14784: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14786: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14788: \$? = $ac_status" >&5
|
||||
echo "$as_me:14790: \$? = $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.
|
||||
@ -14885,11 +14887,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:14888: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14890: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14892: \$? = $ac_status" >&5
|
||||
echo "$as_me:14894: \$? = $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
|
||||
@ -17085,11 +17087,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:17088: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17090: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17092: \$? = $ac_status" >&5
|
||||
echo "$as_me:17094: \$? = $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.
|
||||
@ -17375,11 +17377,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:17378: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17380: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17382: \$? = $ac_status" >&5
|
||||
echo "$as_me:17384: \$? = $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.
|
||||
@ -17479,11 +17481,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:17482: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17484: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17486: \$? = $ac_status" >&5
|
||||
echo "$as_me:17488: \$? = $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
|
||||
@ -32875,9 +32877,13 @@ fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
have_libexif="no (libexif not found)"
|
||||
have_libexif="no (libexif not found or too old)"
|
||||
{ echo "$as_me:$LINENO: result: $have_libexif" >&5
|
||||
echo "${ECHO_T}$have_libexif" >&6; }
|
||||
elif test $pkg_failed = untried; then
|
||||
have_libexif="no (libexif not found)"
|
||||
have_libexif="no (libexif not found or too old)"
|
||||
{ echo "$as_me:$LINENO: result: $have_libexif" >&5
|
||||
echo "${ECHO_T}$have_libexif" >&6; }
|
||||
else
|
||||
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
|
||||
EXIF_LIBS=$pkg_cv_EXIF_LIBS
|
||||
@ -36203,6 +36209,16 @@ _ACEOF
|
||||
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
|
||||
##########################################################
|
||||
@ -36920,6 +36936,13 @@ 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
|
||||
@ -37290,7 +37313,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.4.0-rc1, which was
|
||||
This file was extended by GIMP $as_me 2.4.0-rc2, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -37343,7 +37366,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
GIMP config.status 2.4.0-rc1
|
||||
GIMP config.status 2.4.0-rc2
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
@ -37455,7 +37478,7 @@ INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
|
||||
gimp_major_ver=2
|
||||
gimp_minor_ver=4
|
||||
gimp_micro_ver=0
|
||||
gimp_ver=2.4.0-rc1
|
||||
gimp_ver=2.4.0-rc2
|
||||
gimp_api_ver=2.0
|
||||
|
||||
|
||||
@ -38134,6 +38157,8 @@ 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
|
||||
@ -38169,7 +38194,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` = 76; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
||||
Reference in New Issue
Block a user