Imported Upstream version 2.4.0~rc1
This commit is contained in:
Ari Pollak
371
configure
vendored
371
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.3.19.
|
||||
# Generated by GNU Autoconf 2.61 for GIMP 2.4.0-rc1.
|
||||
#
|
||||
# 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.3.19'
|
||||
PACKAGE_STRING='GIMP 2.3.19'
|
||||
PACKAGE_VERSION='2.4.0-rc1'
|
||||
PACKAGE_STRING='GIMP 2.4.0-rc1'
|
||||
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
|
||||
|
||||
ac_unique_file="app/core/gimp.c"
|
||||
@ -945,14 +945,11 @@ INTLTOOL_CAVES_RULE
|
||||
INTLTOOL_SCHEMAS_RULE
|
||||
INTLTOOL_THEME_RULE
|
||||
INTLTOOL_SERVICE_RULE
|
||||
INTLTOOL_POLICY_RULE
|
||||
INTLTOOL_EXTRACT
|
||||
INTLTOOL_MERGE
|
||||
INTLTOOL_UPDATE
|
||||
INTLTOOL_PERL
|
||||
INTLTOOL_ICONV
|
||||
INTLTOOL_MSGFMT
|
||||
INTLTOOL_MSGMERGE
|
||||
INTLTOOL_XGETTEXT
|
||||
ALL_LINGUAS
|
||||
DATADIRNAME
|
||||
USE_NLS
|
||||
@ -1691,7 +1688,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.3.19 to adapt to many kinds of systems.
|
||||
\`configure' configures GIMP 2.4.0-rc1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1765,7 +1762,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of GIMP 2.3.19:";;
|
||||
short | recursive ) echo "Configuration of GIMP 2.4.0-rc1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1799,7 +1796,7 @@ Optional Features:
|
||||
--disable-python do not build the python extension
|
||||
--enable-gtk-doc use gtk-doc to build documentation default=no
|
||||
--enable-gtk-doc-app build developer documentation for app (default=no)
|
||||
--enable-default-binary install this as the default gimp binary (default=no)
|
||||
--enable-default-binary install this as the default gimp binary (default=yes)
|
||||
--enable-gimp-console build a console-only binary which does not link GTK+
|
||||
|
||||
Optional Packages:
|
||||
@ -1836,7 +1833,7 @@ Optional Packages:
|
||||
--without-script-fu do not build the script-fu extension
|
||||
--with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)
|
||||
--with-html-dir=PATH path to installed docs
|
||||
--with-gimpdir=DIR change default gimpdir from .gimp-2.3 to DIR
|
||||
--with-gimpdir=DIR change default gimpdir from .gimp-2.4 to DIR
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
@ -1971,7 +1968,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
GIMP configure 2.3.19
|
||||
GIMP configure 2.4.0-rc1
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1985,7 +1982,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.3.19, which was
|
||||
It was created by GIMP $as_me 2.4.0-rc1, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2658,7 +2655,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='gimp'
|
||||
VERSION='2.3.19'
|
||||
VERSION='2.4.0-rc1'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@ -2799,21 +2796,21 @@ ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
|
||||
GIMP_MAJOR_VERSION=2
|
||||
GIMP_MINOR_VERSION=3
|
||||
GIMP_MICRO_VERSION=19
|
||||
GIMP_MINOR_VERSION=4
|
||||
GIMP_MICRO_VERSION=0
|
||||
GIMP_INTERFACE_AGE=0
|
||||
GIMP_BINARY_AGE=319
|
||||
GIMP_VERSION=2.3.19
|
||||
GIMP_REAL_VERSION=2.3.19
|
||||
GIMP_BINARY_AGE=400
|
||||
GIMP_VERSION=2.4.0-rc1
|
||||
GIMP_REAL_VERSION=2.4.0
|
||||
GIMP_API_VERSION=2.0
|
||||
GIMP_APP_VERSION=2.3
|
||||
GIMP_APP_VERSION=2.4
|
||||
GIMP_PLUGIN_VERSION=2.0
|
||||
GIMP_TOOL_VERSION=2.0
|
||||
GIMP_PKGCONFIG_VERSION=2.0
|
||||
GIMP_DATA_VERSION=2.0
|
||||
GIMP_SYSCONF_VERSION=2.0
|
||||
GIMP_USER_VERSION=2.3
|
||||
GIMP_UNSTABLE=yes
|
||||
GIMP_USER_VERSION=2.4
|
||||
GIMP_UNSTABLE=no
|
||||
GIMP_FULL_NAME="GNU Image Manipulation Program"
|
||||
|
||||
|
||||
@ -2857,7 +2854,7 @@ fi
|
||||
|
||||
|
||||
|
||||
LT_VERSION_INFO="319:0:319"
|
||||
LT_VERSION_INFO="400:0:400"
|
||||
LT_CURRENT_MINUS_AGE=0
|
||||
|
||||
|
||||
@ -4794,7 +4791,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4797 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4794 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7827,11 +7824,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:7830: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7827: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7834: \$? = $ac_status" >&5
|
||||
echo "$as_me:7831: \$? = $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.
|
||||
@ -8117,11 +8114,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:8120: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8117: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8124: \$? = $ac_status" >&5
|
||||
echo "$as_me:8121: \$? = $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.
|
||||
@ -8221,11 +8218,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:8224: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8221: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8228: \$? = $ac_status" >&5
|
||||
echo "$as_me:8225: \$? = $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
|
||||
@ -10583,7 +10580,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10586 "configure"
|
||||
#line 10583 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10683,7 +10680,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10686 "configure"
|
||||
#line 10683 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13103,11 +13100,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:13106: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13103: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13110: \$? = $ac_status" >&5
|
||||
echo "$as_me:13107: \$? = $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.
|
||||
@ -13207,11 +13204,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:13210: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13207: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13214: \$? = $ac_status" >&5
|
||||
echo "$as_me:13211: \$? = $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
|
||||
@ -14784,11 +14781,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:14787: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14784: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14791: \$? = $ac_status" >&5
|
||||
echo "$as_me:14788: \$? = $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.
|
||||
@ -14888,11 +14885,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:14891: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14888: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14895: \$? = $ac_status" >&5
|
||||
echo "$as_me:14892: \$? = $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
|
||||
@ -17088,11 +17085,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:17091: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17088: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17095: \$? = $ac_status" >&5
|
||||
echo "$as_me:17092: \$? = $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.
|
||||
@ -17378,11 +17375,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:17381: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17378: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17385: \$? = $ac_status" >&5
|
||||
echo "$as_me:17382: \$? = $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.
|
||||
@ -17482,11 +17479,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:17485: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17482: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17489: \$? = $ac_status" >&5
|
||||
echo "$as_me:17486: \$? = $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
|
||||
@ -23977,6 +23974,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
|
||||
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
||||
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
||||
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
||||
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
||||
|
||||
|
||||
|
||||
|
||||
@ -24068,171 +24067,6 @@ echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
# Extract the first word of "iconv", so it can be a program name with args.
|
||||
set dummy iconv; 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_ICONV+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $INTLTOOL_ICONV in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_INTLTOOL_ICONV="$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_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
|
||||
if test -n "$INTLTOOL_ICONV"; then
|
||||
{ echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
|
||||
echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# 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_INTLTOOL_MSGFMT+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $INTLTOOL_MSGFMT in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_INTLTOOL_MSGFMT="$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_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
|
||||
if test -n "$INTLTOOL_MSGFMT"; then
|
||||
{ echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
|
||||
echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "msgmerge", so it can be a program name with args.
|
||||
set dummy msgmerge; 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_MSGMERGE+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $INTLTOOL_MSGMERGE in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_INTLTOOL_MSGMERGE="$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_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
|
||||
if test -n "$INTLTOOL_MSGMERGE"; then
|
||||
{ echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
|
||||
echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&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_INTLTOOL_XGETTEXT+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $INTLTOOL_XGETTEXT in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_INTLTOOL_XGETTEXT="$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_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
|
||||
if test -n "$INTLTOOL_XGETTEXT"; then
|
||||
{ echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
|
||||
echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
||||
|
||||
|
||||
@ -31254,7 +31088,7 @@ fi
|
||||
# Some plug-ins are X11 specific
|
||||
################################
|
||||
|
||||
GIMP_COMMAND='gimp-2.3'
|
||||
GIMP_COMMAND='gimp-2.4'
|
||||
|
||||
gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
|
||||
if test "$gdk_target" = x11; then
|
||||
@ -31384,8 +31218,8 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
GIMP_REMOTE='gimp-remote-2.3$(EXEEXT)';
|
||||
GIMP_COMMAND='gimp-remote-2.3'
|
||||
GIMP_REMOTE='gimp-remote-2.4$(EXEEXT)';
|
||||
GIMP_COMMAND='gimp-remote-2.4'
|
||||
have_libxmu=yes
|
||||
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt"
|
||||
else
|
||||
@ -34956,7 +34790,65 @@ echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6; }
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_linux_input_h = yes; then
|
||||
{ echo "$as_me:$LINENO: checking whether KEY_OK is declared" >&5
|
||||
echo $ECHO_N "checking whether KEY_OK is declared... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_have_decl_KEY_OK+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <linux/input.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef KEY_OK
|
||||
(void) KEY_OK;
|
||||
#endif
|
||||
|
||||
;
|
||||
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); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_have_decl_KEY_OK=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl_KEY_OK=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_KEY_OK" >&5
|
||||
echo "${ECHO_T}$ac_cv_have_decl_KEY_OK" >&6; }
|
||||
if test $ac_cv_have_decl_KEY_OK = yes; then
|
||||
have_linux_input=yes
|
||||
else
|
||||
have_linux_input="no (needs Linux 2.6)"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@ -35374,7 +35266,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_DBUS_GLIB 1
|
||||
_ACEOF
|
||||
|
||||
GIMP_COMMAND='gimp-2.3'
|
||||
GIMP_COMMAND='gimp-2.4'
|
||||
fi
|
||||
|
||||
|
||||
@ -36602,7 +36494,7 @@ fi
|
||||
if test "${enable_default_binary+set}" = set; then
|
||||
enableval=$enable_default_binary;
|
||||
else
|
||||
enable_default_binary=no
|
||||
enable_default_binary=yes
|
||||
fi
|
||||
|
||||
|
||||
@ -36638,7 +36530,7 @@ fi
|
||||
|
||||
|
||||
|
||||
gimpdir=.gimp-2.3
|
||||
gimpdir=.gimp-2.4
|
||||
|
||||
# Check whether --with-gimpdir was given.
|
||||
if test "${with_gimpdir+set}" = set; then
|
||||
@ -36737,7 +36629,7 @@ ac_config_commands="$ac_config_commands libgimpbase/gimpversion.h"
|
||||
ac_config_files="$ac_config_files gimptool-win32.c tools/Makefile tools/pdbgen/Makefile regexrepl/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/base/Makefile app/config/Makefile app/core/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/paint-funcs/Makefile app/composite/Makefile app/pdb/Makefile app/plug-in/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile plug-ins/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/ftx/Makefile plug-ins/script-fu/re/Makefile plug-ins/script-fu/tinyscheme/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/xjt/Makefile plug-ins/FractalExplorer/Makefile plug-ins/FractalExplorer/examples/Makefile plug-ins/Lighting/Makefile plug-ins/Lighting/images/Makefile plug-ins/MapObject/Makefile plug-ins/bmp/Makefile plug-ins/common/Makefile plug-ins/faxg3/Makefile plug-ins/fits/Makefile plug-ins/flame/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/gflare/Makefile plug-ins/gflare/gflares/Makefile plug-ins/gfli/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/help/Makefile plug-ins/helpbrowser/Makefile plug-ins/ifscompose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/jpeg/Makefile plug-ins/maze/Makefile plug-ins/metadata/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/rcm/Makefile plug-ins/rcm/images/Makefile plug-ins/sel2path/Makefile plug-ins/sgi/Makefile plug-ins/twain/Makefile plug-ins/uri/Makefile plug-ins/winicon/Makefile plug-ins/winsnap/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version devel-docs/tools/Makefile docs/Makefile menus/Makefile cursors/Makefile themes/Makefile themes/Default/Makefile themes/Default/images/Makefile themes/Default/images/preferences/Makefile themes/Small/Makefile data/Makefile data/brushes/Makefile data/environ/Makefile data/gradients/Makefile data/images/Makefile data/interpreters/Makefile data/palettes/Makefile data/patterns/Makefile data/tips/Makefile desktop/Makefile desktop/gimp.applications desktop/gimp.desktop.in desktop/gimp.keys etc/Makefile m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-python/Makefile.in po-script-fu/Makefile.in po-tips/Makefile.in gimp-zip Makefile"
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files docs/gimp-2.3.1:docs/gimp.1.in docs/gimprc-2.3.5:docs/gimprc.5.in docs/gimptool-2.0.1:docs/gimptool.1.in docs/gimp-remote-2.3.1:docs/gimp-remote.1.in gimptool-2.0:gimptool-2.0.in gimp-2.0.pc:gimp.pc.in gimpthumb-2.0.pc:gimpthumb.pc.in gimpui-2.0.pc:gimpui.pc.in"
|
||||
ac_config_files="$ac_config_files docs/gimp-2.4.1:docs/gimp.1.in docs/gimprc-2.4.5:docs/gimprc.5.in docs/gimptool-2.0.1:docs/gimptool.1.in docs/gimp-remote-2.4.1:docs/gimp-remote.1.in gimptool-2.0:gimptool-2.0.in gimp-2.0.pc:gimp.pc.in gimpthumb-2.0.pc:gimpthumb.pc.in gimpui-2.0.pc:gimpui.pc.in"
|
||||
|
||||
|
||||
ac_config_commands="$ac_config_commands chmod-scripts"
|
||||
@ -37398,7 +37290,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.3.19, which was
|
||||
This file was extended by GIMP $as_me 2.4.0-rc1, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -37451,7 +37343,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
GIMP config.status 2.3.19
|
||||
GIMP config.status 2.4.0-rc1
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
@ -37557,15 +37449,13 @@ cat >>$CONFIG_STATUS <<_ACEOF
|
||||
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
||||
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
|
||||
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
|
||||
INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
|
||||
INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
|
||||
INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
|
||||
INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
|
||||
|
||||
|
||||
gimp_major_ver=2
|
||||
gimp_minor_ver=3
|
||||
gimp_micro_ver=19
|
||||
gimp_ver=2.3.19
|
||||
gimp_minor_ver=4
|
||||
gimp_micro_ver=0
|
||||
gimp_ver=2.4.0-rc1
|
||||
gimp_api_ver=2.0
|
||||
|
||||
|
||||
@ -37714,10 +37604,10 @@ do
|
||||
"po-tips/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-tips/Makefile.in" ;;
|
||||
"gimp-zip") CONFIG_FILES="$CONFIG_FILES gimp-zip" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"docs/gimp-2.3.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-2.3.1:docs/gimp.1.in" ;;
|
||||
"docs/gimprc-2.3.5") CONFIG_FILES="$CONFIG_FILES docs/gimprc-2.3.5:docs/gimprc.5.in" ;;
|
||||
"docs/gimp-2.4.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-2.4.1:docs/gimp.1.in" ;;
|
||||
"docs/gimprc-2.4.5") CONFIG_FILES="$CONFIG_FILES docs/gimprc-2.4.5:docs/gimprc.5.in" ;;
|
||||
"docs/gimptool-2.0.1") CONFIG_FILES="$CONFIG_FILES docs/gimptool-2.0.1:docs/gimptool.1.in" ;;
|
||||
"docs/gimp-remote-2.3.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-remote-2.3.1:docs/gimp-remote.1.in" ;;
|
||||
"docs/gimp-remote-2.4.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-remote-2.4.1:docs/gimp-remote.1.in" ;;
|
||||
"gimptool-2.0") CONFIG_FILES="$CONFIG_FILES gimptool-2.0:gimptool-2.0.in" ;;
|
||||
"gimp-2.0.pc") CONFIG_FILES="$CONFIG_FILES gimp-2.0.pc:gimp.pc.in" ;;
|
||||
"gimpthumb-2.0.pc") CONFIG_FILES="$CONFIG_FILES gimpthumb-2.0.pc:gimpthumb.pc.in" ;;
|
||||
@ -38004,14 +37894,11 @@ 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_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
|
||||
INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_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
|
||||
INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
|
||||
INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
|
||||
INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
|
||||
INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
|
||||
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
|
||||
DATADIRNAME!$DATADIRNAME$ac_delim
|
||||
USE_NLS!$USE_NLS$ac_delim
|
||||
@ -38022,6 +37909,9 @@ XGETTEXT!$XGETTEXT$ac_delim
|
||||
CATALOGS!$CATALOGS$ac_delim
|
||||
CATOBJEXT!$CATOBJEXT$ac_delim
|
||||
GMOFILES!$GMOFILES$ac_delim
|
||||
INSTOBJEXT!$INSTOBJEXT$ac_delim
|
||||
INTLLIBS!$INTLLIBS$ac_delim
|
||||
PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -38063,9 +37953,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
INSTOBJEXT!$INSTOBJEXT$ac_delim
|
||||
INTLLIBS!$INTLLIBS$ac_delim
|
||||
PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
|
||||
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
|
||||
POFILES!$POFILES$ac_delim
|
||||
POSUB!$POSUB$ac_delim
|
||||
@ -38160,6 +38047,9 @@ HAVE_LIBCURL_FALSE!$HAVE_LIBCURL_FALSE$ac_delim
|
||||
WMF_CONFIG!$WMF_CONFIG$ac_delim
|
||||
LIBWMF!$LIBWMF$ac_delim
|
||||
WMF_CFLAGS!$WMF_CFLAGS$ac_delim
|
||||
WMF!$WMF$ac_delim
|
||||
LCMS!$LCMS$ac_delim
|
||||
LIBLCMS!$LIBLCMS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -38201,9 +38091,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
WMF!$WMF$ac_delim
|
||||
LCMS!$LCMS$ac_delim
|
||||
LIBLCMS!$LIBLCMS$ac_delim
|
||||
HAVE_LCMS_TRUE!$HAVE_LCMS_TRUE$ac_delim
|
||||
HAVE_LCMS_FALSE!$HAVE_LCMS_FALSE$ac_delim
|
||||
ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
|
||||
@ -38282,7 +38169,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` = 79; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
@ -38846,10 +38733,6 @@ done
|
||||
for file in intltool-extract intltool-merge intltool-update; do
|
||||
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
|
||||
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
|
||||
-e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
|
||||
-e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
|
||||
-e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
|
||||
-e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
|
||||
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
|
||||
< ${ac_aux_dir}/${file}.in > ${file}.out
|
||||
if cmp -s ${file} ${file}.out 2>/dev/null; then
|
||||
|
||||
Reference in New Issue
Block a user