~mterry/ubuntu/natty/gnome-shell/wip : revision 9

1

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/aclocal.m4 gnome-shell-2.27.3.new/aclocal.m4

2

--- gnome-shell-2.27.3/aclocal.m4 2009-09-16 00:03:56.000000000 +0200

3

+++ gnome-shell-2.27.3.new/aclocal.m4 2009-09-30 23:16:45.000000000 +0200

1

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/aclocal.m4 gnome-shell-2.28.0.new/aclocal.m4

2

--- gnome-shell-2.28.0/aclocal.m4 2009-10-08 00:50:01.000000000 +0200

3

+++ gnome-shell-2.28.0.new/aclocal.m4 2009-10-12 22:59:32.000000000 +0200

4

@@ -13,8 +13,8 @@

5

6

m4_ifndef([AC_AUTOCONF_VERSION],

147

fi

148

# Put the nasty error message in config.log where it belongs

149

echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

150

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/config.h.in gnome-shell-2.27.3.new/config.h.in

151

--- gnome-shell-2.27.3/config.h.in 2009-09-16 00:04:18.000000000 +0200

152

+++ gnome-shell-2.27.3.new/config.h.in 2009-09-30 23:16:49.000000000 +0200

150

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/config.h.in gnome-shell-2.28.0.new/config.h.in

151

--- gnome-shell-2.28.0/config.h.in 2009-10-08 00:50:31.000000000 +0200

152

+++ gnome-shell-2.28.0.new/config.h.in 2009-10-12 22:59:32.000000000 +0200

153

@@ -79,6 +79,9 @@

154

/* Define to the one symbol short name of this package. */

155

#undef PACKAGE_TARNAME

160

/* Define to the version of this package. */

161

#undef PACKAGE_VERSION

162

163

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/configure gnome-shell-2.27.3.new/configure

164

--- gnome-shell-2.27.3/configure 2009-09-16 00:04:02.000000000 +0200

165

+++ gnome-shell-2.27.3.new/configure 2009-09-30 23:16:48.000000000 +0200

163

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/configure gnome-shell-2.28.0.new/configure

164

--- gnome-shell-2.28.0/configure 2009-10-08 00:50:07.000000000 +0200

165

+++ gnome-shell-2.28.0.new/configure 2009-10-12 22:59:40.000000000 +0200

166

@@ -1,18 +1,20 @@

167

#! /bin/sh

168

# Guess values for system-dependent variables and create Makefiles.

169

-# Generated by GNU Autoconf 2.63 for gnome-shell 2.27.3.

170

+# Generated by GNU Autoconf 2.64 for gnome-shell 2.27.3.

169

-# Generated by GNU Autoconf 2.63 for gnome-shell 2.28.0.

170

+# Generated by GNU Autoconf 2.64 for gnome-shell 2.28.0.

171

#

172

173

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

667

+# Create "$as_dir" as a directory, including parents if necessary.

668

+as_fn_mkdir_p ()

669

+{

670

+

671

+ case $as_dir in #(

672

+ -*) as_dir=./$as_dir;;

673

+ esac

707

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

708

+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

709

710

711

-(eval "as_func_return () {

711

712

- (exit \$1)

712

713

-}

722

723

-as_func_ret_failure () {

723

724

- return 1

724

725

-}

725

726

-exitcode=0

727

-if as_func_success; then

728

- :

729

726

+} # as_fn_mkdir_p

730

727

+# as_fn_append VAR VALUE

731

728

+# ----------------------

738

735

+ {

739

736

+ eval $1+=\$2

740

737

+ }'

741

else

742

- exitcode=1

743

- echo as_func_success failed.

744

-fi

738

+else

745

739

+ as_fn_append ()

746

740

+ {

747

741

+ eval $1=\$$1\$2

748

742

+ }

749

743

+fi # as_fn_append

750

744

751

-if as_func_failure; then

752

- exitcode=1

753

- echo as_func_failure succeeded.

754

-fi

745

-exitcode=0

746

-if as_func_success; then

747

- :

755

748

+# as_fn_arith ARG...

756

749

+# ------------------

757

750

+# Perform arithmetic evaluation on the ARGs, and store the result in the

762

755

+ {

763

756

+ as_val=$(( $* ))

764

757

+ }'

765

+else

758

else

759

- exitcode=1

760

- echo as_func_success failed.

761

-fi

766

762

+ as_fn_arith ()

767

763

+ {

768

764

+ as_val=`expr "$@" || test $? -eq 1`

769

765

+ }

770

766

+fi # as_fn_arith

771

767

768

-if as_func_failure; then

769

- exitcode=1

770

- echo as_func_failure succeeded.

771

-fi

772

773

-if as_func_ret_success; then

773

774

- :

774

+

775

+# as_fn_error ERROR [LINENO LOG_FD]

776

+# ---------------------------------

777

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

957

# Identity of this package.

958

PACKAGE_NAME='gnome-shell'

959

@@ -746,6 +698,7 @@

960

PACKAGE_VERSION='2.27.3'

961

PACKAGE_STRING='gnome-shell 2.27.3'

960

PACKAGE_VERSION='2.28.0'

961

PACKAGE_STRING='gnome-shell 2.28.0'

962

PACKAGE_BUGREPORT=''

963

+PACKAGE_URL=''

964

965

# Factoring default headers for most tests.

966

ac_includes_default="\

967

@@ -976,6 +929,7 @@

967

@@ -978,6 +931,7 @@

968

program_transform_name

969

prefix

970

exec_prefix

972

PACKAGE_BUGREPORT

973

PACKAGE_STRING

974

PACKAGE_VERSION

975

@@ -1132,8 +1086,7 @@

975

@@ -1136,8 +1090,7 @@

976

ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

977

# Reject names that are not valid shell variable names.

978

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

982

ac_useropt_orig=$ac_useropt

983

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

984

case $ac_user_opts in

985

@@ -1159,8 +1112,7 @@

985

@@ -1163,8 +1116,7 @@

986

ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

987

# Reject names that are not valid shell variable names.

988

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

992

ac_useropt_orig=$ac_useropt

993

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

994

case $ac_user_opts in

995

@@ -1364,8 +1316,7 @@

995

@@ -1368,8 +1320,7 @@

996

ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

997

# Reject names that are not valid shell variable names.

998

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1002

ac_useropt_orig=$ac_useropt

1003

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1004

case $ac_user_opts in

1005

@@ -1381,8 +1332,7 @@

1005

@@ -1385,8 +1336,7 @@

1006

ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

1007

# Reject names that are not valid shell variable names.

1008

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1012

ac_useropt_orig=$ac_useropt

1013

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1014

case $ac_user_opts in

1015

@@ -1412,17 +1362,17 @@

1015

@@ -1416,17 +1366,17 @@

1016

1017

x_libraries=$ac_optarg ;;

1018

1036

eval $ac_envvar=\$ac_optarg

1037

export $ac_envvar ;;

1038

1039

@@ -1439,15 +1389,13 @@

1039

@@ -1443,15 +1393,13 @@

1040

1041

if test -n "$ac_prev"; then

1042

ac_option=--`echo $ac_prev | sed 's/_/-/g'`

1054

*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

1055

esac

1056

fi

1057

@@ -1470,8 +1418,7 @@

1057

@@ -1474,8 +1422,7 @@

1058

[\\/$]* | ?:[\\/]* ) continue;;

1059

NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

1060

esac

1064

done

1065

1066

# There might be people who depend on the old broken behavior: `$host'

1067

@@ -1501,11 +1448,9 @@

1067

@@ -1505,11 +1452,9 @@

1068

ac_pwd=`pwd` && test -n "$ac_pwd" &&

1069

ac_ls_di=`ls -di .` &&

1070

ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

1078

1079

1080

# Find the source files, if location was not specified.

1081

@@ -1544,13 +1489,11 @@

1081

@@ -1548,13 +1493,11 @@

1082

fi

1083

if test ! -r "$srcdir/$ac_unique_file"; then

1084

test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

1094

pwd)`

1095

# When building in place, set srcdir=.

1096

if test "$ac_abs_confdir" = "$ac_pwd"; then

1097

@@ -1715,84 +1658,436 @@

1097

@@ -1721,84 +1664,436 @@

1098

Use these variables to override the choices made by `configure' or to help

1099

it to find libraries and programs with nonstandard names/locations.

1100

1161

+test -n "$ac_init_help" && exit $ac_status

1162

+if $ac_init_version; then

1163

+ cat <<\_ACEOF

1164

+gnome-shell configure 2.27.3

1164

+gnome-shell configure 2.28.0

1165

+generated by GNU Autoconf 2.64

1166

+

1167

1527

-test -n "$ac_init_help" && exit $ac_status

1528

-if $ac_init_version; then

1529

- cat <<\_ACEOF

1530

-gnome-shell configure 2.27.3

1530

-gnome-shell configure 2.28.0

1531

-generated by GNU Autoconf 2.63

1532

-

1533

1546

+ ac_header_preproc=yes

1547

+else

1548

+ ac_header_preproc=no

1549

+fi

1549

fi

1550

+rm -f conftest.err conftest.$ac_ext

1551

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

1552

+$as_echo "$ac_header_preproc" >&6; }

1582

+eval ac_res=\$$3

1583

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1584

+$as_echo "$ac_res" >&6; }

1585

fi

1585

+fi

1586

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1587

+

1588

+} # ac_fn_c_check_header_mongrel

1590

This file contains any messages produced by compilers while

1591

running configure, to aid debugging if configure makes a mistake.

1592

1593

It was created by gnome-shell $as_me 2.27.3, which was

1593

It was created by gnome-shell $as_me 2.28.0, which was

1594

-generated by GNU Autoconf 2.63. Invocation command line was

1595

+generated by GNU Autoconf 2.64. Invocation command line was

1596

1597

$ $0 $@

1598

1599

@@ -1828,8 +2123,8 @@

1599

@@ -1834,8 +2129,8 @@

1600

do

1601

IFS=$as_save_IFS

1602

test -z "$as_dir" && as_dir=.

1607

IFS=$as_save_IFS

1608

1609

} >&5

1610

@@ -1866,9 +2161,9 @@

1610

@@ -1872,9 +2167,9 @@

1611

ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

1612

esac

1613

case $ac_pass in

1619

if test $ac_must_keep_next = true; then

1620

ac_must_keep_next=false # Got value, back to normal.

1621

else

1622

@@ -1884,13 +2179,13 @@

1622

@@ -1890,13 +2185,13 @@

1623

-* ) ac_must_keep_next=true ;;

1624

esac

1625

fi

1636

1637

# When interrupted or exit'd, cleanup temporary files, and complete

1638

# config.log. We remove comments because anyway the quotes in there

1639

@@ -1915,13 +2210,13 @@

1639

@@ -1921,13 +2216,13 @@

1640

case $ac_val in #(

1641

*${as_nl}*)

1642

case $ac_var in #(

1652

esac ;;

1653

esac

1654

done

1655

@@ -1993,39 +2288,41 @@

1655

@@ -1999,39 +2294,41 @@

1656

exit $exit_status

1657

' 0

1658

for ac_signal in 1 2 13 15; do

1699

1700

# Let the site file select an alternate cache file if it wants to.

1701

# Prefer an explicitly selected file to automatically selected ones.

1702

@@ -2044,7 +2341,7 @@

1702

@@ -2050,7 +2347,7 @@

1703

do

1704

test "x$ac_site_file" = xNONE && continue

1705

if test -r "$ac_site_file"; then

1708

$as_echo "$as_me: loading site script $ac_site_file" >&6;}

1709

sed 's/^/| /' "$ac_site_file" >&5

1710

. "$ac_site_file"

1711

@@ -2055,7 +2352,7 @@

1711

@@ -2061,7 +2358,7 @@

1712

# Some versions of bash will fail to source /dev/null (special

1713

# files actually), so we avoid doing that.

1714

if test -f "$cache_file"; then

1717

$as_echo "$as_me: loading cache $cache_file" >&6;}

1718

case $cache_file in

1719

[\\/]* | ?:[\\/]* ) . "$cache_file";;

1720

@@ -2063,7 +2360,7 @@

1720

@@ -2069,7 +2366,7 @@

1721

esac

1722

fi

1723

else

1726

$as_echo "$as_me: creating cache $cache_file" >&6;}

1727

>$cache_file

1728

fi

1729

@@ -2078,11 +2375,11 @@

1729

@@ -2084,11 +2381,11 @@

1730

eval ac_new_val=\$ac_env_${ac_var}_value

1731

case $ac_old_set,$ac_new_set in

1732

set,)

1740

$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

1741

ac_cache_corrupted=: ;;

1742

,);;

1743

@@ -2092,17 +2389,17 @@

1743

@@ -2098,17 +2395,17 @@

1744

ac_old_val_w=`echo x $ac_old_val`

1745

ac_new_val_w=`echo x $ac_new_val`

1746

if test "$ac_old_val_w" != "$ac_new_val_w"; then

1762

$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

1763

fi;;

1764

esac

1765

@@ -2114,43 +2411,20 @@

1765

@@ -2120,43 +2417,20 @@

1766

esac

1767

case " $ac_configure_args " in

1768

*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

1813

1814

ac_ext=c

1815

ac_cpp='$CPP $CPPFLAGS'

1816

@@ -2162,24 +2436,16 @@

1816

@@ -2168,24 +2442,16 @@

1817

1818

ac_aux_dir=

1819

for ac_dir in config "$srcdir"/config; do

1846

fi

1847

1848

# These three variables are undocumented and unsupported,

1849

@@ -2208,10 +2474,10 @@

1849

@@ -2214,10 +2480,10 @@

1850

# OS/2's system install, which has a completely different semantic

1851

# ./install, which can be erroneously created by make from ./install.sh.

1852

# Reject install programs that cannot install multiple files.

1859

$as_echo_n "(cached) " >&6

1860

else

1861

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1862

@@ -2219,11 +2485,11 @@

1862

@@ -2225,11 +2491,11 @@

1863

do

1864

IFS=$as_save_IFS

1865

test -z "$as_dir" && as_dir=.

1875

/usr/ucb/* ) ;;

1876

*)

1877

# OSF1 and SCO ODT 3.0 have their own names for install.

1878

@@ -2260,7 +2526,7 @@

1878

@@ -2266,7 +2532,7 @@

1879

;;

1880

esac

1881

1884

IFS=$as_save_IFS

1885

1886

rm -rf conftest.one conftest.two conftest.dir

1887

@@ -2276,7 +2542,7 @@

1887

@@ -2282,7 +2548,7 @@

1888

INSTALL=$ac_install_sh

1889

fi

1890

fi

1893

$as_echo "$INSTALL" >&6; }

1894

1895

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

1896

@@ -2287,7 +2553,7 @@

1896

@@ -2293,7 +2559,7 @@

1897

1898

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

1899

1902

$as_echo_n "checking whether build environment is sane... " >&6; }

1903

# Just in case

1904

sleep 1

1905

@@ -2298,15 +2564,11 @@

1905

@@ -2304,15 +2570,11 @@

1906

'

1907

case `pwd` in

1908

*[\\\"\#\$\&\'\`$am_lf]*)

1920

esac

1921

1922

# Do `set' in a subshell so we don't clobber the current shell's

1923

@@ -2328,11 +2590,8 @@

1923

@@ -2334,11 +2596,8 @@

1924

# if, for instance, CONFIG_SHELL is bash and it inherits a

1925

# broken ls alias from the environment. This has actually

1926

# happened. Such a system could not be considered "sane".

1934

fi

1935

1936

test "$2" = conftest.file

1937

@@ -2341,13 +2600,10 @@

1937

@@ -2347,13 +2606,10 @@

1938

# Ok.

1939

:

1940

else

1951

$as_echo "yes" >&6; }

1952

test "$program_prefix" != NONE &&

1953

program_transform_name="s&^&$program_prefix&;$program_transform_name"

1954

@@ -2375,7 +2631,7 @@

1954

@@ -2381,7 +2637,7 @@

1955

am_missing_run="$MISSING --run "

1956

else

1957

am_missing_run=

1960

$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

1961

fi

1962

1963

@@ -2396,9 +2652,9 @@

1963

@@ -2402,9 +2658,9 @@

1964

if test -n "$ac_tool_prefix"; then

1965

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

1966

set dummy ${ac_tool_prefix}strip; ac_word=$2

1972

$as_echo_n "(cached) " >&6

1973

else

1974

if test -n "$STRIP"; then

1975

@@ -2409,24 +2665,24 @@

1975

@@ -2415,24 +2671,24 @@

1976

do

1977

IFS=$as_save_IFS

1978

test -z "$as_dir" && as_dir=.

2002

$as_echo "no" >&6; }

2003

fi

2004

2005

@@ -2436,9 +2692,9 @@

2005

@@ -2442,9 +2698,9 @@

2006

ac_ct_STRIP=$STRIP

2007

# Extract the first word of "strip", so it can be a program name with args.

2008

set dummy strip; ac_word=$2

2014

$as_echo_n "(cached) " >&6

2015

else

2016

if test -n "$ac_ct_STRIP"; then

2017

@@ -2449,24 +2705,24 @@

2017

@@ -2455,24 +2711,24 @@

2018

do

2019

IFS=$as_save_IFS

2020

test -z "$as_dir" && as_dir=.

2044

$as_echo "no" >&6; }

2045

fi

2046

2047

@@ -2475,7 +2731,7 @@

2047

@@ -2481,7 +2737,7 @@

2048

else

2049

case $cross_compiling:$ac_tool_warned in

2050

yes:)

2053

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2054

ac_tool_warned=yes ;;

2055

esac

2056

@@ -2488,10 +2744,10 @@

2056

@@ -2494,10 +2750,10 @@

2057

fi

2058

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

2059

2066

$as_echo_n "(cached) " >&6

2067

else

2068

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2069

@@ -2499,7 +2755,7 @@

2069

@@ -2505,7 +2761,7 @@

2070

do

2071

IFS=$as_save_IFS

2072

test -z "$as_dir" && as_dir=.

2075

for ac_exec_ext in '' $ac_executable_extensions; do

2076

{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

2077

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

2078

@@ -2511,7 +2767,7 @@

2078

@@ -2517,7 +2773,7 @@

2079

esac

2080

done

2081

done

2084

IFS=$as_save_IFS

2085

2086

fi

2087

@@ -2527,7 +2783,7 @@

2087

@@ -2533,7 +2789,7 @@

2088

MKDIR_P="$ac_install_sh -d"

2089

fi

2090

fi

2093

$as_echo "$MKDIR_P" >&6; }

2094

2095

mkdir_p="$MKDIR_P"

2096

@@ -2540,9 +2796,9 @@

2096

@@ -2546,9 +2802,9 @@

2097

do

2098

# Extract the first word of "$ac_prog", so it can be a program name with args.

2099

set dummy $ac_prog; ac_word=$2

2105

$as_echo_n "(cached) " >&6

2106

else

2107

if test -n "$AWK"; then

2108

@@ -2553,24 +2809,24 @@

2108

@@ -2559,24 +2815,24 @@

2109

do

2110

IFS=$as_save_IFS

2111

test -z "$as_dir" && as_dir=.

2135

$as_echo "no" >&6; }

2136

fi

2137

2138

@@ -2578,11 +2834,11 @@

2138

@@ -2584,11 +2840,11 @@

2139

test -n "$AWK" && break

2140

done

2141

2149

$as_echo_n "(cached) " >&6

2150

else

2151

cat >conftest.make <<\_ACEOF

2152

@@ -2600,11 +2856,11 @@

2152

@@ -2606,11 +2862,11 @@

2153

rm -f conftest.make

2154

fi

2155

if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then

2163

$as_echo "no" >&6; }

2164

SET_MAKE="MAKE=${MAKE-make}"

2165

fi

2166

@@ -2624,9 +2880,7 @@

2166

@@ -2630,9 +2886,7 @@

2167

am__isrc=' -I$(srcdir)'

2168

# test to see if srcdir already configured

2169

if test -f $srcdir/config.status; then

2174

fi

2175

fi

2176

2177

@@ -2683,16 +2937,16 @@

2177

@@ -2689,16 +2943,16 @@

2178

2179

2180

2194

$as_echo "$USE_MAINTAINER_MODE" >&6; }

2195

if test $USE_MAINTAINER_MODE = yes; then

2196

MAINTAINER_MODE_TRUE=

2197

@@ -2707,7 +2961,7 @@

2197

@@ -2713,7 +2967,7 @@

2198

2199

2200

# Check whether --enable-silent-rules was given.

2203

enableval=$enable_silent_rules;

2204

fi

2205

2206

@@ -2723,7 +2977,7 @@

2206

@@ -2729,7 +2983,7 @@

2207

2208

2209

# Check whether --enable-static was given.

2212

enableval=$enable_static; p=${PACKAGE-default}

2213

case $enableval in

2214

yes) enable_static=yes ;;

2215

@@ -2761,9 +3015,9 @@

2215

@@ -2767,9 +3021,9 @@

2216

if test -n "$ac_tool_prefix"; then

2217

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

2218

set dummy ${ac_tool_prefix}gcc; ac_word=$2

2224

$as_echo_n "(cached) " >&6

2225

else

2226

if test -n "$CC"; then

2227

@@ -2774,24 +3028,24 @@

2227

@@ -2780,24 +3034,24 @@

2228

do

2229

IFS=$as_save_IFS

2230

test -z "$as_dir" && as_dir=.

2254

$as_echo "no" >&6; }

2255

fi

2256

2257

@@ -2801,9 +3055,9 @@

2257

@@ -2807,9 +3061,9 @@

2258

ac_ct_CC=$CC

2259

# Extract the first word of "gcc", so it can be a program name with args.

2260

set dummy gcc; ac_word=$2

2266

$as_echo_n "(cached) " >&6

2267

else

2268

if test -n "$ac_ct_CC"; then

2269

@@ -2814,24 +3068,24 @@

2269

@@ -2820,24 +3074,24 @@

2270

do

2271

IFS=$as_save_IFS

2272

test -z "$as_dir" && as_dir=.

2296

$as_echo "no" >&6; }

2297

fi

2298

2299

@@ -2840,7 +3094,7 @@

2299

@@ -2846,7 +3100,7 @@

2300

else

2301

case $cross_compiling:$ac_tool_warned in

2302

yes:)

2305

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2306

ac_tool_warned=yes ;;

2307

esac

2308

@@ -2854,9 +3108,9 @@

2308

@@ -2860,9 +3114,9 @@

2309

if test -n "$ac_tool_prefix"; then

2310

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

2311

set dummy ${ac_tool_prefix}cc; ac_word=$2

2317

$as_echo_n "(cached) " >&6

2318

else

2319

if test -n "$CC"; then

2320

@@ -2867,24 +3121,24 @@

2320

@@ -2873,24 +3127,24 @@

2321

do

2322

IFS=$as_save_IFS

2323

test -z "$as_dir" && as_dir=.

2347

$as_echo "no" >&6; }

2348

fi

2349

2350

@@ -2894,9 +3148,9 @@

2350

@@ -2900,9 +3154,9 @@

2351

if test -z "$CC"; then

2352

# Extract the first word of "cc", so it can be a program name with args.

2353

set dummy cc; ac_word=$2

2359

$as_echo_n "(cached) " >&6

2360

else

2361

if test -n "$CC"; then

2362

@@ -2908,18 +3162,18 @@

2362

@@ -2914,18 +3168,18 @@

2363

do

2364

IFS=$as_save_IFS

2365

test -z "$as_dir" && as_dir=.

2381

IFS=$as_save_IFS

2382

2383

if test $ac_prog_rejected = yes; then

2384

@@ -2938,10 +3192,10 @@

2384

@@ -2944,10 +3198,10 @@

2385

fi

2386

CC=$ac_cv_prog_CC

2387

if test -n "$CC"; then

2394

$as_echo "no" >&6; }

2395

fi

2396

2397

@@ -2953,9 +3207,9 @@

2397

@@ -2959,9 +3213,9 @@

2398

do

2399

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

2400

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

2406

$as_echo_n "(cached) " >&6

2407

else

2408

if test -n "$CC"; then

2409

@@ -2966,24 +3220,24 @@

2409

@@ -2972,24 +3226,24 @@

2410

do

2411

IFS=$as_save_IFS

2412

test -z "$as_dir" && as_dir=.

2436

$as_echo "no" >&6; }

2437

fi

2438

2439

@@ -2997,9 +3251,9 @@

2439

@@ -3003,9 +3257,9 @@

2440

do

2441

# Extract the first word of "$ac_prog", so it can be a program name with args.

2442

set dummy $ac_prog; ac_word=$2

2448

$as_echo_n "(cached) " >&6

2449

else

2450

if test -n "$ac_ct_CC"; then

2451

@@ -3010,24 +3264,24 @@

2451

@@ -3016,24 +3270,24 @@

2452

do

2453

IFS=$as_save_IFS

2454

test -z "$as_dir" && as_dir=.

2478

$as_echo "no" >&6; }

2479

fi

2480

2481

@@ -3040,7 +3294,7 @@

2481

@@ -3046,7 +3300,7 @@

2482

else

2483

case $cross_compiling:$ac_tool_warned in

2484

yes:)

2487

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2488

ac_tool_warned=yes ;;

2489

esac

2490

@@ -3051,73 +3305,55 @@

2490

@@ -3057,73 +3311,55 @@

2491

fi

2492

2493

2586

$as_echo_n "checking for C compiler default output file name... " >&6; }

2587

ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

2588

2589

@@ -3134,17 +3370,17 @@

2589

@@ -3140,17 +3376,17 @@

2590

done

2591

rm -f $ac_rmfiles

2592

2609

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

2610

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

2611

# in a Makefile. We should not override ac_cv_exeext if it was cached,

2612

@@ -3161,7 +3397,7 @@

2612

@@ -3167,7 +3403,7 @@

2613

# certainly right.

2614

break;;

2615

*.* )

2618

then :; else

2619

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

2620

fi

2621

@@ -3180,84 +3416,75 @@

2621

@@ -3186,84 +3422,75 @@

2622

else

2623

ac_file=''

2624

fi

2679

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2680

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2681

-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.

2682

-If you meant to cross compile, use \`--host'.

2683

-See \`config.log' for more details." >&5

2684

-$as_echo "$as_me: error: cannot run C compiled programs.

2685

2682

+as_fn_error "cannot run C compiled programs.

2686

2683

If you meant to cross compile, use \`--host'.

2684

-See \`config.log' for more details." >&5

2685

-$as_echo "$as_me: error: cannot run C compiled programs.

2686

-If you meant to cross compile, use \`--host'.

2687

-See \`config.log' for more details." >&2;}

2688

- { (exit 1); exit 1; }; }; }

2689

+See \`config.log' for more details." "$LINENO" 5; }

2728

# If both `conftest.exe' and `conftest' are `present' (well, observable)

2729

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

2730

# work properly (i.e., refer to `conftest.exe'), while it won't with

2731

@@ -3272,32 +3499,24 @@

2731

@@ -3278,32 +3505,24 @@

2732

esac

2733

done

2734

else

2768

/* end confdefs.h. */

2769

2770

int

2771

@@ -3309,17 +3528,17 @@

2771

@@ -3315,17 +3534,17 @@

2772

}

2773

_ACEOF

2774

rm -f conftest.o conftest.obj

2791

for ac_file in conftest.o conftest.obj conftest.*; do

2792

test -f "$ac_file" || continue;

2793

case $ac_file in

2794

@@ -3332,31 +3551,23 @@

2794

@@ -3338,31 +3557,23 @@

2795

$as_echo "$as_me: failed program was:" >&5

2796

sed 's/^/| /' conftest.$ac_ext >&5

2797

2830

/* end confdefs.h. */

2831

2832

int

2833

@@ -3370,37 +3581,16 @@

2833

@@ -3376,37 +3587,16 @@

2834

return 0;

2835

}

2836

_ACEOF

2871

$as_echo "$ac_cv_c_compiler_gnu" >&6; }

2872

if test $ac_compiler_gnu = yes; then

2873

GCC=yes

2874

@@ -3409,20 +3599,16 @@

2874

@@ -3415,20 +3605,16 @@

2875

fi

2876

ac_test_CFLAGS=${CFLAGS+set}

2877

ac_save_CFLAGS=$CFLAGS

2895

/* end confdefs.h. */

2896

2897

int

2898

@@ -3433,35 +3619,11 @@

2898

@@ -3439,35 +3625,11 @@

2899

return 0;

2900

}

2901

_ACEOF

2934

/* end confdefs.h. */

2935

2936

int

2937

@@ -3472,36 +3634,12 @@

2937

@@ -3478,36 +3640,12 @@

2938

return 0;

2939

}

2940

_ACEOF

2975

/* end confdefs.h. */

2976

2977

int

2978

@@ -3512,42 +3650,17 @@

2978

@@ -3518,42 +3656,17 @@

2979

return 0;

2980

}

2981

_ACEOF

2997

- test -z "$ac_c_werror_flag" ||

2998

- test ! -s conftest.err

2999

- } && test -s conftest.$ac_objext; then

3000

+if ac_fn_c_try_compile "$LINENO"; then :

3001

ac_cv_prog_cc_g=yes

3000

- ac_cv_prog_cc_g=yes

3002

3001

-else

3003

3002

- $as_echo "$as_me: failed program was:" >&5

3004

3003

-sed 's/^/| /' conftest.$ac_ext >&5

3005

3004

-

3006

3005

-

3006

+if ac_fn_c_try_compile "$LINENO"; then :

3007

+ ac_cv_prog_cc_g=yes

3007

3008

fi

3008

3009

-

3009

3010

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3020

3021

$as_echo "$ac_cv_prog_cc_g" >&6; }

3021

3022

if test "$ac_test_CFLAGS" = set; then

3022

3023

CFLAGS=$ac_save_CFLAGS

3023

@@ -3564,18 +3677,14 @@

3024

@@ -3570,18 +3683,14 @@

3024

3025

CFLAGS=

3025

3026

fi

3026

3027

fi

3042

3043

/* end confdefs.h. */

3043

3044

#include <stdarg.h>

3044

3045

#include <stdio.h>

3045

@@ -3632,32 +3741,9 @@

3046

@@ -3638,32 +3747,9 @@

3046

3047

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

3047

3048

do

3048

3049

CC="$ac_save_CC $ac_arg"

3076

3077

rm -f core conftest.err conftest.$ac_objext

3077

3078

test "x$ac_cv_prog_cc_c89" != "xno" && break

3078

3079

done

3079

@@ -3668,17 +3754,19 @@

3080

@@ -3674,17 +3760,19 @@

3080

3081

# AC_CACHE_VAL

3081

3082

case "x$ac_cv_prog_cc_c89" in

3082

3083

x)

3099

3100

3101

ac_ext=c

3101

3102

ac_cpp='$CPP $CPPFLAGS'

3102

@@ -3697,7 +3785,7 @@

3103

@@ -3703,7 +3791,7 @@

3103

3104

.PHONY: am__doit

3104

3105

END

3105

3106

# If we don't find an include directive, just comment out the code.

3108

3109

$as_echo_n "checking for style of include used by $am_make... " >&6; }

3109

3110

am__include="#"

3110

3111

am__quote=

3111

@@ -3725,12 +3813,12 @@

3112

@@ -3731,12 +3819,12 @@

3112

3113

fi

3113

3114

3115

3123

3124

enableval=$enable_dependency_tracking;

3124

3125

fi

3125

3126

@@ -3750,9 +3838,9 @@

3127

@@ -3756,9 +3844,9 @@

3127

3128

3129

depcc="$CC" am_compiler_list=

3129

3130

3135

3136

$as_echo_n "(cached) " >&6

3136

3137

else

3137

3138

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

3138

@@ -3860,7 +3948,7 @@

3139

@@ -3866,7 +3954,7 @@

3139

3140

fi

3140

3141

3142

fi

3144

3145

$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

3145

3146

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

3146

3147

@@ -3877,22 +3965,18 @@

3148

@@ -3883,22 +3971,18 @@

3148

3149

3150

# Needed for per-target cflags, like in gnomeshell-taskpanel

3150

3151

if test "x$CC" != xcc; then

3171

3172

/* end confdefs.h. */

3172

3173

3174

int

3174

@@ -3908,63 +3992,63 @@

3175

@@ -3914,63 +3998,63 @@

3175

3176

# existing .o file with -o, though they will create one.

3176

3177

ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

3177

3178

rm -f conftest2.*

3260

3261

then

3261

3262

# cc works too.

3262

3263

:

3263

@@ -3981,15 +4065,13 @@

3264

@@ -3987,15 +4071,13 @@

3264

3265

3266

fi

3266

3267

if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then

3279

3280

3281

fi

3281

3282

@@ -4010,7 +4092,7 @@

3283

@@ -4016,7 +4098,7 @@

3283

3284

3285

case `pwd` in

3285

3286

*\ * | *\ *)

3288

3289

$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

3289

3290

esac

3290

3291

@@ -4035,35 +4117,27 @@

3292

@@ -4041,35 +4123,27 @@

3292

3293

3294

# Make sure we can run config.sub.

3294

3295

$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

3331

3332

esac

3332

3333

build=$ac_cv_build

3333

3334

ac_save_IFS=$IFS; IFS='-'

3334

@@ -4079,28 +4153,24 @@

3335

@@ -4085,28 +4159,24 @@

3335

3336

case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

3336

3337

3338

3365

3366

esac

3366

3367

host=$ac_cv_host

3367

3368

ac_save_IFS=$IFS; IFS='-'

3368

@@ -4116,9 +4186,9 @@

3369

@@ -4122,9 +4192,9 @@

3369

3370

case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

3370

3371

3372

3377

3378

$as_echo_n "(cached) " >&6

3378

3379

else

3379

3380

ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/

3380

@@ -4126,7 +4196,7 @@

3381

@@ -4132,7 +4202,7 @@

3381

3382

ac_script="$ac_script$as_nl$ac_script"

3382

3383

done

3383

3384

echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed

3386

3387

if test -z "$SED"; then

3387

3388

ac_path_SED_found=false

3388

3389

# Loop through the user's path and test for each of PROGNAME-LIST

3389

@@ -4135,7 +4205,7 @@

3390

@@ -4141,7 +4211,7 @@

3390

3391

do

3391

3392

IFS=$as_save_IFS

3392

3393

test -z "$as_dir" && as_dir=.

3395

3396

for ac_exec_ext in '' $ac_executable_extensions; do

3396

3397

ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

3397

3398

{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

3398

@@ -4155,7 +4225,7 @@

3399

@@ -4161,7 +4231,7 @@

3399

3400

$as_echo '' >> "conftest.nl"

3400

3401

"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break

3401

3402

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3404

3405

if test $ac_count -gt ${ac_path_SED_max-0}; then

3405

3406

# Best one so far, save it but keep looking for a better one

3406

3407

ac_cv_path_SED="$ac_path_SED"

3407

@@ -4170,19 +4240,17 @@

3408

@@ -4176,19 +4246,17 @@

3408

3409

$ac_path_SED_found && break 3

3409

3410

done

3410

3411

done

3427

3428

$as_echo "$ac_cv_path_SED" >&6; }

3428

3429

SED="$ac_cv_path_SED"

3429

3430

rm -f conftest.sed

3430

@@ -4200,9 +4268,9 @@

3431

@@ -4206,9 +4274,9 @@

3431

3432

3433

3434

3439

3440

$as_echo_n "(cached) " >&6

3440

3441

else

3441

3442

if test -z "$GREP"; then

3442

@@ -4213,7 +4281,7 @@

3443

@@ -4219,7 +4287,7 @@

3443

3444

do

3444

3445

IFS=$as_save_IFS

3445

3446

test -z "$as_dir" && as_dir=.

3448

3449

for ac_exec_ext in '' $ac_executable_extensions; do

3449

3450

ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

3450

3451

{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

3451

@@ -4233,7 +4301,7 @@

3452

@@ -4239,7 +4307,7 @@

3452

3453

$as_echo 'GREP' >> "conftest.nl"

3453

3454

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3454

3455

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3457

3458

if test $ac_count -gt ${ac_path_GREP_max-0}; then

3458

3459

# Best one so far, save it but keep looking for a better one

3459

3460

ac_cv_path_GREP="$ac_path_GREP"

3460

@@ -4248,26 +4316,24 @@

3461

@@ -4254,26 +4322,24 @@

3461

3462

$ac_path_GREP_found && break 3

3462

3463

done

3463

3464

done

3489

3490

$as_echo_n "(cached) " >&6

3490

3491

else

3491

3492

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

3492

@@ -4281,7 +4347,7 @@

3493

@@ -4287,7 +4353,7 @@

3493

3494

do

3494

3495

IFS=$as_save_IFS

3495

3496

test -z "$as_dir" && as_dir=.

3498

3499

for ac_exec_ext in '' $ac_executable_extensions; do

3499

3500

ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

3500

3501

{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

3501

@@ -4301,7 +4367,7 @@

3502

@@ -4307,7 +4373,7 @@

3502

3503

$as_echo 'EGREP' >> "conftest.nl"

3503

3504

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3504

3505

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3507

3508

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

3508

3509

# Best one so far, save it but keep looking for a better one

3509

3510

ac_cv_path_EGREP="$ac_path_EGREP"

3510

@@ -4316,12 +4382,10 @@

3511

@@ -4322,12 +4388,10 @@

3511

3512

$ac_path_EGREP_found && break 3

3512

3513

done

3513

3514

done

3522

3523

fi

3523

3524

else

3524

3525

ac_cv_path_EGREP=$EGREP

3525

@@ -4329,14 +4393,14 @@

3526

@@ -4335,14 +4399,14 @@

3526

3527

3528

fi

3528

3529

fi

3540

3541

$as_echo_n "(cached) " >&6

3541

3542

else

3542

3543

if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1

3543

@@ -4350,7 +4414,7 @@

3544

@@ -4356,7 +4420,7 @@

3544

3545

do

3545

3546

IFS=$as_save_IFS

3546

3547

test -z "$as_dir" && as_dir=.

3549

3550

for ac_exec_ext in '' $ac_executable_extensions; do

3550

3551

ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

3551

3552

{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

3552

@@ -4370,7 +4434,7 @@

3553

@@ -4376,7 +4440,7 @@

3553

3554

$as_echo 'FGREP' >> "conftest.nl"

3554

3555

"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break

3555

3556

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3558

3559

if test $ac_count -gt ${ac_path_FGREP_max-0}; then

3559

3560

# Best one so far, save it but keep looking for a better one

3560

3561

ac_cv_path_FGREP="$ac_path_FGREP"

3561

@@ -4385,12 +4449,10 @@

3562

@@ -4391,12 +4455,10 @@

3562

3563

$ac_path_FGREP_found && break 3

3563

3564

done

3564

3565

done

3573

3574

fi

3574

3575

else

3575

3576

ac_cv_path_FGREP=$FGREP

3576

@@ -4398,7 +4460,7 @@

3577

@@ -4404,7 +4466,7 @@

3577

3578

3579

fi

3579

3580

fi

3582

3583

$as_echo "$ac_cv_path_FGREP" >&6; }

3583

3584

FGREP="$ac_cv_path_FGREP"

3584

3585

@@ -4424,7 +4486,7 @@

3586

@@ -4430,7 +4492,7 @@

3586

3587

3588

3589

# Check whether --with-gnu-ld was given.

3591

3592

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

3592

3593

else

3593

3594

with_gnu_ld=no

3594

@@ -4433,7 +4495,7 @@

3595

@@ -4439,7 +4501,7 @@

3595

3596

ac_prog=ld

3596

3597

if test "$GCC" = yes; then

3597

3598

# Check if gcc -print-prog-name=ld gives a path.

3600

3601

$as_echo_n "checking for ld used by $CC... " >&6; }

3601

3602

case $host in

3602

3603

*-*-mingw*)

3603

@@ -4463,13 +4525,13 @@

3604

@@ -4469,13 +4531,13 @@

3604

3605

;;

3605

3606

esac

3606

3607

elif test "$with_gnu_ld" = yes; then

3617

3618

$as_echo_n "(cached) " >&6

3618

3619

else

3619

3620

if test -z "$LD"; then

3620

@@ -4500,18 +4562,16 @@

3621

@@ -4506,18 +4568,16 @@

3621

3622

3623

LD="$lt_cv_path_LD"

3623

3624

if test -n "$LD"; then

3641

3642

$as_echo_n "(cached) " >&6

3642

3643

else

3643

3644

# I'd rather use --version here, but apparently some GNU lds only accept -v.

3644

@@ -4524,7 +4584,7 @@

3645

@@ -4530,7 +4590,7 @@

3645

3646

;;

3646

3647

esac

3647

3648

fi

3650

3651

$as_echo "$lt_cv_prog_gnu_ld" >&6; }

3651

3652

with_gnu_ld=$lt_cv_prog_gnu_ld

3652

3653

@@ -4536,9 +4596,9 @@

3654

@@ -4542,9 +4602,9 @@

3654

3655

3656

3657

3662

3663

$as_echo_n "(cached) " >&6

3663

3664

else

3664

3665

if test -n "$NM"; then

3665

@@ -4585,7 +4645,7 @@

3666

@@ -4591,7 +4651,7 @@

3666

3667

: ${lt_cv_path_NM=no}

3667

3668

fi

3668

3669

fi

3671

3672

$as_echo "$lt_cv_path_NM" >&6; }

3672

3673

if test "$lt_cv_path_NM" != "no"; then

3673

3674

NM="$lt_cv_path_NM"

3674

@@ -4596,9 +4656,9 @@

3675

@@ -4602,9 +4662,9 @@

3675

3676

do

3676

3677

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

3677

3678

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

3683

3684

$as_echo_n "(cached) " >&6

3684

3685

else

3685

3686

if test -n "$DUMPBIN"; then

3686

@@ -4609,24 +4669,24 @@

3687

@@ -4615,24 +4675,24 @@

3687

3688

do

3688

3689

IFS=$as_save_IFS

3689

3690

test -z "$as_dir" && as_dir=.

3713

3714

$as_echo "no" >&6; }

3714

3715

fi

3715

3716

@@ -4640,9 +4700,9 @@

3717

@@ -4646,9 +4706,9 @@

3717

3718

do

3718

3719

# Extract the first word of "$ac_prog", so it can be a program name with args.

3719

3720

set dummy $ac_prog; ac_word=$2

3725

3726

$as_echo_n "(cached) " >&6

3726

3727

else

3727

3728

if test -n "$ac_ct_DUMPBIN"; then

3728

@@ -4653,24 +4713,24 @@

3729

@@ -4659,24 +4719,24 @@

3729

3730

do

3730

3731

IFS=$as_save_IFS

3731

3732

test -z "$as_dir" && as_dir=.

3755

3756

$as_echo "no" >&6; }

3756

3757

fi

3757

3758

@@ -4683,7 +4743,7 @@

3759

@@ -4689,7 +4749,7 @@

3759

3760

else

3760

3761

case $cross_compiling:$ac_tool_warned in

3761

3762

yes:)

3764

3765

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3765

3766

ac_tool_warned=yes ;;

3766

3767

esac

3767

@@ -4703,44 +4763,44 @@

3768

@@ -4709,44 +4769,44 @@

3768

3769

3770

3771

3777

3778

else

3778

3779

lt_cv_nm_interface="BSD nm"

3779

3780

echo "int some_variable = 0;" > conftest.$ac_ext

3780

- (eval echo "\"\$as_me:4713: $ac_compile\"" >&5)

3781

+ (eval echo "\"\$as_me:4773: $ac_compile\"" >&5)

3781

- (eval echo "\"\$as_me:4719: $ac_compile\"" >&5)

3782

+ (eval echo "\"\$as_me:4779: $ac_compile\"" >&5)

3782

3783

(eval "$ac_compile" 2>conftest.err)

3783

3784

cat conftest.err >&5

3784

- (eval echo "\"\$as_me:4716: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

3785

+ (eval echo "\"\$as_me:4776: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

3785

- (eval echo "\"\$as_me:4722: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

3786

+ (eval echo "\"\$as_me:4782: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

3786

3787

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

3787

3788

cat conftest.err >&5

3788

- (eval echo "\"\$as_me:4719: output\"" >&5)

3789

+ (eval echo "\"\$as_me:4779: output\"" >&5)

3789

- (eval echo "\"\$as_me:4725: output\"" >&5)

3790

+ (eval echo "\"\$as_me:4785: output\"" >&5)

3790

3791

cat conftest.out >&5

3791

3792

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

3792

3793

lt_cv_nm_interface="MS dumpbin"

3820

3821

$as_echo_n "(cached) " >&6

3821

3822

else

3822

3823

i=0

3823

@@ -4858,10 +4918,10 @@

3824

@@ -4864,10 +4924,10 @@

3824

3825

fi

3825

3826

3827

if test -n $lt_cv_sys_max_cmd_len ; then

3833

3834

$as_echo "none" >&6; }

3834

3835

fi

3835

3836

max_cmd_len=$lt_cv_sys_max_cmd_len

3836

@@ -4875,7 +4935,7 @@

3837

@@ -4881,7 +4941,7 @@

3837

3838

: ${MV="mv -f"}

3838

3839

: ${RM="rm -f"}

3839

3840

3842

3843

$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }

3843

3844

# Try some XSI features

3844

3845

xsi_shell=no

3845

@@ -4885,17 +4945,17 @@

3846

@@ -4891,17 +4951,17 @@

3846

3847

&& eval 'test $(( 1 + 1 )) -eq 2 \

3847

3848

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

3848

3849

&& xsi_shell=yes

3863

3864

$as_echo "$lt_shell_append" >&6; }

3864

3865

3866

@@ -4930,14 +4990,14 @@

3867

@@ -4936,14 +4996,14 @@

3867

3868

3869

3870

3881

3882

$as_echo "$lt_cv_ld_reload_flag" >&6; }

3882

3883

reload_flag=$lt_cv_ld_reload_flag

3883

3884

case $reload_flag in

3884

@@ -4966,9 +5026,9 @@

3885

@@ -4972,9 +5032,9 @@

3885

3886

if test -n "$ac_tool_prefix"; then

3886

3887

# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.

3887

3888

set dummy ${ac_tool_prefix}objdump; ac_word=$2

3893

3894

$as_echo_n "(cached) " >&6

3894

3895

else

3895

3896

if test -n "$OBJDUMP"; then

3896

@@ -4979,24 +5039,24 @@

3897

@@ -4985,24 +5045,24 @@

3897

3898

do

3898

3899

IFS=$as_save_IFS

3899

3900

test -z "$as_dir" && as_dir=.

3923

3924

$as_echo "no" >&6; }

3924

3925

fi

3925

3926

@@ -5006,9 +5066,9 @@

3927

@@ -5012,9 +5072,9 @@

3927

3928

ac_ct_OBJDUMP=$OBJDUMP

3928

3929

# Extract the first word of "objdump", so it can be a program name with args.

3929

3930

set dummy objdump; ac_word=$2

3935

3936

$as_echo_n "(cached) " >&6

3936

3937

else

3937

3938

if test -n "$ac_ct_OBJDUMP"; then

3938

@@ -5019,24 +5079,24 @@

3939

@@ -5025,24 +5085,24 @@

3939

3940

do

3940

3941

IFS=$as_save_IFS

3941

3942

test -z "$as_dir" && as_dir=.

3965

3966

$as_echo "no" >&6; }

3966

3967

fi

3967

3968

@@ -5045,7 +5105,7 @@

3969

@@ -5051,7 +5111,7 @@

3969

3970

else

3970

3971

case $cross_compiling:$ac_tool_warned in

3971

3972

yes:)

3974

3975

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3975

3976

ac_tool_warned=yes ;;

3976

3977

esac

3977

@@ -5065,9 +5125,9 @@

3978

@@ -5071,9 +5131,9 @@

3978

3979

3980

3981

3986

3987

$as_echo_n "(cached) " >&6

3987

3988

else

3988

3989

lt_cv_file_magic_cmd='$MAGIC_CMD'

3989

@@ -5186,7 +5246,7 @@

3990

@@ -5192,7 +5252,7 @@

3990

3991

lt_cv_deplibs_check_method=pass_all

3991

3992

;;

3992

3993

3995

3996

if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

3996

3997

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

3997

3998

else

3998

@@ -5261,7 +5321,7 @@

3999

@@ -5267,7 +5327,7 @@

3999

4000

esac

4000

4001

4002

fi

4004

4005

$as_echo "$lt_cv_deplibs_check_method" >&6; }

4005

4006

file_magic_cmd=$lt_cv_file_magic_cmd

4006

4007

deplibs_check_method=$lt_cv_deplibs_check_method

4007

@@ -5281,9 +5341,9 @@

4008

@@ -5287,9 +5347,9 @@

4008

4009

if test -n "$ac_tool_prefix"; then

4009

4010

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

4010

4011

set dummy ${ac_tool_prefix}ar; ac_word=$2

4016

4017

$as_echo_n "(cached) " >&6

4017

4018

else

4018

4019

if test -n "$AR"; then

4019

@@ -5294,24 +5354,24 @@

4020

@@ -5300,24 +5360,24 @@

4020

4021

do

4021

4022

IFS=$as_save_IFS

4022

4023

test -z "$as_dir" && as_dir=.

4046

4047

$as_echo "no" >&6; }

4047

4048

fi

4048

4049

@@ -5321,9 +5381,9 @@

4050

@@ -5327,9 +5387,9 @@

4050

4051

ac_ct_AR=$AR

4051

4052

# Extract the first word of "ar", so it can be a program name with args.

4052

4053

set dummy ar; ac_word=$2

4058

4059

$as_echo_n "(cached) " >&6

4059

4060

else

4060

4061

if test -n "$ac_ct_AR"; then

4061

@@ -5334,24 +5394,24 @@

4062

@@ -5340,24 +5400,24 @@

4062

4063

do

4063

4064

IFS=$as_save_IFS

4064

4065

test -z "$as_dir" && as_dir=.

4088

4089

$as_echo "no" >&6; }

4089

4090

fi

4090

4091

@@ -5360,7 +5420,7 @@

4092

@@ -5366,7 +5426,7 @@

4092

4093

else

4093

4094

case $cross_compiling:$ac_tool_warned in

4094

4095

yes:)

4097

4098

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4098

4099

ac_tool_warned=yes ;;

4099

4100

esac

4100

@@ -5386,9 +5446,9 @@

4101

@@ -5392,9 +5452,9 @@

4101

4102

if test -n "$ac_tool_prefix"; then

4102

4103

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

4103

4104

set dummy ${ac_tool_prefix}strip; ac_word=$2

4109

4110

$as_echo_n "(cached) " >&6

4110

4111

else

4111

4112

if test -n "$STRIP"; then

4112

@@ -5399,24 +5459,24 @@

4113

@@ -5405,24 +5465,24 @@

4113

4114

do

4114

4115

IFS=$as_save_IFS

4115

4116

test -z "$as_dir" && as_dir=.

4139

4140

$as_echo "no" >&6; }

4140

4141

fi

4141

4142

@@ -5426,9 +5486,9 @@

4143

@@ -5432,9 +5492,9 @@

4143

4144

ac_ct_STRIP=$STRIP

4144

4145

# Extract the first word of "strip", so it can be a program name with args.

4145

4146

set dummy strip; ac_word=$2

4151

4152

$as_echo_n "(cached) " >&6

4152

4153

else

4153

4154

if test -n "$ac_ct_STRIP"; then

4154

@@ -5439,24 +5499,24 @@

4155

@@ -5445,24 +5505,24 @@

4155

4156

do

4156

4157

IFS=$as_save_IFS

4157

4158

test -z "$as_dir" && as_dir=.

4181

4182

$as_echo "no" >&6; }

4182

4183

fi

4183

4184

@@ -5465,7 +5525,7 @@

4185

@@ -5471,7 +5531,7 @@

4185

4186

else

4186

4187

case $cross_compiling:$ac_tool_warned in

4187

4188

yes:)

4190

4191

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4191

4192

ac_tool_warned=yes ;;

4192

4193

esac

4193

@@ -5485,9 +5545,9 @@

4194

@@ -5491,9 +5551,9 @@

4194

4195

if test -n "$ac_tool_prefix"; then

4195

4196

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

4196

4197

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

4202

4203

$as_echo_n "(cached) " >&6

4203

4204

else

4204

4205

if test -n "$RANLIB"; then

4205

@@ -5498,24 +5558,24 @@

4206

@@ -5504,24 +5564,24 @@

4206

4207

do

4207

4208

IFS=$as_save_IFS

4208

4209

test -z "$as_dir" && as_dir=.

4232

4233

$as_echo "no" >&6; }

4233

4234

fi

4234

4235

@@ -5525,9 +5585,9 @@

4236

@@ -5531,9 +5591,9 @@

4236

4237

ac_ct_RANLIB=$RANLIB

4237

4238

# Extract the first word of "ranlib", so it can be a program name with args.

4238

4239

set dummy ranlib; ac_word=$2

4244

4245

$as_echo_n "(cached) " >&6

4245

4246

else

4246

4247

if test -n "$ac_ct_RANLIB"; then

4247

@@ -5538,24 +5598,24 @@

4248

@@ -5544,24 +5604,24 @@

4248

4249

do

4249

4250

IFS=$as_save_IFS

4250

4251

test -z "$as_dir" && as_dir=.

4274

4275

$as_echo "no" >&6; }

4275

4276

fi

4276

4277

@@ -5564,7 +5624,7 @@

4278

@@ -5570,7 +5630,7 @@

4278

4279

else

4279

4280

case $cross_compiling:$ac_tool_warned in

4280

4281

yes:)

4283

4284

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4284

4285

ac_tool_warned=yes ;;

4285

4286

esac

4286

@@ -5642,9 +5702,9 @@

4287

@@ -5648,9 +5708,9 @@

4287

4288

4289

4290

# Check for command to grab the raw symbol name followed by C symbol from nm.

4295

4296

$as_echo_n "(cached) " >&6

4296

4297

else

4297

4298

@@ -5760,18 +5820,18 @@

4299

@@ -5766,18 +5826,18 @@

4299

4300

int main(){nm_test_var='a';nm_test_func();return(0);}

4300

4301

_LT_EOF

4301

4302

4320

4321

# Try sorting and uniquifying the output.

4321

4322

if sort "$nlist" | uniq > "$nlist"T; then

4322

4323

mv -f "$nlist"T "$nlist"

4323

@@ -5824,11 +5884,11 @@

4324

@@ -5830,11 +5890,11 @@

4324

4325

lt_save_CFLAGS="$CFLAGS"

4325

4326

LIBS="conftstm.$ac_objext"

4326

4327

CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"

4335

4336

pipe_works=yes

4336

4337

fi

4337

4338

LIBS="$lt_save_LIBS"

4338

@@ -5862,10 +5922,10 @@

4339

@@ -5868,10 +5928,10 @@

4339

4340

lt_cv_sys_global_symbol_to_cdecl=

4340

4341

fi

4341

4342

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

4348

4349

$as_echo "ok" >&6; }

4349

4350

fi

4350

4351

@@ -5892,7 +5952,7 @@

4352

@@ -5898,7 +5958,7 @@

4352

4353

4354

4355

# Check whether --enable-libtool-lock was given.

4357

4358

enableval=$enable_libtool_lock;

4358

4359

fi

4359

4360

@@ -5904,11 +5964,11 @@

4361

@@ -5910,11 +5970,11 @@

4361

4362

ia64-*-hpux*)

4362

4363

# Find out which ABI we are using.

4363

4364

echo 'int i;' > conftest.$ac_ext

4372

4373

case `/usr/bin/file conftest.$ac_objext` in

4373

4374

*ELF-32*)

4374

4375

HPUX_IA64_MODE="32"

4375

@@ -5922,12 +5982,12 @@

4376

@@ -5928,12 +5988,12 @@

4376

4377

;;

4377

4378

*-*-irix6*)

4378

4379

# Find out which ABI we are using.

4379

- echo '#line 5925 "configure"' > conftest.$ac_ext

4380

- echo '#line 5931 "configure"' > conftest.$ac_ext

4380

4381

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4381

+ echo '#line 5985 "configure"' > conftest.$ac_ext

4382

+ echo '#line 5991 "configure"' > conftest.$ac_ext

4382

4383

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

4383

4384

(eval $ac_compile) 2>&5

4384

4385

ac_status=$?

4389

4390

if test "$lt_cv_prog_gnu_ld" = yes; then

4390

4391

case `/usr/bin/file conftest.$ac_objext` in

4391

4392

*32-bit*)

4392

@@ -5961,11 +6021,11 @@

4393

@@ -5967,11 +6027,11 @@

4393

4394

s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

4394

4395

# Find out which ABI we are using.

4395

4396

echo 'int i;' > conftest.$ac_ext

4404

4405

case `/usr/bin/file conftest.o` in

4405

4406

*32-bit*)

4406

4407

case $host in

4407

@@ -6014,9 +6074,9 @@

4408

@@ -6020,9 +6080,9 @@

4408

4409

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

4409

4410

SAVE_CFLAGS="$CFLAGS"

4410

4411

CFLAGS="$CFLAGS -belf"

4416

4417

$as_echo_n "(cached) " >&6

4417

4418

else

4418

4419

ac_ext=c

4419

@@ -6025,11 +6085,7 @@

4420

@@ -6031,11 +6091,7 @@

4420

4421

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4421

4422

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4422

4423

4429

4430

/* end confdefs.h. */

4430

4431

4432

int

4432

@@ -6040,38 +6096,13 @@

4433

@@ -6046,38 +6102,13 @@

4433

4434

return 0;

4434

4435

}

4435

4436

_ACEOF

4472

4473

ac_ext=c

4473

4474

ac_cpp='$CPP $CPPFLAGS'

4474

4475

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4475

@@ -6079,7 +6110,7 @@

4476

@@ -6085,7 +6116,7 @@

4476

4477

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4477

4478

4479

fi

4481

4482

$as_echo "$lt_cv_cc_needs_belf" >&6; }

4482

4483

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

4483

4484

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

4484

@@ -6089,11 +6120,11 @@

4485

@@ -6095,11 +6126,11 @@

4485

4486

sparc*-*solaris*)

4486

4487

# Find out which ABI we are using.

4487

4488

echo 'int i;' > conftest.$ac_ext

4496

4497

case `/usr/bin/file conftest.o` in

4497

4498

*64-bit*)

4498

4499

case $lt_cv_prog_gnu_ld in

4499

@@ -6119,9 +6150,9 @@

4500

@@ -6125,9 +6156,9 @@

4500

4501

if test -n "$ac_tool_prefix"; then

4501

4502

# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.

4502

4503

set dummy ${ac_tool_prefix}dsymutil; ac_word=$2

4508

4509

$as_echo_n "(cached) " >&6

4509

4510

else

4510

4511

if test -n "$DSYMUTIL"; then

4511

@@ -6132,24 +6163,24 @@

4512

@@ -6138,24 +6169,24 @@

4512

4513

do

4513

4514

IFS=$as_save_IFS

4514

4515

test -z "$as_dir" && as_dir=.

4538

4539

$as_echo "no" >&6; }

4539

4540

fi

4540

4541

@@ -6159,9 +6190,9 @@

4542

@@ -6165,9 +6196,9 @@

4542

4543

ac_ct_DSYMUTIL=$DSYMUTIL

4543

4544

# Extract the first word of "dsymutil", so it can be a program name with args.

4544

4545

set dummy dsymutil; ac_word=$2

4550

4551

$as_echo_n "(cached) " >&6

4551

4552

else

4552

4553

if test -n "$ac_ct_DSYMUTIL"; then

4553

@@ -6172,24 +6203,24 @@

4554

@@ -6178,24 +6209,24 @@

4554

4555

do

4555

4556

IFS=$as_save_IFS

4556

4557

test -z "$as_dir" && as_dir=.

4580

4581

$as_echo "no" >&6; }

4581

4582

fi

4582

4583

@@ -6198,7 +6229,7 @@

4584

@@ -6204,7 +6235,7 @@

4584

4585

else

4585

4586

case $cross_compiling:$ac_tool_warned in

4586

4587

yes:)

4589

4590

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4590

4591

ac_tool_warned=yes ;;

4591

4592

esac

4592

@@ -6211,9 +6242,9 @@

4593

@@ -6217,9 +6248,9 @@

4593

4594

if test -n "$ac_tool_prefix"; then

4594

4595

# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.

4595

4596

set dummy ${ac_tool_prefix}nmedit; ac_word=$2

4601

4602

$as_echo_n "(cached) " >&6

4602

4603

else

4603

4604

if test -n "$NMEDIT"; then

4604

@@ -6224,24 +6255,24 @@

4605

@@ -6230,24 +6261,24 @@

4605

4606

do

4606

4607

IFS=$as_save_IFS

4607

4608

test -z "$as_dir" && as_dir=.

4631

4632

$as_echo "no" >&6; }

4632

4633

fi

4633

4634

@@ -6251,9 +6282,9 @@

4635

@@ -6257,9 +6288,9 @@

4635

4636

ac_ct_NMEDIT=$NMEDIT

4636

4637

# Extract the first word of "nmedit", so it can be a program name with args.

4637

4638

set dummy nmedit; ac_word=$2

4643

4644

$as_echo_n "(cached) " >&6

4644

4645

else

4645

4646

if test -n "$ac_ct_NMEDIT"; then

4646

@@ -6264,24 +6295,24 @@

4647

@@ -6270,24 +6301,24 @@

4647

4648

do

4648

4649

IFS=$as_save_IFS

4649

4650

test -z "$as_dir" && as_dir=.

4673

4674

$as_echo "no" >&6; }

4674

4675

fi

4675

4676

@@ -6290,7 +6321,7 @@

4677

@@ -6296,7 +6327,7 @@

4677

4678

else

4678

4679

case $cross_compiling:$ac_tool_warned in

4679

4680

yes:)

4682

4683

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4683

4684

ac_tool_warned=yes ;;

4684

4685

esac

4685

@@ -6303,9 +6334,9 @@

4686

@@ -6309,9 +6340,9 @@

4686

4687

if test -n "$ac_tool_prefix"; then

4687

4688

# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.

4688

4689

set dummy ${ac_tool_prefix}lipo; ac_word=$2

4694

4695

$as_echo_n "(cached) " >&6

4695

4696

else

4696

4697

if test -n "$LIPO"; then

4697

@@ -6316,24 +6347,24 @@

4698

@@ -6322,24 +6353,24 @@

4698

4699

do

4699

4700

IFS=$as_save_IFS

4700

4701

test -z "$as_dir" && as_dir=.

4724

4725

$as_echo "no" >&6; }

4725

4726

fi

4726

4727

@@ -6343,9 +6374,9 @@

4728

@@ -6349,9 +6380,9 @@

4728

4729

ac_ct_LIPO=$LIPO

4729

4730

# Extract the first word of "lipo", so it can be a program name with args.

4730

4731

set dummy lipo; ac_word=$2

4736

4737

$as_echo_n "(cached) " >&6

4737

4738

else

4738

4739

if test -n "$ac_ct_LIPO"; then

4739

@@ -6356,24 +6387,24 @@

4740

@@ -6362,24 +6393,24 @@

4740

4741

do

4741

4742

IFS=$as_save_IFS

4742

4743

test -z "$as_dir" && as_dir=.

4766

4767

$as_echo "no" >&6; }

4767

4768

fi

4768

4769

@@ -6382,7 +6413,7 @@

4770

@@ -6388,7 +6419,7 @@

4770

4771

else

4771

4772

case $cross_compiling:$ac_tool_warned in

4772

4773

yes:)

4775

4776

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4776

4777

ac_tool_warned=yes ;;

4777

4778

esac

4778

@@ -6395,9 +6426,9 @@

4779

@@ -6401,9 +6432,9 @@

4779

4780

if test -n "$ac_tool_prefix"; then

4780

4781

# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.

4781

4782

set dummy ${ac_tool_prefix}otool; ac_word=$2

4787

4788

$as_echo_n "(cached) " >&6

4788

4789

else

4789

4790

if test -n "$OTOOL"; then

4790

@@ -6408,24 +6439,24 @@

4791

@@ -6414,24 +6445,24 @@

4791

4792

do

4792

4793

IFS=$as_save_IFS

4793

4794

test -z "$as_dir" && as_dir=.

4817

4818

$as_echo "no" >&6; }

4818

4819

fi

4819

4820

@@ -6435,9 +6466,9 @@

4821

@@ -6441,9 +6472,9 @@

4821

4822

ac_ct_OTOOL=$OTOOL

4822

4823

# Extract the first word of "otool", so it can be a program name with args.

4823

4824

set dummy otool; ac_word=$2

4829

4830

$as_echo_n "(cached) " >&6

4830

4831

else

4831

4832

if test -n "$ac_ct_OTOOL"; then

4832

@@ -6448,24 +6479,24 @@

4833

@@ -6454,24 +6485,24 @@

4833

4834

do

4834

4835

IFS=$as_save_IFS

4835

4836

test -z "$as_dir" && as_dir=.

4859

4860

$as_echo "no" >&6; }

4860

4861

fi

4861

4862

@@ -6474,7 +6505,7 @@

4863

@@ -6480,7 +6511,7 @@

4863

4864

else

4864

4865

case $cross_compiling:$ac_tool_warned in

4865

4866

yes:)

4868

4869

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4869

4870

ac_tool_warned=yes ;;

4870

4871

esac

4871

@@ -6487,9 +6518,9 @@

4872

@@ -6493,9 +6524,9 @@

4872

4873

if test -n "$ac_tool_prefix"; then

4873

4874

# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.

4874

4875

set dummy ${ac_tool_prefix}otool64; ac_word=$2

4880

4881

$as_echo_n "(cached) " >&6

4881

4882

else

4882

4883

if test -n "$OTOOL64"; then

4883

@@ -6500,24 +6531,24 @@

4884

@@ -6506,24 +6537,24 @@

4884

4885

do

4885

4886

IFS=$as_save_IFS

4886

4887

test -z "$as_dir" && as_dir=.

4910

4911

$as_echo "no" >&6; }

4911

4912

fi

4912

4913

@@ -6527,9 +6558,9 @@

4914

@@ -6533,9 +6564,9 @@

4914

4915

ac_ct_OTOOL64=$OTOOL64

4915

4916

# Extract the first word of "otool64", so it can be a program name with args.

4916

4917

set dummy otool64; ac_word=$2

4922

4923

$as_echo_n "(cached) " >&6

4923

4924

else

4924

4925

if test -n "$ac_ct_OTOOL64"; then

4925

@@ -6540,24 +6571,24 @@

4926

@@ -6546,24 +6577,24 @@

4926

4927

do

4927

4928

IFS=$as_save_IFS

4928

4929

test -z "$as_dir" && as_dir=.

4952

4953

$as_echo "no" >&6; }

4953

4954

fi

4954

4955

@@ -6566,7 +6597,7 @@

4956

@@ -6572,7 +6603,7 @@

4956

4957

else

4957

4958

case $cross_compiling:$ac_tool_warned in

4958

4959

yes:)

4961

4962

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4962

4963

ac_tool_warned=yes ;;

4963

4964

esac

4964

@@ -6602,9 +6633,9 @@

4965

@@ -6608,9 +6639,9 @@

4965

4966

4967

4968

4973

4974

$as_echo_n "(cached) " >&6

4974

4975

else

4975

4976

lt_cv_apple_cc_single_mod=no

4976

@@ -6629,22 +6660,18 @@

4977

@@ -6635,22 +6666,18 @@

4977

4978

rm -f conftest.*

4978

4979

fi

4979

4980

fi

5000

5001

/* end confdefs.h. */

5001

5002

5003

int

5003

@@ -6655,42 +6682,17 @@

5004

@@ -6661,42 +6688,17 @@

5004

5005

return 0;

5005

5006

}

5006

5007

_ACEOF

5048

5049

$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

5049

5050

case $host_os in

5050

5051

rhapsody* | darwin1.[012])

5051

@@ -6732,14 +6734,14 @@

5052

@@ -6738,14 +6740,14 @@

5052

5053

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5053

5054

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5054

5055

ac_compiler_gnu=$ac_cv_c_compiler_gnu

5065

5066

$as_echo_n "(cached) " >&6

5066

5067

else

5067

5068

# Double quotes because CPP needs to be expanded

5068

@@ -6754,11 +6756,7 @@

5069

@@ -6760,11 +6762,7 @@

5069

5070

# <limits.h> exists even on freestanding compilers.

5070

5071

# On the NeXT, cc -E runs the code through the compiler's parser,

5071

5072

# not just through cpp. "Syntax error" is here to catch this case.

5078

5079

/* end confdefs.h. */

5079

5080

#ifdef __STDC__

5080

5081

# include <limits.h>

5081

@@ -6767,78 +6765,34 @@

5082

@@ -6773,78 +6771,34 @@

5082

5083

#endif

5083

5084

Syntax error

5084

5085

_ACEOF

5162

5163

break

5163

5164

fi

5164

5165

@@ -6850,7 +6804,7 @@

5166

@@ -6856,7 +6810,7 @@

5166

5167

else

5167

5168

ac_cv_prog_CPP=$CPP

5168

5169

fi

5171

5172

$as_echo "$CPP" >&6; }

5172

5173

ac_preproc_ok=false

5173

5174

for ac_c_preproc_warn_flag in '' yes

5174

@@ -6861,11 +6815,7 @@

5175

@@ -6867,11 +6821,7 @@

5175

5176

# <limits.h> exists even on freestanding compilers.

5176

5177

# On the NeXT, cc -E runs the code through the compiler's parser,

5177

5178

# not just through cpp. "Syntax error" is here to catch this case.

5184

5185

/* end confdefs.h. */

5185

5186

#ifdef __STDC__

5186

5187

# include <limits.h>

5187

@@ -6874,87 +6824,40 @@

5188

@@ -6880,87 +6830,40 @@

5188

5189

#endif

5189

5190

Syntax error

5190

5191

_ACEOF

5281

5282

fi

5282

5283

5284

ac_ext=c

5284

@@ -6964,16 +6867,12 @@

5285

@@ -6970,16 +6873,12 @@

5285

5286

ac_compiler_gnu=$ac_cv_c_compiler_gnu

5286

5287

5288

5301

5302

/* end confdefs.h. */

5302

5303

#include <stdlib.h>

5303

5304

#include <stdarg.h>

5304

@@ -6988,48 +6887,23 @@

5305

@@ -6994,48 +6893,23 @@

5305

5306

return 0;

5306

5307

}

5307

5308

_ACEOF

5355

5356

else

5356

5357

ac_cv_header_stdc=no

5357

5358

fi

5358

@@ -7039,18 +6913,14 @@

5359

@@ -7045,18 +6919,14 @@

5359

5360

5361

if test $ac_cv_header_stdc = yes; then

5361

5362

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

5377

5378

else

5378

5379

ac_cv_header_stdc=no

5379

5380

fi

5380

@@ -7060,14 +6930,10 @@

5381

@@ -7066,14 +6936,10 @@

5381

5382

5383

if test $ac_cv_header_stdc = yes; then

5383

5384

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

5394

5395

/* end confdefs.h. */

5395

5396

#include <ctype.h>

5396

5397

#include <stdlib.h>

5397

@@ -7094,118 +6960,34 @@

5398

@@ -7100,118 +6966,34 @@

5398

5399

return 0;

5399

5400

}

5400

5401

_ACEOF

5425

5426

- $as_echo "$as_me: program exited with status $ac_status" >&5

5426

5427

-$as_echo "$as_me: failed program was:" >&5

5427

5428

-sed 's/^/| /' conftest.$ac_ext >&5

5428

-

5429

+if ac_fn_c_try_run "$LINENO"; then :

5430

5429

5431

-( exit $ac_status )

5430

5432

-ac_cv_header_stdc=no

5431

-fi

5433

+else

5434

+ ac_cv_header_stdc=no

5435

fi

5432

5436

-rm -rf conftest.dSYM

5433

5437

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

5434

-fi

5435

-

5436

-

5437

-fi

5438

-fi

5438

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

5439

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

5440

fi

5441

5442

-

5443

fi

5444

fi

5439

5445

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

5440

-$as_echo "$ac_cv_header_stdc" >&6; }

5441

-if test $ac_cv_header_stdc = yes; then

5442

-

5446

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

5447

$as_echo "$ac_cv_header_stdc" >&6; }

5448

if test $ac_cv_header_stdc = yes; then

5449

5443

5450

-cat >>confdefs.h <<\_ACEOF

5444

5451

-#define STDC_HEADERS 1

5445

5452

-_ACEOF

5472

5479

-cat >>conftest.$ac_ext <<_ACEOF

5473

5480

-/* end confdefs.h. */

5474

5481

-$ac_includes_default

5475

+if ac_fn_c_try_run "$LINENO"; then :

5476

5482

-

5477

5483

-#include <$ac_header>

5478

5484

-_ACEOF

5479

5485

-rm -f conftest.$ac_objext

5495

5501

- test ! -s conftest.err

5496

5502

- } && test -s conftest.$ac_objext; then

5497

5503

- eval "$as_ac_Header=yes"

5498

else

5504

-else

5499

5505

- $as_echo "$as_me: failed program was:" >&5

5500

5506

-sed 's/^/| /' conftest.$ac_ext >&5

5501

+ ac_cv_header_stdc=no

5502

+fi

5503

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

5504

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

5505

+fi

5506

5507

- eval "$as_ac_Header=no"

5508

fi

5509

+fi

5510

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

5511

+$as_echo "$ac_cv_header_stdc" >&6; }

5512

+if test $ac_cv_header_stdc = yes; then

5513

+

5514

5507

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

5515

5508

5509

- eval "$as_ac_Header=no"

5510

fi

5511

5516

5512

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5517

fi

5513

-fi

5518

5514

-ac_res=`eval 'as_val=${'$as_ac_Header'}

5519

5515

- $as_echo "$as_val"'`

5520

5516

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

5522

5518

-as_val=`eval 'as_val=${'$as_ac_Header'}

5523

5519

- $as_echo "$as_val"'`

5524

5520

- if test "x$as_val" = x""yes; then

5525

+

5526

5521

+# On IRIX 5.3, sys/types and inttypes.h are conflicting.

5527

5522

+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

5528

5523

+ inttypes.h stdint.h unistd.h

5535

5530

cat >>confdefs.h <<_ACEOF

5536

5531

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

5537

5532

_ACEOF

5538

@@ -7215,62 +6997,13 @@

5533

@@ -7221,62 +7003,13 @@

5539

5534

done

5540

5535

5541

5536

5603

5598

_ACEOF

5604

5599

5605

5600

fi

5606

@@ -7290,7 +7023,7 @@

5601

@@ -7296,7 +7029,7 @@

5607

5602

5608

5603

5609

5604

# Check whether --enable-shared was given.

5612

5607

enableval=$enable_shared; p=${PACKAGE-default}

5613

5608

case $enableval in

5614

5609

yes) enable_shared=yes ;;

5615

@@ -7323,7 +7056,7 @@

5610

@@ -7329,7 +7062,7 @@

5616

5611

5617

5612

5618

5613

# Check whether --with-pic was given.

5621

5616

withval=$with_pic; pic_mode="$withval"

5622

5617

else

5623

5618

pic_mode=default

5624

@@ -7339,7 +7072,7 @@

5619

@@ -7345,7 +7078,7 @@

5625

5620

5626

5621

5627

5622

# Check whether --enable-fast-install was given.

5630

5625

enableval=$enable_fast_install; p=${PACKAGE-default}

5631

5626

case $enableval in

5632

5627

yes) enable_fast_install=yes ;;

5633

@@ -7420,9 +7153,9 @@

5628

@@ -7426,9 +7159,9 @@

5634

5629

setopt NO_GLOB_SUBST

5635

5630

fi

5636

5631

5642

5637

$as_echo_n "(cached) " >&6

5643

5638

else

5644

5639

rm -f .libs 2>/dev/null

5645

@@ -7435,7 +7168,7 @@

5640

@@ -7441,7 +7174,7 @@

5646

5641

fi

5647

5642

rmdir .libs 2>/dev/null

5648

5643

fi

5651

5646

$as_echo "$lt_cv_objdir" >&6; }

5652

5647

objdir=$lt_cv_objdir

5653

5648

5654

@@ -7528,9 +7261,9 @@

5649

@@ -7534,9 +7267,9 @@

5655

5650

case $deplibs_check_method in

5656

5651

file_magic*)

5657

5652

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

5663

5658

$as_echo_n "(cached) " >&6

5664

5659

else

5665

5660

case $MAGIC_CMD in

5666

@@ -7581,10 +7314,10 @@

5661

@@ -7587,10 +7320,10 @@

5667

5662

5668

5663

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

5669

5664

if test -n "$MAGIC_CMD"; then

5676

5671

$as_echo "no" >&6; }

5677

5672

fi

5678

5673

5679

@@ -7594,9 +7327,9 @@

5674

@@ -7600,9 +7333,9 @@

5680

5675

5681

5676

if test -z "$lt_cv_path_MAGIC_CMD"; then

5682

5677

if test -n "$ac_tool_prefix"; then

5688

5683

$as_echo_n "(cached) " >&6

5689

5684

else

5690

5685

case $MAGIC_CMD in

5691

@@ -7647,10 +7380,10 @@

5686

@@ -7653,10 +7386,10 @@

5692

5687

5693

5688

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

5694

5689

if test -n "$MAGIC_CMD"; then

5701

5696

$as_echo "no" >&6; }

5702

5697

fi

5703

5698

5704

@@ -7727,9 +7460,9 @@

5699

@@ -7733,9 +7466,9 @@

5705

5700

if test "$GCC" = yes; then

5706

5701

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

5707

5702

5713

5708

$as_echo_n "(cached) " >&6

5714

5709

else

5715

5710

lt_cv_prog_compiler_rtti_exceptions=no

5716

@@ -7745,11 +7478,11 @@

5711

@@ -7751,11 +7484,11 @@

5717

5712

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5718

5713

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5719

5714

-e 's:$: $lt_compiler_flag:'`

5720

- (eval echo "\"\$as_me:7748: $lt_compile\"" >&5)

5721

+ (eval echo "\"\$as_me:7481: $lt_compile\"" >&5)

5715

- (eval echo "\"\$as_me:7754: $lt_compile\"" >&5)

5716

+ (eval echo "\"\$as_me:7487: $lt_compile\"" >&5)

5722

5717

(eval "$lt_compile" 2>conftest.err)

5723

5718

ac_status=$?

5724

5719

cat conftest.err >&5

5725

- echo "$as_me:7752: \$? = $ac_status" >&5

5726

+ echo "$as_me:7485: \$? = $ac_status" >&5

5720

- echo "$as_me:7758: \$? = $ac_status" >&5

5721

+ echo "$as_me:7491: \$? = $ac_status" >&5

5727

5722

if (exit $ac_status) && test -s "$ac_outfile"; then

5728

5723

# The compiler can only warn and ignore the option if not recognized

5729

5724

# So say no if there are warnings other than the usual output.

5730

@@ -7762,7 +7495,7 @@

5725

@@ -7768,7 +7501,7 @@

5731

5726

$RM conftest*

5732

5727

5733

5728

fi

5736

5731

$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

5737

5732

5738

5733

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

5739

@@ -7782,7 +7515,7 @@

5734

@@ -7788,7 +7521,7 @@

5740

5735

lt_prog_compiler_pic=

5741

5736

lt_prog_compiler_static=

5742

5737

5745

5740

$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

5746

5741

5747

5742

if test "$GCC" = yes; then

5748

@@ -8054,7 +7787,7 @@

5743

@@ -8060,7 +7793,7 @@

5749

5744

lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"

5750

5745

;;

5751

5746

esac

5754

5749

$as_echo "$lt_prog_compiler_pic" >&6; }

5755

5750

5756

5751

5757

@@ -8066,9 +7799,9 @@

5752

@@ -8072,9 +7805,9 @@

5758

5753

# Check to make sure the PIC flag actually works.

5759

5754

#

5760

5755

if test -n "$lt_prog_compiler_pic"; then

5766

5761

$as_echo_n "(cached) " >&6

5767

5762

else

5768

5763

lt_cv_prog_compiler_pic_works=no

5769

@@ -8084,11 +7817,11 @@

5764

@@ -8090,11 +7823,11 @@

5770

5765

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5771

5766

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5772

5767

-e 's:$: $lt_compiler_flag:'`

5773

- (eval echo "\"\$as_me:8087: $lt_compile\"" >&5)

5774

+ (eval echo "\"\$as_me:7820: $lt_compile\"" >&5)

5768

- (eval echo "\"\$as_me:8093: $lt_compile\"" >&5)

5769

+ (eval echo "\"\$as_me:7826: $lt_compile\"" >&5)

5775

5770

(eval "$lt_compile" 2>conftest.err)

5776

5771

ac_status=$?

5777

5772

cat conftest.err >&5

5778

- echo "$as_me:8091: \$? = $ac_status" >&5

5779

+ echo "$as_me:7824: \$? = $ac_status" >&5

5773

- echo "$as_me:8097: \$? = $ac_status" >&5

5774

+ echo "$as_me:7830: \$? = $ac_status" >&5

5780

5775

if (exit $ac_status) && test -s "$ac_outfile"; then

5781

5776

# The compiler can only warn and ignore the option if not recognized

5782

5777

# So say no if there are warnings other than the usual output.

5783

@@ -8101,7 +7834,7 @@

5778

@@ -8107,7 +7840,7 @@

5784

5779

$RM conftest*

5785

5780

5786

5781

fi

5789

5784

$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }

5790

5785

5791

5786

if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

5792

@@ -8125,9 +7858,9 @@

5787

@@ -8131,9 +7864,9 @@

5793

5788

# Check to make sure the static flag actually works.

5794

5789

#

5795

5790

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

5801

5796

$as_echo_n "(cached) " >&6

5802

5797

else

5803

5798

lt_cv_prog_compiler_static_works=no

5804

@@ -8153,7 +7886,7 @@

5799

@@ -8159,7 +7892,7 @@

5805

5800

LDFLAGS="$save_LDFLAGS"

5806

5801

5807

5802

fi

5810

5805

$as_echo "$lt_cv_prog_compiler_static_works" >&6; }

5811

5806

5812

5807

if test x"$lt_cv_prog_compiler_static_works" = xyes; then

5813

@@ -8168,9 +7901,9 @@

5814

5815

5816

5817

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

5818

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

5819

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

5820

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

5821

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

5822

$as_echo_n "(cached) " >&6

5823

else

5824

lt_cv_prog_compiler_c_o=no

5825

@@ -8189,11 +7922,11 @@

5826

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5827

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5828

-e 's:$: $lt_compiler_flag:'`

5829

- (eval echo "\"\$as_me:8192: $lt_compile\"" >&5)

5830

+ (eval echo "\"\$as_me:7925: $lt_compile\"" >&5)

5831

(eval "$lt_compile" 2>out/conftest.err)

5832

ac_status=$?

5833

cat out/conftest.err >&5

5834

- echo "$as_me:8196: \$? = $ac_status" >&5

5835

+ echo "$as_me:7929: \$? = $ac_status" >&5

5836

if (exit $ac_status) && test -s out/conftest2.$ac_objext

5837

then

5838

# The compiler can only warn and ignore the option if not recognized

5839

@@ -8215,7 +7948,7 @@

5840

$RM conftest*

5841

5842

fi

5843

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

5844

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

5845

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

5846

5847

5848

@@ -8223,9 +7956,9 @@

5849

5850

5851

5852

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

5853

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

5854

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

5855

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

5856

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

5857

$as_echo_n "(cached) " >&6

5858

else

5859

lt_cv_prog_compiler_c_o=no

5860

@@ -8244,11 +7977,11 @@

5861

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5862

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5863

-e 's:$: $lt_compiler_flag:'`

5864

- (eval echo "\"\$as_me:8247: $lt_compile\"" >&5)

5865

+ (eval echo "\"\$as_me:7980: $lt_compile\"" >&5)

5866

(eval "$lt_compile" 2>out/conftest.err)

5867

ac_status=$?

5868

cat out/conftest.err >&5

5869

- echo "$as_me:8251: \$? = $ac_status" >&5

5870

+ echo "$as_me:7984: \$? = $ac_status" >&5

5871

if (exit $ac_status) && test -s out/conftest2.$ac_objext

5872

then

5873

# The compiler can only warn and ignore the option if not recognized

5874

@@ -8270,7 +8003,7 @@

5875

$RM conftest*

5876

5877

fi

5878

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

5879

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

5880

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

5881

5882

5883

@@ -8279,7 +8012,7 @@

5808

@@ -8174,9 +7907,9 @@

5809

5810

5811

5812

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

5813

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

5814

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

5815

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

5816

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

5817

$as_echo_n "(cached) " >&6

5818

else

5819

lt_cv_prog_compiler_c_o=no

5820

@@ -8195,11 +7928,11 @@

5821

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5822

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5823

-e 's:$: $lt_compiler_flag:'`

5824

- (eval echo "\"\$as_me:8198: $lt_compile\"" >&5)

5825

+ (eval echo "\"\$as_me:7931: $lt_compile\"" >&5)

5826

(eval "$lt_compile" 2>out/conftest.err)

5827

ac_status=$?

5828

cat out/conftest.err >&5

5829

- echo "$as_me:8202: \$? = $ac_status" >&5

5830

+ echo "$as_me:7935: \$? = $ac_status" >&5

5831

if (exit $ac_status) && test -s out/conftest2.$ac_objext

5832

then

5833

# The compiler can only warn and ignore the option if not recognized

5834

@@ -8221,7 +7954,7 @@

5835

$RM conftest*

5836

5837

fi

5838

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

5839

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

5840

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

5841

5842

5843

@@ -8229,9 +7962,9 @@

5844

5845

5846

5847

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

5848

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

5849

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

5850

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

5851

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

5852

$as_echo_n "(cached) " >&6

5853

else

5854

lt_cv_prog_compiler_c_o=no

5855

@@ -8250,11 +7983,11 @@

5856

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

5857

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

5858

-e 's:$: $lt_compiler_flag:'`

5859

- (eval echo "\"\$as_me:8253: $lt_compile\"" >&5)

5860

+ (eval echo "\"\$as_me:7986: $lt_compile\"" >&5)

5861

(eval "$lt_compile" 2>out/conftest.err)

5862

ac_status=$?

5863

cat out/conftest.err >&5

5864

- echo "$as_me:8257: \$? = $ac_status" >&5

5865

+ echo "$as_me:7990: \$? = $ac_status" >&5

5866

if (exit $ac_status) && test -s out/conftest2.$ac_objext

5867

then

5868

# The compiler can only warn and ignore the option if not recognized

5869

@@ -8276,7 +8009,7 @@

5870

$RM conftest*

5871

5872

fi

5873

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

5874

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

5875

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

5876

5877

5878

@@ -8285,7 +8018,7 @@

5884

5879

hard_links="nottested"

5885

5880

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

5886

5881

# do not overwrite the value of need_locks provided by the user

5889

5884

$as_echo_n "checking if we can lock with hard links... " >&6; }

5890

5885

hard_links=yes

5891

5886

$RM conftest*

5892

@@ -8287,10 +8020,10 @@

5887

@@ -8293,10 +8026,10 @@

5893

5888

touch conftest.a

5894

5889

ln conftest.a conftest.b 2>&5 || hard_links=no

5895

5890

ln conftest.a conftest.b 2>/dev/null && hard_links=no

5902

5897

$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

5903

5898

need_locks=warn

5904

5899

fi

5905

@@ -8303,7 +8036,7 @@

5900

@@ -8309,7 +8042,7 @@

5906

5901

5907

5902

5908

5903

5911

5906

$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

5912

5907

5913

5908

runpath_var=

5914

@@ -8363,6 +8096,9 @@

5909

@@ -8369,6 +8102,9 @@

5915

5910

openbsd*)

5916

5911

with_gnu_ld=no

5917

5912

;;

5921

5916

esac

5922

5917

5923

5918

ld_shlibs=yes

5924

@@ -8545,7 +8281,7 @@

5919

@@ -8551,7 +8287,7 @@

5925

5920

fi

5926

5921

;;

5927

5922

5930

5925

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

5931

5926

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

5932

5927

wlarc=

5933

@@ -8720,6 +8456,7 @@

5928

@@ -8726,6 +8462,7 @@

5934

5929

if test "$aix_use_runtimelinking" = yes; then

5935

5930

shared_flag="$shared_flag "'${wl}-G'

5936

5931

fi

5938

5933

else

5939

5934

# not using gcc

5940

5935

if test "$host_cpu" = ia64; then

5941

@@ -8745,11 +8482,7 @@

5936

@@ -8751,11 +8488,7 @@

5942

5937

allow_undefined_flag='-berok'

5943

5938

# Determine the default libpath from the value encoded in an

5944

5939

# empty executable.

5951

5946

/* end confdefs.h. */

5952

5947

5953

5948

int

5954

@@ -8760,27 +8493,7 @@

5949

@@ -8766,27 +8499,7 @@

5955

5950

return 0;

5956

5951

}

5957

5952

_ACEOF

5980

5975

5981

5976

lt_aix_libpath_sed='

5982

5977

/Import File Strings/,/^$/ {

5983

@@ -8794,16 +8507,9 @@

5978

@@ -8800,16 +8513,9 @@

5984

5979

if test -z "$aix_libpath"; then

5985

5980

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5986

5981

fi

5999

5994

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6000

5995

6001

5996

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

6002

@@ -8816,11 +8522,7 @@

5997

@@ -8822,11 +8528,7 @@

6003

5998

else

6004

5999

# Determine the default libpath from the value encoded in an

6005

6000

# empty executable.

6012

6007

/* end confdefs.h. */

6013

6008

6014

6009

int

6015

@@ -8831,27 +8533,7 @@

6010

@@ -8837,27 +8539,7 @@

6016

6011

return 0;

6017

6012

}

6018

6013

_ACEOF

6041

6036

6042

6037

lt_aix_libpath_sed='

6043

6038

/Import File Strings/,/^$/ {

6044

@@ -8865,16 +8547,9 @@

6039

@@ -8871,16 +8553,9 @@

6045

6040

if test -z "$aix_libpath"; then

6046

6041

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6047

6042

fi

6060

6055

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6061

6056

6062

6057

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

6063

@@ -9086,42 +8761,16 @@

6058

@@ -9092,42 +8767,16 @@

6064

6059

# implicitly export all symbols.

6065

6060

save_LDFLAGS="$LDFLAGS"

6066

6061

LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

6108

6103

LDFLAGS="$save_LDFLAGS"

6109

6104

else

6110

6105

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

6111

@@ -9134,7 +8783,7 @@

6106

@@ -9140,7 +8789,7 @@

6112

6107

link_all_deplibs=yes

6113

6108

;;

6114

6109

6117

6112

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

6118

6113

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

6119

6114

else

6120

@@ -9377,7 +9026,7 @@

6115

@@ -9383,7 +9032,7 @@

6121

6116

fi

6122

6117

fi

6123

6118

6126

6121

$as_echo "$ld_shlibs" >&6; }

6127

6122

test "$ld_shlibs" = no && can_build_shared=no

6128

6123

6129

@@ -9414,16 +9063,16 @@

6124

@@ -9420,16 +9069,16 @@

6130

6125

# Test whether the compiler implicitly links with -lc since on some

6131

6126

# systems, -lgcc has to come before -lc. If gcc already passes -lc

6132

6127

# to ld, don't add -lc before -lgcc.

6147

6142

soname=conftest

6148

6143

lib=conftest

6149

6144

libobjs=conftest.$ac_objext

6150

@@ -9437,11 +9086,11 @@

6145

@@ -9443,11 +9092,11 @@

6151

6146

libname=conftest

6152

6147

lt_save_allow_undefined_flag=$allow_undefined_flag

6153

6148

allow_undefined_flag=

6162

6157

then

6163

6158

archive_cmds_need_lc=no

6164

6159

else

6165

@@ -9452,7 +9101,7 @@

6160

@@ -9458,7 +9107,7 @@

6166

6161

cat conftest.err 1>&5

6167

6162

fi

6168

6163

$RM conftest*

6171

6166

$as_echo "$archive_cmds_need_lc" >&6; }

6172

6167

;;

6173

6168

esac

6174

@@ -9616,7 +9265,7 @@

6169

@@ -9622,7 +9271,7 @@

6175

6170

6176

6171

6177

6172

6180

6175

$as_echo_n "checking dynamic linker characteristics... " >&6; }

6181

6176

6182

6177

if test "$GCC" = yes; then

6183

@@ -10038,11 +9687,7 @@

6178

@@ -10044,11 +9693,7 @@

6184

6179

save_libdir=$libdir

6185

6180

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

6186

6181

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

6193

6188

/* end confdefs.h. */

6194

6189

6195

6190

int

6196

@@ -10053,41 +9698,13 @@

6191

@@ -10059,41 +9704,13 @@

6197

6192

return 0;

6198

6193

}

6199

6194

_ACEOF

6239

6234

LDFLAGS=$save_LDFLAGS

6240

6235

libdir=$save_libdir

6241

6236

6242

@@ -10096,13 +9713,10 @@

6237

@@ -10102,13 +9719,10 @@

6243

6238

# before this can be enabled.

6244

6239

hardcode_into_libs=yes

6245

6240

6254

6249

fi

6255

6250

6256

6251

# We used to test for /lib/ld.so.1 and disable shared libraries on

6257

@@ -10114,6 +9728,18 @@

6252

@@ -10120,6 +9734,18 @@

6258

6253

dynamic_linker='GNU/Linux ld.so'

6259

6254

;;

6260

6255

6273

6268

netbsd*)

6274

6269

version_type=sunos

6275

6270

need_lib_prefix=no

6276

@@ -10302,7 +9928,7 @@

6271

@@ -10308,7 +9934,7 @@

6277

6272

dynamic_linker=no

6278

6273

;;

6279

6274

esac

6282

6277

$as_echo "$dynamic_linker" >&6; }

6283

6278

test "$dynamic_linker" = no && can_build_shared=no

6284

6279

6285

@@ -10404,7 +10030,7 @@

6280

@@ -10410,7 +10036,7 @@

6286

6281

6287

6282

6288

6283

6291

6286

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

6292

6287

hardcode_action=

6293

6288

if test -n "$hardcode_libdir_flag_spec" ||

6294

@@ -10429,7 +10055,7 @@

6289

@@ -10435,7 +10061,7 @@

6295

6290

# directories.

6296

6291

hardcode_action=unsupported

6297

6292

fi

6300

6295

$as_echo "$hardcode_action" >&6; }

6301

6296

6302

6297

if test "$hardcode_action" = relink ||

6303

@@ -10474,18 +10100,14 @@

6298

@@ -10480,18 +10106,14 @@

6304

6299

6305

6300

darwin*)

6306

6301

# if libdl is installed we need to link against it

6322

6317

/* end confdefs.h. */

6323

6318

6324

6319

/* Override any GCC internal prototype to avoid an error.

6325

@@ -10503,43 +10125,18 @@

6320

@@ -10509,43 +10131,18 @@

6326

6321

return 0;

6327

6322

}

6328

6323

_ACEOF

6372

6367

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

6373

6368

else

6374

6369

6375

@@ -10552,189 +10149,19 @@

6370

@@ -10557,190 +10154,20 @@

6371

6376

6372

;;

6377

6373

6378

*)

6374

- *)

6379

6375

- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5

6380

6376

-$as_echo_n "checking for shl_load... " >&6; }

6381

6377

-if test "${ac_cv_func_shl_load+set}" = set; then

6462

6458

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

6463

6459

-$as_echo "$ac_cv_func_shl_load" >&6; }

6464

6460

-if test "x$ac_cv_func_shl_load" = x""yes; then

6465

+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

6466

+if test "x$ac_cv_func_shl_load" = x""yes; then :

6467

lt_cv_dlopen="shl_load"

6468

else

6461

- lt_cv_dlopen="shl_load"

6462

-else

6469

6463

- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

6470

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

6471

$as_echo_n "checking for shl_load in -ldld... " >&6; }

6464

-$as_echo_n "checking for shl_load in -ldld... " >&6; }

6472

6465

-if test "${ac_cv_lib_dld_shl_load+set}" = set; then

6473

+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

6474

$as_echo_n "(cached) " >&6

6475

else

6476

ac_check_lib_save_LIBS=$LIBS

6466

- $as_echo_n "(cached) " >&6

6467

-else

6468

- ac_check_lib_save_LIBS=$LIBS

6477

6469

-LIBS="-ldld $LIBS"

6478

6470

-cat >conftest.$ac_ext <<_ACEOF

6479

6471

-/* confdefs.h. */

6563

6555

-#endif

6564

6556

-

6565

6557

-#undef dlopen

6558

+ *)

6559

+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

6560

+if test "x$ac_cv_func_shl_load" = x""yes; then :

6561

+ lt_cv_dlopen="shl_load"

6562

+else

6563

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

6564

+$as_echo_n "checking for shl_load in -ldld... " >&6; }

6565

+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

6566

+ $as_echo_n "(cached) " >&6

6567

+else

6568

+ ac_check_lib_save_LIBS=$LIBS

6566

6569

+LIBS="-ldld $LIBS"

6567

6570

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6568

6571

+/* end confdefs.h. */

6569

6572

6570

6573

/* Override any GCC internal prototype to avoid an error.

6571

6574

Use char because int might match the return type of a GCC

6572

@@ -10742,72 +10169,41 @@

6575

@@ -10748,72 +10175,41 @@

6573

6576

#ifdef __cplusplus

6574

6577

extern "C"

6575

6578

#endif

6660

6663

/* end confdefs.h. */

6661

6664

6662

6665

/* Override any GCC internal prototype to avoid an error.

6663

@@ -10825,57 +10221,28 @@

6666

@@ -10831,57 +10227,28 @@

6664

6667

return 0;

6665

6668

}

6666

6669

_ACEOF

6727

6730

/* end confdefs.h. */

6728

6731

6729

6732

/* Override any GCC internal prototype to avoid an error.

6730

@@ -10893,57 +10260,28 @@

6733

@@ -10899,57 +10266,28 @@

6731

6734

return 0;

6732

6735

}

6733

6736

_ACEOF

6794

6797

/* end confdefs.h. */

6795

6798

6796

6799

/* Override any GCC internal prototype to avoid an error.

6797

@@ -10961,43 +10299,18 @@

6800

@@ -10967,43 +10305,18 @@

6798

6801

return 0;

6799

6802

}

6800

6803

_ACEOF

6844

6847

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

6845

6848

fi

6846

6849

6847

@@ -11036,9 +10349,9 @@

6850

@@ -11042,9 +10355,9 @@

6848

6851

save_LIBS="$LIBS"

6849

6852

LIBS="$lt_cv_dlopen_libs $LIBS"

6850

6853

6856

6859

$as_echo_n "(cached) " >&6

6857

6860

else

6858

6861

if test "$cross_compiling" = yes; then :

6859

@@ -11047,7 +10360,7 @@

6862

@@ -11053,7 +10366,7 @@

6860

6863

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

6861

6864

lt_status=$lt_dlunknown

6862

6865

cat > conftest.$ac_ext <<_LT_EOF

6863

-#line 11050 "configure"

6864

+#line 10363 "configure"

6866

-#line 11056 "configure"

6867

+#line 10369 "configure"

6865

6868

#include "confdefs.h"

6866

6869

6867

6870

#if HAVE_DLFCN_H

6868

@@ -11106,11 +10419,11 @@

6871

@@ -11112,11 +10425,11 @@

6869

6872

return status;

6870

6873

}

6871

6874

_LT_EOF

6880

6883

(./conftest; exit; ) >&5 2>/dev/null

6881

6884

lt_status=$?

6882

6885

case x$lt_status in

6883

@@ -11127,14 +10440,14 @@

6886

@@ -11133,14 +10446,14 @@

6884

6887

6885

6888

6886

6889

fi

6898

6901

$as_echo_n "(cached) " >&6

6899

6902

else

6900

6903

if test "$cross_compiling" = yes; then :

6901

@@ -11143,7 +10456,7 @@

6904

@@ -11149,7 +10462,7 @@

6902

6905

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

6903

6906

lt_status=$lt_dlunknown

6904

6907

cat > conftest.$ac_ext <<_LT_EOF

6905

-#line 11146 "configure"

6906

+#line 10459 "configure"

6908

-#line 11152 "configure"

6909

+#line 10465 "configure"

6907

6910

#include "confdefs.h"

6908

6911

6909

6912

#if HAVE_DLFCN_H

6910

@@ -11202,11 +10515,11 @@

6913

@@ -11208,11 +10521,11 @@

6911

6914

return status;

6912

6915

}

6913

6916

_LT_EOF

6922

6925

(./conftest; exit; ) >&5 2>/dev/null

6923

6926

lt_status=$?

6924

6927

case x$lt_status in

6925

@@ -11223,7 +10536,7 @@

6928

@@ -11229,7 +10542,7 @@

6926

6929

6927

6930

6928

6931

fi

6931

6934

$as_echo "$lt_cv_dlopen_self_static" >&6; }

6932

6935

fi

6933

6936

6934

@@ -11262,12 +10575,12 @@

6937

@@ -11268,12 +10581,12 @@

6935

6938

6936

6939

striplib=

6937

6940

old_striplib=

6946

6949

$as_echo "yes" >&6; }

6947

6950

else

6948

6951

# FIXME - insert some real tests, host_os isn't really good enough

6949

@@ -11276,15 +10589,15 @@

6952

@@ -11282,15 +10595,15 @@

6950

6953

if test -n "$STRIP" ; then

6951

6954

striplib="$STRIP -x"

6952

6955

old_striplib="$STRIP -S"

6965

6968

$as_echo "no" >&6; }

6966

6969

;;

6967

6970

esac

6968

@@ -11302,12 +10615,12 @@

6971

@@ -11308,12 +10621,12 @@

6969

6972

6970

6973

6971

6974

# Report which library types will actually be built

6981

6984

$as_echo_n "checking whether to build shared libraries... " >&6; }

6982

6985

test "$can_build_shared" = "no" && enable_shared=no

6983

6986

6984

@@ -11328,14 +10641,14 @@

6987

@@ -11334,14 +10647,14 @@

6985

6988

fi

6986

6989

;;

6987

6990

esac

6999

7002

$as_echo "$enable_static" >&6; }

7000

7003

7001

7004

7002

@@ -11385,9 +10698,9 @@

7005

@@ -11391,9 +10704,9 @@

7003

7006

if test -n "$ac_tool_prefix"; then

7004

7007

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

7005

7008

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

7011

7014

$as_echo_n "(cached) " >&6

7012

7015

else

7013

7016

case $PKG_CONFIG in

7014

@@ -11400,14 +10713,14 @@

7017

@@ -11406,14 +10719,14 @@

7015

7018

do

7016

7019

IFS=$as_save_IFS

7017

7020

test -z "$as_dir" && as_dir=.

7029

7032

IFS=$as_save_IFS

7030

7033

7031

7034

;;

7032

@@ -11415,10 +10728,10 @@

7035

@@ -11421,10 +10734,10 @@

7033

7036

fi

7034

7037

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

7035

7038

if test -n "$PKG_CONFIG"; then

7042

7045

$as_echo "no" >&6; }

7043

7046

fi

7044

7047

7045

@@ -11428,9 +10741,9 @@

7048

@@ -11434,9 +10747,9 @@

7046

7049

ac_pt_PKG_CONFIG=$PKG_CONFIG

7047

7050

# Extract the first word of "pkg-config", so it can be a program name with args.

7048

7051

set dummy pkg-config; ac_word=$2

7054

7057

$as_echo_n "(cached) " >&6

7055

7058

else

7056

7059

case $ac_pt_PKG_CONFIG in

7057

@@ -11443,14 +10756,14 @@

7060

@@ -11449,14 +10762,14 @@

7058

7061

do

7059

7062

IFS=$as_save_IFS

7060

7063

test -z "$as_dir" && as_dir=.

7072

7075

IFS=$as_save_IFS

7073

7076

7074

7077

;;

7075

@@ -11458,10 +10771,10 @@

7078

@@ -11464,10 +10777,10 @@

7076

7079

fi

7077

7080

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

7078

7081

if test -n "$ac_pt_PKG_CONFIG"; then

7085

7088

$as_echo "no" >&6; }

7086

7089

fi

7087

7090

7088

@@ -11470,7 +10783,7 @@

7091

@@ -11476,7 +10789,7 @@

7089

7092

else

7090

7093

case $cross_compiling:$ac_tool_warned in

7091

7094

yes:)

7094

7097

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7095

7098

ac_tool_warned=yes ;;

7096

7099

esac

7097

@@ -11483,13 +10796,13 @@

7100

@@ -11489,13 +10802,13 @@

7098

7101

fi

7099

7102

if test -n "$PKG_CONFIG"; then

7100

7103

_pkg_min_version=0.16

7111

7114

$as_echo "no" >&6; }

7112

7115

PKG_CONFIG=""

7113

7116

fi

7114

@@ -11497,16 +10810,16 @@

7117

@@ -11503,16 +10816,16 @@

7115

7118

fi

7116

7119

7117

7120

7131

7134

$as_echo "$USE_NLS" >&6; }

7132

7135

7133

7136

7134

@@ -11514,35 +10827,31 @@

7137

@@ -11520,35 +10833,31 @@

7135

7138

7136

7139

case "$am__api_version" in

7137

7140

1.01234)

7173

7176

$as_echo_n "(cached) " >&6

7174

7177

else

7175

7178

case $INTLTOOL_UPDATE in

7176

@@ -11555,14 +10864,14 @@

7179

@@ -11561,14 +10870,14 @@

7177

7180

do

7178

7181

IFS=$as_save_IFS

7179

7182

test -z "$as_dir" && as_dir=.

7191

7194

IFS=$as_save_IFS

7192

7195

7193

7196

;;

7194

@@ -11570,19 +10879,19 @@

7197

@@ -11576,19 +10885,19 @@

7195

7198

fi

7196

7199

INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE

7197

7200

if test -n "$INTLTOOL_UPDATE"; then

7215

7218

$as_echo_n "(cached) " >&6

7216

7219

else

7217

7220

case $INTLTOOL_MERGE in

7218

@@ -11595,14 +10904,14 @@

7221

@@ -11601,14 +10910,14 @@

7219

7222

do

7220

7223

IFS=$as_save_IFS

7221

7224

test -z "$as_dir" && as_dir=.

7233

7236

IFS=$as_save_IFS

7234

7237

7235

7238

;;

7236

@@ -11610,19 +10919,19 @@

7239

@@ -11616,19 +10925,19 @@

7237

7240

fi

7238

7241

INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE

7239

7242

if test -n "$INTLTOOL_MERGE"; then

7257

7260

$as_echo_n "(cached) " >&6

7258

7261

else

7259

7262

case $INTLTOOL_EXTRACT in

7260

@@ -11635,14 +10944,14 @@

7263

@@ -11641,14 +10950,14 @@

7261

7264

do

7262

7265

IFS=$as_save_IFS

7263

7266

test -z "$as_dir" && as_dir=.

7275

7278

IFS=$as_save_IFS

7276

7279

7277

7280

;;

7278

@@ -11650,18 +10959,16 @@

7281

@@ -11656,18 +10965,16 @@

7279

7282

fi

7280

7283

INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT

7281

7284

if test -n "$INTLTOOL_EXTRACT"; then

7297

7300

fi

7298

7301

7299

7302

INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.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 $< $@'

7300

@@ -11783,9 +11090,9 @@

7303

@@ -11789,9 +11096,9 @@

7301

7304

# Check the gettext tools to make sure they are GNU

7302

7305

# Extract the first word of "xgettext", so it can be a program name with args.

7303

7306

set dummy xgettext; ac_word=$2

7309

7312

$as_echo_n "(cached) " >&6

7310

7313

else

7311

7314

case $XGETTEXT in

7312

@@ -11798,14 +11105,14 @@

7315

@@ -11804,14 +11111,14 @@

7313

7316

do

7314

7317

IFS=$as_save_IFS

7315

7318

test -z "$as_dir" && as_dir=.

7327

7330

IFS=$as_save_IFS

7328

7331

7329

7332

;;

7330

@@ -11813,19 +11120,19 @@

7333

@@ -11819,19 +11126,19 @@

7331

7334

fi

7332

7335

XGETTEXT=$ac_cv_path_XGETTEXT

7333

7336

if test -n "$XGETTEXT"; then

7351

7354

$as_echo_n "(cached) " >&6

7352

7355

else

7353

7356

case $MSGMERGE in

7354

@@ -11838,14 +11145,14 @@

7357

@@ -11844,14 +11151,14 @@

7355

7358

do

7356

7359

IFS=$as_save_IFS

7357

7360

test -z "$as_dir" && as_dir=.

7369

7372

IFS=$as_save_IFS

7370

7373

7371

7374

;;

7372

@@ -11853,19 +11160,19 @@

7375

@@ -11859,19 +11166,19 @@

7373

7376

fi

7374

7377

MSGMERGE=$ac_cv_path_MSGMERGE

7375

7378

if test -n "$MSGMERGE"; then

7393

7396

$as_echo_n "(cached) " >&6

7394

7397

else

7395

7398

case $MSGFMT in

7396

@@ -11878,14 +11185,14 @@

7399

@@ -11884,14 +11191,14 @@

7397

7400

do

7398

7401

IFS=$as_save_IFS

7399

7402

test -z "$as_dir" && as_dir=.

7411

7414

IFS=$as_save_IFS

7412

7415

7413

7416

;;

7414

@@ -11893,19 +11200,19 @@

7417

@@ -11899,19 +11206,19 @@

7415

7418

fi

7416

7419

MSGFMT=$ac_cv_path_MSGFMT

7417

7420

if test -n "$MSGFMT"; then

7435

7438

$as_echo_n "(cached) " >&6

7436

7439

else

7437

7440

case $GMSGFMT in

7438

@@ -11918,14 +11225,14 @@

7441

@@ -11924,14 +11231,14 @@

7439

7442

do

7440

7443

IFS=$as_save_IFS

7441

7444

test -z "$as_dir" && as_dir=.

7453

7456

IFS=$as_save_IFS

7454

7457

7455

7458

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

7456

@@ -11934,33 +11241,29 @@

7459

@@ -11940,33 +11247,29 @@

7457

7460

fi

7458

7461

GMSGFMT=$ac_cv_path_GMSGFMT

7459

7462

if test -n "$GMSGFMT"; then

7493

7496

$as_echo_n "(cached) " >&6

7494

7497

else

7495

7498

case $INTLTOOL_PERL in

7496

@@ -11973,14 +11276,14 @@

7499

@@ -11979,14 +11282,14 @@

7497

7500

do

7498

7501

IFS=$as_save_IFS

7499

7502

test -z "$as_dir" && as_dir=.

7511

7514

IFS=$as_save_IFS

7512

7515

7513

7516

;;

7514

@@ -11988,41 +11291,35 @@

7517

@@ -11994,41 +11297,35 @@

7515

7518

fi

7516

7519

INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL

7517

7520

if test -n "$INTLTOOL_PERL"; then

7562

7565

fi

7563

7566

fi

7564

7567

7565

@@ -12032,298 +11329,51 @@

7568

@@ -12038,11 +11335,7 @@

7566

7569

# Set DATADIRNAME correctly if it is not set yet

7567

7570

# (copied from glib-gettext.m4)

7568

7571

if test -z "$DATADIRNAME"; then

7571

7574

-_ACEOF

7572

7575

-cat confdefs.h >>conftest.$ac_ext

7573

7576

-cat >>conftest.$ac_ext <<_ACEOF

7574

-/* end confdefs.h. */

7575

-

7576

-int

7577

-main ()

7578

-{

7579

-extern int _nl_msg_cat_cntr;

7580

- return _nl_msg_cat_cntr

7581

- ;

7582

- return 0;

7583

-}

7584

-_ACEOF

7577

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7578

/* end confdefs.h. */

7579

7580

int

7581

@@ -12054,120 +11347,13 @@

7582

return 0;

7583

}

7584

_ACEOF

7585

-rm -f conftest.$ac_objext conftest$ac_exeext

7586

-if { (ac_try="$ac_link"

7587

-case "(($ac_try" in

7603

- test "$cross_compiling" = yes ||

7604

- $as_test_x conftest$ac_exeext

7605

- }; then

7606

- DATADIRNAME=share

7607

-else

7606

+if ac_fn_c_try_link "$LINENO"; then :

7607

DATADIRNAME=share

7608

else

7608

7609

- $as_echo "$as_me: failed program was:" >&5

7609

7610

-sed 's/^/| /' conftest.$ac_ext >&5

7610

7611

-

7611

7612

- case $host in

7612

- *-*-solaris*)

7613

+ case $host in

7614

*-*-solaris*)

7613

7615

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

7614

7616

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

7615

7617

-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

7696

7698

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

7697

7699

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

7698

7700

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

7699

- DATADIRNAME=share

7700

-else

7701

- DATADIRNAME=lib

7702

-fi

7703

-

7704

- ;;

7705

- *)

7706

- DATADIRNAME=lib

7707

- ;;

7708

- esac

7709

-fi

7701

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

7702

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

7703

DATADIRNAME=share

7704

else

7705

DATADIRNAME=lib

7706

@@ -12179,157 +11365,21 @@

7707

;;

7708

esac

7709

fi

7710

-

7711

-rm -rf conftest.dSYM

7712

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7783

-_ACEOF

7784

-cat confdefs.h >>conftest.$ac_ext

7785

-cat >>conftest.$ac_ext <<_ACEOF

7786

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7787

/* end confdefs.h. */

7786

-/* end confdefs.h. */

7788

7787

-#include <$ac_header>

7789

7788

-_ACEOF

7790

7789

-if { (ac_try="$ac_cpp conftest.$ac_ext"

7808

7807

-else

7809

7808

- $as_echo "$as_me: failed program was:" >&5

7810

7809

-sed 's/^/| /' conftest.$ac_ext >&5

7811

7810

-

7812

7811

- ac_header_preproc=no

7813

+int

7814

+main ()

7815

+{

7816

+extern int _nl_msg_cat_cntr;

7817

+ return _nl_msg_cat_cntr

7818

+ ;

7819

+ return 0;

7820

+}

7821

+_ACEOF

7822

+if ac_fn_c_try_link "$LINENO"; then :

7823

+ DATADIRNAME=share

7824

+else

7825

+ case $host in

7826

+ *-*-solaris*)

7827

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

7828

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

7829

+ DATADIRNAME=share

7830

+else

7831

+ DATADIRNAME=lib

7812

+rm -f core conftest.err conftest.$ac_objext \

7813

+ conftest$ac_exeext conftest.$ac_ext

7832

7814

fi

7833

7815

7834

7816

-rm -f conftest.err conftest.$ac_ext

7843

7825

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

7844

7826

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

7845

7827

- ac_header_preproc=yes

7846

;;

7828

- ;;

7847

7829

- no:yes:* )

7848

7830

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

7849

7831

-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

7858

7840

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

7859

7841

-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

7860

7842

-

7861

+ *)

7862

+ DATADIRNAME=lib

7863

;;

7843

- ;;

7864

7844

-esac

7865

7845

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

7866

7846

-$as_echo_n "checking for $ac_header... " >&6; }

7868

7848

- $as_echo_n "(cached) " >&6

7869

7849

-else

7870

7850

- eval "$as_ac_Header=\$ac_header_preproc"

7871

+ esac

7872

fi

7851

-fi

7873

7852

-ac_res=`eval 'as_val=${'$as_ac_Header'}

7874

7853

- $as_echo "$as_val"'`

7875

7854

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

7876

7855

-$as_echo "$ac_res" >&6; }

7877

-

7878

+rm -f core conftest.err conftest.$ac_objext \

7879

+ conftest$ac_exeext conftest.$ac_ext

7880

fi

7856

7857

-fi

7881

7858

-as_val=`eval 'as_val=${'$as_ac_Header'}

7882

7859

- $as_echo "$as_val"'`

7883

7860

- if test "x$as_val" = x""yes; then

7885

7862

+

7886

7863

+

7887

7864

+

7888

+

7889

+

7890

7865

+ for ac_header in locale.h

7891

7866

+do :

7892

7867

+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"

7897

7872

_ACEOF

7898

7873

7899

7874

fi

7900

@@ -12331,16 +11381,12 @@

7875

@@ -12337,16 +11387,12 @@

7901

7876

done

7902

7877

7903

7878

if test $ac_cv_header_locale_h = yes; then

7917

7892

/* end confdefs.h. */

7918

7893

#include <locale.h>

7919

7894

int

7920

@@ -12351,46 +11397,19 @@

7895

@@ -12357,46 +11403,19 @@

7921

7896

return 0;

7922

7897

}

7923

7898

_ACEOF

7970

7945

7971

7946

fi

7972

7947

fi

7973

@@ -12403,150 +11422,20 @@

7948

@@ -12409,150 +11428,20 @@

7974

7949

XGETTEXT=:

7975

7950

INTLLIBS=

7976

7951

8126

8101

/* end confdefs.h. */

8127

8102

8128

8103

#include <libintl.h>

8129

@@ -12559,54 +11448,25 @@

8104

@@ -12565,54 +11454,25 @@

8130

8105

return 0;

8131

8106

}

8132

8107

_ACEOF

8189

8164

/* end confdefs.h. */

8190

8165

8191

8166

#include <libintl.h>

8192

@@ -12619,141 +11479,26 @@

8167

@@ -12625,141 +11485,26 @@

8193

8168

return 0;

8194

8169

}

8195

8170

_ACEOF

8341

8316

_ACEOF

8342

8317

8343

8318

fi

8344

@@ -12768,18 +11513,14 @@

8319

@@ -12774,18 +11519,14 @@

8345

8320

|| test "$gt_cv_func_ngettext_libc" != "yes" \

8346

8321

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

8347

8322

8363

8338

/* end confdefs.h. */

8364

8339

8365

8340

/* Override any GCC internal prototype to avoid an error.

8366

@@ -12797,55 +11538,26 @@

8341

@@ -12803,55 +11544,26 @@

8367

8342

return 0;

8368

8343

}

8369

8344

_ACEOF

8428

8403

/* end confdefs.h. */

8429

8404

8430

8405

/* Override any GCC internal prototype to avoid an error.

8431

@@ -12863,55 +11575,26 @@

8406

@@ -12869,55 +11581,26 @@

8432

8407

return 0;

8433

8408

}

8434

8409

_ACEOF

8493

8468

/* end confdefs.h. */

8494

8469

8495

8470

/* Override any GCC internal prototype to avoid an error.

8496

@@ -12929,43 +11612,18 @@

8471

@@ -12935,43 +11618,18 @@

8497

8472

return 0;

8498

8473

}

8499

8474

_ACEOF

8543

8518

gt_cv_func_dgettext_libintl=yes

8544

8519

fi

8545

8520

8546

@@ -12975,22 +11633,18 @@

8521

@@ -12981,22 +11639,18 @@

8547

8522

8548

8523

8549

8524

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

8571

8546

/* end confdefs.h. */

8572

8547

8573

8548

/* Override any GCC internal prototype to avoid an error.

8574

@@ -13008,55 +11662,26 @@

8549

@@ -13014,55 +11668,26 @@

8575

8550

return 0;

8576

8551

}

8577

8552

_ACEOF

8636

8611

/* end confdefs.h. */

8637

8612

8638

8613

/* Override any GCC internal prototype to avoid an error.

8639

@@ -13074,43 +11699,18 @@

8640

return 0;

8641

}

8642

_ACEOF

8614

@@ -13074,49 +11699,24 @@

8615

char dcgettext ();

8616

int

8617

main ()

8618

-{

8619

-return dcgettext ();

8620

- ;

8621

- return 0;

8622

-}

8623

-_ACEOF

8643

8624

-rm -f conftest.$ac_objext conftest$ac_exeext

8644

8625

-if { (ac_try="$ac_link"

8645

8626

-case "(($ac_try" in

8661

8642

- test "$cross_compiling" = yes ||

8662

8643

- $as_test_x conftest$ac_exeext

8663

8644

- }; then

8645

+{

8646

+return dcgettext ();

8647

+ ;

8648

+ return 0;

8649

+}

8650

+_ACEOF

8664

8651

+if ac_fn_c_try_link "$LINENO"; then :

8665

8652

ac_cv_lib_intl_dcgettext=yes

8666

8653

else

8686

8673

gt_cv_func_dgettext_libintl=yes

8687

8674

libintl_extra_libs=-liconv

8688

8675

else

8689

@@ -13132,102 +11732,12 @@

8676

@@ -13138,102 +11738,12 @@

8690

8677

glib_save_LIBS="$LIBS"

8691

8678

LIBS="$LIBS -lintl $libintl_extra_libs"

8692

8679

unset ac_cv_func_bind_textdomain_codeset

8794

8781

_ACEOF

8795

8782

8796

8783

fi

8797

@@ -13257,15 +11767,13 @@

8784

@@ -13263,15 +11773,13 @@

8798

8785

8799

8786

if test "$gt_cv_have_gettext" = "yes"; then

8800

8787

8813

8800

$as_echo_n "(cached) " >&6

8814

8801

else

8815

8802

case "$MSGFMT" in

8816

@@ -13290,118 +11798,28 @@

8803

@@ -13296,118 +11804,28 @@

8817

8804

fi

8818

8805

MSGFMT="$ac_cv_path_MSGFMT"

8819

8806

if test "$MSGFMT" != "no"; then

8940

8927

$as_echo_n "checking if msgfmt accepts -c... " >&6; }

8941

8928

cat >conftest.foo <<_ACEOF

8942

8929

8943

@@ -13416,14 +11834,14 @@

8930

@@ -13422,14 +11840,14 @@

8944

8931

"Content-Transfer-Encoding: 8bit\n"

8945

8932

8946

8933

_ACEOF

8960

8947

$as_echo "no" >&6; }

8961

8948

echo "$as_me: failed input was:" >&5

8962

8949

sed 's/^/| /' conftest.foo >&5

8963

@@ -13431,9 +11849,9 @@

8950

@@ -13437,9 +11855,9 @@

8964

8951

8965

8952

# Extract the first word of "gmsgfmt", so it can be a program name with args.

8966

8953

set dummy gmsgfmt; ac_word=$2

8972

8959

$as_echo_n "(cached) " >&6

8973

8960

else

8974

8961

case $GMSGFMT in

8975

@@ -13446,14 +11864,14 @@

8962

@@ -13452,14 +11870,14 @@

8976

8963

do

8977

8964

IFS=$as_save_IFS

8978

8965

test -z "$as_dir" && as_dir=.

8990

8977

IFS=$as_save_IFS

8991

8978

8992

8979

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

8993

@@ -13462,19 +11880,19 @@

8980

@@ -13468,19 +11886,19 @@

8994

8981

fi

8995

8982

GMSGFMT=$ac_cv_path_GMSGFMT

8996

8983

if test -n "$GMSGFMT"; then

9014

9001

$as_echo_n "(cached) " >&6

9015

9002

else

9016

9003

case "$XGETTEXT" in

9017

@@ -13499,18 +11917,14 @@

9004

@@ -13505,18 +11923,14 @@

9018

9005

fi

9019

9006

XGETTEXT="$ac_cv_path_XGETTEXT"

9020

9007

if test "$XGETTEXT" != ":"; then

9036

9023

/* end confdefs.h. */

9037

9024

9038

9025

int

9039

@@ -13522,121 +11936,14 @@

9026

@@ -13528,121 +11942,14 @@

9040

9027

return 0;

9041

9028

}

9042

9029

_ACEOF

9162

9149

CATOBJEXT=.gmo

9163

9150

DATADIRNAME=share

9164

9151

else

9165

@@ -13651,10 +11958,8 @@

9152

@@ -13657,10 +11964,8 @@

9166

9153

;;

9167

9154

esac

9168

9155

fi

9175

9162

LIBS="$glib_save_LIBS"

9176

9163

INSTOBJEXT=.mo

9177

9164

else

9178

@@ -13668,9 +11973,7 @@

9165

@@ -13674,9 +11979,7 @@

9179

9166

9180

9167

if test "$gt_cv_have_gettext" = "yes" ; then

9181

9168

9186

9173

9187

9174

fi

9188

9175

9189

@@ -13678,7 +11981,7 @@

9176

@@ -13684,7 +11987,7 @@

9190

9177

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

9191

9178

: ;

9192

9179

else

9195

9182

$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }

9196

9183

XGETTEXT=":"

9197

9184

fi

9198

@@ -13711,7 +12014,7 @@

9185

@@ -13717,7 +12020,7 @@

9199

9186

if test "x$ALL_LINGUAS" = "x"; then

9200

9187

LINGUAS=

9201

9188

else

9204

9191

$as_echo_n "checking for catalogs to be installed... " >&6; }

9205

9192

NEW_LINGUAS=

9206

9193

for presentlang in $ALL_LINGUAS; do

9207

@@ -13736,7 +12039,7 @@

9194

@@ -13742,7 +12045,7 @@

9208

9195

fi

9209

9196

done

9210

9197

LINGUAS=$NEW_LINGUAS

9213

9200

$as_echo "$LINGUAS" >&6; }

9214

9201

fi

9215

9202

9216

@@ -13771,9 +12074,9 @@

9203

@@ -13777,9 +12080,9 @@

9217

9204

9218

9205

# Extract the first word of "gconftool-2", so it can be a program name with args.

9219

9206

set dummy gconftool-2; ac_word=$2

9225

9212

$as_echo_n "(cached) " >&6

9226

9213

else

9227

9214

case $GCONFTOOL in

9228

@@ -13786,14 +12089,14 @@

9215

@@ -13792,14 +12095,14 @@

9229

9216

do

9230

9217

IFS=$as_save_IFS

9231

9218

test -z "$as_dir" && as_dir=.

9243

9230

IFS=$as_save_IFS

9244

9231

9245

9232

test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"

9246

@@ -13802,10 +12105,10 @@

9233

@@ -13808,10 +12111,10 @@

9247

9234

fi

9248

9235

GCONFTOOL=$ac_cv_path_GCONFTOOL

9249

9236

if test -n "$GCONFTOOL"; then

9256

9243

$as_echo "no" >&6; }

9257

9244

fi

9258

9245

9259

@@ -13819,13 +12122,13 @@

9246

@@ -13825,13 +12128,13 @@

9260

9247

9261

9248

9262

9249

# Check whether --with-gconf-source was given.

9272

9259

$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }

9273

9260

9274

9261

if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then

9275

@@ -13834,22 +12137,20 @@

9262

@@ -13840,22 +12143,20 @@

9276

9263

9277

9264

9278

9265

# Check whether --with-gconf-schema-file-dir was given.

9299

9286

esac

9300

9287

fi

9301

9288

9302

@@ -13870,7 +12171,7 @@

9289

@@ -13876,7 +12177,7 @@

9303

9290

9304

9291

if test -n "$PYTHON"; then

9305

9292

# If the user set $PYTHON, use it and don't search something else.

9308

9295

$as_echo_n "checking whether $PYTHON version >= 2.5... " >&6; }

9309

9296

prog="import sys

9310

9297

# split strings by '.' and convert to numeric. Append some zeros

9311

@@ -13885,22 +12186,19 @@

9298

@@ -13891,22 +12192,19 @@

9312

9299

($PYTHON -c "$prog") >&5 2>&5

9313

9300

ac_status=$?

9314

9301

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9336

9323

$as_echo_n "(cached) " >&6

9337

9324

else

9338

9325

9339

@@ -13919,13 +12217,12 @@

9326

@@ -13925,13 +12223,12 @@

9340

9327

($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5

9341

9328

ac_status=$?

9342

9329

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9352

9339

$as_echo "$am_cv_pathless_PYTHON" >&6; }

9353

9340

# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.

9354

9341

if test "$am_cv_pathless_PYTHON" = none; then

9355

@@ -13933,9 +12230,9 @@

9342

@@ -13939,9 +12236,9 @@

9356

9343

else

9357

9344

# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.

9358

9345

set dummy $am_cv_pathless_PYTHON; ac_word=$2

9364

9351

$as_echo_n "(cached) " >&6

9365

9352

else

9366

9353

case $PYTHON in

9367

@@ -13948,14 +12245,14 @@

9354

@@ -13954,14 +12251,14 @@

9368

9355

do

9369

9356

IFS=$as_save_IFS

9370

9357

test -z "$as_dir" && as_dir=.

9382

9369

IFS=$as_save_IFS

9383

9370

9384

9371

;;

9385

@@ -13963,10 +12260,10 @@

9372

@@ -13969,10 +12266,10 @@

9386

9373

fi

9387

9374

PYTHON=$ac_cv_path_PYTHON

9388

9375

if test -n "$PYTHON"; then

9395

9382

$as_echo "no" >&6; }

9396

9383

fi

9397

9384

9398

@@ -13977,20 +12274,18 @@

9385

@@ -13983,20 +12280,18 @@

9399

9386

9400

9387

9401

9388

if test "$PYTHON" = :; then

9420

9407

$as_echo "$am_cv_python_version" >&6; }

9421

9408

PYTHON_VERSION=$am_cv_python_version

9422

9409

9423

@@ -14002,23 +12297,23 @@

9410

@@ -14008,23 +12303,23 @@

9424

9411

9425

9412

9426

9413

9449

9436

$as_echo_n "(cached) " >&6

9450

9437

else

9451

9438

if test "x$prefix" = xNONE

9452

@@ -14037,7 +12332,7 @@

9439

@@ -14043,7 +12338,7 @@

9453

9440

esac

9454

9441

9455

9442

fi

9458

9445

$as_echo "$am_cv_python_pythondir" >&6; }

9459

9446

pythondir=$am_cv_python_pythondir

9460

9447

9461

@@ -14046,9 +12341,9 @@

9448

@@ -14052,9 +12347,9 @@

9462

9449

pkgpythondir=\${pythondir}/$PACKAGE

9463

9450

9464

9451

9470

9457

$as_echo_n "(cached) " >&6

9471

9458

else

9472

9459

if test "x$exec_prefix" = xNONE

9473

@@ -14067,7 +12362,7 @@

9460

@@ -14073,7 +12368,7 @@

9474

9461

esac

9475

9462

9476

9463

fi

9479

9466

$as_echo "$am_cv_python_pyexecdir" >&6; }

9480

9467

pyexecdir=$am_cv_python_pyexecdir

9481

9468

9482

@@ -14088,49 +12383,53 @@

9469

@@ -14094,49 +12389,53 @@

9483

9470

9484

9471

recorder_modules=

9485

9472

build_recorder=false

9554

9541

fi

9555

9542

9556

9543

9557

@@ -14143,50 +12442,28 @@

9544

@@ -14149,25 +12448,14 @@

9558

9545

_pkg_short_errors_supported=no

9559

9546

fi

9560

9547

if test $_pkg_short_errors_supported = yes; then

9583

9570

9584

9571

$TEST_SHELL_RECORDER_PKG_ERRORS

9585

9572

9586

Consider adjusting the PKG_CONFIG_PATH environment variable if you

9587

-installed software in a non-standard prefix.

9588

-

9589

-Alternatively, you may set the environment variables TEST_SHELL_RECORDER_CFLAGS

9590

-and TEST_SHELL_RECORDER_LIBS to avoid the need to call pkg-config.

9591

-See the pkg-config man page for more details.

9592

-" >&2;}

9593

- { (exit 1); exit 1; }; }

9594

-elif test $pkg_failed = untried; then

9595

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

9596

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

9597

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

9598

-is in your PATH or set the PKG_CONFIG environment variable to the full

9599

-path to pkg-config.

9600

+installed software in a non-standard prefix.

9601

9573

@@ -14177,22 +12465,11 @@

9602

9574

Alternatively, you may set the environment variables TEST_SHELL_RECORDER_CFLAGS

9603

9575

and TEST_SHELL_RECORDER_LIBS to avoid the need to call pkg-config.

9604

9576

See the pkg-config man page for more details.

9577

-" >&2;}

9578

- { (exit 1); exit 1; }; }

9579

+" "$LINENO" 5

9580

elif test $pkg_failed = untried; then

9581

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

9582

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

9583

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

9584

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

9585

-is in your PATH or set the PKG_CONFIG environment variable to the full

9586

-path to pkg-config.

9587

-

9588

-Alternatively, you may set the environment variables TEST_SHELL_RECORDER_CFLAGS

9589

-and TEST_SHELL_RECORDER_LIBS to avoid the need to call pkg-config.

9590

-See the pkg-config man page for more details.

9605

9591

-

9606

9592

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

9607

9593

-See \`config.log' for more details." >&5

9608

9594

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

9609

+" "$LINENO" 5

9610

+elif test $pkg_failed = untried; then

9611

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

9612

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

9613

9595

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

9614

9596

is in your PATH or set the PKG_CONFIG environment variable to the full

9615

9597

path to pkg-config.

9616

9598

9617

@@ -14195,17 +12472,16 @@

9599

@@ -14201,17 +12478,16 @@

9618

9600

See the pkg-config man page for more details.

9619

9601

9620

9602

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

9635

9617

$as_echo "no" >&6; }

9636

9618

fi

9637

9619

9638

@@ -14221,26 +12497,27 @@

9620

@@ -14227,26 +12503,27 @@

9639

9621

# Collect more than 20 libraries for a prize!

9640

9622

9641

9623

pkg_failed=no

9672

9654

pkg_cv_MUTTER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins

9673

9655

gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0

9674

9656

gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0

9675

@@ -14249,26 +12526,28 @@

9657

@@ -14255,26 +12532,28 @@

9676

9658

else

9677

9659

pkg_failed=yes

9678

9660

fi

9711

9693

pkg_cv_MUTTER_PLUGIN_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins

9712

9694

gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0

9713

9695

gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0

9714

@@ -14277,8 +12556,9 @@

9696

@@ -14283,8 +12562,9 @@

9715

9697

else

9716

9698

pkg_failed=yes

9717

9699

fi

9723

9705

fi

9724

9706

9725

9707

9726

@@ -14291,37 +12571,22 @@

9708

@@ -14297,37 +12577,22 @@

9727

9709

_pkg_short_errors_supported=no

9728

9710

fi

9729

9711

if test $_pkg_short_errors_supported = yes; then

9745

9727

fi

9746

9728

# Put the nasty error message in config.log where it belongs

9747

9729

echo "$MUTTER_PLUGIN_PKG_ERRORS" >&5

9748

9730

-

9749

9731

- { { $as_echo "$as_me:$LINENO: error: Package requirements (gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins

9750

9732

- gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0

9751

9733

- gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0

9762

9744

-See the pkg-config man page for more details.

9763

9745

-" >&5

9764

9746

-$as_echo "$as_me: error: Package requirements (gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins

9747

+

9765

9748

+ as_fn_error "Package requirements (gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins

9766

9749

gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0

9767

9750

gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0

9768

9751

gnome-desktop-2.0 >= 2.26 libstartup-notification-1.0

9769

@@ -14335,22 +12600,11 @@

9752

@@ -14341,22 +12606,11 @@

9770

9753

Alternatively, you may set the environment variables MUTTER_PLUGIN_CFLAGS

9771

9754

and MUTTER_PLUGIN_LIBS to avoid the need to call pkg-config.

9772

9755

See the pkg-config man page for more details.

9792

9775

is in your PATH or set the PKG_CONFIG environment variable to the full

9793

9776

path to pkg-config.

9794

9777

9795

@@ -14359,51 +12613,54 @@

9778

@@ -14365,51 +12619,54 @@

9796

9779

See the pkg-config man page for more details.

9797

9780

9798

9781

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

9869

9852

fi

9870

9853

9871

9854

9872

@@ -14416,25 +12673,14 @@

9855

@@ -14422,25 +12679,14 @@

9873

9856

_pkg_short_errors_supported=no

9874

9857

fi

9875

9858

if test $_pkg_short_errors_supported = yes; then

9898

9881

9899

9882

$TIDY_PKG_ERRORS

9900

9883

9901

@@ -14444,22 +12690,11 @@

9884

@@ -14450,22 +12696,11 @@

9902

9885

Alternatively, you may set the environment variables TIDY_CFLAGS

9903

9886

and TIDY_LIBS to avoid the need to call pkg-config.

9904

9887

See the pkg-config man page for more details.

9924

9907

is in your PATH or set the PKG_CONFIG environment variable to the full

9925

9908

path to pkg-config.

9926

9909

9927

@@ -14468,51 +12703,54 @@

9910

@@ -14474,51 +12709,54 @@

9928

9911

See the pkg-config man page for more details.

9929

9912

9930

9913

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

9941

9924

fi

9942

9925

9943

9926

pkg_failed=no

9927

-{ $as_echo "$as_me:$LINENO: checking for ST" >&5

9928

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ST" >&5

9929

$as_echo_n "checking for ST... " >&6; }

9930

9931

-if test -n "$ST_CFLAGS"; then

9932

- pkg_cv_ST_CFLAGS="$ST_CFLAGS"

9933

- elif test -n "$PKG_CONFIG"; then

9934

- if test -n "$PKG_CONFIG" && \

9935

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 gtk+-2.0 libcroco-0.6\"") >&5

9936

+if test -n "$PKG_CONFIG"; then

9937

+ if test -n "$ST_CFLAGS"; then

9938

+ pkg_cv_ST_CFLAGS="$ST_CFLAGS"

9939

+ else

9940

+ if test -n "$PKG_CONFIG" && \

9941

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 gtk+-2.0 libcroco-0.6\""; } >&5

9942

($PKG_CONFIG --exists --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6") 2>&5

9943

ac_status=$?

9944

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9945

- (exit $ac_status); }; then

9946

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

9947

+ test $ac_status = 0; }; then

9948

pkg_cv_ST_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 gtk+-2.0 libcroco-0.6" 2>/dev/null`

9949

else

9950

pkg_failed=yes

9951

fi

9952

- else

9953

- pkg_failed=untried

9954

+ fi

9955

+else

9956

+ pkg_failed=untried

9957

fi

9958

-if test -n "$ST_LIBS"; then

9959

- pkg_cv_ST_LIBS="$ST_LIBS"

9960

- elif test -n "$PKG_CONFIG"; then

9961

- if test -n "$PKG_CONFIG" && \

9962

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 gtk+-2.0 libcroco-0.6\"") >&5

9963

+if test -n "$PKG_CONFIG"; then

9964

+ if test -n "$ST_LIBS"; then

9965

+ pkg_cv_ST_LIBS="$ST_LIBS"

9966

+ else

9967

+ if test -n "$PKG_CONFIG" && \

9968

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 gtk+-2.0 libcroco-0.6\""; } >&5

9969

($PKG_CONFIG --exists --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6") 2>&5

9970

ac_status=$?

9971

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9972

- (exit $ac_status); }; then

9973

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

9974

+ test $ac_status = 0; }; then

9975

pkg_cv_ST_LIBS=`$PKG_CONFIG --libs "clutter-1.0 gtk+-2.0 libcroco-0.6" 2>/dev/null`

9976

else

9977

pkg_failed=yes

9978

fi

9979

- else

9980

- pkg_failed=untried

9981

+ fi

9982

+else

9983

+ pkg_failed=untried

9984

fi

9985

9986

9987

@@ -14531,25 +12769,14 @@

9988

_pkg_short_errors_supported=no

9989

fi

9990

if test $_pkg_short_errors_supported = yes; then

9991

- ST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6" 2>&1`

9992

+ ST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6"`

9993

else

9994

- ST_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6" 2>&1`

9995

+ ST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-1.0 gtk+-2.0 libcroco-0.6"`

9996

fi

9997

# Put the nasty error message in config.log where it belongs

9998

echo "$ST_PKG_ERRORS" >&5

9999

10000

- { { $as_echo "$as_me:$LINENO: error: Package requirements (clutter-1.0 gtk+-2.0 libcroco-0.6) were not met:

10001

-

10002

-$ST_PKG_ERRORS

10003

-

10004

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

10005

-installed software in a non-standard prefix.

10006

-

10007

-Alternatively, you may set the environment variables ST_CFLAGS

10008

-and ST_LIBS to avoid the need to call pkg-config.

10009

-See the pkg-config man page for more details.

10010

-" >&5

10011

-$as_echo "$as_me: error: Package requirements (clutter-1.0 gtk+-2.0 libcroco-0.6) were not met:

10012

+ as_fn_error "Package requirements (clutter-1.0 gtk+-2.0 libcroco-0.6) were not met:

10013

10014

$ST_PKG_ERRORS

10015

10016

@@ -14559,22 +12786,11 @@

10017

Alternatively, you may set the environment variables ST_CFLAGS

10018

and ST_LIBS to avoid the need to call pkg-config.

10019

See the pkg-config man page for more details.

10020

-" >&2;}

10021

- { (exit 1); exit 1; }; }

10022

+" "$LINENO" 5

10023

elif test $pkg_failed = untried; then

10024

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

10025

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

10026

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

10027

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10028

-is in your PATH or set the PKG_CONFIG environment variable to the full

10029

-path to pkg-config.

10030

-

10031

-Alternatively, you may set the environment variables ST_CFLAGS

10032

-and ST_LIBS to avoid the need to call pkg-config.

10033

-See the pkg-config man page for more details.

10034

-

10035

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10036

-See \`config.log' for more details." >&5

10037

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10038

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

10039

is in your PATH or set the PKG_CONFIG environment variable to the full

10040

path to pkg-config.

10041

10042

@@ -14583,51 +12799,54 @@

10043

See the pkg-config man page for more details.

10044

10045

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10046

-See \`config.log' for more details." >&2;}

10047

- { (exit 1); exit 1; }; }; }

10048

+See \`config.log' for more details." "$LINENO" 5; }

10049

else

10050

ST_CFLAGS=$pkg_cv_ST_CFLAGS

10051

ST_LIBS=$pkg_cv_ST_LIBS

10052

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10053

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

10054

$as_echo "yes" >&6; }

10055

:

10056

fi

10057

10058

pkg_failed=no

9944

10059

-{ $as_echo "$as_me:$LINENO: checking for BIG" >&5

9945

10060

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIG" >&5

9946

10061

$as_echo_n "checking for BIG... " >&6; }

10001

10116

fi

10002

10117

10003

10118

10004

@@ -14525,25 +12763,14 @@

10119

@@ -14640,25 +12859,14 @@

10005

10120

_pkg_short_errors_supported=no

10006

10121

fi

10007

10122

if test $_pkg_short_errors_supported = yes; then

10030

10145

10031

10146

$BIG_PKG_ERRORS

10032

10147

10033

@@ -14553,22 +12780,11 @@

10148

@@ -14668,22 +12876,11 @@

10034

10149

Alternatively, you may set the environment variables BIG_CFLAGS

10035

10150

and BIG_LIBS to avoid the need to call pkg-config.

10036

10151

See the pkg-config man page for more details.

10056

10171

is in your PATH or set the PKG_CONFIG environment variable to the full

10057

10172

path to pkg-config.

10058

10173

10059

@@ -14577,51 +12793,54 @@

10174

@@ -14692,51 +12889,54 @@

10060

10175

See the pkg-config man page for more details.

10061

10176

10062

10177

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10133

10248

fi

10134

10249

10135

10250

10136

@@ -14634,25 +12853,14 @@

10251

@@ -14749,25 +12949,14 @@

10137

10252

_pkg_short_errors_supported=no

10138

10253

fi

10139

10254

if test $_pkg_short_errors_supported = yes; then

10162

10277

10163

10278

$GDMUSER_PKG_ERRORS

10164

10279

10165

@@ -14662,22 +12870,11 @@

10280

@@ -14777,22 +12966,11 @@

10166

10281

Alternatively, you may set the environment variables GDMUSER_CFLAGS

10167

10282

and GDMUSER_LIBS to avoid the need to call pkg-config.

10168

10283

See the pkg-config man page for more details.

10188

10303

is in your PATH or set the PKG_CONFIG environment variable to the full

10189

10304

path to pkg-config.

10190

10305

10191

@@ -14686,51 +12883,54 @@

10306

@@ -14801,51 +12979,54 @@

10192

10307

See the pkg-config man page for more details.

10193

10308

10194

10309

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10265

10380

fi

10266

10381

10267

10382

10268

@@ -14743,25 +12943,14 @@

10383

@@ -14858,25 +13039,14 @@

10269

10384

_pkg_short_errors_supported=no

10270

10385

fi

10271

10386

if test $_pkg_short_errors_supported = yes; then

10294

10409

10295

10410

$TRAY_PKG_ERRORS

10296

10411

10297

@@ -14771,22 +12960,11 @@

10412

@@ -14886,22 +13056,11 @@

10298

10413

Alternatively, you may set the environment variables TRAY_CFLAGS

10299

10414

and TRAY_LIBS to avoid the need to call pkg-config.

10300

10415

See the pkg-config man page for more details.

10320

10435

is in your PATH or set the PKG_CONFIG environment variable to the full

10321

10436

path to pkg-config.

10322

10437

10323

@@ -14795,12 +12973,11 @@

10438

@@ -14910,12 +13069,11 @@

10324

10439

See the pkg-config man page for more details.

10325

10440

10326

10441

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10335

10450

$as_echo "yes" >&6; }

10336

10451

:

10337

10452

fi

10338

@@ -14818,247 +12995,23 @@

10453

@@ -14933,247 +13091,23 @@

10339

10454

10340

10455

10341

10456

10592

10707

_ACEOF

10593

10708

10594

10709

fi

10595

@@ -15068,7 +13021,7 @@

10710

@@ -15183,7 +13117,7 @@

10596

10711

10597

10712

# Sets GLIB_GENMARSHAL and GLIB_MKENUMS

10598

10713

# Check whether --enable-glibtest was given.

10601

10716

enableval=$enable_glibtest;

10602

10717

else

10603

10718

enable_glibtest=yes

10604

@@ -15103,9 +13056,9 @@

10719

@@ -15218,9 +13152,9 @@

10605

10720

if test -n "$ac_tool_prefix"; then

10606

10721

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

10607

10722

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

10613

10728

$as_echo_n "(cached) " >&6

10614

10729

else

10615

10730

case $PKG_CONFIG in

10616

@@ -15118,14 +13071,14 @@

10731

@@ -15233,14 +13167,14 @@

10617

10732

do

10618

10733

IFS=$as_save_IFS

10619

10734

test -z "$as_dir" && as_dir=.

10631

10746

IFS=$as_save_IFS

10632

10747

10633

10748

;;

10634

@@ -15133,10 +13086,10 @@

10749

@@ -15248,10 +13182,10 @@

10635

10750

fi

10636

10751

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

10637

10752

if test -n "$PKG_CONFIG"; then

10644

10759

$as_echo "no" >&6; }

10645

10760

fi

10646

10761

10647

@@ -15146,9 +13099,9 @@

10762

@@ -15261,9 +13195,9 @@

10648

10763

ac_pt_PKG_CONFIG=$PKG_CONFIG

10649

10764

# Extract the first word of "pkg-config", so it can be a program name with args.

10650

10765

set dummy pkg-config; ac_word=$2

10656

10771

$as_echo_n "(cached) " >&6

10657

10772

else

10658

10773

case $ac_pt_PKG_CONFIG in

10659

@@ -15161,14 +13114,14 @@

10774

@@ -15276,14 +13210,14 @@

10660

10775

do

10661

10776

IFS=$as_save_IFS

10662

10777

test -z "$as_dir" && as_dir=.

10674

10789

IFS=$as_save_IFS

10675

10790

10676

10791

;;

10677

@@ -15176,10 +13129,10 @@

10792

@@ -15291,10 +13225,10 @@

10678

10793

fi

10679

10794

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

10680

10795

if test -n "$ac_pt_PKG_CONFIG"; then

10687

10802

$as_echo "no" >&6; }

10688

10803

fi

10689

10804

10690

@@ -15188,7 +13141,7 @@

10805

@@ -15303,7 +13237,7 @@

10691

10806

else

10692

10807

case $cross_compiling:$ac_tool_warned in

10693

10808

yes:)

10696

10811

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10697

10812

ac_tool_warned=yes ;;

10698

10813

esac

10699

@@ -15201,13 +13154,13 @@

10814

@@ -15316,13 +13250,13 @@

10700

10815

fi

10701

10816

if test -n "$PKG_CONFIG"; then

10702

10817

_pkg_min_version=0.16

10713

10828

$as_echo "no" >&6; }

10714

10829

PKG_CONFIG=""

10715

10830

fi

10716

@@ -15222,7 +13175,7 @@

10831

@@ -15337,7 +13271,7 @@

10717

10832

fi

10718

10833

10719

10834

min_glib_version=2.0.0

10722

10837

$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }

10723

10838

10724

10839

if test x$PKG_CONFIG != xno ; then

10725

@@ -15258,14 +13211,10 @@

10840

@@ -15373,14 +13307,10 @@

10726

10841

CFLAGS="$CFLAGS $GLIB_CFLAGS"

10727

10842

LIBS="$GLIB_LIBS $LIBS"

10728

10843

rm -f conf.glibtest

10739

10854

/* end confdefs.h. */

10740

10855

10741

10856

#include <glib.h>

10742

@@ -15341,52 +13290,25 @@

10857

@@ -15456,52 +13386,25 @@

10743

10858

}

10744

10859

10745

10860

_ACEOF

10799

10914

$as_echo "no" >&6; }

10800

10915

if test "$PKG_CONFIG" = "no" ; then

10801

10916

echo "*** A new enough version of pkg-config was not found."

10802

@@ -15400,11 +13322,7 @@

10917

@@ -15515,11 +13418,7 @@

10803

10918

ac_save_LIBS="$LIBS"

10804

10919

CFLAGS="$CFLAGS $GLIB_CFLAGS"

10805

10920

LIBS="$LIBS $GLIB_LIBS"

10812

10927

/* end confdefs.h. */

10813

10928

10814

10929

#include <glib.h>

10815

@@ -15418,27 +13336,7 @@

10930

@@ -15533,27 +13432,7 @@

10816

10931

return 0;

10817

10932

}

10818

10933

_ACEOF

10841

10956

echo "*** The test program compiled, but did not run. This usually means"

10842

10957

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

10843

10958

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

10844

@@ -15449,16 +13347,11 @@

10959

@@ -15564,16 +13443,11 @@

10845

10960

echo "*** If you have an old version installed, it is best to remove it, although"

10846

10961

echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"

10847

10962

else

10861

10976

CFLAGS="$ac_save_CFLAGS"

10862

10977

LIBS="$ac_save_LIBS"

10863

10978

fi

10864

@@ -15491,7 +13384,7 @@

10979

@@ -15606,7 +13480,7 @@

10865

10980

# Stay command-line compatible with the gnome-common configure option. Here

10866

10981

# minimum/yes/maximum are the same, however.

10867

10982

# Check whether --enable-compile_warnings was given.

10870

10985

enableval=$enable_compile_warnings;

10871

10986

else

10872

10987

enable_compile_warnings=error

10873

@@ -15519,9 +13412,9 @@

10988

@@ -15634,9 +13508,9 @@

10874

10989

10875

10990

# Extract the first word of "mutter", so it can be a program name with args.

10876

10991

set dummy mutter; ac_word=$2

10882

10997

$as_echo_n "(cached) " >&6

10883

10998

else

10884

10999

case $mutter in

10885

@@ -15534,14 +13427,14 @@

11000

@@ -15649,14 +13523,14 @@

10886

11001

do

10887

11002

IFS=$as_save_IFS

10888

11003

test -z "$as_dir" && as_dir=.

10900

11015

IFS=$as_save_IFS

10901

11016

10902

11017

;;

10903

@@ -15549,10 +13442,10 @@

11018

@@ -15664,10 +13538,10 @@

10904

11019

fi

10905

11020

mutter=$ac_cv_path_mutter

10906

11021

if test -n "$mutter"; then

10913

11028

$as_echo "no" >&6; }

10914

11029

fi

10915

11030

10916

@@ -15588,13 +13481,13 @@

11031

@@ -15703,13 +13577,13 @@

10917

11032

case $ac_val in #(

10918

11033

*${as_nl}*)

10919

11034

case $ac_var in #(

10929

11044

esac ;;

10930

11045

esac

10931

11046

done

10932

@@ -15602,8 +13495,8 @@

11047

@@ -15717,8 +13591,8 @@

10933

11048

(set) 2>&1 |

10934

11049

case $as_nl`(ac_space=' '; set) 2>&1` in #(

10935

11050

*${as_nl}ac_space=\ *)

10940

11055

sed -n \

10941

11056

"s/'/'\\\\''/g;

10942

11057

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

10943

@@ -15626,11 +13519,11 @@

11058

@@ -15741,11 +13615,11 @@

10944

11059

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

10945

11060

if test -w "$cache_file"; then

10946

11061

test "x$cache_file" != "x/dev/null" &&

10954

11069

$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

10955

11070

fi

10956

11071

fi

10957

@@ -15650,8 +13543,8 @@

11072

@@ -15765,8 +13639,8 @@

10958

11073

ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

10959

11074

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

10960

11075

# will be set to the directory where LIBOBJS objects are built.

10965

11080

done

10966

11081

LIBOBJS=$ac_libobjs

10967

11082

10968

@@ -15667,52 +13560,38 @@

11083

@@ -15782,52 +13656,38 @@

10969

11084

fi

10970

11085

10971

11086

if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

11031

11146

#! $SHELL

11032

11147

# Generated by $as_me.

11033

11148

# Run this file to recreate the current configuration.

11034

@@ -15722,17 +13601,18 @@

11149

@@ -15837,17 +13697,18 @@

11035

11150

debug=false

11036

11151

ac_cs_recheck=false

11037

11152

ac_cs_silent=false

11057

11172

emulate sh

11058

11173

NULLCMD=:

11059

11174

# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

11060

@@ -15740,23 +13620,15 @@

11175

@@ -15855,23 +13716,15 @@

11061

11176

alias -g '${1+"$@"}'='"$@"'

11062

11177

setopt NO_GLOB_SUBST

11063

11178

else

11086

11201

as_nl='

11087

11202

'

11088

11203

export as_nl

11089

@@ -15764,7 +13636,13 @@

11204

@@ -15879,7 +13732,13 @@

11090

11205

as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

11091

11206

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

11092

11207

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

11101

11216

as_echo='printf %s\n'

11102

11217

as_echo_n='printf %s'

11103

11218

else

11104

@@ -15775,7 +13653,7 @@

11219

@@ -15890,7 +13749,7 @@

11105

11220

as_echo_body='eval expr "X$1" : "X\$.*\$"'

11106

11221

as_echo_n_body='eval

11107

11222

arg=$1;

11110

11225

*"$as_nl"*)

11111

11226

expr "X$arg" : "X\$.*\$$as_nl";

11112

11227

arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

11113

@@ -15798,13 +13676,6 @@

11228

@@ -15913,13 +13772,6 @@

11114

11229

}

11115

11230

fi

11116

11231

11124

11239

11125

11240

# IFS

11126

11241

# We need space, tab and new line, in precisely that order. Quoting is

11127

@@ -15814,15 +13685,15 @@

11242

@@ -15929,15 +13781,15 @@

11128

11243

IFS=" "" $as_nl"

11129

11244

11130

11245

# Find who we are. Look in the path if we contain no directory separator.

11143

11258

IFS=$as_save_IFS

11144

11259

11145

11260

;;

11146

@@ -15834,12 +13705,16 @@

11261

@@ -15949,12 +13801,16 @@

11147

11262

fi

11148

11263

if test ! -f "$as_myself"; then

11149

11264

$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

11164

11279

done

11165

11280

PS1='$ '

11166

11281

PS2='> '

11167

@@ -15851,7 +13726,89 @@

11282

@@ -15966,7 +13822,89 @@

11168

11283

LANGUAGE=C

11169

11284

export LANGUAGE

11170

11285

11255

11370

if expr a : '$a$' >/dev/null 2>&1 &&

11256

11371

test "X`expr 00001 : '.*$...$'`" = X001; then

11257

11372

as_expr=expr

11258

@@ -15865,8 +13822,12 @@

11373

@@ -15980,8 +13918,12 @@

11259

11374

as_basename=false

11260

11375

fi

11261

11376

11269

11384

as_me=`$as_basename -- "$0" ||

11270

11385

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

11271

11386

X"$0" : 'X$//$$' \| \

11272

@@ -15886,76 +13847,25 @@

11387

@@ -16001,76 +13943,25 @@

11273

11388

}

11274

11389

s/.*/./; q'`

11275

11390

11357

11472

11358

11473

rm -f conf$$ conf$$.exe conf$$.file

11359

11474

if test -d conf$$.dir; then

11360

@@ -15984,8 +13894,56 @@

11475

@@ -16099,8 +13990,56 @@

11361

11476

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

11362

11477

rmdir conf$$.dir 2>/dev/null

11363

11478

11415

11530

else

11416

11531

test -d ./-p && rmdir ./-p

11417

11532

as_mkdir_p=false

11418

@@ -16004,10 +13962,10 @@

11533

@@ -16119,10 +14058,10 @@

11419

11534

if test -d "$1"; then

11420

11535

test -d "$1/.";

11421

11536

else

11428

11543

???[sx]*):;;*)false;;esac;fi

11429

11544

'\'' sh

11430

11545

'

11431

@@ -16022,13 +13980,19 @@

11546

@@ -16137,13 +14076,19 @@

11432

11547

11433

11548

11434

11549

exec 6>&1

11444

11559

# report actual input values of CONFIG_FILES etc. instead of their

11445

11560

# values after options handling.

11446

11561

ac_log="

11447

This file was extended by gnome-shell $as_me 2.27.3, which was

11562

This file was extended by gnome-shell $as_me 2.28.0, which was

11448

11563

-generated by GNU Autoconf 2.63. Invocation command line was

11449

11564

+generated by GNU Autoconf 2.64. Invocation command line was

11450

11565

11451

11566

CONFIG_FILES = $CONFIG_FILES

11452

11567

CONFIG_HEADERS = $CONFIG_HEADERS

11453

@@ -16060,10 +14024,11 @@

11568

@@ -16175,10 +14120,11 @@

11454

11569

11455

11570

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

11456

11571

ac_cs_usage="\

11465

11580

11466

11581

-h, --help print this help, then exit

11467

11582

-V, --version print version number and configuration settings, then exit

11468

@@ -16085,16 +14050,16 @@

11583

@@ -16200,16 +14146,16 @@

11469

11584

Configuration commands:

11470

11585

$config_commands

11471

11586

11475

11590

_ACEOF

11476

11591

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

11477

11592

ac_cs_version="\\

11478

gnome-shell config.status 2.27.3

11593

gnome-shell config.status 2.28.0

11479

11594

-configured by $0, generated by GNU Autoconf 2.63,

11480

11595

+configured by $0, generated by GNU Autoconf 2.64,

11481

11596

with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

11485

11600

This config.status script is free software; the Free Software Foundation

11486

11601

gives unlimited permission to copy, distribute and modify it."

11487

11602

11488

@@ -16137,20 +14102,19 @@

11603

@@ -16252,20 +14198,19 @@

11489

11604

case $ac_optarg in

11490

11605

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

11491

11606

esac

11510

11625

--help | --hel | -h )

11511

11626

$as_echo "$ac_cs_usage"; exit ;;

11512

11627

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

11513

@@ -16158,11 +14122,10 @@

11628

@@ -16273,11 +14218,10 @@

11514

11629

ac_cs_silent=: ;;

11515

11630

11516

11631

# This is an error.

11525

11640

ac_need_defaults=false ;;

11526

11641

11527

11642

esac

11528

@@ -16482,9 +14445,7 @@

11643

@@ -16598,9 +14542,7 @@

11529

11644

"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

11530

11645

"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

11531

11646

11536

11651

esac

11537

11652

done

11538

11653

11539

@@ -16511,7 +14472,7 @@

11654

@@ -16627,7 +14569,7 @@

11540

11655

trap 'exit_status=$?

11541

11656

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

11542

11657

' 0

11545

11660

}

11546

11661

# Create a (secure) tmp directory for tmp files.

11547

11662

11548

@@ -16522,11 +14483,7 @@

11663

@@ -16638,11 +14580,7 @@

11549

11664

{

11550

11665

tmp=./conf$$-$RANDOM

11551

11666

(umask 077 && mkdir "$tmp")

11558

11673

11559

11674

# Set up the scripts for CONFIG_FILES section.

11560

11675

# No need to generate them if there are no CONFIG_FILES.

11561

@@ -16534,10 +14491,16 @@

11676

@@ -16650,10 +14588,16 @@

11562

11677

if test -n "$CONFIG_FILES"; then

11563

11678

11564

11679

11577

11692

else

11578

11693

ac_cs_awk_cr=$ac_cr

11579

11694

fi

11580

@@ -16551,24 +14514,18 @@

11695

@@ -16667,24 +14611,18 @@

11581

11696

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

11582

11697

echo "_ACEOF"

11583

11698

} >conf$$subs.sh ||

11605

11720

else

11606

11721

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

11607

11722

fi

11608

@@ -16657,9 +14614,7 @@

11723

@@ -16773,9 +14711,7 @@

11609

11724

else

11610

11725

cat

11611

11726

fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

11616

11731

_ACEOF

11617

11732

11618

11733

# VPATH may cause trouble with some makes, so we remove $(srcdir),

11619

@@ -16700,9 +14655,7 @@

11734

@@ -16816,9 +14752,7 @@

11620

11735

if test -z "$ac_t"; then

11621

11736

break

11622

11737

elif $ac_last_try; then

11627

11742

else

11628

11743

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

11629

11744

fi

11630

@@ -16787,9 +14740,7 @@

11745

@@ -16903,9 +14837,7 @@

11631

11746

_ACAWK

11632

11747

_ACEOF

11633

11748

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

11638

11753

fi # test -n "$CONFIG_HEADERS"

11639

11754

11640

11755

11641

@@ -16802,9 +14753,7 @@

11756

@@ -16918,9 +14850,7 @@

11642

11757

esac

11643

11758

case $ac_mode$ac_tag in

11644

11759

:[FHL]*:*);;

11649

11764

:[FH]-) ac_tag=-:-;;

11650

11765

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

11651

11766

esac

11652

@@ -16832,12 +14781,10 @@

11767

@@ -16948,12 +14878,10 @@

11653

11768

[\\/$]*) false;;

11654

11769

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

11655

11770

esac ||

11664

11779

done

11665

11780

11666

11781

# Let's still pretend it is `configure' which instantiates (i.e., don't

11667

@@ -16848,7 +14795,7 @@

11782

@@ -16964,7 +14892,7 @@

11668

11783

`' by configure.'

11669

11784

if test x"$ac_file" != x-; then

11670

11785

configure_input="$ac_file. $configure_input"

11673

11788

$as_echo "$as_me: creating $ac_file" >&6;}

11674

11789

fi

11675

11790

# Neutralize special characters interpreted by sed in replacement strings.

11676

@@ -16861,9 +14808,7 @@

11791

@@ -16977,9 +14905,7 @@

11677

11792

11678

11793

case $ac_tag in

11679

11794

*:-:* | *:-) cat >"$tmp/stdin" \

11684

11799

esac

11685

11800

;;

11686

11801

esac

11687

@@ -16891,47 +14836,7 @@

11802

@@ -17007,47 +14933,7 @@

11688

11803

q

11689

11804

}

11690

11805

s/.*/./; q'`

11733

11848

ac_builddir=.

11734

11849

11735

11850

case "$ac_dir" in

11736

@@ -16988,7 +14893,6 @@

11851

@@ -17104,7 +14990,6 @@

11737

11852

# If the template does not know about datarootdir, expand it.

11738

11853

# FIXME: This hack should be removed a few years after 2.60.

11739

11854

ac_datarootdir_hack=; ac_datarootdir_seen=

11741

11856

ac_sed_dataroot='

11742

11857

/datarootdir/ {

11743

11858

p

11744

@@ -16998,12 +14902,11 @@

11859

@@ -17114,12 +14999,11 @@

11745

11860

/@docdir@/p

11746

11861

/@infodir@/p

11747

11862

/@localedir@/p

11756

11871

$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

11757

11872

_ACEOF

11758

11873

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

11759

@@ -17013,7 +14916,7 @@

11874

@@ -17129,7 +15013,7 @@

11760

11875

s&@infodir@&$infodir&g

11761

11876

s&@localedir@&$localedir&g

11762

11877

s&@mandir@&$mandir&g

11765

11880

esac

11766

11881

_ACEOF

11767

11882

11768

@@ -17042,14 +14945,12 @@

11883

@@ -17158,14 +15042,12 @@

11769

11884

$ac_datarootdir_hack

11770

11885

"

11771

11886

eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

11782

11897

which seems to be undefined. Please make sure it is defined." >&5

11783

11898

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

11784

11899

which seems to be undefined. Please make sure it is defined." >&2;}

11785

@@ -17059,9 +14960,7 @@

11900

@@ -17175,9 +15057,7 @@

11786

11901

-) cat "$tmp/out" && rm -f "$tmp/out";;

11787

11902

*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

11788

11903

esac \

11793

11908

;;

11794

11909

:H)

11795

11910

#

11796

@@ -17072,25 +14971,19 @@

11911

@@ -17188,25 +15068,19 @@

11797

11912

$as_echo "/* $configure_input */" \

11798

11913

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

11799

11914

} >"$tmp/config.h" \

11823

11938

fi

11824

11939

# Compute "$ac_file"'s index in $config_headers.

11825

11940

_am_arg="$ac_file"

11826

@@ -17128,7 +15021,7 @@

11941

@@ -17244,7 +15118,7 @@

11827

11942

s/.*/./; q'`/stamp-h$_am_stamp_count

11828

11943

;;

11829

11944

11832

11947

$as_echo "$as_me: executing $ac_file commands" >&6;}

11833

11948

;;

11834

11949

esac

11835

@@ -17223,47 +15116,7 @@

11950

@@ -17339,47 +15213,7 @@

11836

11951

q

11837

11952

}

11838

11953

s/.*/./; q'`

11881

11996

# echo "creating $dirpart/$file"

11882

11997

echo '# dummy' > "$dirpart/$file"

11883

11998

done

11884

@@ -17910,9 +15763,7 @@

11999

@@ -18026,9 +15860,7 @@

11885

12000

esac ;;

11886

12001

"po/stamp-it":C)

11887

12002

if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then

11892

12007

fi

11893

12008

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

11894

12009

>"po/stamp-it.tmp"

11895

@@ -17935,15 +15786,12 @@

12010

@@ -18051,15 +15883,12 @@

11896

12011

done # for ac_tag

11897

12012

11898

12013

11910

12025

11911

12026

11912

12027

# configure is writing to config.log, and then calls config.status.

11913

@@ -17964,10 +15812,10 @@

12028

@@ -18080,10 +15909,10 @@

11914

12029

exec 5>>config.log

11915

12030

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

11916

12031

# would make configure fail if this is the last instruction.

11923

12038

$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

11924

12039

fi

11925

12040

11926

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/data/Makefile.in gnome-shell-2.27.3.new/data/Makefile.in

11927

--- gnome-shell-2.27.3/data/Makefile.in 2009-09-16 00:03:59.000000000 +0200

11928

+++ gnome-shell-2.27.3.new/data/Makefile.in 2009-09-30 23:16:49.000000000 +0200

11929

@@ -170,6 +170,7 @@

12041

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/data/Makefile.in gnome-shell-2.28.0.new/data/Makefile.in

12042

--- gnome-shell-2.28.0/data/Makefile.in 2009-10-08 00:50:04.000000000 +0200

12043

+++ gnome-shell-2.28.0.new/data/Makefile.in 2009-10-12 22:59:41.000000000 +0200

12044

@@ -171,6 +171,7 @@

11930

12045

PACKAGE_NAME = @PACKAGE_NAME@

11931

12046

PACKAGE_STRING = @PACKAGE_STRING@

11932

12047

PACKAGE_TARNAME = @PACKAGE_TARNAME@

11934

12049

PACKAGE_VERSION = @PACKAGE_VERSION@

11935

12050

PATH_SEPARATOR = @PATH_SEPARATOR@

11936

12051

PKG_CONFIG = @PKG_CONFIG@

11937

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/js/Makefile.in gnome-shell-2.27.3.new/js/Makefile.in

11938

--- gnome-shell-2.27.3/js/Makefile.in 2009-09-16 00:04:00.000000000 +0200

11939

+++ gnome-shell-2.27.3.new/js/Makefile.in 2009-09-30 23:16:49.000000000 +0200

12052

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/js/Makefile.in gnome-shell-2.28.0.new/js/Makefile.in

12053

--- gnome-shell-2.28.0/js/Makefile.in 2009-10-08 00:50:04.000000000 +0200

12054

+++ gnome-shell-2.28.0.new/js/Makefile.in 2009-10-12 22:59:41.000000000 +0200

11940

12055

@@ -184,6 +184,7 @@

11941

12056

PACKAGE_NAME = @PACKAGE_NAME@

11942

12057

PACKAGE_STRING = @PACKAGE_STRING@

11945

12060

PACKAGE_VERSION = @PACKAGE_VERSION@

11946

12061

PATH_SEPARATOR = @PATH_SEPARATOR@

11947

12062

PKG_CONFIG = @PKG_CONFIG@

11948

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/js/misc/Makefile.in gnome-shell-2.27.3.new/js/misc/Makefile.in

11949

--- gnome-shell-2.27.3/js/misc/Makefile.in 2009-09-16 00:04:00.000000000 +0200

11950

+++ gnome-shell-2.27.3.new/js/misc/Makefile.in 2009-09-30 23:16:49.000000000 +0200

11951

@@ -169,6 +169,7 @@

11952

PACKAGE_NAME = @PACKAGE_NAME@

11953

PACKAGE_STRING = @PACKAGE_STRING@

11954

PACKAGE_TARNAME = @PACKAGE_TARNAME@

11955

+PACKAGE_URL = @PACKAGE_URL@

11956

PACKAGE_VERSION = @PACKAGE_VERSION@

11957

PATH_SEPARATOR = @PATH_SEPARATOR@

11958

PKG_CONFIG = @PKG_CONFIG@

11959

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/js/ui/Makefile.in gnome-shell-2.27.3.new/js/ui/Makefile.in

11960

--- gnome-shell-2.27.3/js/ui/Makefile.in 2009-09-16 00:04:00.000000000 +0200

11961

+++ gnome-shell-2.27.3.new/js/ui/Makefile.in 2009-09-30 23:16:50.000000000 +0200

11962

@@ -169,6 +169,7 @@

11963

PACKAGE_NAME = @PACKAGE_NAME@

11964

PACKAGE_STRING = @PACKAGE_STRING@

11965

PACKAGE_TARNAME = @PACKAGE_TARNAME@

11966

+PACKAGE_URL = @PACKAGE_URL@

11967

PACKAGE_VERSION = @PACKAGE_VERSION@

11968

PATH_SEPARATOR = @PATH_SEPARATOR@

11969

PKG_CONFIG = @PKG_CONFIG@

11970

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/Makefile.in gnome-shell-2.27.3.new/Makefile.in

11971

--- gnome-shell-2.27.3/Makefile.in 2009-09-16 00:04:01.000000000 +0200

11972

+++ gnome-shell-2.27.3.new/Makefile.in 2009-09-30 23:16:50.000000000 +0200

12063

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/js/misc/Makefile.in gnome-shell-2.28.0.new/js/misc/Makefile.in

12064

--- gnome-shell-2.28.0/js/misc/Makefile.in 2009-10-08 00:50:05.000000000 +0200

12065

+++ gnome-shell-2.28.0.new/js/misc/Makefile.in 2009-10-12 22:59:41.000000000 +0200

12066

@@ -169,6 +169,7 @@

12067

PACKAGE_NAME = @PACKAGE_NAME@

12068

PACKAGE_STRING = @PACKAGE_STRING@

12069

PACKAGE_TARNAME = @PACKAGE_TARNAME@

12070

+PACKAGE_URL = @PACKAGE_URL@

12071

PACKAGE_VERSION = @PACKAGE_VERSION@

12072

PATH_SEPARATOR = @PATH_SEPARATOR@

12073

PKG_CONFIG = @PKG_CONFIG@

12074

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/js/ui/Makefile.in gnome-shell-2.28.0.new/js/ui/Makefile.in

12075

--- gnome-shell-2.28.0/js/ui/Makefile.in 2009-10-08 00:50:05.000000000 +0200

12076

+++ gnome-shell-2.28.0.new/js/ui/Makefile.in 2009-10-12 22:59:41.000000000 +0200

12077

@@ -169,6 +169,7 @@

12078

PACKAGE_NAME = @PACKAGE_NAME@

12079

PACKAGE_STRING = @PACKAGE_STRING@

12080

PACKAGE_TARNAME = @PACKAGE_TARNAME@

12081

+PACKAGE_URL = @PACKAGE_URL@

12082

PACKAGE_VERSION = @PACKAGE_VERSION@

12083

PATH_SEPARATOR = @PATH_SEPARATOR@

12084

PKG_CONFIG = @PKG_CONFIG@

12085

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/Makefile.in gnome-shell-2.28.0.new/Makefile.in

12086

--- gnome-shell-2.28.0/Makefile.in 2009-10-08 00:50:06.000000000 +0200

12087

+++ gnome-shell-2.28.0.new/Makefile.in 2009-10-12 22:59:41.000000000 +0200

11973

12088

@@ -201,6 +201,7 @@

11974

12089

PACKAGE_NAME = @PACKAGE_NAME@

11975

12090

PACKAGE_STRING = @PACKAGE_STRING@

11978

12093

PACKAGE_VERSION = @PACKAGE_VERSION@

11979

12094

PATH_SEPARATOR = @PATH_SEPARATOR@

11980

12095

PKG_CONFIG = @PKG_CONFIG@

11981

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.27.3/src/Makefile.in gnome-shell-2.27.3.new/src/Makefile.in

11982

--- gnome-shell-2.27.3/src/Makefile.in 2009-09-16 00:04:01.000000000 +0200

11983

+++ gnome-shell-2.27.3.new/src/Makefile.in 2009-09-30 23:16:50.000000000 +0200

11984

@@ -303,6 +303,7 @@

12096

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/src/Makefile.in gnome-shell-2.28.0.new/src/Makefile.in

12097

--- gnome-shell-2.28.0/src/Makefile.in 2009-10-08 01:32:48.000000000 +0200

12098

+++ gnome-shell-2.28.0.new/src/Makefile.in 2009-10-12 22:59:41.000000000 +0200

12099

@@ -332,6 +332,7 @@

11985

12100

PACKAGE_NAME = @PACKAGE_NAME@

11986

12101

PACKAGE_STRING = @PACKAGE_STRING@

11987

12102

PACKAGE_TARNAME = @PACKAGE_TARNAME@

11989

12104

PACKAGE_VERSION = @PACKAGE_VERSION@

11990

12105

PATH_SEPARATOR = @PATH_SEPARATOR@

11991

12106

PKG_CONFIG = @PKG_CONFIG@

11992

@@ -1438,7 +1439,7 @@

12107

@@ -1856,7 +1857,7 @@

11993

12108

rm -f xgen-smc

11994

12109

11995

Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile

12110

Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.la Makefile

11996

12111

- $(AM_V_GEN) $(G_IR_SCANNER) \

11997

12112

+ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:$$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.1 --gre-version`" $(G_IR_SCANNER) \

11998

12113

--namespace=Shell \

11999

12114

--nsversion=0.1 \

12000

12115

--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \

12001

@@ -1463,7 +1464,7 @@

12116

@@ -1882,7 +1883,7 @@

12002

12117

Shell-0.1.gir -o $@

12003

12118

12004

Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la $(srcdir)/big-enum-types.h Makefile

12119

Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile

12005

12120

- $(AM_V_GEN) $(G_IR_SCANNER) \

12006

12121

+ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:$$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.1 --gre-version`" $(G_IR_SCANNER) \

12007

12122

--namespace=Big \

12008

12123

--nsversion=1.0 \

12009

12124

--include=Clutter-1.0 \

12125

@@ -1900,7 +1901,7 @@

12126

$(AM_V_GEN) $(G_IR_COMPILER) Big-1.0.gir -o $@

12127

12128

St-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libst-1.0.la Makefile

12129

- $(AM_V_GEN) $(G_IR_SCANNER) \

12130

+ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:$$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.1 --gre-version`" $(G_IR_SCANNER) \

12131

--namespace=St \

12132

--nsversion=1.0 \

12133

--include=Clutter-1.0 \

12134

diff -Nur -x '*.orig' -x '*~' gnome-shell-2.28.0/tests/Makefile.in gnome-shell-2.28.0.new/tests/Makefile.in

12135

--- gnome-shell-2.28.0/tests/Makefile.in 2009-10-08 01:16:00.000000000 +0200

12136

+++ gnome-shell-2.28.0.new/tests/Makefile.in 2009-10-12 22:59:41.000000000 +0200

12137

@@ -146,6 +146,7 @@

12138

PACKAGE_NAME = @PACKAGE_NAME@

12139

PACKAGE_STRING = @PACKAGE_STRING@

12140

PACKAGE_TARNAME = @PACKAGE_TARNAME@

12141

+PACKAGE_URL = @PACKAGE_URL@

12142

PACKAGE_VERSION = @PACKAGE_VERSION@

12143

PATH_SEPARATOR = @PATH_SEPARATOR@

12144

PKG_CONFIG = @PKG_CONFIG@