~ubuntu-branches/ubuntu/lucid/seamonkey/lucid-security : revision 3

6

#

7

# autoconf.

8

9

Index: seamonkey-1.1.6+nobinonly/configure

9

Index: seamonkey-1.1.7+nobinonly/configure

10

===================================================================

11

--- seamonkey-1.1.6+nobinonly.orig/configure

12

+++ seamonkey-1.1.6+nobinonly/configure

11

--- seamonkey-1.1.7+nobinonly.orig/configure

12

+++ seamonkey-1.1.7+nobinonly/configure

13

@@ -55,16 +55,18 @@

14

Use system libjpeg [installed at prefix PFX]"

15

ac_help="$ac_help

1893

ac_cv_path_SDP="$SDP" # Let the user override the test with a path.

1894

;;

1895

?:/*)

1896

@@ -4016,34 +3920,34 @@

1896

@@ -4024,34 +3928,34 @@

1897

CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}"

1898

1899

if test "$GCC_VERSION_FULL" = "4.0.0" ; then

1902

fi

1903

1904

echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6

1905

-echo "configure:4025: checking for valid compiler/Mac OS X SDK combination" >&5

1906

+echo "configure:3929: checking for valid compiler/Mac OS X SDK combination" >&5

1905

-echo "configure:4033: checking for valid compiler/Mac OS X SDK combination" >&5

1906

+echo "configure:3937: checking for valid compiler/Mac OS X SDK combination" >&5

1907

ac_ext=C

1908

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

1909

ac_cpp='$CXXCPP $CPPFLAGS'

1912

cross_compiling=$ac_cv_prog_cxx_cross

1913

1914

cat > conftest.$ac_ext <<EOF

1915

-#line 4034 "configure"

1916

+#line 3938 "configure"

1915

-#line 4042 "configure"

1916

+#line 3946 "configure"

1917

#include "confdefs.h"

1918

#include <new>

1919

int main() { return 0; }

1921

result=yes

1922

; return 0; }

1923

EOF

1924

-if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

1925

+if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

1924

-if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

1925

+if { (eval echo configure:3954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

1926

rm -rf conftest*

1927

result=no

1928

else

1931

fi

1932

rm -f conftest*

1933

1934

@@ -4058,17 +3962,17 @@

1934

@@ -4066,17 +3970,17 @@

1935

1936

case "$host_os" in

1937

cygwin*|mingw*|mks*|msvc*)

1940

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

1941

set dummy $ac_prog; ac_word=$2

1942

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

1943

-echo "configure:4067: checking for $ac_word" >&5

1944

+echo "configure:3971: checking for $ac_word" >&5

1943

-echo "configure:4075: checking for $ac_word" >&5

1944

+echo "configure:3979: checking for $ac_word" >&5

1945

if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then

1946

echo $ac_n "(cached) $ac_c" 1>&6

1947

else

1950

ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.

1951

;;

1952

?:/*)

1953

@@ -4101,17 +4005,17 @@

1953

@@ -4109,17 +4013,17 @@

1954

1955

;;

1956

*)

1959

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

1960

set dummy $ac_prog; ac_word=$2

1961

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

1962

-echo "configure:4110: checking for $ac_word" >&5

1963

+echo "configure:4014: checking for $ac_word" >&5

1962

-echo "configure:4118: checking for $ac_word" >&5

1963

+echo "configure:4022: checking for $ac_word" >&5

1964

if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then

1965

echo $ac_n "(cached) $ac_c" 1>&6

1966

else

1969

ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.

1970

;;

1971

?:/*)

1972

@@ -4169,17 +4073,17 @@

1972

@@ -4177,17 +4081,17 @@

1973

1974

if test "$COMPILE_ENVIRONMENT"; then

1975

1978

# Uses ac_ vars as temps to allow command line to override cache and checks.

1979

# --without-x overrides everything else, but does not touch the cache.

1980

echo $ac_n "checking for X""... $ac_c" 1>&6

1981

-echo "configure:4178: checking for X" >&5

1982

+echo "configure:4082: checking for X" >&5

1981

-echo "configure:4186: checking for X" >&5

1982

+echo "configure:4090: checking for X" >&5

1983

1984

# Check whether --with-x or --without-x was given.

1985

if test "${with_x+set}" = set; then

1988

fi

1989

1990

# $have_x is `yes', `no', `disabled', or empty when we do not yet know.

1991

@@ -4231,22 +4135,22 @@

1991

@@ -4239,22 +4143,22 @@

1992

fi

1993

1994

if test "$ac_x_includes" = NO; then

1997

1998

# First, try using that file with no special directory specified.

1999

cat > conftest.$ac_ext <<EOF

2000

-#line 4240 "configure"

2001

+#line 4144 "configure"

2000

-#line 4248 "configure"

2001

+#line 4152 "configure"

2002

#include "confdefs.h"

2003

#include <$x_direct_test_include>

2004

EOF

2005

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

2006

-{ (eval echo configure:4245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2007

+{ (eval echo configure:4149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2006

-{ (eval echo configure:4253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2007

+{ (eval echo configure:4157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2008

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

2009

if test -z "$ac_err"; then

2010

rm -rf conftest*

2013

else

2014

echo "$ac_err" >&5

2015

echo "configure: failed program was:" >&5

2016

@@ -4305,24 +4209,24 @@

2016

@@ -4313,24 +4217,24 @@

2017

test -z "$x_direct_test_library" && x_direct_test_library=Xt

2018

test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc

2019

2022

ac_save_LIBS="$LIBS"

2023

LIBS="-l$x_direct_test_library $LIBS"

2024

cat > conftest.$ac_ext <<EOF

2025

-#line 4314 "configure"

2026

+#line 4218 "configure"

2025

-#line 4322 "configure"

2026

+#line 4226 "configure"

2027

#include "confdefs.h"

2028

2029

int main() {

2030

${x_direct_test_function}()

2031

; return 0; }

2032

EOF

2033

-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2034

+if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2033

-if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2034

+if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2035

rm -rf conftest*

2036

LIBS="$ac_save_LIBS"

2037

# We can link X programs with no special library path.

2040

echo "configure: failed program was:" >&5

2041

cat conftest.$ac_ext >&5

2042

rm -rf conftest*

2043

@@ -4418,50 +4322,50 @@

2043

@@ -4426,50 +4330,50 @@

2044

# It would also be nice to do this for all -L options, not just this one.

2045

if test -n "$x_libraries"; then

2046

X_LIBS="$X_LIBS -L$x_libraries"

2049

case "`(uname -sr) 2>/dev/null`" in

2050

"SunOS 5"*)

2051

echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6

2052

-echo "configure:4427: checking whether -R must be followed by a space" >&5

2053

+echo "configure:4331: checking whether -R must be followed by a space" >&5

2052

-echo "configure:4435: checking whether -R must be followed by a space" >&5

2053

+echo "configure:4339: checking whether -R must be followed by a space" >&5

2054

ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"

2055

cat > conftest.$ac_ext <<EOF

2056

-#line 4430 "configure"

2057

+#line 4334 "configure"

2056

-#line 4438 "configure"

2057

+#line 4342 "configure"

2058

#include "confdefs.h"

2059

2060

int main() {

2061

2062

; return 0; }

2063

EOF

2064

-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2065

+if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2064

-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2065

+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2066

rm -rf conftest*

2067

ac_R_nospace=yes

2068

else

2078

else

2079

LIBS="$ac_xsave_LIBS -R $x_libraries"

2080

cat > conftest.$ac_ext <<EOF

2081

-#line 4453 "configure"

2082

+#line 4357 "configure"

2081

-#line 4461 "configure"

2082

+#line 4365 "configure"

2083

#include "confdefs.h"

2084

2085

int main() {

2086

2087

; return 0; }

2088

EOF

2089

-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2090

+if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2089

-if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2090

+if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2091

rm -rf conftest*

2092

ac_R_space=yes

2093

else

2096

rm -rf conftest*

2097

ac_R_space=no

2098

fi

2099

@@ -4483,39 +4387,39 @@

2099

@@ -4491,39 +4395,39 @@

2100

2101

if test "$ISC" = yes; then

2102

X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"

2105

# libraries were built with DECnet support. And karl@cs.umb.edu says

2106

# the Alpha needs dnet_stub (dnet does not exist).

2107

echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6

2108

-echo "configure:4492: checking for dnet_ntoa in -ldnet" >&5

2109

+echo "configure:4396: checking for dnet_ntoa in -ldnet" >&5

2108

-echo "configure:4500: checking for dnet_ntoa in -ldnet" >&5

2109

+echo "configure:4404: checking for dnet_ntoa in -ldnet" >&5

2110

ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`

2111

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2112

echo $ac_n "(cached) $ac_c" 1>&6

2114

ac_save_LIBS="$LIBS"

2115

LIBS="-ldnet $LIBS"

2116

cat > conftest.$ac_ext <<EOF

2117

-#line 4500 "configure"

2118

+#line 4404 "configure"

2117

-#line 4508 "configure"

2118

+#line 4412 "configure"

2119

#include "confdefs.h"

2120

/* Override any gcc2 internal prototype to avoid an error. */

2121

#ifdef __cplusplus

2129

dnet_ntoa()

2130

; return 0; }

2131

EOF

2132

-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2133

+if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2132

-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2133

+if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2134

rm -rf conftest*

2135

eval "ac_cv_lib_$ac_lib_var=yes"

2136

else

2139

rm -rf conftest*

2140

eval "ac_cv_lib_$ac_lib_var=no"

2141

fi

2142

@@ -4527,39 +4431,39 @@

2142

@@ -4535,39 +4439,39 @@

2143

echo "$ac_t""yes" 1>&6

2144

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

2145

else

2148

2149

if test $ac_cv_lib_dnet_dnet_ntoa = no; then

2150

echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6

2151

-echo "configure:4536: checking for dnet_ntoa in -ldnet_stub" >&5

2152

+echo "configure:4440: checking for dnet_ntoa in -ldnet_stub" >&5

2151

-echo "configure:4544: checking for dnet_ntoa in -ldnet_stub" >&5

2152

+echo "configure:4448: checking for dnet_ntoa in -ldnet_stub" >&5

2153

ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`

2154

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2155

echo $ac_n "(cached) $ac_c" 1>&6

2157

ac_save_LIBS="$LIBS"

2158

LIBS="-ldnet_stub $LIBS"

2159

cat > conftest.$ac_ext <<EOF

2160

-#line 4544 "configure"

2161

+#line 4448 "configure"

2160

-#line 4552 "configure"

2161

+#line 4456 "configure"

2162

#include "confdefs.h"

2163

/* Override any gcc2 internal prototype to avoid an error. */

2164

#ifdef __cplusplus

2172

dnet_ntoa()

2173

; return 0; }

2174

EOF

2175

-if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2176

+if { (eval echo configure:4462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2175

-if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2176

+if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2177

rm -rf conftest*

2178

eval "ac_cv_lib_$ac_lib_var=yes"

2179

else

2182

rm -rf conftest*

2183

eval "ac_cv_lib_$ac_lib_var=no"

2184

fi

2185

@@ -4578,22 +4482,22 @@

2185

@@ -4586,22 +4490,22 @@

2186

2187

# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,

2188

# to get the SysV transport functions.

2191

# The nsl library prevents programs from opening the X display

2192

# on Irix 5.2, according to dickey@clark.net.

2193

echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6

2194

-echo "configure:4587: checking for gethostbyname" >&5

2195

+echo "configure:4491: checking for gethostbyname" >&5

2194

-echo "configure:4595: checking for gethostbyname" >&5

2195

+echo "configure:4499: checking for gethostbyname" >&5

2196

if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then

2197

echo $ac_n "(cached) $ac_c" 1>&6

2198

else

2199

cat > conftest.$ac_ext <<EOF

2200

-#line 4592 "configure"

2201

+#line 4496 "configure"

2200

-#line 4600 "configure"

2201

+#line 4504 "configure"

2202

#include "confdefs.h"

2203

/* System header to define __stub macros and hopefully few prototypes,

2204

which can conflict with char gethostbyname(); below. */

2207

#ifdef __cplusplus

2208

extern "C"

2209

#endif

2210

@@ -4609,17 +4513,17 @@

2210

@@ -4617,17 +4521,17 @@

2211

#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

2212

choke me

2213

#else

2216

2217

; return 0; }

2218

EOF

2219

-if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2220

+if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2219

-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2220

+if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2221

rm -rf conftest*

2222

eval "ac_cv_func_gethostbyname=yes"

2223

else

2226

rm -rf conftest*

2227

eval "ac_cv_func_gethostbyname=no"

2228

fi

2229

@@ -4630,39 +4534,39 @@

2229

@@ -4638,39 +4542,39 @@

2230

echo "$ac_t""yes" 1>&6

2231

:

2232

else

2235

2236

if test $ac_cv_func_gethostbyname = no; then

2237

echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

2238

-echo "configure:4639: checking for gethostbyname in -lnsl" >&5

2239

+echo "configure:4543: checking for gethostbyname in -lnsl" >&5

2238

-echo "configure:4647: checking for gethostbyname in -lnsl" >&5

2239

+echo "configure:4551: checking for gethostbyname in -lnsl" >&5

2240

ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`

2241

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2242

echo $ac_n "(cached) $ac_c" 1>&6

2244

ac_save_LIBS="$LIBS"

2245

LIBS="-lnsl $LIBS"

2246

cat > conftest.$ac_ext <<EOF

2247

-#line 4647 "configure"

2248

+#line 4551 "configure"

2247

-#line 4655 "configure"

2248

+#line 4559 "configure"

2249

#include "confdefs.h"

2250

/* Override any gcc2 internal prototype to avoid an error. */

2251

#ifdef __cplusplus

2259

gethostbyname()

2260

; return 0; }

2261

EOF

2262

-if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2263

+if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2262

-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2263

+if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2264

rm -rf conftest*

2265

eval "ac_cv_lib_$ac_lib_var=yes"

2266

else

2269

rm -rf conftest*

2270

eval "ac_cv_lib_$ac_lib_var=no"

2271

fi

2272

@@ -4682,22 +4586,22 @@

2272

@@ -4690,22 +4594,22 @@

2273

# lieder@skyler.mavd.honeywell.com says without -lsocket,

2274

# socket/setsockopt and other routines are undefined under SCO ODT

2275

# 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary

2278

# -lsocket must be given before -lnsl if both are needed.

2279

# We assume that if connect needs -lnsl, so does gethostbyname.

2280

echo $ac_n "checking for connect""... $ac_c" 1>&6

2281

-echo "configure:4691: checking for connect" >&5

2282

+echo "configure:4595: checking for connect" >&5

2281

-echo "configure:4699: checking for connect" >&5

2282

+echo "configure:4603: checking for connect" >&5

2283

if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then

2284

echo $ac_n "(cached) $ac_c" 1>&6

2285

else

2286

cat > conftest.$ac_ext <<EOF

2287

-#line 4696 "configure"

2288

+#line 4600 "configure"

2287

-#line 4704 "configure"

2288

+#line 4608 "configure"

2289

#include "confdefs.h"

2290

/* System header to define __stub macros and hopefully few prototypes,

2291

which can conflict with char connect(); below. */

2294

#ifdef __cplusplus

2295

extern "C"

2296

#endif

2297

@@ -4713,17 +4617,17 @@

2297

@@ -4721,17 +4625,17 @@

2298

#if defined (__stub_connect) || defined (__stub___connect)

2299

choke me

2300

#else

2303

2304

; return 0; }

2305

EOF

2306

-if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2307

+if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2306

-if { (eval echo configure:4730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2307

+if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2308

rm -rf conftest*

2309

eval "ac_cv_func_connect=yes"

2310

else

2313

rm -rf conftest*

2314

eval "ac_cv_func_connect=no"

2315

fi

2316

@@ -4734,39 +4638,39 @@

2316

@@ -4742,39 +4646,39 @@

2317

echo "$ac_t""yes" 1>&6

2318

:

2319

else

2322

2323

if test $ac_cv_func_connect = no; then

2324

echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6

2325

-echo "configure:4743: checking for connect in -lsocket" >&5

2326

+echo "configure:4647: checking for connect in -lsocket" >&5

2325

-echo "configure:4751: checking for connect in -lsocket" >&5

2326

+echo "configure:4655: checking for connect in -lsocket" >&5

2327

ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`

2328

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2329

echo $ac_n "(cached) $ac_c" 1>&6

2331

ac_save_LIBS="$LIBS"

2332

LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

2333

cat > conftest.$ac_ext <<EOF

2334

-#line 4751 "configure"

2335

+#line 4655 "configure"

2334

-#line 4759 "configure"

2335

+#line 4663 "configure"

2336

#include "confdefs.h"

2337

/* Override any gcc2 internal prototype to avoid an error. */

2338

#ifdef __cplusplus

2346

connect()

2347

; return 0; }

2348

EOF

2349

-if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2350

+if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2349

-if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2350

+if { (eval echo configure:4677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2351

rm -rf conftest*

2352

eval "ac_cv_lib_$ac_lib_var=yes"

2353

else

2356

rm -rf conftest*

2357

eval "ac_cv_lib_$ac_lib_var=no"

2358

fi

2359

@@ -4780,22 +4684,22 @@

2359

@@ -4788,22 +4692,22 @@

2360

else

2361

echo "$ac_t""no" 1>&6

2362

fi

2365

2366

# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.

2367

echo $ac_n "checking for remove""... $ac_c" 1>&6

2368

-echo "configure:4789: checking for remove" >&5

2369

+echo "configure:4693: checking for remove" >&5

2368

-echo "configure:4797: checking for remove" >&5

2369

+echo "configure:4701: checking for remove" >&5

2370

if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then

2371

echo $ac_n "(cached) $ac_c" 1>&6

2372

else

2373

cat > conftest.$ac_ext <<EOF

2374

-#line 4794 "configure"

2375

+#line 4698 "configure"

2374

-#line 4802 "configure"

2375

+#line 4706 "configure"

2376

#include "confdefs.h"

2377

/* System header to define __stub macros and hopefully few prototypes,

2378

which can conflict with char remove(); below. */

2381

#ifdef __cplusplus

2382

extern "C"

2383

#endif

2384

@@ -4811,17 +4715,17 @@

2384

@@ -4819,17 +4723,17 @@

2385

#if defined (__stub_remove) || defined (__stub___remove)

2386

choke me

2387

#else

2390

2391

; return 0; }

2392

EOF

2393

-if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2394

+if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2393

-if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2394

+if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2395

rm -rf conftest*

2396

eval "ac_cv_func_remove=yes"

2397

else

2400

rm -rf conftest*

2401

eval "ac_cv_func_remove=no"

2402

fi

2403

@@ -4832,39 +4736,39 @@

2403

@@ -4840,39 +4744,39 @@

2404

echo "$ac_t""yes" 1>&6

2405

:

2406

else

2409

2410

if test $ac_cv_func_remove = no; then

2411

echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6

2412

-echo "configure:4841: checking for remove in -lposix" >&5

2413

+echo "configure:4745: checking for remove in -lposix" >&5

2412

-echo "configure:4849: checking for remove in -lposix" >&5

2413

+echo "configure:4753: checking for remove in -lposix" >&5

2414

ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`

2415

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2416

echo $ac_n "(cached) $ac_c" 1>&6

2418

ac_save_LIBS="$LIBS"

2419

LIBS="-lposix $LIBS"

2420

cat > conftest.$ac_ext <<EOF

2421

-#line 4849 "configure"

2422

+#line 4753 "configure"

2421

-#line 4857 "configure"

2422

+#line 4761 "configure"

2423

#include "confdefs.h"

2424

/* Override any gcc2 internal prototype to avoid an error. */

2425

#ifdef __cplusplus

2433

remove()

2434

; return 0; }

2435

EOF

2436

-if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2437

+if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2436

-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2437

+if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2438

rm -rf conftest*

2439

eval "ac_cv_lib_$ac_lib_var=yes"

2440

else

2443

rm -rf conftest*

2444

eval "ac_cv_lib_$ac_lib_var=no"

2445

fi

2446

@@ -4878,22 +4782,22 @@

2446

@@ -4886,22 +4790,22 @@

2447

else

2448

echo "$ac_t""no" 1>&6

2449

fi

2452

2453

# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

2454

echo $ac_n "checking for shmat""... $ac_c" 1>&6

2455

-echo "configure:4887: checking for shmat" >&5

2456

+echo "configure:4791: checking for shmat" >&5

2455

-echo "configure:4895: checking for shmat" >&5

2456

+echo "configure:4799: checking for shmat" >&5

2457

if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then

2458

echo $ac_n "(cached) $ac_c" 1>&6

2459

else

2460

cat > conftest.$ac_ext <<EOF

2461

-#line 4892 "configure"

2462

+#line 4796 "configure"

2461

-#line 4900 "configure"

2462

+#line 4804 "configure"

2463

#include "confdefs.h"

2464

/* System header to define __stub macros and hopefully few prototypes,

2465

which can conflict with char shmat(); below. */

2468

#ifdef __cplusplus

2469

extern "C"

2470

#endif

2471

@@ -4909,17 +4813,17 @@

2471

@@ -4917,17 +4821,17 @@

2472

#if defined (__stub_shmat) || defined (__stub___shmat)

2473

choke me

2474

#else

2477

2478

; return 0; }

2479

EOF

2480

-if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2481

+if { (eval echo configure:4822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2480

-if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2481

+if { (eval echo configure:4830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2482

rm -rf conftest*

2483

eval "ac_cv_func_shmat=yes"

2484

else

2487

rm -rf conftest*

2488

eval "ac_cv_func_shmat=no"

2489

fi

2490

@@ -4930,39 +4834,39 @@

2490

@@ -4938,39 +4842,39 @@

2491

echo "$ac_t""yes" 1>&6

2492

:

2493

else

2496

2497

if test $ac_cv_func_shmat = no; then

2498

echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6

2499

-echo "configure:4939: checking for shmat in -lipc" >&5

2500

+echo "configure:4843: checking for shmat in -lipc" >&5

2499

-echo "configure:4947: checking for shmat in -lipc" >&5

2500

+echo "configure:4851: checking for shmat in -lipc" >&5

2501

ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`

2502

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2503

echo $ac_n "(cached) $ac_c" 1>&6

2505

ac_save_LIBS="$LIBS"

2506

LIBS="-lipc $LIBS"

2507

cat > conftest.$ac_ext <<EOF

2508

-#line 4947 "configure"

2509

+#line 4851 "configure"

2508

-#line 4955 "configure"

2509

+#line 4859 "configure"

2510

#include "confdefs.h"

2511

/* Override any gcc2 internal prototype to avoid an error. */

2512

#ifdef __cplusplus

2520

shmat()

2521

; return 0; }

2522

EOF

2523

-if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2524

+if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2523

-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2524

+if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2525

rm -rf conftest*

2526

eval "ac_cv_lib_$ac_lib_var=yes"

2527

else

2530

rm -rf conftest*

2531

eval "ac_cv_lib_$ac_lib_var=no"

2532

fi

2533

@@ -4985,39 +4889,39 @@

2533

@@ -4993,39 +4897,39 @@

2534

test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"

2535

# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to

2536

# check for ICE first), but we must link in the order -lSM -lICE or

2539

# libraries we check for below, so use a different variable.

2540

# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.

2541

echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6

2542

-echo "configure:4994: checking for IceConnectionNumber in -lICE" >&5

2543

+echo "configure:4898: checking for IceConnectionNumber in -lICE" >&5

2542

-echo "configure:5002: checking for IceConnectionNumber in -lICE" >&5

2543

+echo "configure:4906: checking for IceConnectionNumber in -lICE" >&5

2544

ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`

2545

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2546

echo $ac_n "(cached) $ac_c" 1>&6

2548

ac_save_LIBS="$LIBS"

2549

LIBS="-lICE $X_EXTRA_LIBS $LIBS"

2550

cat > conftest.$ac_ext <<EOF

2551

-#line 5002 "configure"

2552

+#line 4906 "configure"

2551

-#line 5010 "configure"

2552

+#line 4914 "configure"

2553

#include "confdefs.h"

2554

/* Override any gcc2 internal prototype to avoid an error. */

2555

#ifdef __cplusplus

2563

IceConnectionNumber()

2564

; return 0; }

2565

EOF

2566

-if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2567

+if { (eval echo configure:4920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2566

-if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2567

+if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2568

rm -rf conftest*

2569

eval "ac_cv_lib_$ac_lib_var=yes"

2570

else

2573

rm -rf conftest*

2574

eval "ac_cv_lib_$ac_lib_var=no"

2575

fi

2576

@@ -5097,27 +5001,36 @@

2576

@@ -5105,27 +5009,36 @@

2577

MOZ_ENABLE_POSTSCRIPT=1

2578

2579

if test -n "$CROSS_COMPILE"; then

2614

#######################################################################

2615

# Master "Core Components" macros for getting the OS target #

2616

#######################################################################

2617

@@ -5445,41 +5358,41 @@

2617

@@ -5453,41 +5366,41 @@

2618

fi

2619

2620

MKSHLIB_FORCE_ALL=

2623

if test "$COMPILE_ENVIRONMENT"; then

2624

if test "$GNU_CC"; then

2625

echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6

2626

-echo "configure:5454: checking whether ld has archive extraction flags" >&5

2627

+echo "configure:5367: checking whether ld has archive extraction flags" >&5

2626

-echo "configure:5462: checking whether ld has archive extraction flags" >&5

2627

+echo "configure:5375: checking whether ld has archive extraction flags" >&5

2628

if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then

2629

echo $ac_n "(cached) $ac_c" 1>&6

2630

else

2641

LDFLAGS=$force

2642

LIBS=$unforce

2643

cat > conftest.$ac_ext <<EOF

2644

-#line 5471 "configure"

2645

+#line 5384 "configure"

2644

-#line 5479 "configure"

2645

+#line 5392 "configure"

2646

#include "confdefs.h"

2647

2648

int main() {

2649

2650

; return 0; }

2651

EOF

2652

-if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2653

+if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2652

-if { (eval echo configure:5486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2653

+if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2654

rm -rf conftest*

2655

ac_cv_mkshlib_force_and_unforce=$line; break

2656

else

2659

fi

2660

rm -f conftest*

2661

done

2662

@@ -5502,95 +5415,95 @@

2662

@@ -5510,95 +5423,95 @@

2663

if test "$COMPILE_ENVIRONMENT"; then

2664

configure_static_assert_macros='

2665

#define CONFIGURE_STATIC_ASSERT(condition) CONFIGURE_STATIC_ASSERT_IMPL(condition, __LINE__)

2668

'

2669

2670

echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6

2671

-echo "configure:5511: checking that static assertion macros used in autoconf tests work" >&5

2672

+echo "configure:5424: checking that static assertion macros used in autoconf tests work" >&5

2671

-echo "configure:5519: checking that static assertion macros used in autoconf tests work" >&5

2672

+echo "configure:5432: checking that static assertion macros used in autoconf tests work" >&5

2673

if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then

2674

echo $ac_n "(cached) $ac_c" 1>&6

2675

else

2683

2684

ac_cv_static_assertion_macros_work="yes"

2685

cat > conftest.$ac_ext <<EOF

2686

-#line 5525 "configure"

2687

+#line 5438 "configure"

2686

-#line 5533 "configure"

2687

+#line 5446 "configure"

2688

#include "confdefs.h"

2689

$configure_static_assert_macros

2690

int main() {

2691

CONFIGURE_STATIC_ASSERT(1)

2692

; return 0; }

2693

EOF

2694

-if { (eval echo configure:5532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2695

+if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2694

-if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2695

+if { (eval echo configure:5453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2696

:

2697

else

2698

echo "configure: failed program was:" >&5

2702

fi

2703

rm -f conftest*

2704

cat > conftest.$ac_ext <<EOF

2705

-#line 5542 "configure"

2706

+#line 5455 "configure"

2705

-#line 5550 "configure"

2706

+#line 5463 "configure"

2707

#include "confdefs.h"

2708

$configure_static_assert_macros

2709

int main() {

2710

CONFIGURE_STATIC_ASSERT(0)

2711

; return 0; }

2712

EOF

2713

-if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2714

+if { (eval echo configure:5462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2713

-if { (eval echo configure:5557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2714

+if { (eval echo configure:5470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2715

rm -rf conftest*

2716

ac_cv_static_assertion_macros_work="no"

2717

else

2727

cross_compiling=$ac_cv_prog_cxx_cross

2728

2729

cat > conftest.$ac_ext <<EOF

2730

-#line 5565 "configure"

2731

+#line 5478 "configure"

2730

-#line 5573 "configure"

2731

+#line 5486 "configure"

2732

#include "confdefs.h"

2733

$configure_static_assert_macros

2734

int main() {

2735

CONFIGURE_STATIC_ASSERT(1)

2736

; return 0; }

2737

EOF

2738

-if { (eval echo configure:5572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2739

+if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2738

-if { (eval echo configure:5580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2739

+if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2740

:

2741

else

2742

echo "configure: failed program was:" >&5

2746

fi

2747

rm -f conftest*

2748

cat > conftest.$ac_ext <<EOF

2749

-#line 5582 "configure"

2750

+#line 5495 "configure"

2749

-#line 5590 "configure"

2750

+#line 5503 "configure"

2751

#include "confdefs.h"

2752

$configure_static_assert_macros

2753

int main() {

2754

CONFIGURE_STATIC_ASSERT(0)

2755

; return 0; }

2756

EOF

2757

-if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2758

+if { (eval echo configure:5502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2757

-if { (eval echo configure:5597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2758

+if { (eval echo configure:5510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2759

rm -rf conftest*

2760

ac_cv_static_assertion_macros_work="no"

2761

else

2764

fi

2765

rm -f conftest*

2766

ac_ext=C

2767

@@ -5615,26 +5528,26 @@

2767

@@ -5623,26 +5536,26 @@

2768

ac_ext=c

2769

# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

2770

ac_cpp='$CPP $CPPFLAGS'

2773

cross_compiling=$ac_cv_prog_cc_cross

2774

2775

echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6

2776

-echo "configure:5624: checking for 64-bit OS" >&5

2777

+echo "configure:5537: checking for 64-bit OS" >&5

2776

-echo "configure:5632: checking for 64-bit OS" >&5

2777

+echo "configure:5545: checking for 64-bit OS" >&5

2778

cat > conftest.$ac_ext <<EOF

2779

-#line 5626 "configure"

2780

+#line 5539 "configure"

2779

-#line 5634 "configure"

2780

+#line 5547 "configure"

2781

#include "confdefs.h"

2782

$configure_static_assert_macros

2783

int main() {

2784

CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)

2785

; return 0; }

2786

EOF

2787

-if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2788

+if { (eval echo configure:5546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2787

-if { (eval echo configure:5641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2788

+if { (eval echo configure:5554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2789

rm -rf conftest*

2790

result="yes"

2791

else

2794

rm -rf conftest*

2795

result="no"

2796

fi

2797

@@ -5703,17 +5616,17 @@

2797

@@ -5711,17 +5624,17 @@

2798

*-darwin*)

2799

HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"

2800

HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'

2813

*os2*)

2814

HOST_CFLAGS="$HOST_CFLAGS -DXP_OS2 -DNO_X11 -Zomf"

2815

HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'

2816

@@ -5782,28 +5695,28 @@

2816

@@ -5790,28 +5703,28 @@

2817

ac_ext=C

2818

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

2819

ac_cpp='$CXXCPP $CPPFLAGS'

2822

cross_compiling=$ac_cv_prog_cxx_cross

2823

2824

echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6

2825

-echo "configure:5791: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5

2826

+echo "configure:5704: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5

2825

-echo "configure:5799: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5

2826

+echo "configure:5712: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5

2827

cat > conftest.$ac_ext <<EOF

2828

-#line 5793 "configure"

2829

+#line 5706 "configure"

2828

-#line 5801 "configure"

2829

+#line 5714 "configure"

2830

#include "confdefs.h"

2831

2832

int main() {

2835

#endif

2836

; return 0; }

2837

EOF

2838

-if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2839

+if { (eval echo configure:5715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2838

-if { (eval echo configure:5810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2839

+if { (eval echo configure:5723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

2840

rm -rf conftest*

2841

_BAD_COMPILER=

2842

else

2845

rm -rf conftest*

2846

_BAD_COMPILER=1

2847

fi

2848

@@ -5831,27 +5744,27 @@

2848

@@ -5839,27 +5752,27 @@

2849

DLL_SUFFIX='_shr.a'

2850

;;

2851

esac

2854

do

2855

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

2856

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

2857

-echo "configure:5840: checking for $ac_hdr" >&5

2858

+echo "configure:5753: checking for $ac_hdr" >&5

2857

-echo "configure:5848: checking for $ac_hdr" >&5

2858

+echo "configure:5761: checking for $ac_hdr" >&5

2859

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

2860

echo $ac_n "(cached) $ac_c" 1>&6

2861

else

2862

cat > conftest.$ac_ext <<EOF

2863

-#line 5845 "configure"

2864

+#line 5758 "configure"

2863

-#line 5853 "configure"

2864

+#line 5766 "configure"

2865

#include "confdefs.h"

2866

#include <$ac_hdr>

2867

EOF

2868

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

2869

-{ (eval echo configure:5850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2870

+{ (eval echo configure:5763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2869

-{ (eval echo configure:5858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2870

+{ (eval echo configure:5771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

2871

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

2872

if test -z "$ac_err"; then

2873

rm -rf conftest*

2876

echo "$ac_err" >&5

2877

echo "configure: failed program was:" >&5

2878

cat conftest.$ac_ext >&5

2879

@@ -5883,32 +5796,32 @@

2879

@@ -5891,32 +5804,32 @@

2880

no_x=yes

2881

MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'

2882

_PLATFORM_DEFAULT_TOOLKIT="beos"

2885

LIBS="$LIBS -lbe"

2886

if test "$COMPILE_ENVIRONMENT"; then

2887

echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6

2888

-echo "configure:5892: checking for main in -lbind" >&5

2889

+echo "configure:5805: checking for main in -lbind" >&5

2888

-echo "configure:5900: checking for main in -lbind" >&5

2889

+echo "configure:5813: checking for main in -lbind" >&5

2890

ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'`

2891

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2892

echo $ac_n "(cached) $ac_c" 1>&6

2894

ac_save_LIBS="$LIBS"

2895

LIBS="-lbind $LIBS"

2896

cat > conftest.$ac_ext <<EOF

2897

-#line 5900 "configure"

2898

+#line 5813 "configure"

2897

-#line 5908 "configure"

2898

+#line 5821 "configure"

2899

#include "confdefs.h"

2900

2901

int main() {

2902

main()

2903

; return 0; }

2904

EOF

2905

-if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2906

+if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2905

-if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2906

+if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2907

rm -rf conftest*

2908

eval "ac_cv_lib_$ac_lib_var=yes"

2909

else

2912

rm -rf conftest*

2913

eval "ac_cv_lib_$ac_lib_var=no"

2914

fi

2915

@@ -5919,32 +5832,32 @@

2915

@@ -5927,32 +5840,32 @@

2916

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

2917

echo "$ac_t""yes" 1>&6

2918

LIBS="$LIBS -lbind"

2921

fi

2922

2923

echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6

2924

-echo "configure:5928: checking for main in -lzeta" >&5

2925

+echo "configure:5841: checking for main in -lzeta" >&5

2924

-echo "configure:5936: checking for main in -lzeta" >&5

2925

+echo "configure:5849: checking for main in -lzeta" >&5

2926

ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'`

2927

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

2928

echo $ac_n "(cached) $ac_c" 1>&6

2930

ac_save_LIBS="$LIBS"

2931

LIBS="-lzeta $LIBS"

2932

cat > conftest.$ac_ext <<EOF

2933

-#line 5936 "configure"

2934

+#line 5849 "configure"

2933

-#line 5944 "configure"

2934

+#line 5857 "configure"

2935

#include "confdefs.h"

2936

2937

int main() {

2938

main()

2939

; return 0; }

2940

EOF

2941

-if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2942

+if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2941

-if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2942

+if { (eval echo configure:5864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2943

rm -rf conftest*

2944

eval "ac_cv_lib_$ac_lib_var=yes"

2945

else

2948

rm -rf conftest*

2949

eval "ac_cv_lib_$ac_lib_var=no"

2950

fi

2951

@@ -5998,28 +5911,28 @@

2951

@@ -6010,28 +5923,28 @@

2952

STRIP="$STRIP -x -S"

2953

_PLATFORM_DEFAULT_TOOLKIT='mac'

2954

MOZ_ENABLE_POSTSCRIPT=

2957

MACOSX=1

2958

2959

echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6

2960

-echo "configure:6007: checking for -dead_strip option to ld" >&5

2961

+echo "configure:5920: checking for -dead_strip option to ld" >&5

2960

-echo "configure:6019: checking for -dead_strip option to ld" >&5

2961

+echo "configure:5932: checking for -dead_strip option to ld" >&5

2962

_SAVE_LDFLAGS=$LDFLAGS

2963

LDFLAGS="$LDFLAGS -Wl,-dead_strip"

2964

cat > conftest.$ac_ext <<EOF

2965

-#line 6011 "configure"

2966

+#line 5924 "configure"

2965

-#line 6023 "configure"

2966

+#line 5936 "configure"

2967

#include "confdefs.h"

2968

2969

int main() {

2970

return 0;

2971

; return 0; }

2972

EOF

2973

-if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2974

+if { (eval echo configure:5931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2973

-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2974

+if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2975

rm -rf conftest*

2976

_HAVE_DEAD_STRIP=1

2977

else

2980

rm -rf conftest*

2981

_HAVE_DEAD_STRIP=

2982

fi

2983

@@ -6148,18 +6061,16 @@

2983

@@ -6160,18 +6073,16 @@

2984

CFLAGS="$CFLAGS -mieee"

2985

CXXFLAGS="$CXXFLAGS -mieee"

2986

;;

2999

3000

MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`

3001

AR_LIST="$AR -list"

3002

@@ -6877,24 +6788,24 @@

3002

@@ -6889,24 +6800,24 @@

3003

3004

CFLAGS="$CFLAGS -xstrconst -xbuiltin=%all"

3005

CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"

3008

_SAVE_LDFLAGS=$LDFLAGS

3009

LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"

3010

cat > conftest.$ac_ext <<EOF

3011

-#line 6886 "configure"

3012

+#line 6797 "configure"

3011

-#line 6898 "configure"

3012

+#line 6809 "configure"

3013

#include "confdefs.h"

3014

#include <stdio.h>

3015

int main() {

3016

printf("Hello World\n");

3017

; return 0; }

3018

EOF

3019

-if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3020

+if { (eval echo configure:6804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3019

-if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3020

+if { (eval echo configure:6816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3021

:

3022

else

3023

echo "configure: failed program was:" >&5

3026

LDFLAGS=$_SAVE_LDFLAGS

3027

fi

3028

rm -f conftest*

3029

@@ -6912,36 +6823,36 @@

3029

@@ -6924,36 +6835,36 @@

3030

AR_FLAGS='-o $@'

3031

AS='/usr/ccs/bin/as'

3032

ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"

3035

CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`

3036

CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`

3037

echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6

3038

-echo "configure:6921: checking for Forte compiler version >= WS6U2" >&5

3039

+echo "configure:6832: checking for Forte compiler version >= WS6U2" >&5

3038

-echo "configure:6933: checking for Forte compiler version >= WS6U2" >&5

3039

+echo "configure:6844: checking for Forte compiler version >= WS6U2" >&5

3040

3041

ac_ext=C

3042

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

3046

cross_compiling=$ac_cv_prog_cxx_cross

3047

3048

cat > conftest.$ac_ext <<EOF

3049

-#line 6931 "configure"

3050

+#line 6842 "configure"

3049

-#line 6943 "configure"

3050

+#line 6854 "configure"

3051

#include "confdefs.h"

3052

3053

int main() {

3056

#endif

3057

; return 0; }

3058

EOF

3059

-if { (eval echo configure:6940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3060

+if { (eval echo configure:6851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3059

-if { (eval echo configure:6952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3060

+if { (eval echo configure:6863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3061

rm -rf conftest*

3062

_BAD_COMPILER=

3063

else

3066

rm -rf conftest*

3067

_BAD_COMPILER=1

3068

fi

3069

@@ -7041,17 +6952,17 @@

3069

@@ -7053,17 +6964,17 @@

3070

cat >> confdefs.h <<\EOF

3071

#define MOZ_OJI_REQUIRE_THREAD_SAFE_ON_STARTUP 1

3072

EOF

3085

else

3086

if test -z "$GCC_USE_GNU_LD"; then

3087

MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'

3088

@@ -7060,17 +6971,17 @@

3088

@@ -7072,17 +6983,17 @@

3089

fi

3090

fi

3091

;;

3094

;;

3095

*-darwin*)

3096

echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6

3097

-echo "configure:7069: checking for -exported_symbols_list option to ld" >&5

3098

+echo "configure:6980: checking for -exported_symbols_list option to ld" >&5

3097

-echo "configure:7081: checking for -exported_symbols_list option to ld" >&5

3098

+echo "configure:6992: checking for -exported_symbols_list option to ld" >&5

3099

if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then

3100

echo $ac_n "(cached) $ac_c" 1>&6

3101

else

3104

ac_cv_exported_symbols_list=true

3105

else

3106

ac_cv_exported_symbols_list=false

3107

@@ -7100,47 +7011,47 @@

3107

@@ -7112,47 +7023,47 @@

3108

ac_ext=c

3109

# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

3110

ac_cpp='$CPP $CPPFLAGS'

3113

cross_compiling=$ac_cv_prog_cc_cross

3114

3115

echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

3116

-echo "configure:7109: checking for ANSI C header files" >&5

3117

+echo "configure:7020: checking for ANSI C header files" >&5

3116

-echo "configure:7121: checking for ANSI C header files" >&5

3117

+echo "configure:7032: checking for ANSI C header files" >&5

3118

if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then

3119

echo $ac_n "(cached) $ac_c" 1>&6

3120

else

3121

cat > conftest.$ac_ext <<EOF

3122

-#line 7114 "configure"

3123

+#line 7025 "configure"

3122

-#line 7126 "configure"

3123

+#line 7037 "configure"

3124

#include "confdefs.h"

3125

#include <stdlib.h>

3126

#include <stdarg.h>

3128

#include <float.h>

3129

EOF

3130

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

3131

-{ (eval echo configure:7122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

3132

+{ (eval echo configure:7033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

3131

-{ (eval echo configure:7134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

3132

+{ (eval echo configure:7045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

3133

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

3134

if test -z "$ac_err"; then

3135

rm -rf conftest*

3146

if test $ac_cv_header_stdc = yes; then

3147

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

3148

cat > conftest.$ac_ext <<EOF

3149

-#line 7139 "configure"

3150

+#line 7050 "configure"

3149

-#line 7151 "configure"

3150

+#line 7062 "configure"

3151

#include "confdefs.h"

3152

#include <string.h>

3153

EOF

3156

:

3157

else

3158

rm -rf conftest*

3159

@@ -7148,17 +7059,17 @@

3159

@@ -7160,17 +7071,17 @@

3160

fi

3161

rm -f conftest*

3162

3165

if test $ac_cv_header_stdc = yes; then

3166

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

3167

cat > conftest.$ac_ext <<EOF

3168

-#line 7157 "configure"

3169

+#line 7068 "configure"

3168

-#line 7169 "configure"

3169

+#line 7080 "configure"

3170

#include "confdefs.h"

3171

#include <stdlib.h>

3172

EOF

3175

:

3176

else

3177

rm -rf conftest*

3178

@@ -7169,28 +7080,28 @@

3178

@@ -7181,28 +7092,28 @@

3179

fi

3180

3181

if test $ac_cv_header_stdc = yes; then

3184

:

3185

else

3186

cat > conftest.$ac_ext <<EOF

3187

-#line 7178 "configure"

3188

+#line 7089 "configure"

3187

-#line 7190 "configure"

3188

+#line 7101 "configure"

3189

#include "confdefs.h"

3190

#include <ctype.h>

3191

#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

3196

exit (0); }

3197

3198

EOF

3199

-if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

3200

+if { (eval echo configure:7100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

3199

-if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

3200

+if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

3201

then

3202

:

3203

else

3206

rm -fr conftest*

3207

ac_cv_header_stdc=no

3208

fi

3209

@@ -7204,22 +7115,22 @@

3209

@@ -7216,22 +7127,22 @@

3210

if test $ac_cv_header_stdc = yes; then

3211

cat >> confdefs.h <<\EOF

3212

#define STDC_HEADERS 1

3215

fi

3216

3217

echo $ac_n "checking for working const""... $ac_c" 1>&6

3218

-echo "configure:7213: checking for working const" >&5

3219

+echo "configure:7124: checking for working const" >&5

3218

-echo "configure:7225: checking for working const" >&5

3219

+echo "configure:7136: checking for working const" >&5

3220

if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then

3221

echo $ac_n "(cached) $ac_c" 1>&6

3222

else

3223

cat > conftest.$ac_ext <<EOF

3224

-#line 7218 "configure"

3225

+#line 7129 "configure"

3224

-#line 7230 "configure"

3225

+#line 7141 "configure"

3226

#include "confdefs.h"

3227

3228

int main() {

3231

typedef int charset[2]; const charset x;

3232

/* SunOS 4.1.1 cc rejects this. */

3233

char const *const *ccp;

3234

@@ -7258,17 +7169,17 @@

3234

@@ -7270,17 +7181,17 @@

3235

struct s *b; b->j = 5;

3236

}

3237

{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */

3240

3241

; return 0; }

3242

EOF

3243

-if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3244

+if { (eval echo configure:7178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3243

-if { (eval echo configure:7279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3244

+if { (eval echo configure:7190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3245

rm -rf conftest*

3246

ac_cv_c_const=yes

3247

else

3250

rm -rf conftest*

3251

ac_cv_c_const=no

3252

fi

3253

@@ -7279,22 +7190,22 @@

3253

@@ -7291,22 +7202,22 @@

3254

if test $ac_cv_c_const = no; then

3255

cat >> confdefs.h <<\EOF

3256

#define const

3259

fi

3260

3261

echo $ac_n "checking for mode_t""... $ac_c" 1>&6

3262

-echo "configure:7288: checking for mode_t" >&5

3263

+echo "configure:7199: checking for mode_t" >&5

3262

-echo "configure:7300: checking for mode_t" >&5

3263

+echo "configure:7211: checking for mode_t" >&5

3264

if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then

3265

echo $ac_n "(cached) $ac_c" 1>&6

3266

else

3267

cat > conftest.$ac_ext <<EOF

3268

-#line 7293 "configure"

3269

+#line 7204 "configure"

3268

-#line 7305 "configure"

3269

+#line 7216 "configure"

3270

#include "confdefs.h"

3271

#include <sys/types.h>

3272

#if STDC_HEADERS

3275

#endif

3276

EOF

3277

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

3278

@@ -7312,22 +7223,22 @@

3278

@@ -7324,22 +7235,22 @@

3279

if test $ac_cv_type_mode_t = no; then

3280

cat >> confdefs.h <<\EOF

3281

#define mode_t int

3284

fi

3285

3286

echo $ac_n "checking for off_t""... $ac_c" 1>&6

3287

-echo "configure:7321: checking for off_t" >&5

3288

+echo "configure:7232: checking for off_t" >&5

3287

-echo "configure:7333: checking for off_t" >&5

3288

+echo "configure:7244: checking for off_t" >&5

3289

if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then

3290

echo $ac_n "(cached) $ac_c" 1>&6

3291

else

3292

cat > conftest.$ac_ext <<EOF

3293

-#line 7326 "configure"

3294

+#line 7237 "configure"

3293

-#line 7338 "configure"

3294

+#line 7249 "configure"

3295

#include "confdefs.h"

3296

#include <sys/types.h>

3297

#if STDC_HEADERS

3300

#endif

3301

EOF

3302

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

3303

@@ -7345,22 +7256,22 @@

3303

@@ -7357,22 +7268,22 @@

3304

if test $ac_cv_type_off_t = no; then

3305

cat >> confdefs.h <<\EOF

3306

#define off_t long

3309

fi

3310

3311

echo $ac_n "checking for pid_t""... $ac_c" 1>&6

3312

-echo "configure:7354: checking for pid_t" >&5

3313

+echo "configure:7265: checking for pid_t" >&5

3312

-echo "configure:7366: checking for pid_t" >&5

3313

+echo "configure:7277: checking for pid_t" >&5

3314

if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then

3315

echo $ac_n "(cached) $ac_c" 1>&6

3316

else

3317

cat > conftest.$ac_ext <<EOF

3318

-#line 7359 "configure"

3319

+#line 7270 "configure"

3318

-#line 7371 "configure"

3319

+#line 7282 "configure"

3320

#include "confdefs.h"

3321

#include <sys/types.h>

3322

#if STDC_HEADERS

3325

#endif

3326

EOF

3327

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

3328

@@ -7378,22 +7289,22 @@

3328

@@ -7390,22 +7301,22 @@

3329

if test $ac_cv_type_pid_t = no; then

3330

cat >> confdefs.h <<\EOF

3331

#define pid_t int

3334

fi

3335

3336

echo $ac_n "checking for size_t""... $ac_c" 1>&6

3337

-echo "configure:7387: checking for size_t" >&5

3338

+echo "configure:7298: checking for size_t" >&5

3337

-echo "configure:7399: checking for size_t" >&5

3338

+echo "configure:7310: checking for size_t" >&5

3339

if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then

3340

echo $ac_n "(cached) $ac_c" 1>&6

3341

else

3342

cat > conftest.$ac_ext <<EOF

3343

-#line 7392 "configure"

3344

+#line 7303 "configure"

3343

-#line 7404 "configure"

3344

+#line 7315 "configure"

3345

#include "confdefs.h"

3346

#include <sys/types.h>

3347

#if STDC_HEADERS

3350

#endif

3351

EOF

3352

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

3353

@@ -7411,30 +7322,30 @@

3353

@@ -7423,30 +7334,30 @@

3354

if test $ac_cv_type_size_t = no; then

3355

cat >> confdefs.h <<\EOF

3356

#define size_t unsigned

3359

fi

3360

3361

echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6

3362

-echo "configure:7420: checking for st_blksize in struct stat" >&5

3363

+echo "configure:7331: checking for st_blksize in struct stat" >&5

3362

-echo "configure:7432: checking for st_blksize in struct stat" >&5

3363

+echo "configure:7343: checking for st_blksize in struct stat" >&5

3364

if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then

3365

echo $ac_n "(cached) $ac_c" 1>&6

3366

else

3367

cat > conftest.$ac_ext <<EOF

3368

-#line 7425 "configure"

3369

+#line 7336 "configure"

3368

-#line 7437 "configure"

3369

+#line 7348 "configure"

3370

#include "confdefs.h"

3371

#include <sys/types.h>

3372

#include <sys/stat.h>

3374

struct stat s; s.st_blksize;

3375

; return 0; }

3376

EOF

3377

-if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3378

+if { (eval echo configure:7344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3377

-if { (eval echo configure:7445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3378

+if { (eval echo configure:7356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3379

rm -rf conftest*

3380

ac_cv_struct_st_blksize=yes

3381

else

3384

rm -rf conftest*

3385

ac_cv_struct_st_blksize=no

3386

fi

3387

@@ -7445,30 +7356,30 @@

3387

@@ -7457,30 +7368,30 @@

3388

if test $ac_cv_struct_st_blksize = yes; then

3389

cat >> confdefs.h <<\EOF

3390

#define HAVE_ST_BLKSIZE 1

3393

fi

3394

3395

echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6

3396

-echo "configure:7454: checking for siginfo_t" >&5

3397

+echo "configure:7365: checking for siginfo_t" >&5

3396

-echo "configure:7466: checking for siginfo_t" >&5

3397

+echo "configure:7377: checking for siginfo_t" >&5

3398

if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then

3399

echo $ac_n "(cached) $ac_c" 1>&6

3400

else

3401

cat > conftest.$ac_ext <<EOF

3402

-#line 7459 "configure"

3403

+#line 7370 "configure"

3402

-#line 7471 "configure"

3403

+#line 7382 "configure"

3404

#include "confdefs.h"

3405

#define _POSIX_C_SOURCE 199506L

3406

#include <signal.h>

3408

siginfo_t* info;

3409

; return 0; }

3410

EOF

3411

-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3412

+if { (eval echo configure:7378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3411

-if { (eval echo configure:7479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3412

+if { (eval echo configure:7390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3413

rm -rf conftest*

3414

ac_cv_siginfo_t=true

3415

else

3418

rm -rf conftest*

3419

ac_cv_siginfo_t=false

3420

fi

3421

@@ -7492,30 +7403,30 @@

3421

@@ -7504,30 +7415,30 @@

3422

3423

cat >> confdefs.h <<\EOF

3424

#define __off_t 1

3427

fi

3428

3429

echo $ac_n "checking for int16_t""... $ac_c" 1>&6

3430

-echo "configure:7501: checking for int16_t" >&5

3431

+echo "configure:7412: checking for int16_t" >&5

3430

-echo "configure:7513: checking for int16_t" >&5

3431

+echo "configure:7424: checking for int16_t" >&5

3432

if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then

3433

echo $ac_n "(cached) $ac_c" 1>&6

3434

else

3435

cat > conftest.$ac_ext <<EOF

3436

-#line 7506 "configure"

3437

+#line 7417 "configure"

3436

-#line 7518 "configure"

3437

+#line 7429 "configure"

3438

#include "confdefs.h"

3439

#include <stdio.h>

3440

#include <sys/types.h>

3442

int16_t foo = 0;

3443

; return 0; }

3444

EOF

3445

-if { (eval echo configure:7514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3446

+if { (eval echo configure:7425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3445

-if { (eval echo configure:7526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3446

+if { (eval echo configure:7437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3447

rm -rf conftest*

3448

ac_cv_int16_t=true

3449

else

3452

rm -rf conftest*

3453

ac_cv_int16_t=false

3454

fi

3455

@@ -7527,30 +7438,30 @@

3455

@@ -7539,30 +7450,30 @@

3456

#define HAVE_INT16_T 1

3457

EOF

3458

3461

echo "$ac_t""no" 1>&6

3462

fi

3463

echo $ac_n "checking for int32_t""... $ac_c" 1>&6

3464

-echo "configure:7536: checking for int32_t" >&5

3465

+echo "configure:7447: checking for int32_t" >&5

3464

-echo "configure:7548: checking for int32_t" >&5

3465

+echo "configure:7459: checking for int32_t" >&5

3466

if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then

3467

echo $ac_n "(cached) $ac_c" 1>&6

3468

else

3469

cat > conftest.$ac_ext <<EOF

3470

-#line 7541 "configure"

3471

+#line 7452 "configure"

3470

-#line 7553 "configure"

3471

+#line 7464 "configure"

3472

#include "confdefs.h"

3473

#include <stdio.h>

3474

#include <sys/types.h>

3476

int32_t foo = 0;

3477

; return 0; }

3478

EOF

3479

-if { (eval echo configure:7549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3480

+if { (eval echo configure:7460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3479

-if { (eval echo configure:7561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3480

+if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3481

rm -rf conftest*

3482

ac_cv_int32_t=true

3483

else

3486

rm -rf conftest*

3487

ac_cv_int32_t=false

3488

fi

3489

@@ -7562,30 +7473,30 @@

3489

@@ -7574,30 +7485,30 @@

3490

#define HAVE_INT32_T 1

3491

EOF

3492

3495

echo "$ac_t""no" 1>&6

3496

fi

3497

echo $ac_n "checking for int64_t""... $ac_c" 1>&6

3498

-echo "configure:7571: checking for int64_t" >&5

3499

+echo "configure:7482: checking for int64_t" >&5

3498

-echo "configure:7583: checking for int64_t" >&5

3499

+echo "configure:7494: checking for int64_t" >&5

3500

if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then

3501

echo $ac_n "(cached) $ac_c" 1>&6

3502

else

3503

cat > conftest.$ac_ext <<EOF

3504

-#line 7576 "configure"

3505

+#line 7487 "configure"

3504

-#line 7588 "configure"

3505

+#line 7499 "configure"

3506

#include "confdefs.h"

3507

#include <stdio.h>

3508

#include <sys/types.h>

3510

int64_t foo = 0;

3511

; return 0; }

3512

EOF

3513

-if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3514

+if { (eval echo configure:7495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3513

-if { (eval echo configure:7596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3514

+if { (eval echo configure:7507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3515

rm -rf conftest*

3516

ac_cv_int64_t=true

3517

else

3520

rm -rf conftest*

3521

ac_cv_int64_t=false

3522

fi

3523

@@ -7597,30 +7508,30 @@

3523

@@ -7609,30 +7520,30 @@

3524

#define HAVE_INT64_T 1

3525

EOF

3526

3529

echo "$ac_t""no" 1>&6

3530

fi

3531

echo $ac_n "checking for int64""... $ac_c" 1>&6

3532

-echo "configure:7606: checking for int64" >&5

3533

+echo "configure:7517: checking for int64" >&5

3532

-echo "configure:7618: checking for int64" >&5

3533

+echo "configure:7529: checking for int64" >&5

3534

if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then

3535

echo $ac_n "(cached) $ac_c" 1>&6

3536

else

3537

cat > conftest.$ac_ext <<EOF

3538

-#line 7611 "configure"

3539

+#line 7522 "configure"

3538

-#line 7623 "configure"

3539

+#line 7534 "configure"

3540

#include "confdefs.h"

3541

#include <stdio.h>

3542

#include <sys/types.h>

3544

int64 foo = 0;

3545

; return 0; }

3546

EOF

3547

-if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3548

+if { (eval echo configure:7530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3547

-if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3548

+if { (eval echo configure:7542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3549

rm -rf conftest*

3550

ac_cv_int64=true

3551

else

3554

rm -rf conftest*

3555

ac_cv_int64=false

3556

fi

3557

@@ -7632,30 +7543,30 @@

3557

@@ -7644,30 +7555,30 @@

3558

#define HAVE_INT64 1

3559

EOF

3560

3563

echo "$ac_t""no" 1>&6

3564

fi

3565

echo $ac_n "checking for uint""... $ac_c" 1>&6

3566

-echo "configure:7641: checking for uint" >&5

3567

+echo "configure:7552: checking for uint" >&5

3566

-echo "configure:7653: checking for uint" >&5

3567

+echo "configure:7564: checking for uint" >&5

3568

if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then

3569

echo $ac_n "(cached) $ac_c" 1>&6

3570

else

3571

cat > conftest.$ac_ext <<EOF

3572

-#line 7646 "configure"

3573

+#line 7557 "configure"

3572

-#line 7658 "configure"

3573

+#line 7569 "configure"

3574

#include "confdefs.h"

3575

#include <stdio.h>

3576

#include <sys/types.h>

3578

uint foo = 0;

3579

; return 0; }

3580

EOF

3581

-if { (eval echo configure:7654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3582

+if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3581

-if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3582

+if { (eval echo configure:7577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3583

rm -rf conftest*

3584

ac_cv_uint=true

3585

else

3588

rm -rf conftest*

3589

ac_cv_uint=false

3590

fi

3591

@@ -7667,30 +7578,30 @@

3591

@@ -7679,30 +7590,30 @@

3592

#define HAVE_UINT 1

3593

EOF

3594

3597

echo "$ac_t""no" 1>&6

3598

fi

3599

echo $ac_n "checking for uint_t""... $ac_c" 1>&6

3600

-echo "configure:7676: checking for uint_t" >&5

3601

+echo "configure:7587: checking for uint_t" >&5

3600

-echo "configure:7688: checking for uint_t" >&5

3601

+echo "configure:7599: checking for uint_t" >&5

3602

if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then

3603

echo $ac_n "(cached) $ac_c" 1>&6

3604

else

3605

cat > conftest.$ac_ext <<EOF

3606

-#line 7681 "configure"

3607

+#line 7592 "configure"

3606

-#line 7693 "configure"

3607

+#line 7604 "configure"

3608

#include "confdefs.h"

3609

#include <stdio.h>

3610

#include <sys/types.h>

3612

uint_t foo = 0;

3613

; return 0; }

3614

EOF

3615

-if { (eval echo configure:7689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3616

+if { (eval echo configure:7600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3615

-if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3616

+if { (eval echo configure:7612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3617

rm -rf conftest*

3618

ac_cv_uint_t=true

3619

else

3622

rm -rf conftest*

3623

ac_cv_uint_t=false

3624

fi

3625

@@ -7702,30 +7613,30 @@

3625

@@ -7714,30 +7625,30 @@

3626

#define HAVE_UINT_T 1

3627

EOF

3628

3631

echo "$ac_t""no" 1>&6

3632

fi

3633

echo $ac_n "checking for uint16_t""... $ac_c" 1>&6

3634

-echo "configure:7711: checking for uint16_t" >&5

3635

+echo "configure:7622: checking for uint16_t" >&5

3634

-echo "configure:7723: checking for uint16_t" >&5

3635

+echo "configure:7634: checking for uint16_t" >&5

3636

if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then

3637

echo $ac_n "(cached) $ac_c" 1>&6

3638

else

3639

cat > conftest.$ac_ext <<EOF

3640

-#line 7716 "configure"

3641

+#line 7627 "configure"

3640

-#line 7728 "configure"

3641

+#line 7639 "configure"

3642

#include "confdefs.h"

3643

#include <stdio.h>

3644

#include <sys/types.h>

3646

uint16_t foo = 0;

3647

; return 0; }

3648

EOF

3649

-if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3650

+if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3649

-if { (eval echo configure:7736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3650

+if { (eval echo configure:7647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3651

rm -rf conftest*

3652

ac_cv_uint16_t=true

3653

else

3656

rm -rf conftest*

3657

ac_cv_uint16_t=false

3658

fi

3659

@@ -7746,30 +7657,30 @@

3659

@@ -7758,30 +7669,30 @@

3660

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

3661

ac_cpp='$CXXCPP $CPPFLAGS'

3662

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

3665

3666

3667

echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6

3668

-echo "configure:7755: checking for uname.domainname" >&5

3669

+echo "configure:7666: checking for uname.domainname" >&5

3668

-echo "configure:7767: checking for uname.domainname" >&5

3669

+echo "configure:7678: checking for uname.domainname" >&5

3670

if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then

3671

echo $ac_n "(cached) $ac_c" 1>&6

3672

else

3673

cat > conftest.$ac_ext <<EOF

3674

-#line 7760 "configure"

3675

+#line 7671 "configure"

3674

-#line 7772 "configure"

3675

+#line 7683 "configure"

3676

#include "confdefs.h"

3677

#include <sys/utsname.h>

3678

int main() {

3680

(void)uname(res); if (res != 0) { domain = res->domainname; }

3681

; return 0; }

3682

EOF

3683

-if { (eval echo configure:7768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3684

+if { (eval echo configure:7679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3683

-if { (eval echo configure:7780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3684

+if { (eval echo configure:7691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3685

rm -rf conftest*

3686

ac_cv_have_uname_domainname_field=true

3687

else

3690

rm -rf conftest*

3691

ac_cv_have_uname_domainname_field=false

3692

fi

3693

@@ -7783,30 +7694,30 @@

3693

@@ -7795,30 +7706,30 @@

3694

EOF

3695

3696

echo "$ac_t""yes" 1>&6

3699

fi

3700

3701

echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6

3702

-echo "configure:7792: checking for uname.__domainname" >&5

3703

+echo "configure:7703: checking for uname.__domainname" >&5

3702

-echo "configure:7804: checking for uname.__domainname" >&5

3703

+echo "configure:7715: checking for uname.__domainname" >&5

3704

if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then

3705

echo $ac_n "(cached) $ac_c" 1>&6

3706

else

3707

cat > conftest.$ac_ext <<EOF

3708

-#line 7797 "configure"

3709

+#line 7708 "configure"

3708

-#line 7809 "configure"

3709

+#line 7720 "configure"

3710

#include "confdefs.h"

3711

#include <sys/utsname.h>

3712

int main() {

3714

(void)uname(res); if (res != 0) { domain = res->__domainname; }

3715

; return 0; }

3716

EOF

3717

-if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3718

+if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3717

-if { (eval echo configure:7817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3718

+if { (eval echo configure:7728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3719

rm -rf conftest*

3720

ac_cv_have_uname_us_domainname_field=true

3721

else

3724

rm -rf conftest*

3725

ac_cv_have_uname_us_domainname_field=false

3726

fi

3727

@@ -7829,31 +7740,31 @@

3727

@@ -7841,31 +7752,31 @@

3728

ac_cpp='$CPP $CPPFLAGS'

3729

ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

3730

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

3733

3734

3735

echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6

3736

-echo "configure:7838: checking for usable wchar_t (2 bytes, unsigned)" >&5

3737

+echo "configure:7749: checking for usable wchar_t (2 bytes, unsigned)" >&5

3736

-echo "configure:7850: checking for usable wchar_t (2 bytes, unsigned)" >&5

3737

+echo "configure:7761: checking for usable wchar_t (2 bytes, unsigned)" >&5

3738

if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then

3739

echo $ac_n "(cached) $ac_c" 1>&6

3740

else

3741

cat > conftest.$ac_ext <<EOF

3742

-#line 7843 "configure"

3743

+#line 7754 "configure"

3742

-#line 7855 "configure"

3743

+#line 7766 "configure"

3744

#include "confdefs.h"

3745

#include <stddef.h>

3746

$configure_static_assert_macros

3749

CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)

3750

; return 0; }

3751

EOF

3752

-if { (eval echo configure:7852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3753

+if { (eval echo configure:7763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3752

-if { (eval echo configure:7864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3753

+if { (eval echo configure:7775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3754

rm -rf conftest*

3755

ac_cv_have_usable_wchar_v2="yes"

3756

else

3759

rm -rf conftest*

3760

ac_cv_have_usable_wchar_v2="no"

3761

fi

3762

@@ -7876,31 +7787,31 @@

3762

@@ -7888,31 +7799,31 @@

3763

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

3764

ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

3765

cross_compiling=$ac_cv_prog_cxx_cross

3768

CXXFLAGS="$CXXFLAGS -fshort-wchar"

3769

3770

echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6

3771

-echo "configure:7885: checking for compiler -fshort-wchar option" >&5

3772

+echo "configure:7796: checking for compiler -fshort-wchar option" >&5

3771

-echo "configure:7897: checking for compiler -fshort-wchar option" >&5

3772

+echo "configure:7808: checking for compiler -fshort-wchar option" >&5

3773

if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then

3774

echo $ac_n "(cached) $ac_c" 1>&6

3775

else

3776

cat > conftest.$ac_ext <<EOF

3777

-#line 7890 "configure"

3778

+#line 7801 "configure"

3777

-#line 7902 "configure"

3778

+#line 7813 "configure"

3779

#include "confdefs.h"

3780

#include <stddef.h>

3781

$configure_static_assert_macros

3784

CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)

3785

; return 0; }

3786

EOF

3787

-if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3788

+if { (eval echo configure:7810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3787

-if { (eval echo configure:7911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3788

+if { (eval echo configure:7822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3789

rm -rf conftest*

3790

ac_cv_have_usable_wchar_option_v2="yes"

3791

else

3794

rm -rf conftest*

3795

ac_cv_have_usable_wchar_option_v2="no"

3796

fi

3797

@@ -7924,17 +7835,17 @@

3797

@@ -7936,17 +7847,17 @@

3798

ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

3799

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

3800

cross_compiling=$ac_cv_prog_cc_cross

3803

3804

if test "$GNU_CC"; then

3805

echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6

3806

-echo "configure:7933: checking for visibility(hidden) attribute" >&5

3807

+echo "configure:7844: checking for visibility(hidden) attribute" >&5

3806

-echo "configure:7945: checking for visibility(hidden) attribute" >&5

3807

+echo "configure:7856: checking for visibility(hidden) attribute" >&5

3808

if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then

3809

echo $ac_n "(cached) $ac_c" 1>&6

3810

else

3813

EOF

3814

ac_cv_visibility_hidden=no

3815

if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then

3816

@@ -7949,17 +7860,17 @@

3816

@@ -7961,17 +7872,17 @@

3817

echo "$ac_t""$ac_cv_visibility_hidden" 1>&6

3818

if test "$ac_cv_visibility_hidden" = "yes"; then

3819

cat >> confdefs.h <<\EOF

3822

3823

3824

echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6

3825

-echo "configure:7958: checking for visibility(default) attribute" >&5

3826

+echo "configure:7869: checking for visibility(default) attribute" >&5

3825

-echo "configure:7970: checking for visibility(default) attribute" >&5

3826

+echo "configure:7881: checking for visibility(default) attribute" >&5

3827

if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then

3828

echo $ac_n "(cached) $ac_c" 1>&6

3829

else

3832

EOF

3833

ac_cv_visibility_default=no

3834

if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then

3835

@@ -7974,17 +7885,17 @@

3835

@@ -7986,17 +7897,17 @@

3836

echo "$ac_t""$ac_cv_visibility_default" 1>&6

3837

if test "$ac_cv_visibility_default" = "yes"; then

3838

cat >> confdefs.h <<\EOF

3841

3842

3843

echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6

3844

-echo "configure:7983: checking for visibility pragma support" >&5

3845

+echo "configure:7894: checking for visibility pragma support" >&5

3844

-echo "configure:7995: checking for visibility pragma support" >&5

3845

+echo "configure:7906: checking for visibility pragma support" >&5

3846

if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then

3847

echo $ac_n "(cached) $ac_c" 1>&6

3848

else

3851

int foo_hidden = 1;

3852

#pragma GCC visibility push(default)

3853

int foo_default = 1;

3854

@@ -7999,17 +7910,17 @@

3854

@@ -8011,17 +7922,17 @@

3855

fi

3856

rm -f conftest.cs

3857

3860

echo "$ac_t""$ac_cv_visibility_pragma" 1>&6

3861

if test "$ac_cv_visibility_pragma" = "yes"; then

3862

echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6

3863

-echo "configure:8008: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5

3864

+echo "configure:7919: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5

3863

-echo "configure:8020: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5

3864

+echo "configure:7931: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5

3865

if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then

3866

echo $ac_n "(cached) $ac_c" 1>&6

3867

else

3870

struct __attribute__ ((visibility ("default"))) TestStruct {

3871

static void Init();

3872

};

3873

@@ -8027,17 +7938,17 @@

3873

@@ -8039,17 +7950,17 @@

3874

fi

3875

rm -rf conftest.{c,S}

3876

3879

echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6

3880

3881

echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6

3882

-echo "configure:8036: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5

3883

+echo "configure:7947: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5

3882

-echo "configure:8048: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5

3883

+echo "configure:7959: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5

3884

if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then

3885

echo $ac_n "(cached) $ac_c" 1>&6

3886

else

3889

#pragma GCC visibility push(default)

3890

#include <string.h>

3891

#pragma GCC visibility pop

3892

@@ -8057,48 +7968,47 @@

3892

@@ -8069,48 +7980,47 @@

3893

fi

3894

rm -f conftest.{c,S}

3895

3917

do

3918

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

3919

echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6

3920

-echo "configure:8084: checking for $ac_hdr that defines DIR" >&5

3921

+echo "configure:7994: checking for $ac_hdr that defines DIR" >&5

3920

-echo "configure:8096: checking for $ac_hdr that defines DIR" >&5

3921

+echo "configure:8006: checking for $ac_hdr that defines DIR" >&5

3922

if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then

3923

echo $ac_n "(cached) $ac_c" 1>&6

3924

else

3925

cat > conftest.$ac_ext <<EOF

3926

-#line 8089 "configure"

3927

+#line 7999 "configure"

3926

-#line 8101 "configure"

3927

+#line 8011 "configure"

3928

#include "confdefs.h"

3929

#include <sys/types.h>

3930

#include <$ac_hdr>

3932

DIR *dirp = 0;

3933

; return 0; }

3934

EOF

3935

-if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3936

+if { (eval echo configure:8007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3935

-if { (eval echo configure:8109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3936

+if { (eval echo configure:8019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

3937

rm -rf conftest*

3938

eval "ac_cv_header_dirent_$ac_safe=yes"

3939

else

3942

rm -rf conftest*

3943

eval "ac_cv_header_dirent_$ac_safe=no"

3944

fi

3945

@@ -8113,36 +8023,36 @@

3945

@@ -8125,36 +8035,36 @@

3946

ac_header_dirent=$ac_hdr; break

3947

else

3948

echo "$ac_t""no" 1>&6

3951

# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.

3952

if test $ac_header_dirent = dirent.h; then

3953

echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6

3954

-echo "configure:8122: checking for opendir in -ldir" >&5

3955

+echo "configure:8032: checking for opendir in -ldir" >&5

3954

-echo "configure:8134: checking for opendir in -ldir" >&5

3955

+echo "configure:8044: checking for opendir in -ldir" >&5

3956

ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`

3957

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

3958

echo $ac_n "(cached) $ac_c" 1>&6

3960

ac_save_LIBS="$LIBS"

3961

LIBS="-ldir $LIBS"

3962

cat > conftest.$ac_ext <<EOF

3963

-#line 8130 "configure"

3964

+#line 8040 "configure"

3963

-#line 8142 "configure"

3964

+#line 8052 "configure"

3965

#include "confdefs.h"

3966

/* Override any gcc2 internal prototype to avoid an error. */

3967

/* We use char because int might match the return type of a gcc2

3972

opendir()

3973

; return 0; }

3974

EOF

3975

-if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3976

+if { (eval echo configure:8051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3975

-if { (eval echo configure:8153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3976

+if { (eval echo configure:8063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

3977

rm -rf conftest*

3978

eval "ac_cv_lib_$ac_lib_var=yes"

3979

else

3982

rm -rf conftest*

3983

eval "ac_cv_lib_$ac_lib_var=no"

3984

fi

3985

@@ -8154,36 +8064,36 @@

3985

@@ -8166,36 +8076,36 @@

3986

echo "$ac_t""yes" 1>&6

3987

LIBS="$LIBS -ldir"

3988

else

3991

3992

else

3993

echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6

3994

-echo "configure:8163: checking for opendir in -lx" >&5

3995

+echo "configure:8073: checking for opendir in -lx" >&5

3994

-echo "configure:8175: checking for opendir in -lx" >&5

3995

+echo "configure:8085: checking for opendir in -lx" >&5

3996

ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`

3997

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

3998

echo $ac_n "(cached) $ac_c" 1>&6

4000

ac_save_LIBS="$LIBS"

4001

LIBS="-lx $LIBS"

4002

cat > conftest.$ac_ext <<EOF

4003

-#line 8171 "configure"

4004

+#line 8081 "configure"

4003

-#line 8183 "configure"

4004

+#line 8093 "configure"

4005

#include "confdefs.h"

4006

/* Override any gcc2 internal prototype to avoid an error. */

4007

/* We use char because int might match the return type of a gcc2

4012

opendir()

4013

; return 0; }

4014

EOF

4015

-if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4016

+if { (eval echo configure:8092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4015

-if { (eval echo configure:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4016

+if { (eval echo configure:8104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4017

rm -rf conftest*

4018

eval "ac_cv_lib_$ac_lib_var=yes"

4019

else

4022

rm -rf conftest*

4023

eval "ac_cv_lib_$ac_lib_var=no"

4024

fi

4025

@@ -8205,27 +8115,27 @@

4025

@@ -8217,27 +8127,27 @@

4026

# for stuff like -lXshm

4027

CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"

4028

;;

4031

do

4032

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4033

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4034

-echo "configure:8214: checking for $ac_hdr" >&5

4035

+echo "configure:8124: checking for $ac_hdr" >&5

4034

-echo "configure:8226: checking for $ac_hdr" >&5

4035

+echo "configure:8136: checking for $ac_hdr" >&5

4036

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4037

echo $ac_n "(cached) $ac_c" 1>&6

4038

else

4039

cat > conftest.$ac_ext <<EOF

4040

-#line 8219 "configure"

4041

+#line 8129 "configure"

4040

-#line 8231 "configure"

4041

+#line 8141 "configure"

4042

#include "confdefs.h"

4043

#include <$ac_hdr>

4044

EOF

4045

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4046

-{ (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4047

+{ (eval echo configure:8134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4046

-{ (eval echo configure:8236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4047

+{ (eval echo configure:8146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4048

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4049

if test -z "$ac_err"; then

4050

rm -rf conftest*

4053

echo "$ac_err" >&5

4054

echo "configure: failed program was:" >&5

4055

cat conftest.$ac_ext >&5

4056

@@ -8245,27 +8155,27 @@

4056

@@ -8257,27 +8167,27 @@

4057

echo "$ac_t""no" 1>&6

4058

fi

4059

done

4062

do

4063

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4064

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4065

-echo "configure:8254: checking for $ac_hdr" >&5

4066

+echo "configure:8164: checking for $ac_hdr" >&5

4065

-echo "configure:8266: checking for $ac_hdr" >&5

4066

+echo "configure:8176: checking for $ac_hdr" >&5

4067

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4068

echo $ac_n "(cached) $ac_c" 1>&6

4069

else

4070

cat > conftest.$ac_ext <<EOF

4071

-#line 8259 "configure"

4072

+#line 8169 "configure"

4071

-#line 8271 "configure"

4072

+#line 8181 "configure"

4073

#include "confdefs.h"

4074

#include <$ac_hdr>

4075

EOF

4076

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4077

-{ (eval echo configure:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4078

+{ (eval echo configure:8174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4077

-{ (eval echo configure:8276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4078

+{ (eval echo configure:8186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4079

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4080

if test -z "$ac_err"; then

4081

rm -rf conftest*

4084

echo "$ac_err" >&5

4085

echo "configure: failed program was:" >&5

4086

cat conftest.$ac_ext >&5

4087

@@ -8285,27 +8195,27 @@

4087

@@ -8297,27 +8207,27 @@

4088

echo "$ac_t""no" 1>&6

4089

fi

4090

done

4093

do

4094

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4095

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4096

-echo "configure:8294: checking for $ac_hdr" >&5

4097

+echo "configure:8204: checking for $ac_hdr" >&5

4096

-echo "configure:8306: checking for $ac_hdr" >&5

4097

+echo "configure:8216: checking for $ac_hdr" >&5

4098

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4099

echo $ac_n "(cached) $ac_c" 1>&6

4100

else

4101

cat > conftest.$ac_ext <<EOF

4102

-#line 8299 "configure"

4103

+#line 8209 "configure"

4102

-#line 8311 "configure"

4103

+#line 8221 "configure"

4104

#include "confdefs.h"

4105

#include <$ac_hdr>

4106

EOF

4107

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4108

-{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4109

+{ (eval echo configure:8214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4108

-{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4109

+{ (eval echo configure:8226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4110

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4111

if test -z "$ac_err"; then

4112

rm -rf conftest*

4115

echo "$ac_err" >&5

4116

echo "configure: failed program was:" >&5

4117

cat conftest.$ac_ext >&5

4118

@@ -8325,27 +8235,27 @@

4118

@@ -8337,27 +8247,27 @@

4119

echo "$ac_t""no" 1>&6

4120

fi

4121

done

4124

do

4125

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4126

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4127

-echo "configure:8334: checking for $ac_hdr" >&5

4128

+echo "configure:8244: checking for $ac_hdr" >&5

4127

-echo "configure:8346: checking for $ac_hdr" >&5

4128

+echo "configure:8256: checking for $ac_hdr" >&5

4129

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4130

echo $ac_n "(cached) $ac_c" 1>&6

4131

else

4132

cat > conftest.$ac_ext <<EOF

4133

-#line 8339 "configure"

4134

+#line 8249 "configure"

4133

-#line 8351 "configure"

4134

+#line 8261 "configure"

4135

#include "confdefs.h"

4136

#include <$ac_hdr>

4137

EOF

4138

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4139

-{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4140

+{ (eval echo configure:8254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4139

-{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4140

+{ (eval echo configure:8266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4141

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4142

if test -z "$ac_err"; then

4143

rm -rf conftest*

4146

echo "$ac_err" >&5

4147

echo "configure: failed program was:" >&5

4148

cat conftest.$ac_ext >&5

4149

@@ -8365,27 +8275,27 @@

4149

@@ -8377,27 +8287,27 @@

4150

echo "$ac_t""no" 1>&6

4151

fi

4152

done

4155

do

4156

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4157

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4158

-echo "configure:8374: checking for $ac_hdr" >&5

4159

+echo "configure:8284: checking for $ac_hdr" >&5

4158

-echo "configure:8386: checking for $ac_hdr" >&5

4159

+echo "configure:8296: checking for $ac_hdr" >&5

4160

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4161

echo $ac_n "(cached) $ac_c" 1>&6

4162

else

4163

cat > conftest.$ac_ext <<EOF

4164

-#line 8379 "configure"

4165

+#line 8289 "configure"

4164

-#line 8391 "configure"

4165

+#line 8301 "configure"

4166

#include "confdefs.h"

4167

#include <$ac_hdr>

4168

EOF

4169

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4170

-{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4171

+{ (eval echo configure:8294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4170

-{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4171

+{ (eval echo configure:8306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4172

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4173

if test -z "$ac_err"; then

4174

rm -rf conftest*

4177

echo "$ac_err" >&5

4178

echo "configure: failed program was:" >&5

4179

cat conftest.$ac_ext >&5

4180

@@ -8406,27 +8316,27 @@

4180

@@ -8418,27 +8328,27 @@

4181

fi

4182

done

4183

4186

do

4187

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4188

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4189

-echo "configure:8415: checking for $ac_hdr" >&5

4190

+echo "configure:8325: checking for $ac_hdr" >&5

4189

-echo "configure:8427: checking for $ac_hdr" >&5

4190

+echo "configure:8337: checking for $ac_hdr" >&5

4191

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4192

echo $ac_n "(cached) $ac_c" 1>&6

4193

else

4194

cat > conftest.$ac_ext <<EOF

4195

-#line 8420 "configure"

4196

+#line 8330 "configure"

4195

-#line 8432 "configure"

4196

+#line 8342 "configure"

4197

#include "confdefs.h"

4198

#include <$ac_hdr>

4199

EOF

4200

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4201

-{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4202

+{ (eval echo configure:8335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4201

-{ (eval echo configure:8437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4202

+{ (eval echo configure:8347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4203

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4204

if test -z "$ac_err"; then

4205

rm -rf conftest*

4208

echo "$ac_err" >&5

4209

echo "configure: failed program was:" >&5

4210

cat conftest.$ac_ext >&5

4211

@@ -8447,27 +8357,27 @@

4211

@@ -8459,27 +8369,27 @@

4212

fi

4213

done

4214

4217

do

4218

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4219

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4220

-echo "configure:8456: checking for $ac_hdr" >&5

4221

+echo "configure:8366: checking for $ac_hdr" >&5

4220

-echo "configure:8468: checking for $ac_hdr" >&5

4221

+echo "configure:8378: checking for $ac_hdr" >&5

4222

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4223

echo $ac_n "(cached) $ac_c" 1>&6

4224

else

4225

cat > conftest.$ac_ext <<EOF

4226

-#line 8461 "configure"

4227

+#line 8371 "configure"

4226

-#line 8473 "configure"

4227

+#line 8383 "configure"

4228

#include "confdefs.h"

4229

#include <$ac_hdr>

4230

EOF

4231

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4232

-{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4233

+{ (eval echo configure:8376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4232

-{ (eval echo configure:8478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4233

+{ (eval echo configure:8388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4234

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4235

if test -z "$ac_err"; then

4236

rm -rf conftest*

4239

echo "$ac_err" >&5

4240

echo "configure: failed program was:" >&5

4241

cat conftest.$ac_ext >&5

4242

@@ -8494,27 +8404,27 @@

4242

@@ -8506,27 +8416,27 @@

4243

ac_cpp='$CXXCPP $CPPFLAGS'

4244

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

4245

ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

4248

NEW_H=new.h

4249

ac_safe=`echo "new" | sed 'y%./+-%__p_%'`

4250

echo $ac_n "checking for new""... $ac_c" 1>&6

4251

-echo "configure:8503: checking for new" >&5

4252

+echo "configure:8413: checking for new" >&5

4251

-echo "configure:8515: checking for new" >&5

4252

+echo "configure:8425: checking for new" >&5

4253

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4254

echo $ac_n "(cached) $ac_c" 1>&6

4255

else

4256

cat > conftest.$ac_ext <<EOF

4257

-#line 8508 "configure"

4258

+#line 8418 "configure"

4257

-#line 8520 "configure"

4258

+#line 8430 "configure"

4259

#include "confdefs.h"

4260

#include <new>

4261

EOF

4262

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4263

-{ (eval echo configure:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4264

+{ (eval echo configure:8423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4263

-{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4264

+{ (eval echo configure:8435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4265

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4266

if test -z "$ac_err"; then

4267

rm -rf conftest*

4270

echo "$ac_err" >&5

4271

echo "configure: failed program was:" >&5

4272

cat conftest.$ac_ext >&5

4273

@@ -8545,27 +8455,27 @@

4273

@@ -8557,27 +8467,27 @@

4274

case $target in

4275

*-aix4.3*|*-aix5*)

4276

;;

4279

do

4280

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

4281

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

4282

-echo "configure:8554: checking for $ac_hdr" >&5

4283

+echo "configure:8464: checking for $ac_hdr" >&5

4282

-echo "configure:8566: checking for $ac_hdr" >&5

4283

+echo "configure:8476: checking for $ac_hdr" >&5

4284

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4285

echo $ac_n "(cached) $ac_c" 1>&6

4286

else

4287

cat > conftest.$ac_ext <<EOF

4288

-#line 8559 "configure"

4289

+#line 8469 "configure"

4288

-#line 8571 "configure"

4289

+#line 8481 "configure"

4290

#include "confdefs.h"

4291

#include <$ac_hdr>

4292

EOF

4293

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4294

-{ (eval echo configure:8564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4295

+{ (eval echo configure:8474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4294

-{ (eval echo configure:8576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4295

+{ (eval echo configure:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4296

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4297

if test -z "$ac_err"; then

4298

rm -rf conftest*

4301

echo "$ac_err" >&5

4302

echo "configure: failed program was:" >&5

4303

cat conftest.$ac_ext >&5

4304

@@ -8589,36 +8499,36 @@

4304

@@ -8601,36 +8511,36 @@

4305

;;

4306

esac

4307

4310

;;

4311

*)

4312

echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6

4313

-echo "configure:8598: checking for gethostbyname_r in -lc_r" >&5

4314

+echo "configure:8508: checking for gethostbyname_r in -lc_r" >&5

4313

-echo "configure:8610: checking for gethostbyname_r in -lc_r" >&5

4314

+echo "configure:8520: checking for gethostbyname_r in -lc_r" >&5

4315

ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`

4316

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4317

echo $ac_n "(cached) $ac_c" 1>&6

4319

ac_save_LIBS="$LIBS"

4320

LIBS="-lc_r $LIBS"

4321

cat > conftest.$ac_ext <<EOF

4322

-#line 8606 "configure"

4323

+#line 8516 "configure"

4322

-#line 8618 "configure"

4323

+#line 8528 "configure"

4324

#include "confdefs.h"

4325

/* Override any gcc2 internal prototype to avoid an error. */

4326

/* We use char because int might match the return type of a gcc2

4331

gethostbyname_r()

4332

; return 0; }

4333

EOF

4334

-if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4335

+if { (eval echo configure:8527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4334

-if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4335

+if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4336

rm -rf conftest*

4337

eval "ac_cv_lib_$ac_lib_var=yes"

4338

else

4341

rm -rf conftest*

4342

eval "ac_cv_lib_$ac_lib_var=no"

4343

fi

4344

@@ -8638,36 +8548,36 @@

4344

@@ -8650,36 +8560,36 @@

4345

4346

else

4347

echo "$ac_t""no" 1>&6

4350

;;

4351

esac

4352

echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6

4353

-echo "configure:8647: checking for atan in -lm" >&5

4354

+echo "configure:8557: checking for atan in -lm" >&5

4353

-echo "configure:8659: checking for atan in -lm" >&5

4354

+echo "configure:8569: checking for atan in -lm" >&5

4355

ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`

4356

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4357

echo $ac_n "(cached) $ac_c" 1>&6

4359

ac_save_LIBS="$LIBS"

4360

LIBS="-lm $LIBS"

4361

cat > conftest.$ac_ext <<EOF

4362

-#line 8655 "configure"

4363

+#line 8565 "configure"

4362

-#line 8667 "configure"

4363

+#line 8577 "configure"

4364

#include "confdefs.h"

4365

/* Override any gcc2 internal prototype to avoid an error. */

4366

/* We use char because int might match the return type of a gcc2

4371

atan()

4372

; return 0; }

4373

EOF

4374

-if { (eval echo configure:8666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4375

+if { (eval echo configure:8576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4374

-if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4375

+if { (eval echo configure:8588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4376

rm -rf conftest*

4377

eval "ac_cv_lib_$ac_lib_var=yes"

4378

else

4381

rm -rf conftest*

4382

eval "ac_cv_lib_$ac_lib_var=no"

4383

fi

4384

@@ -8691,63 +8601,63 @@

4384

@@ -8703,63 +8613,63 @@

4385

4386

4387

4390

;;

4391

*)

4392

echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

4393

-echo "configure:8700: checking for dlopen in -ldl" >&5

4394

+echo "configure:8610: checking for dlopen in -ldl" >&5

4393

-echo "configure:8712: checking for dlopen in -ldl" >&5

4394

+echo "configure:8622: checking for dlopen in -ldl" >&5

4395

ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`

4396

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4397

echo $ac_n "(cached) $ac_c" 1>&6

4399

ac_save_LIBS="$LIBS"

4400

LIBS="-ldl $LIBS"

4401

cat > conftest.$ac_ext <<EOF

4402

-#line 8708 "configure"

4403

+#line 8618 "configure"

4402

-#line 8720 "configure"

4403

+#line 8630 "configure"

4404

#include "confdefs.h"

4405

/* Override any gcc2 internal prototype to avoid an error. */

4406

/* We use char because int might match the return type of a gcc2

4411

dlopen()

4412

; return 0; }

4413

EOF

4414

-if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4415

+if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4414

-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4415

+if { (eval echo configure:8641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4416

rm -rf conftest*

4417

eval "ac_cv_lib_$ac_lib_var=yes"

4418

else

4429

echo "$ac_t""yes" 1>&6

4430

ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`

4431

echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6

4432

-echo "configure:8736: checking for dlfcn.h" >&5

4433

+echo "configure:8646: checking for dlfcn.h" >&5

4432

-echo "configure:8748: checking for dlfcn.h" >&5

4433

+echo "configure:8658: checking for dlfcn.h" >&5

4434

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4435

echo $ac_n "(cached) $ac_c" 1>&6

4436

else

4437

cat > conftest.$ac_ext <<EOF

4438

-#line 8741 "configure"

4439

+#line 8651 "configure"

4438

-#line 8753 "configure"

4439

+#line 8663 "configure"

4440

#include "confdefs.h"

4441

#include <dlfcn.h>

4442

EOF

4443

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4444

-{ (eval echo configure:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4445

+{ (eval echo configure:8656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4444

-{ (eval echo configure:8758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4445

+{ (eval echo configure:8668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4446

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4447

if test -z "$ac_err"; then

4448

rm -rf conftest*

4451

echo "$ac_err" >&5

4452

echo "configure: failed program was:" >&5

4453

cat conftest.$ac_ext >&5

4454

@@ -8773,36 +8683,36 @@

4454

@@ -8785,36 +8695,36 @@

4455

4456

;;

4457

esac

4460

case $target in

4461

*-aix*)

4462

echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6

4463

-echo "configure:8782: checking for demangle in -lC_r" >&5

4464

+echo "configure:8692: checking for demangle in -lC_r" >&5

4463

-echo "configure:8794: checking for demangle in -lC_r" >&5

4464

+echo "configure:8704: checking for demangle in -lC_r" >&5

4465

ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'`

4466

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4467

echo $ac_n "(cached) $ac_c" 1>&6

4469

ac_save_LIBS="$LIBS"

4470

LIBS="-lC_r $LIBS"

4471

cat > conftest.$ac_ext <<EOF

4472

-#line 8790 "configure"

4473

+#line 8700 "configure"

4472

-#line 8802 "configure"

4473

+#line 8712 "configure"

4474

#include "confdefs.h"

4475

/* Override any gcc2 internal prototype to avoid an error. */

4476

/* We use char because int might match the return type of a gcc2

4481

demangle()

4482

; return 0; }

4483

EOF

4484

-if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4485

+if { (eval echo configure:8711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4484

-if { (eval echo configure:8813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4485

+if { (eval echo configure:8723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4486

rm -rf conftest*

4487

eval "ac_cv_lib_$ac_lib_var=yes"

4488

else

4491

rm -rf conftest*

4492

eval "ac_cv_lib_$ac_lib_var=no"

4493

fi

4494

@@ -8822,36 +8732,36 @@

4494

@@ -8834,36 +8744,36 @@

4495

4496

else

4497

echo "$ac_t""no" 1>&6

4500

;;

4501

*)

4502

echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6

4503

-echo "configure:8831: checking for demangle in -lC" >&5

4504

+echo "configure:8741: checking for demangle in -lC" >&5

4503

-echo "configure:8843: checking for demangle in -lC" >&5

4504

+echo "configure:8753: checking for demangle in -lC" >&5

4505

ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'`

4506

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4507

echo $ac_n "(cached) $ac_c" 1>&6

4509

ac_save_LIBS="$LIBS"

4510

LIBS="-lC $LIBS"

4511

cat > conftest.$ac_ext <<EOF

4512

-#line 8839 "configure"

4513

+#line 8749 "configure"

4512

-#line 8851 "configure"

4513

+#line 8761 "configure"

4514

#include "confdefs.h"

4515

/* Override any gcc2 internal prototype to avoid an error. */

4516

/* We use char because int might match the return type of a gcc2

4521

demangle()

4522

; return 0; }

4523

EOF

4524

-if { (eval echo configure:8850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4525

+if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4524

-if { (eval echo configure:8862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4525

+if { (eval echo configure:8772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4526

rm -rf conftest*

4527

eval "ac_cv_lib_$ac_lib_var=yes"

4528

else

4531

rm -rf conftest*

4532

eval "ac_cv_lib_$ac_lib_var=no"

4533

fi

4534

@@ -8872,36 +8782,36 @@

4534

@@ -8884,36 +8794,36 @@

4535

else

4536

echo "$ac_t""no" 1>&6

4537

fi

4540

esac

4541

fi

4542

echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6

4543

-echo "configure:8881: checking for socket in -lsocket" >&5

4544

+echo "configure:8791: checking for socket in -lsocket" >&5

4543

-echo "configure:8893: checking for socket in -lsocket" >&5

4544

+echo "configure:8803: checking for socket in -lsocket" >&5

4545

ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`

4546

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4547

echo $ac_n "(cached) $ac_c" 1>&6

4549

ac_save_LIBS="$LIBS"

4550

LIBS="-lsocket $LIBS"

4551

cat > conftest.$ac_ext <<EOF

4552

-#line 8889 "configure"

4553

+#line 8799 "configure"

4552

-#line 8901 "configure"

4553

+#line 8811 "configure"

4554

#include "confdefs.h"

4555

/* Override any gcc2 internal prototype to avoid an error. */

4556

/* We use char because int might match the return type of a gcc2

4561

socket()

4562

; return 0; }

4563

EOF

4564

-if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4565

+if { (eval echo configure:8810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4564

-if { (eval echo configure:8912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4565

+if { (eval echo configure:8822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4566

rm -rf conftest*

4567

eval "ac_cv_lib_$ac_lib_var=yes"

4568

else

4571

rm -rf conftest*

4572

eval "ac_cv_lib_$ac_lib_var=no"

4573

fi

4574

@@ -8936,36 +8846,36 @@

4574

@@ -8948,36 +8858,36 @@

4575

cat >> confdefs.h <<EOF

4576

#define FUNCPROTO 15

4577

EOF

4580

_SAVE_LDFLAGS="$LDFLAGS"

4581

LDFLAGS="$XLDFLAGS $LDFLAGS"

4582

echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6

4583

-echo "configure:8945: checking for XDrawLines in -lX11" >&5

4584

+echo "configure:8855: checking for XDrawLines in -lX11" >&5

4583

-echo "configure:8957: checking for XDrawLines in -lX11" >&5

4584

+echo "configure:8867: checking for XDrawLines in -lX11" >&5

4585

ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`

4586

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4587

echo $ac_n "(cached) $ac_c" 1>&6

4589

ac_save_LIBS="$LIBS"

4590

LIBS="-lX11 $XLIBS $LIBS"

4591

cat > conftest.$ac_ext <<EOF

4592

-#line 8953 "configure"

4593

+#line 8863 "configure"

4592

-#line 8965 "configure"

4593

+#line 8875 "configure"

4594

#include "confdefs.h"

4595

/* Override any gcc2 internal prototype to avoid an error. */

4596

/* We use char because int might match the return type of a gcc2

4601

XDrawLines()

4602

; return 0; }

4603

EOF

4604

-if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4605

+if { (eval echo configure:8874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4604

-if { (eval echo configure:8976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4605

+if { (eval echo configure:8886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4606

rm -rf conftest*

4607

eval "ac_cv_lib_$ac_lib_var=yes"

4608

else

4611

rm -rf conftest*

4612

eval "ac_cv_lib_$ac_lib_var=no"

4613

fi

4614

@@ -8977,36 +8887,36 @@

4614

@@ -8989,36 +8899,36 @@

4615

echo "$ac_t""yes" 1>&6

4616

X11_LIBS="-lX11"

4617

else

4620

fi

4621

4622

echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6

4623

-echo "configure:8986: checking for XextAddDisplay in -lXext" >&5

4624

+echo "configure:8896: checking for XextAddDisplay in -lXext" >&5

4623

-echo "configure:8998: checking for XextAddDisplay in -lXext" >&5

4624

+echo "configure:8908: checking for XextAddDisplay in -lXext" >&5

4625

ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`

4626

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4627

echo $ac_n "(cached) $ac_c" 1>&6

4629

ac_save_LIBS="$LIBS"

4630

LIBS="-lXext $XLIBS $LIBS"

4631

cat > conftest.$ac_ext <<EOF

4632

-#line 8994 "configure"

4633

+#line 8904 "configure"

4632

-#line 9006 "configure"

4633

+#line 8916 "configure"

4634

#include "confdefs.h"

4635

/* Override any gcc2 internal prototype to avoid an error. */

4636

/* We use char because int might match the return type of a gcc2

4641

XextAddDisplay()

4642

; return 0; }

4643

EOF

4644

-if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4645

+if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4644

-if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4645

+if { (eval echo configure:8927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4646

rm -rf conftest*

4647

eval "ac_cv_lib_$ac_lib_var=yes"

4648

else

4651

rm -rf conftest*

4652

eval "ac_cv_lib_$ac_lib_var=no"

4653

fi

4654

@@ -9020,36 +8930,36 @@

4654

@@ -9032,36 +8942,36 @@

4655

else

4656

echo "$ac_t""no" 1>&6

4657

MISSING_X="$MISSING_X -lXext"

4660

4661

4662

echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6

4663

-echo "configure:9029: checking for XtFree in -lXt" >&5

4664

+echo "configure:8939: checking for XtFree in -lXt" >&5

4663

-echo "configure:9041: checking for XtFree in -lXt" >&5

4664

+echo "configure:8951: checking for XtFree in -lXt" >&5

4665

ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`

4666

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4667

echo $ac_n "(cached) $ac_c" 1>&6

4669

ac_save_LIBS="$LIBS"

4670

LIBS="-lXt $LIBS"

4671

cat > conftest.$ac_ext <<EOF

4672

-#line 9037 "configure"

4673

+#line 8947 "configure"

4672

-#line 9049 "configure"

4673

+#line 8959 "configure"

4674

#include "confdefs.h"

4675

/* Override any gcc2 internal prototype to avoid an error. */

4676

/* We use char because int might match the return type of a gcc2

4681

XtFree()

4682

; return 0; }

4683

EOF

4684

-if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4685

+if { (eval echo configure:8958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4684

-if { (eval echo configure:9060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4685

+if { (eval echo configure:8970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4686

rm -rf conftest*

4687

eval "ac_cv_lib_$ac_lib_var=yes"

4688

else

4691

rm -rf conftest*

4692

eval "ac_cv_lib_$ac_lib_var=no"

4693

fi

4694

@@ -9060,36 +8970,36 @@

4694

@@ -9072,36 +8982,36 @@

4695

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

4696

echo "$ac_t""yes" 1>&6

4697

XT_LIBS="-lXt"

4700

4701

unset ac_cv_lib_Xt_XtFree

4702

echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6

4703

-echo "configure:9069: checking for IceFlush in -lICE" >&5

4704

+echo "configure:8979: checking for IceFlush in -lICE" >&5

4703

-echo "configure:9081: checking for IceFlush in -lICE" >&5

4704

+echo "configure:8991: checking for IceFlush in -lICE" >&5

4705

ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`

4706

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4707

echo $ac_n "(cached) $ac_c" 1>&6

4709

ac_save_LIBS="$LIBS"

4710

LIBS="-lICE $XT_LIBS $XLIBS $LIBS"

4711

cat > conftest.$ac_ext <<EOF

4712

-#line 9077 "configure"

4713

+#line 8987 "configure"

4712

-#line 9089 "configure"

4713

+#line 8999 "configure"

4714

#include "confdefs.h"

4715

/* Override any gcc2 internal prototype to avoid an error. */

4716

/* We use char because int might match the return type of a gcc2

4721

IceFlush()

4722

; return 0; }

4723

EOF

4724

-if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4725

+if { (eval echo configure:8998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4724

-if { (eval echo configure:9100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4725

+if { (eval echo configure:9010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4726

rm -rf conftest*

4727

eval "ac_cv_lib_$ac_lib_var=yes"

4728

else

4731

rm -rf conftest*

4732

eval "ac_cv_lib_$ac_lib_var=no"

4733

fi

4734

@@ -9100,36 +9010,36 @@

4734

@@ -9112,36 +9022,36 @@

4735

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

4736

echo "$ac_t""yes" 1>&6

4737

XT_LIBS="-lICE $XT_LIBS"

4740

fi

4741

4742

echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6

4743

-echo "configure:9109: checking for SmcCloseConnection in -lSM" >&5

4744

+echo "configure:9019: checking for SmcCloseConnection in -lSM" >&5

4743

-echo "configure:9121: checking for SmcCloseConnection in -lSM" >&5

4744

+echo "configure:9031: checking for SmcCloseConnection in -lSM" >&5

4745

ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`

4746

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4747

echo $ac_n "(cached) $ac_c" 1>&6

4749

ac_save_LIBS="$LIBS"

4750

LIBS="-lSM $XT_LIBS $XLIBS $LIBS"

4751

cat > conftest.$ac_ext <<EOF

4752

-#line 9117 "configure"

4753

+#line 9027 "configure"

4752

-#line 9129 "configure"

4753

+#line 9039 "configure"

4754

#include "confdefs.h"

4755

/* Override any gcc2 internal prototype to avoid an error. */

4756

/* We use char because int might match the return type of a gcc2

4761

SmcCloseConnection()

4762

; return 0; }

4763

EOF

4764

-if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4765

+if { (eval echo configure:9038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4764

-if { (eval echo configure:9140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4765

+if { (eval echo configure:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4766

rm -rf conftest*

4767

eval "ac_cv_lib_$ac_lib_var=yes"

4768

else

4771

rm -rf conftest*

4772

eval "ac_cv_lib_$ac_lib_var=no"

4773

fi

4774

@@ -9140,36 +9050,36 @@

4774

@@ -9152,36 +9062,36 @@

4775

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

4776

echo "$ac_t""yes" 1>&6

4777

XT_LIBS="-lSM $XT_LIBS"

4780

fi

4781

4782

echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6

4783

-echo "configure:9149: checking for XtFree in -lXt" >&5

4784

+echo "configure:9059: checking for XtFree in -lXt" >&5

4783

-echo "configure:9161: checking for XtFree in -lXt" >&5

4784

+echo "configure:9071: checking for XtFree in -lXt" >&5

4785

ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`

4786

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4787

echo $ac_n "(cached) $ac_c" 1>&6

4789

ac_save_LIBS="$LIBS"

4790

LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"

4791

cat > conftest.$ac_ext <<EOF

4792

-#line 9157 "configure"

4793

+#line 9067 "configure"

4792

-#line 9169 "configure"

4793

+#line 9079 "configure"

4794

#include "confdefs.h"

4795

/* Override any gcc2 internal prototype to avoid an error. */

4796

/* We use char because int might match the return type of a gcc2

4801

XtFree()

4802

; return 0; }

4803

EOF

4804

-if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4805

+if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4804

-if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4805

+if { (eval echo configure:9090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4806

rm -rf conftest*

4807

eval "ac_cv_lib_$ac_lib_var=yes"

4808

else

4811

rm -rf conftest*

4812

eval "ac_cv_lib_$ac_lib_var=no"

4813

fi

4814

@@ -9193,36 +9103,36 @@

4814

@@ -9205,36 +9115,36 @@

4815

# crashes in plugins linked against Motif - Bug #98892

4816

case "${target_os}" in

4817

aix*)

4820

esac

4821

4822

echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6

4823

-echo "configure:9202: checking for XineramaIsActive in -lXinerama" >&5

4824

+echo "configure:9112: checking for XineramaIsActive in -lXinerama" >&5

4823

-echo "configure:9214: checking for XineramaIsActive in -lXinerama" >&5

4824

+echo "configure:9124: checking for XineramaIsActive in -lXinerama" >&5

4825

ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'`

4826

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4827

echo $ac_n "(cached) $ac_c" 1>&6

4829

ac_save_LIBS="$LIBS"

4830

LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"

4831

cat > conftest.$ac_ext <<EOF

4832

-#line 9210 "configure"

4833

+#line 9120 "configure"

4832

-#line 9222 "configure"

4833

+#line 9132 "configure"

4834

#include "confdefs.h"

4835

/* Override any gcc2 internal prototype to avoid an error. */

4836

/* We use char because int might match the return type of a gcc2

4841

XineramaIsActive()

4842

; return 0; }

4843

EOF

4844

-if { (eval echo configure:9221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4845

+if { (eval echo configure:9131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4844

-if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4845

+if { (eval echo configure:9143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4846

rm -rf conftest*

4847

eval "ac_cv_lib_$ac_lib_var=yes"

4848

else

4851

rm -rf conftest*

4852

eval "ac_cv_lib_$ac_lib_var=no"

4853

fi

4854

@@ -9234,27 +9144,27 @@

4854

@@ -9246,27 +9156,27 @@

4855

echo "$ac_t""yes" 1>&6

4856

MOZ_XINERAMA_LIBS="-lXinerama"

4857

else

4860

4861

ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`

4862

echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6

4863

-echo "configure:9243: checking for X11/extensions/Xinerama.h" >&5

4864

+echo "configure:9153: checking for X11/extensions/Xinerama.h" >&5

4863

-echo "configure:9255: checking for X11/extensions/Xinerama.h" >&5

4864

+echo "configure:9165: checking for X11/extensions/Xinerama.h" >&5

4865

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4866

echo $ac_n "(cached) $ac_c" 1>&6

4867

else

4868

cat > conftest.$ac_ext <<EOF

4869

-#line 9248 "configure"

4870

+#line 9158 "configure"

4869

-#line 9260 "configure"

4870

+#line 9170 "configure"

4871

#include "confdefs.h"

4872

#include <X11/extensions/Xinerama.h>

4873

EOF

4874

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4875

-{ (eval echo configure:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4876

+{ (eval echo configure:9163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4875

-{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4876

+{ (eval echo configure:9175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4877

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4878

if test -z "$ac_err"; then

4879

rm -rf conftest*

4882

echo "$ac_err" >&5

4883

echo "configure: failed program was:" >&5

4884

cat conftest.$ac_ext >&5

4885

@@ -9267,36 +9177,36 @@

4885

@@ -9279,36 +9189,36 @@

4886

echo "$ac_t""yes" 1>&6

4887

:

4888

else

4891

4892

4893

echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6

4894

-echo "configure:9276: checking for XShmCreateImage in -lXext" >&5

4895

+echo "configure:9186: checking for XShmCreateImage in -lXext" >&5

4894

-echo "configure:9288: checking for XShmCreateImage in -lXext" >&5

4895

+echo "configure:9198: checking for XShmCreateImage in -lXext" >&5

4896

ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`

4897

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4898

echo $ac_n "(cached) $ac_c" 1>&6

4900

ac_save_LIBS="$LIBS"

4901

LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"

4902

cat > conftest.$ac_ext <<EOF

4903

-#line 9284 "configure"

4904

+#line 9194 "configure"

4903

-#line 9296 "configure"

4904

+#line 9206 "configure"

4905

#include "confdefs.h"

4906

/* Override any gcc2 internal prototype to avoid an error. */

4907

/* We use char because int might match the return type of a gcc2

4912

XShmCreateImage()

4913

; return 0; }

4914

EOF

4915

-if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4916

+if { (eval echo configure:9205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4915

-if { (eval echo configure:9307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4916

+if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4917

rm -rf conftest*

4918

eval "ac_cv_lib_$ac_lib_var=yes"

4919

else

4922

rm -rf conftest*

4923

eval "ac_cv_lib_$ac_lib_var=no"

4924

fi

4925

@@ -9308,27 +9218,27 @@

4925

@@ -9320,27 +9230,27 @@

4926

echo "$ac_t""yes" 1>&6

4927

_HAVE_XSHM_XEXT=1

4928

else

4931

4932

ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`

4933

echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6

4934

-echo "configure:9317: checking for X11/extensions/XShm.h" >&5

4935

+echo "configure:9227: checking for X11/extensions/XShm.h" >&5

4934

-echo "configure:9329: checking for X11/extensions/XShm.h" >&5

4935

+echo "configure:9239: checking for X11/extensions/XShm.h" >&5

4936

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

4937

echo $ac_n "(cached) $ac_c" 1>&6

4938

else

4939

cat > conftest.$ac_ext <<EOF

4940

-#line 9322 "configure"

4941

+#line 9232 "configure"

4940

-#line 9334 "configure"

4941

+#line 9244 "configure"

4942

#include "confdefs.h"

4943

#include <X11/extensions/XShm.h>

4944

EOF

4945

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

4946

-{ (eval echo configure:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4947

+{ (eval echo configure:9237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4946

-{ (eval echo configure:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4947

+{ (eval echo configure:9249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

4948

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

4949

if test -z "$ac_err"; then

4950

rm -rf conftest*

4953

echo "$ac_err" >&5

4954

echo "configure: failed program was:" >&5

4955

cat conftest.$ac_ext >&5

4956

@@ -9348,36 +9258,36 @@

4956

@@ -9360,36 +9270,36 @@

4957

test -n "$_HAVE_XSHM_XEXT"; then

4958

cat >> confdefs.h <<\EOF

4959

#define HAVE_XSHM 1

4962

fi

4963

4964

echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6

4965

-echo "configure:9357: checking for XieFloGeometry in -lXIE" >&5

4966

+echo "configure:9267: checking for XieFloGeometry in -lXIE" >&5

4965

-echo "configure:9369: checking for XieFloGeometry in -lXIE" >&5

4966

+echo "configure:9279: checking for XieFloGeometry in -lXIE" >&5

4967

ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`

4968

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

4969

echo $ac_n "(cached) $ac_c" 1>&6

4971

ac_save_LIBS="$LIBS"

4972

LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"

4973

cat > conftest.$ac_ext <<EOF

4974

-#line 9365 "configure"

4975

+#line 9275 "configure"

4974

-#line 9377 "configure"

4975

+#line 9287 "configure"

4976

#include "confdefs.h"

4977

/* Override any gcc2 internal prototype to avoid an error. */

4978

/* We use char because int might match the return type of a gcc2

4983

XieFloGeometry()

4984

; return 0; }

4985

EOF

4986

-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4987

+if { (eval echo configure:9286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4986

-if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4987

+if { (eval echo configure:9298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

4988

rm -rf conftest*

4989

eval "ac_cv_lib_$ac_lib_var=yes"

4990

else

4993

rm -rf conftest*

4994

eval "ac_cv_lib_$ac_lib_var=no"

4995

fi

4996

@@ -9389,27 +9299,27 @@

4996

@@ -9401,27 +9311,27 @@

4997

echo "$ac_t""yes" 1>&6

4998

MOZ_XIE_LIBS="-lXIE"

4999

else

5002

5003

ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`

5004

echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6

5005

-echo "configure:9398: checking for X11/extensions/XIElib.h" >&5

5006

+echo "configure:9308: checking for X11/extensions/XIElib.h" >&5

5005

-echo "configure:9410: checking for X11/extensions/XIElib.h" >&5

5006

+echo "configure:9320: checking for X11/extensions/XIElib.h" >&5

5007

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

5008

echo $ac_n "(cached) $ac_c" 1>&6

5009

else

5010

cat > conftest.$ac_ext <<EOF

5011

-#line 9403 "configure"

5012

+#line 9313 "configure"

5011

-#line 9415 "configure"

5012

+#line 9325 "configure"

5013

#include "confdefs.h"

5014

#include <X11/extensions/XIElib.h>

5015

EOF

5016

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

5017

-{ (eval echo configure:9408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

5018

+{ (eval echo configure:9318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

5017

-{ (eval echo configure:9420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

5018

+{ (eval echo configure:9330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

5019

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

5020

if test -z "$ac_err"; then

5021

rm -rf conftest*

5024

echo "$ac_err" >&5

5025

echo "configure: failed program was:" >&5

5026

cat conftest.$ac_ext >&5

5027

@@ -9473,17 +9383,17 @@

5027

@@ -9485,17 +9395,17 @@

5028

ft_config_args="$ft_config_args --prefix=$ft_config_prefix"

5029

if test x${FT2_CONFIG+set} != xset ; then

5030

FT2_CONFIG=$ft_config_prefix/bin/freetype-config

5033

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

5034

set dummy freetype-config; ac_word=$2

5035

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

5036

-echo "configure:9482: checking for $ac_word" >&5

5037

+echo "configure:9392: checking for $ac_word" >&5

5036

-echo "configure:9494: checking for $ac_word" >&5

5037

+echo "configure:9404: checking for $ac_word" >&5

5038

if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then

5039

echo $ac_n "(cached) $ac_c" 1>&6

5040

else

5043

ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a path.

5044

;;

5045

?:/*)

5046

@@ -9509,17 +9419,17 @@

5046

@@ -9521,17 +9431,17 @@

5047

echo "$ac_t""$FT2_CONFIG" 1>&6

5048

else

5049

echo "$ac_t""no" 1>&6

5052

5053

min_ft_version=6.1.0

5054

echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6

5055

-echo "configure:9518: checking for FreeType - version >= $min_ft_version" >&5

5056

+echo "configure:9428: checking for FreeType - version >= $min_ft_version" >&5

5055

-echo "configure:9530: checking for FreeType - version >= $min_ft_version" >&5

5056

+echo "configure:9440: checking for FreeType - version >= $min_ft_version" >&5

5057

no_ft=""

5058

if test "$FT2_CONFIG" = "no" ; then

5059

no_ft=yes

5062

FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`

5063

ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \

5064

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

5065

@@ -9557,17 +9467,17 @@

5065

@@ -9569,17 +9479,17 @@

5066

ac_save_CFLAGS="$CFLAGS"

5067

ac_save_LIBS="$LIBS"

5068

CFLAGS="$CFLAGS $FT2_CFLAGS"

5071

echo $ac_n "cross compiling; assumed OK... $ac_c"

5072

else

5073

cat > conftest.$ac_ext <<EOF

5074

-#line 9566 "configure"

5075

+#line 9476 "configure"

5074

-#line 9578 "configure"

5075

+#line 9488 "configure"

5076

#include "confdefs.h"

5077

5078

#include <ft2build.h>

5081

#include <stdlib.h>

5082

5083

int

5084

@@ -9583,17 +9493,17 @@

5084

@@ -9595,17 +9505,17 @@

5085

else

5086

{

5087

FT_Done_FreeType(library);

5090

}

5091

5092

EOF

5093

-if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5094

+if { (eval echo configure:9502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5093

-if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5094

+if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5095

then

5096

:

5097

else

5100

rm -fr conftest*

5101

no_ft=yes

5102

fi

5103

@@ -9635,17 +9545,17 @@

5103

@@ -9647,17 +9557,17 @@

5104

5105

5106

5109

5110

5111

echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6

5112

-echo "configure:9644: checking for pthread_create in -lpthreads" >&5

5113

+echo "configure:9554: checking for pthread_create in -lpthreads" >&5

5112

-echo "configure:9656: checking for pthread_create in -lpthreads" >&5

5113

+echo "configure:9566: checking for pthread_create in -lpthreads" >&5

5114

echo "

5115

#include <pthread.h>

5116

void *foo(void *v) { int a = 1; }

5119

if (!pthread_create(&t, 0, &foo, 0)) {

5120

pthread_join(t, 0);

5121

}

5122

@@ -9657,17 +9567,17 @@

5122

@@ -9669,17 +9579,17 @@

5123

rm -f dummy.c dummy${ac_exeext} ;

5124

if test "$_res" = "0"; then

5125

echo "$ac_t""yes" 1>&6

5128

echo "$ac_t""no" 1>&6

5129

5130

echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6

5131

-echo "configure:9666: checking for pthread_create in -lpthread" >&5

5132

+echo "configure:9576: checking for pthread_create in -lpthread" >&5

5131

-echo "configure:9678: checking for pthread_create in -lpthread" >&5

5132

+echo "configure:9588: checking for pthread_create in -lpthread" >&5

5133

echo "

5134

#include <pthread.h>

5135

void *foo(void *v) { int a = 1; }

5138

if (!pthread_create(&t, 0, &foo, 0)) {

5139

pthread_join(t, 0);

5140

}

5141

@@ -9679,17 +9589,17 @@

5141

@@ -9691,17 +9601,17 @@

5142

rm -f dummy.c dummy${ac_exeext} ;

5143

if test "$_res" = "0"; then

5144

echo "$ac_t""yes" 1>&6

5147

echo "$ac_t""no" 1>&6

5148

5149

echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6

5150

-echo "configure:9688: checking for pthread_create in -lc_r" >&5

5151

+echo "configure:9598: checking for pthread_create in -lc_r" >&5

5150

-echo "configure:9700: checking for pthread_create in -lc_r" >&5

5151

+echo "configure:9610: checking for pthread_create in -lc_r" >&5

5152

echo "

5153

#include <pthread.h>

5154

void *foo(void *v) { int a = 1; }

5157

if (!pthread_create(&t, 0, &foo, 0)) {

5158

pthread_join(t, 0);

5159

}

5160

@@ -9701,17 +9611,17 @@

5160

@@ -9713,17 +9623,17 @@

5161

rm -f dummy.c dummy${ac_exeext} ;

5162

if test "$_res" = "0"; then

5163

echo "$ac_t""yes" 1>&6

5166

echo "$ac_t""no" 1>&6

5167

5168

echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6

5169

-echo "configure:9710: checking for pthread_create in -lc" >&5

5170

+echo "configure:9620: checking for pthread_create in -lc" >&5

5169

-echo "configure:9722: checking for pthread_create in -lc" >&5

5170

+echo "configure:9632: checking for pthread_create in -lc" >&5

5171

echo "

5172

#include <pthread.h>

5173

void *foo(void *v) { int a = 1; }

5176

if (!pthread_create(&t, 0, &foo, 0)) {

5177

pthread_join(t, 0);

5178

}

5179

@@ -9757,17 +9667,17 @@

5179

@@ -9769,17 +9679,17 @@

5180

fi

5181

5182

5185

rm -f conftest*

5186

ac_cv_have_dash_pthread=no

5187

echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6

5188

-echo "configure:9766: checking whether ${CC-cc} accepts -pthread" >&5

5189

+echo "configure:9676: checking whether ${CC-cc} accepts -pthread" >&5

5188

-echo "configure:9778: checking whether ${CC-cc} accepts -pthread" >&5

5189

+echo "configure:9688: checking whether ${CC-cc} accepts -pthread" >&5

5190

echo 'int main() { return 0; }' | cat > conftest.c

5191

${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1

5192

if test $? -eq 0; then

5195

case "$target_os" in

5196

freebsd*)

5197

# Freebsd doesn't use -pthread for compiles, it uses them for linking

5198

@@ -9780,17 +9690,17 @@

5198

@@ -9792,17 +9702,17 @@

5199

fi

5200

fi

5201

rm -f conftest*

5204

ac_cv_have_dash_pthreads=no

5205

if test "$ac_cv_have_dash_pthread" = "no"; then

5206

echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6

5207

-echo "configure:9789: checking whether ${CC-cc} accepts -pthreads" >&5

5208

+echo "configure:9699: checking whether ${CC-cc} accepts -pthreads" >&5

5207

-echo "configure:9801: checking whether ${CC-cc} accepts -pthreads" >&5

5208

+echo "configure:9711: checking whether ${CC-cc} accepts -pthreads" >&5

5209

echo 'int main() { return 0; }' | cat > conftest.c

5210

${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1

5211

if test $? -eq 0; then

5214

CFLAGS="$CFLAGS -pthreads"

5215

CXXFLAGS="$CXXFLAGS -pthreads"

5216

fi

5217

@@ -9826,17 +9736,17 @@

5217

@@ -9838,17 +9748,17 @@

5218

EOF

5219

5220

if test "$ac_cv_have_dash_pthread" = "yes"; then

5233

5234

*-*-nto*)

5235

cat >> confdefs.h <<\EOF

5236

@@ -9902,17 +9812,17 @@

5236

@@ -9914,17 +9824,17 @@

5237

esac

5238

fi

5239

;;

5242

5243

5244

echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6

5245

-echo "configure:9911: checking whether mmap() sees write()s" >&5

5246

+echo "configure:9821: checking whether mmap() sees write()s" >&5

5245

-echo "configure:9923: checking whether mmap() sees write()s" >&5

5246

+echo "configure:9833: checking whether mmap() sees write()s" >&5

5247

5248

5249

mmap_test_prog='

5252

#include <sys/mman.h>

5253

#include <sys/types.h>

5254

#include <sys/stat.h>

5255

@@ -9941,21 +9851,21 @@

5255

@@ -9953,21 +9863,21 @@

5256

}

5257

'

5258

5261

result="yes"

5262

else

5263

cat > conftest.$ac_ext <<EOF

5264

-#line 9950 "configure"

5265

+#line 9860 "configure"

5264

-#line 9962 "configure"

5265

+#line 9872 "configure"

5266

#include "confdefs.h"

5267

$mmap_test_prog

5268

EOF

5269

-if { (eval echo configure:9954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5270

+if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5269

-if { (eval echo configure:9966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5270

+if { (eval echo configure:9876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5271

then

5272

result="yes"

5273

else

5276

rm -fr conftest*

5277

result="no"

5278

fi

5279

@@ -9970,23 +9880,23 @@

5279

@@ -9982,23 +9892,23 @@

5280

#define MMAP_MISSES_WRITES 1

5281

EOF

5282

5285

5286

if test $ac_cv_prog_gcc = yes; then

5287

echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6

5288

-echo "configure:9979: checking whether ${CC-cc} needs -traditional" >&5

5289

+echo "configure:9889: checking whether ${CC-cc} needs -traditional" >&5

5288

-echo "configure:9991: checking whether ${CC-cc} needs -traditional" >&5

5289

+echo "configure:9901: checking whether ${CC-cc} needs -traditional" >&5

5290

if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then

5291

echo $ac_n "(cached) $ac_c" 1>&6

5292

else

5293

ac_pattern="Autoconf.*'x'"

5294

cat > conftest.$ac_ext <<EOF

5295

-#line 9985 "configure"

5296

+#line 9895 "configure"

5295

-#line 9997 "configure"

5296

+#line 9907 "configure"

5297

#include "confdefs.h"

5298

#include <sgtty.h>

5299

Autoconf TIOCGETP

5302

egrep "$ac_pattern" >/dev/null 2>&1; then

5303

rm -rf conftest*

5304

ac_cv_prog_gcc_traditional=yes

5305

@@ -9994,17 +9904,17 @@

5305

@@ -10006,17 +9916,17 @@

5306

rm -rf conftest*

5307

ac_cv_prog_gcc_traditional=no

5308

fi

5311

5312

if test $ac_cv_prog_gcc_traditional = no; then

5313

cat > conftest.$ac_ext <<EOF

5314

-#line 10003 "configure"

5315

+#line 9913 "configure"

5314

-#line 10015 "configure"

5315

+#line 9925 "configure"

5316

#include "confdefs.h"

5317

#include <termio.h>

5318

Autoconf TCGETA

5321

egrep "$ac_pattern" >/dev/null 2>&1; then

5322

rm -rf conftest*

5323

ac_cv_prog_gcc_traditional=yes

5324

@@ -10016,35 +9926,35 @@

5324

@@ -10028,35 +9938,35 @@

5325

5326

echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6

5327

if test $ac_cv_prog_gcc_traditional = yes; then

5330

fi

5331

5332

echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6

5333

-echo "configure:10025: checking for 8-bit clean memcmp" >&5

5334

+echo "configure:9935: checking for 8-bit clean memcmp" >&5

5333

-echo "configure:10037: checking for 8-bit clean memcmp" >&5

5334

+echo "configure:9947: checking for 8-bit clean memcmp" >&5

5335

if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then

5336

echo $ac_n "(cached) $ac_c" 1>&6

5337

else

5339

ac_cv_func_memcmp_clean=no

5340

else

5341

cat > conftest.$ac_ext <<EOF

5342

-#line 10033 "configure"

5343

+#line 9943 "configure"

5342

-#line 10045 "configure"

5343

+#line 9955 "configure"

5344

#include "confdefs.h"

5345

5346

main()

5350

}

5351

5352

EOF

5353

-if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5354

+if { (eval echo configure:9953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5353

-if { (eval echo configure:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5354

+if { (eval echo configure:9965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5355

then

5356

ac_cv_func_memcmp_clean=yes

5357

else

5360

rm -fr conftest*

5361

ac_cv_func_memcmp_clean=no

5362

fi

5363

@@ -10054,22 +9964,22 @@

5363

@@ -10066,22 +9976,22 @@

5364

fi

5365

5366

echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6

5369

for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64

5370

do

5371

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

5372

-echo "configure:10063: checking for $ac_func" >&5

5373

+echo "configure:9973: checking for $ac_func" >&5

5372

-echo "configure:10075: checking for $ac_func" >&5

5373

+echo "configure:9985: checking for $ac_func" >&5

5374

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

5375

echo $ac_n "(cached) $ac_c" 1>&6

5376

else

5377

cat > conftest.$ac_ext <<EOF

5378

-#line 10068 "configure"

5379

+#line 9978 "configure"

5378

-#line 10080 "configure"

5379

+#line 9990 "configure"

5380

#include "confdefs.h"

5381

/* System header to define __stub macros and hopefully few prototypes,

5382

which can conflict with char $ac_func(); below. */

5385

/* We use char because int might match the return type of a gcc2

5386

builtin and then its argument prototype would still apply. */

5387

char $ac_func();

5388

@@ -10082,17 +9992,17 @@

5388

@@ -10094,17 +10004,17 @@

5389

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

5390

choke me

5391

#else

5394

5395

; return 0; }

5396

EOF

5397

-if { (eval echo configure:10091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5398

+if { (eval echo configure:10001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5397

-if { (eval echo configure:10103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5398

+if { (eval echo configure:10013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5399

rm -rf conftest*

5400

eval "ac_cv_func_$ac_func=yes"

5401

else

5404

rm -rf conftest*

5405

eval "ac_cv_func_$ac_func=no"

5406

fi

5407

@@ -10109,22 +10019,22 @@

5407

@@ -10121,22 +10031,22 @@

5408

else

5409

echo "$ac_t""no" 1>&6

5410

fi

5413

for ac_func in flockfile getpagesize

5414

do

5415

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

5416

-echo "configure:10118: checking for $ac_func" >&5

5417

+echo "configure:10028: checking for $ac_func" >&5

5416

-echo "configure:10130: checking for $ac_func" >&5

5417

+echo "configure:10040: checking for $ac_func" >&5

5418

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

5419

echo $ac_n "(cached) $ac_c" 1>&6

5420

else

5421

cat > conftest.$ac_ext <<EOF

5422

-#line 10123 "configure"

5423

+#line 10033 "configure"

5422

-#line 10135 "configure"

5423

+#line 10045 "configure"

5424

#include "confdefs.h"

5425

/* System header to define __stub macros and hopefully few prototypes,

5426

which can conflict with char $ac_func(); below. */

5429

/* We use char because int might match the return type of a gcc2

5430

builtin and then its argument prototype would still apply. */

5431

char $ac_func();

5432

@@ -10137,17 +10047,17 @@

5432

@@ -10149,17 +10059,17 @@

5433

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

5434

choke me

5435

#else

5438

5439

; return 0; }

5440

EOF

5441

-if { (eval echo configure:10146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5442

+if { (eval echo configure:10056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5441

-if { (eval echo configure:10158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5442

+if { (eval echo configure:10068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5443

rm -rf conftest*

5444

eval "ac_cv_func_$ac_func=yes"

5445

else

5448

rm -rf conftest*

5449

eval "ac_cv_func_$ac_func=no"

5450

fi

5451

@@ -10166,22 +10076,22 @@

5451

@@ -10178,22 +10088,22 @@

5452

fi

5453

done

5454

5457

for ac_func in localtime_r strtok_r

5458

do

5459

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

5460

-echo "configure:10175: checking for $ac_func" >&5

5461

+echo "configure:10085: checking for $ac_func" >&5

5460

-echo "configure:10187: checking for $ac_func" >&5

5461

+echo "configure:10097: checking for $ac_func" >&5

5462

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

5463

echo $ac_n "(cached) $ac_c" 1>&6

5464

else

5465

cat > conftest.$ac_ext <<EOF

5466

-#line 10180 "configure"

5467

+#line 10090 "configure"

5466

-#line 10192 "configure"

5467

+#line 10102 "configure"

5468

#include "confdefs.h"

5469

/* System header to define __stub macros and hopefully few prototypes,

5470

which can conflict with char $ac_func(); below. */

5473

/* We use char because int might match the return type of a gcc2

5474

builtin and then its argument prototype would still apply. */

5475

char $ac_func();

5476

@@ -10194,17 +10104,17 @@

5476

@@ -10206,17 +10116,17 @@

5477

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

5478

choke me

5479

#else

5482

5483

; return 0; }

5484

EOF

5485

-if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5486

+if { (eval echo configure:10113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5485

-if { (eval echo configure:10215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5486

+if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5487

rm -rf conftest*

5488

eval "ac_cv_func_$ac_func=yes"

5489

else

5492

rm -rf conftest*

5493

eval "ac_cv_func_$ac_func=no"

5494

fi

5495

@@ -10230,29 +10140,29 @@

5495

@@ -10242,29 +10152,29 @@

5496

ac_ext=C

5497

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

5498

ac_cpp='$CXXCPP $CPPFLAGS'

5501

cross_compiling=$ac_cv_prog_cxx_cross

5502

5503

echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6

5504

-echo "configure:10239: checking for wcrtomb" >&5

5505

+echo "configure:10149: checking for wcrtomb" >&5

5504

-echo "configure:10251: checking for wcrtomb" >&5

5505

+echo "configure:10161: checking for wcrtomb" >&5

5506

if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then

5507

echo $ac_n "(cached) $ac_c" 1>&6

5508

else

5509

cat > conftest.$ac_ext <<EOF

5510

-#line 10244 "configure"

5511

+#line 10154 "configure"

5510

-#line 10256 "configure"

5511

+#line 10166 "configure"

5512

#include "confdefs.h"

5513

#include <wchar.h>

5514

int main() {

5515

mbstate_t ps={0};wcrtomb(0,'f',&ps);

5516

; return 0; }

5517

EOF

5518

-if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5519

+if { (eval echo configure:10161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5518

-if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5519

+if { (eval echo configure:10173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5520

rm -rf conftest*

5521

ac_cv_have_wcrtomb="yes"

5522

else

5525

rm -rf conftest*

5526

ac_cv_have_wcrtomb="no"

5527

fi

5528

@@ -10262,29 +10172,29 @@

5528

@@ -10274,29 +10184,29 @@

5529

echo "$ac_t""$ac_cv_have_wcrtomb" 1>&6

5530

if test "$ac_cv_have_wcrtomb" = "yes"; then

5531

cat >> confdefs.h <<\EOF

5534

5535

fi

5536

echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6

5537

-echo "configure:10271: checking for mbrtowc" >&5

5538

+echo "configure:10181: checking for mbrtowc" >&5

5537

-echo "configure:10283: checking for mbrtowc" >&5

5538

+echo "configure:10193: checking for mbrtowc" >&5

5539

if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then

5540

echo $ac_n "(cached) $ac_c" 1>&6

5541

else

5542

cat > conftest.$ac_ext <<EOF

5543

-#line 10276 "configure"

5544

+#line 10186 "configure"

5543

-#line 10288 "configure"

5544

+#line 10198 "configure"

5545

#include "confdefs.h"

5546

#include <wchar.h>

5547

int main() {

5548

mbstate_t ps={0};mbrtowc(0,0,0,&ps);

5549

; return 0; }

5550

EOF

5551

-if { (eval echo configure:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5552

+if { (eval echo configure:10193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5551

-if { (eval echo configure:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5552

+if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5553

rm -rf conftest*

5554

ac_cv_have_mbrtowc="yes"

5555

else

5558

rm -rf conftest*

5559

ac_cv_have_mbrtowc="no"

5560

fi

5561

@@ -10303,34 +10213,34 @@

5561

@@ -10315,34 +10225,34 @@

5562

ac_cpp='$CPP $CPPFLAGS'

5563

ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

5564

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

5567

fi

5568

5569

echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6

5570

-echo "configure:10312: checking for res_ninit()" >&5

5571

+echo "configure:10222: checking for res_ninit()" >&5

5570

-echo "configure:10324: checking for res_ninit()" >&5

5571

+echo "configure:10234: checking for res_ninit()" >&5

5572

if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then

5573

echo $ac_n "(cached) $ac_c" 1>&6

5574

else

5575

cat > conftest.$ac_ext <<EOF

5576

-#line 10317 "configure"

5577

+#line 10227 "configure"

5576

-#line 10329 "configure"

5577

+#line 10239 "configure"

5578

#include "confdefs.h"

5579

5580

#ifdef linux

5586

int foo = res_ninit(&_res);

5587

; return 0; }

5588

EOF

5589

-if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5590

+if { (eval echo configure:10239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5589

-if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5590

+if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5591

rm -rf conftest*

5592

ac_cv_func_res_ninit=yes

5593

else

5596

rm -rf conftest*

5597

ac_cv_func_res_ninit=no

5598

fi

5599

@@ -10350,33 +10260,33 @@

5599

@@ -10362,33 +10272,33 @@

5600

ac_ext=C

5601

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

5602

ac_cpp='$CXXCPP $CPPFLAGS'

5605

cross_compiling=$ac_cv_prog_cxx_cross

5606

5607

echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6

5608

-echo "configure:10359: checking for gnu_get_libc_version()" >&5

5609

+echo "configure:10269: checking for gnu_get_libc_version()" >&5

5608

-echo "configure:10371: checking for gnu_get_libc_version()" >&5

5609

+echo "configure:10281: checking for gnu_get_libc_version()" >&5

5610

if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then

5611

echo $ac_n "(cached) $ac_c" 1>&6

5612

else

5613

cat > conftest.$ac_ext <<EOF

5614

-#line 10364 "configure"

5615

+#line 10274 "configure"

5614

-#line 10376 "configure"

5615

+#line 10286 "configure"

5616

#include "confdefs.h"

5617

5618

#ifdef HAVE_GNU_LIBC_VERSION_H

5623

const char *glibc_version = gnu_get_libc_version();

5624

; return 0; }

5625

EOF

5626

-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5627

+if { (eval echo configure:10285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5626

-if { (eval echo configure:10387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5627

+if { (eval echo configure:10297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5628

rm -rf conftest*

5629

ac_cv_func_gnu_get_libc_version=yes

5630

else

5633

rm -rf conftest*

5634

ac_cv_func_gnu_get_libc_version=no

5635

5636

@@ -10395,39 +10305,39 @@

5636

@@ -10407,39 +10317,39 @@

5637

fi

5638

5639

case $target_os in

5642

*)

5643

5644

echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6

5645

-echo "configure:10404: checking for iconv in -lc" >&5

5646

+echo "configure:10314: checking for iconv in -lc" >&5

5645

-echo "configure:10416: checking for iconv in -lc" >&5

5646

+echo "configure:10326: checking for iconv in -lc" >&5

5647

ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`

5648

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

5649

echo $ac_n "(cached) $ac_c" 1>&6

5651

ac_save_LIBS="$LIBS"

5652

LIBS="-lc $LIBS"

5653

cat > conftest.$ac_ext <<EOF

5654

-#line 10412 "configure"

5655

+#line 10322 "configure"

5654

-#line 10424 "configure"

5655

+#line 10334 "configure"

5656

#include "confdefs.h"

5657

/* Override any gcc2 internal prototype to avoid an error. */

5658

#ifdef __cplusplus

5666

iconv()

5667

; return 0; }

5668

EOF

5669

-if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5670

+if { (eval echo configure:10336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5669

-if { (eval echo configure:10438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5670

+if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5671

rm -rf conftest*

5672

eval "ac_cv_lib_$ac_lib_var=yes"

5673

else

5676

rm -rf conftest*

5677

eval "ac_cv_lib_$ac_lib_var=no"

5678

fi

5679

@@ -10436,39 +10346,39 @@

5679

@@ -10448,39 +10358,39 @@

5680

5681

fi

5682

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

5685

else

5686

echo "$ac_t""no" 1>&6

5687

echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6

5688

-echo "configure:10445: checking for iconv in -liconv" >&5

5689

+echo "configure:10355: checking for iconv in -liconv" >&5

5688

-echo "configure:10457: checking for iconv in -liconv" >&5

5689

+echo "configure:10367: checking for iconv in -liconv" >&5

5690

ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`

5691

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

5692

echo $ac_n "(cached) $ac_c" 1>&6

5694

ac_save_LIBS="$LIBS"

5695

LIBS="-liconv $LIBS"

5696

cat > conftest.$ac_ext <<EOF

5697

-#line 10453 "configure"

5698

+#line 10363 "configure"

5697

-#line 10465 "configure"

5698

+#line 10375 "configure"

5699

#include "confdefs.h"

5700

/* Override any gcc2 internal prototype to avoid an error. */

5701

#ifdef __cplusplus

5709

iconv()

5710

; return 0; }

5711

EOF

5712

-if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5713

+if { (eval echo configure:10377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5712

-if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5713

+if { (eval echo configure:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5714

rm -rf conftest*

5715

eval "ac_cv_lib_$ac_lib_var=yes"

5716

else

5719

rm -rf conftest*

5720

eval "ac_cv_lib_$ac_lib_var=no"

5721

fi

5722

@@ -10477,39 +10387,39 @@

5722

@@ -10489,39 +10399,39 @@

5723

5724

fi

5725

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

5728

else

5729

echo "$ac_t""no" 1>&6

5730

echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6

5731

-echo "configure:10486: checking for libiconv in -liconv" >&5

5732

+echo "configure:10396: checking for libiconv in -liconv" >&5

5731

-echo "configure:10498: checking for libiconv in -liconv" >&5

5732

+echo "configure:10408: checking for libiconv in -liconv" >&5

5733

ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`

5734

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

5735

echo $ac_n "(cached) $ac_c" 1>&6

5737

ac_save_LIBS="$LIBS"

5738

LIBS="-liconv $LIBS"

5739

cat > conftest.$ac_ext <<EOF

5740

-#line 10494 "configure"

5741

+#line 10404 "configure"

5740

-#line 10506 "configure"

5741

+#line 10416 "configure"

5742

#include "confdefs.h"

5743

/* Override any gcc2 internal prototype to avoid an error. */

5744

#ifdef __cplusplus

5752

libiconv()

5753

; return 0; }

5754

EOF

5755

-if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5756

+if { (eval echo configure:10418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5755

-if { (eval echo configure:10520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5756

+if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5757

rm -rf conftest*

5758

eval "ac_cv_lib_$ac_lib_var=yes"

5759

else

5762

rm -rf conftest*

5763

eval "ac_cv_lib_$ac_lib_var=no"

5764

fi

5765

@@ -10526,36 +10436,36 @@

5765

@@ -10538,36 +10448,36 @@

5766

5767

fi

5768

5771

_SAVE_LIBS=$LIBS

5772

LIBS="$LIBS $_ICONV_LIBS"

5773

echo $ac_n "checking for iconv()""... $ac_c" 1>&6

5774

-echo "configure:10535: checking for iconv()" >&5

5775

+echo "configure:10445: checking for iconv()" >&5

5774

-echo "configure:10547: checking for iconv()" >&5

5775

+echo "configure:10457: checking for iconv()" >&5

5776

if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then

5777

echo $ac_n "(cached) $ac_c" 1>&6

5778

else

5779

cat > conftest.$ac_ext <<EOF

5780

-#line 10540 "configure"

5781

+#line 10450 "configure"

5780

-#line 10552 "configure"

5781

+#line 10462 "configure"

5782

#include "confdefs.h"

5783

5784

#include <stdlib.h>

5792

5793

; return 0; }

5794

EOF

5795

-if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5796

+if { (eval echo configure:10464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5795

-if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5796

+if { (eval echo configure:10476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5797

rm -rf conftest*

5798

ac_cv_func_iconv=yes

5799

else

5802

rm -rf conftest*

5803

ac_cv_func_iconv=no

5804

5805

@@ -10569,37 +10479,37 @@

5805

@@ -10581,37 +10491,37 @@

5806

cat >> confdefs.h <<\EOF

5807

#define HAVE_ICONV 1

5808

EOF

5811

LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"

5812

LIBICONV="$_ICONV_LIBS"

5813

echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6

5814

-echo "configure:10578: checking for iconv() with const input" >&5

5815

+echo "configure:10488: checking for iconv() with const input" >&5

5814

-echo "configure:10590: checking for iconv() with const input" >&5

5815

+echo "configure:10500: checking for iconv() with const input" >&5

5816

if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then

5817

echo $ac_n "(cached) $ac_c" 1>&6

5818

else

5819

cat > conftest.$ac_ext <<EOF

5820

-#line 10583 "configure"

5821

+#line 10493 "configure"

5820

-#line 10595 "configure"

5821

+#line 10505 "configure"

5822

#include "confdefs.h"

5823

5824

#include <stdlib.h>

5833

5834

; return 0; }

5835

EOF

5836

-if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

5837

+if { (eval echo configure:10508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

5836

-if { (eval echo configure:10610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

5837

+if { (eval echo configure:10520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

5838

rm -rf conftest*

5839

ac_cv_func_const_iconv=yes

5840

else

5843

rm -rf conftest*

5844

ac_cv_func_const_iconv=no

5845

5846

@@ -10618,29 +10528,29 @@

5846

@@ -10630,29 +10540,29 @@

5847

fi

5848

LIBS=$_SAVE_LIBS

5849

5852

5853

5854

echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6

5855

-echo "configure:10627: checking for nl_langinfo and CODESET" >&5

5856

+echo "configure:10537: checking for nl_langinfo and CODESET" >&5

5855

-echo "configure:10639: checking for nl_langinfo and CODESET" >&5

5856

+echo "configure:10549: checking for nl_langinfo and CODESET" >&5

5857

if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then

5858

echo $ac_n "(cached) $ac_c" 1>&6

5859

else

5860

cat > conftest.$ac_ext <<EOF

5861

-#line 10632 "configure"

5862

+#line 10542 "configure"

5861

-#line 10644 "configure"

5862

+#line 10554 "configure"

5863

#include "confdefs.h"

5864

#include <langinfo.h>

5865

int main() {

5866

char* cs = nl_langinfo(CODESET);

5867

; return 0; }

5868

EOF

5869

-if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5870

+if { (eval echo configure:10549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5869

-if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5870

+if { (eval echo configure:10561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

5871

rm -rf conftest*

5872

am_cv_langinfo_codeset=yes

5873

else

5876

rm -rf conftest*

5877

am_cv_langinfo_codeset=no

5878

fi

5879

@@ -10662,123 +10572,123 @@

5879

@@ -10674,123 +10584,123 @@

5880

# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

5881

ac_cpp='$CPP $CPPFLAGS'

5882

ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

5885

5886

5887

echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6

5888

-echo "configure:10671: checking for an implementation of va_copy()" >&5

5889

+echo "configure:10581: checking for an implementation of va_copy()" >&5

5888

-echo "configure:10683: checking for an implementation of va_copy()" >&5

5889

+echo "configure:10593: checking for an implementation of va_copy()" >&5

5890

if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then

5891

echo $ac_n "(cached) $ac_c" 1>&6

5892

else

5896

5897

else

5898

cat > conftest.$ac_ext <<EOF

5899

-#line 10681 "configure"

5900

+#line 10591 "configure"

5899

-#line 10693 "configure"

5900

+#line 10603 "configure"

5901

#include "confdefs.h"

5902

5903

#include <stdarg.h>

5911

}

5912

int main() { f (0, 42); return 0; }

5913

EOF

5914

-if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5915

+if { (eval echo configure:10605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5914

-if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5915

+if { (eval echo configure:10617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5916

then

5917

ac_cv_va_copy=yes

5918

else

5929

5930

echo "$ac_t""$ac_cv_va_copy" 1>&6

5931

echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6

5932

-echo "configure:10712: checking for an implementation of __va_copy()" >&5

5933

+echo "configure:10622: checking for an implementation of __va_copy()" >&5

5932

-echo "configure:10724: checking for an implementation of __va_copy()" >&5

5933

+echo "configure:10634: checking for an implementation of __va_copy()" >&5

5934

if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then

5935

echo $ac_n "(cached) $ac_c" 1>&6

5936

else

5940

5941

else

5942

cat > conftest.$ac_ext <<EOF

5943

-#line 10722 "configure"

5944

+#line 10632 "configure"

5943

-#line 10734 "configure"

5944

+#line 10644 "configure"

5945

#include "confdefs.h"

5946

5947

#include <stdarg.h>

5955

}

5956

int main() { f (0, 42); return 0; }

5957

EOF

5958

-if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5959

+if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5958

-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5959

+if { (eval echo configure:10658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

5960

then

5961

ac_cv___va_copy=yes

5962

else

5973

5974

echo "$ac_t""$ac_cv___va_copy" 1>&6

5975

echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6

5976

-echo "configure:10753: checking whether va_lists can be copied by value" >&5

5977

+echo "configure:10663: checking whether va_lists can be copied by value" >&5

5976

-echo "configure:10765: checking whether va_lists can be copied by value" >&5

5977

+echo "configure:10675: checking whether va_lists can be copied by value" >&5

5978

if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then

5979

echo $ac_n "(cached) $ac_c" 1>&6

5980

else

5984

5985

else

5986

cat > conftest.$ac_ext <<EOF

5987

-#line 10763 "configure"

5988

+#line 10673 "configure"

5987

-#line 10775 "configure"

5988

+#line 10685 "configure"

5989

#include "confdefs.h"

5990

5991

#include <stdarg.h>

5999

}

6000

int main() { f (0, 42); return 0; }

6001

EOF

6002

-if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6003

+if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6002

-if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6003

+if { (eval echo configure:10699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6004

then

6005

ac_cv_va_val_copy=yes

6006

else

6009

rm -fr conftest*

6010

ac_cv_va_val_copy=no

6011

fi

6012

@@ -10867,17 +10777,17 @@

6012

@@ -10879,17 +10789,17 @@

6013

cd ${_curdir}

6014

rm -rf conftest* _conftest

6015

;;

6018

if test "$GNU_CXX"; then

6019

6020

echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6

6021

-echo "configure:10876: checking for C++ exceptions flag" >&5

6022

+echo "configure:10786: checking for C++ exceptions flag" >&5

6021

-echo "configure:10888: checking for C++ exceptions flag" >&5

6022

+echo "configure:10798: checking for C++ exceptions flag" >&5

6023

6024

if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then

6025

echo $ac_n "(cached) $ac_c" 1>&6

6028

6029

${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1

6030

6031

@@ -10902,35 +10812,35 @@

6031

@@ -10914,35 +10824,35 @@

6032

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

6033

ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

6034

cross_compiling=$ac_cv_prog_cxx_cross

6037

HAVE_GCC3_ABI=

6038

if test "$GNU_CC"; then

6039

echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6

6040

-echo "configure:10911: checking for gcc 3.0 ABI" >&5

6041

+echo "configure:10821: checking for gcc 3.0 ABI" >&5

6040

-echo "configure:10923: checking for gcc 3.0 ABI" >&5

6041

+echo "configure:10833: checking for gcc 3.0 ABI" >&5

6042

if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then

6043

echo $ac_n "(cached) $ac_c" 1>&6

6044

else

6045

cat > conftest.$ac_ext <<EOF

6046

-#line 10916 "configure"

6047

+#line 10826 "configure"

6046

-#line 10928 "configure"

6047

+#line 10838 "configure"

6048

#include "confdefs.h"

6049

6050

int main() {

6057

6058

; return 0; }

6059

EOF

6060

-if { (eval echo configure:10929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6061

+if { (eval echo configure:10839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6060

-if { (eval echo configure:10941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6061

+if { (eval echo configure:10851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6062

rm -rf conftest*

6063

ac_cv_gcc_three_abi="yes"

6064

else

6067

rm -rf conftest*

6068

ac_cv_gcc_three_abi="no"

6069

fi

6070

@@ -10944,32 +10854,32 @@

6070

@@ -10956,32 +10866,32 @@

6071

else

6072

TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-gcc2}"

6073

fi

6076

6077

6078

echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6

6079

-echo "configure:10953: checking for C++ \"explicit\" keyword" >&5

6080

+echo "configure:10863: checking for C++ \"explicit\" keyword" >&5

6079

-echo "configure:10965: checking for C++ \"explicit\" keyword" >&5

6080

+echo "configure:10875: checking for C++ \"explicit\" keyword" >&5

6081

if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then

6082

echo $ac_n "(cached) $ac_c" 1>&6

6083

else

6084

cat > conftest.$ac_ext <<EOF

6085

-#line 10958 "configure"

6086

+#line 10868 "configure"

6085

-#line 10970 "configure"

6086

+#line 10880 "configure"

6087

#include "confdefs.h"

6088

class X {

6089

public: explicit X(int i) : i_(i) {}

6093

X x(3);

6094

; return 0; }

6095

EOF

6096

-if { (eval echo configure:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6097

+if { (eval echo configure:10878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6096

-if { (eval echo configure:10980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6097

+if { (eval echo configure:10890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6098

rm -rf conftest*

6099

ac_cv_cpp_explicit=yes

6100

else

6103

rm -rf conftest*

6104

ac_cv_cpp_explicit=no

6105

fi

6106

@@ -10980,22 +10890,22 @@

6106

@@ -10992,22 +10902,22 @@

6107

if test "$ac_cv_cpp_explicit" = yes ; then

6108

cat >> confdefs.h <<\EOF

6109

#define HAVE_CPP_EXPLICIT 1

6112

fi

6113

6114

echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6

6115

-echo "configure:10989: checking for C++ \"typename\" keyword" >&5

6116

+echo "configure:10899: checking for C++ \"typename\" keyword" >&5

6115

-echo "configure:11001: checking for C++ \"typename\" keyword" >&5

6116

+echo "configure:10911: checking for C++ \"typename\" keyword" >&5

6117

if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then

6118

echo $ac_n "(cached) $ac_c" 1>&6

6119

else

6120

cat > conftest.$ac_ext <<EOF

6121

-#line 10994 "configure"

6122

+#line 10904 "configure"

6121

-#line 11006 "configure"

6122

+#line 10916 "configure"

6123

#include "confdefs.h"

6124

class param {

6125

public:

6128

6129

template <class T> class tplt {

6130

public:

6131

@@ -11004,17 +10914,17 @@

6131

@@ -11016,17 +10926,17 @@

6132

return num;

6133

}

6134

};

6137

A.foo(0);

6138

; return 0; }

6139

EOF

6140

-if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6141

+if { (eval echo configure:10923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6140

-if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6141

+if { (eval echo configure:10935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6142

rm -rf conftest*

6143

ac_cv_cpp_typename=yes

6144

else

6147

rm -rf conftest*

6148

ac_cv_cpp_typename=no

6149

fi

6150

@@ -11025,32 +10935,32 @@

6150

@@ -11037,32 +10947,32 @@

6151

if test "$ac_cv_cpp_typename" = yes ; then

6152

cat >> confdefs.h <<\EOF

6153

#define HAVE_CPP_TYPENAME 1

6156

fi

6157

6158

echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6

6159

-echo "configure:11034: checking for modern C++ template specialization syntax support" >&5

6160

+echo "configure:10944: checking for modern C++ template specialization syntax support" >&5

6159

-echo "configure:11046: checking for modern C++ template specialization syntax support" >&5

6160

+echo "configure:10956: checking for modern C++ template specialization syntax support" >&5

6161

if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then

6162

echo $ac_n "(cached) $ac_c" 1>&6

6163

else

6164

cat > conftest.$ac_ext <<EOF

6165

-#line 11039 "configure"

6166

+#line 10949 "configure"

6165

-#line 11051 "configure"

6166

+#line 10961 "configure"

6167

#include "confdefs.h"

6168

template <class T> struct X { int a; };

6169

class Y {};

6173

X<Y> y_x;

6174

; return 0; }

6175

EOF

6176

-if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6177

+if { (eval echo configure:10959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6176

-if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6177

+if { (eval echo configure:10971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6178

rm -rf conftest*

6179

ac_cv_cpp_modern_specialize_template_syntax=yes

6180

else

6183

rm -rf conftest*

6184

ac_cv_cpp_modern_specialize_template_syntax=no

6185

fi

6186

@@ -11062,30 +10972,30 @@

6186

@@ -11074,30 +10984,30 @@

6187

cat >> confdefs.h <<\EOF

6188

#define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX 1

6189

EOF

6192

6193

6194

echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6

6195

-echo "configure:11071: checking whether partial template specialization works" >&5

6196

+echo "configure:10981: checking whether partial template specialization works" >&5

6195

-echo "configure:11083: checking whether partial template specialization works" >&5

6196

+echo "configure:10993: checking whether partial template specialization works" >&5

6197

if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then

6198

echo $ac_n "(cached) $ac_c" 1>&6

6199

else

6200

cat > conftest.$ac_ext <<EOF

6201

-#line 11076 "configure"

6202

+#line 10986 "configure"

6201

-#line 11088 "configure"

6202

+#line 10998 "configure"

6203

#include "confdefs.h"

6204

template <class T> class Foo {};

6205

template <class T> class Foo<T*> {};

6207

return 0;

6208

; return 0; }

6209

EOF

6210

-if { (eval echo configure:11084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6211

+if { (eval echo configure:10994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6210

-if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6211

+if { (eval echo configure:11006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6212

rm -rf conftest*

6213

ac_cv_cpp_partial_specialization=yes

6214

else

6217

rm -rf conftest*

6218

ac_cv_cpp_partial_specialization=no

6219

fi

6220

@@ -11096,34 +11006,34 @@

6220

@@ -11108,34 +11018,34 @@

6221

if test "$ac_cv_cpp_partial_specialization" = yes ; then

6222

cat >> confdefs.h <<\EOF

6223

#define HAVE_CPP_PARTIAL_SPECIALIZATION 1

6226

fi

6227

6228

echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6

6229

-echo "configure:11105: checking whether operators must be re-defined for templates derived from templates" >&5

6230

+echo "configure:11015: checking whether operators must be re-defined for templates derived from templates" >&5

6229

-echo "configure:11117: checking whether operators must be re-defined for templates derived from templates" >&5

6230

+echo "configure:11027: checking whether operators must be re-defined for templates derived from templates" >&5

6231

if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then

6232

echo $ac_n "(cached) $ac_c" 1>&6

6233

else

6234

cat > conftest.$ac_ext <<EOF

6235

-#line 11110 "configure"

6236

+#line 11020 "configure"

6235

-#line 11122 "configure"

6236

+#line 11032 "configure"

6237

#include "confdefs.h"

6238

template <class T> class Base { };

6239

template <class T>

6245

return 0;

6246

; return 0; }

6247

EOF

6248

-if { (eval echo configure:11122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6249

+if { (eval echo configure:11032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6248

-if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6249

+if { (eval echo configure:11044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6250

rm -rf conftest*

6251

ac_cv_need_derived_template_operators=no

6252

else

6255

rm -rf conftest*

6256

ac_cv_need_derived_template_operators=yes

6257

fi

6258

@@ -11135,31 +11045,31 @@

6258

@@ -11147,31 +11057,31 @@

6259

cat >> confdefs.h <<\EOF

6260

#define NEED_CPP_DERIVED_TEMPLATE_OPERATORS 1

6261

EOF

6264

6265

6266

echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6

6267

-echo "configure:11144: checking whether we need to cast a derived template to pass as its base class" >&5

6268

+echo "configure:11054: checking whether we need to cast a derived template to pass as its base class" >&5

6267

-echo "configure:11156: checking whether we need to cast a derived template to pass as its base class" >&5

6268

+echo "configure:11066: checking whether we need to cast a derived template to pass as its base class" >&5

6269

if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then

6270

echo $ac_n "(cached) $ac_c" 1>&6

6271

else

6272

cat > conftest.$ac_ext <<EOF

6273

-#line 11149 "configure"

6274

+#line 11059 "configure"

6273

-#line 11161 "configure"

6274

+#line 11071 "configure"

6275

#include "confdefs.h"

6276

template <class T> class Base { };

6277

template <class T> class Derived : public Base<T> { };

6280

Derived<char> bar; return foo(bar);

6281

; return 0; }

6282

EOF

6283

-if { (eval echo configure:11158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6284

+if { (eval echo configure:11068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6283

-if { (eval echo configure:11170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6284

+if { (eval echo configure:11080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6285

rm -rf conftest*

6286

ac_cv_need_cpp_template_cast_to_base=no

6287

else

6290

rm -rf conftest*

6291

ac_cv_need_cpp_template_cast_to_base=yes

6292

fi

6293

@@ -11170,22 +11080,22 @@

6293

@@ -11182,22 +11092,22 @@

6294

if test "$ac_cv_need_cpp_template_cast_to_base" = yes ; then

6295

cat >> confdefs.h <<\EOF

6296

#define NEED_CPP_TEMPLATE_CAST_TO_BASE 1

6299

fi

6300

6301

echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6

6302

-echo "configure:11179: checking whether the compiler can resolve const ambiguities for templates" >&5

6303

+echo "configure:11089: checking whether the compiler can resolve const ambiguities for templates" >&5

6302

-echo "configure:11191: checking whether the compiler can resolve const ambiguities for templates" >&5

6303

+echo "configure:11101: checking whether the compiler can resolve const ambiguities for templates" >&5

6304

if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then

6305

echo $ac_n "(cached) $ac_c" 1>&6

6306

else

6307

cat > conftest.$ac_ext <<EOF

6308

-#line 11184 "configure"

6309

+#line 11094 "configure"

6308

-#line 11196 "configure"

6309

+#line 11106 "configure"

6310

#include "confdefs.h"

6311

6312

template <class T> class ptrClass {

6315

6316

template <class T> T* a(ptrClass<T> *arg) {

6317

return arg->ptr;

6318

@@ -11196,17 +11106,17 @@

6318

@@ -11208,17 +11118,17 @@

6319

return arg->ptr;

6320

}

6321

6324

a(&i);

6325

; return 0; }

6326

EOF

6327

-if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6328

+if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6327

-if { (eval echo configure:11217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6328

+if { (eval echo configure:11127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6329

rm -rf conftest*

6330

ac_cv_can_resolve_const_ambiguity=yes

6331

else

6334

rm -rf conftest*

6335

ac_cv_can_resolve_const_ambiguity=no

6336

fi

6337

@@ -11218,41 +11128,41 @@

6337

@@ -11230,41 +11140,41 @@

6338

cat >> confdefs.h <<\EOF

6339

#define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1

6340

EOF

6343

6344

6345

echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6

6346

-echo "configure:11227: checking whether the C++ \"using\" keyword can change access" >&5

6347

+echo "configure:11137: checking whether the C++ \"using\" keyword can change access" >&5

6346

-echo "configure:11239: checking whether the C++ \"using\" keyword can change access" >&5

6347

+echo "configure:11149: checking whether the C++ \"using\" keyword can change access" >&5

6348

if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then

6349

echo $ac_n "(cached) $ac_c" 1>&6

6350

else

6351

cat > conftest.$ac_ext <<EOF

6352

-#line 11232 "configure"

6353

+#line 11142 "configure"

6352

-#line 11244 "configure"

6353

+#line 11154 "configure"

6354

#include "confdefs.h"

6355

class A { protected: int foo() { return 0; } };

6356

class B : public A { public: using A::foo; };

6358

B b; return b.foo();

6359

; return 0; }

6360

EOF

6361

-if { (eval echo configure:11240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6362

+if { (eval echo configure:11150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6361

-if { (eval echo configure:11252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6362

+if { (eval echo configure:11162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6363

rm -rf conftest*

6364

cat > conftest.$ac_ext <<EOF

6365

-#line 11243 "configure"

6366

+#line 11153 "configure"

6365

-#line 11255 "configure"

6366

+#line 11165 "configure"

6367

#include "confdefs.h"

6368

class A { public: int foo() { return 1; } };

6369

class B : public A { private: using A::foo; };

6371

B b; return b.foo();

6372

; return 0; }

6373

EOF

6374

-if { (eval echo configure:11251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6375

+if { (eval echo configure:11161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6374

-if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6375

+if { (eval echo configure:11173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6376

rm -rf conftest*

6377

ac_cv_cpp_access_changing_using2=no

6378

else

6381

rm -rf conftest*

6382

ac_cv_cpp_access_changing_using2=yes

6383

fi

6384

@@ -11270,38 +11180,38 @@

6384

@@ -11282,38 +11192,38 @@

6385

if test "$ac_cv_cpp_access_changing_using2" = yes ; then

6386

cat >> confdefs.h <<\EOF

6387

#define HAVE_CPP_ACCESS_CHANGING_USING 1

6390

fi

6391

6392

echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6

6393

-echo "configure:11279: checking whether the C++ \"using\" keyword resolves ambiguity" >&5

6394

+echo "configure:11189: checking whether the C++ \"using\" keyword resolves ambiguity" >&5

6393

-echo "configure:11291: checking whether the C++ \"using\" keyword resolves ambiguity" >&5

6394

+echo "configure:11201: checking whether the C++ \"using\" keyword resolves ambiguity" >&5

6395

if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then

6396

echo $ac_n "(cached) $ac_c" 1>&6

6397

else

6398

cat > conftest.$ac_ext <<EOF

6399

-#line 11284 "configure"

6400

+#line 11194 "configure"

6399

-#line 11296 "configure"

6400

+#line 11206 "configure"

6401

#include "confdefs.h"

6402

class X {

6403

public: int go(const X&) {return 3;}

6413

X x; Y y; y.jo(x);

6414

; return 0; }

6415

EOF

6416

-if { (eval echo configure:11300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6417

+if { (eval echo configure:11210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6416

-if { (eval echo configure:11312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6417

+if { (eval echo configure:11222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6418

rm -rf conftest*

6419

ac_cv_cpp_ambiguity_resolving_using=yes

6420

else

6423

rm -rf conftest*

6424

ac_cv_cpp_ambiguity_resolving_using=no

6425

fi

6426

@@ -11312,29 +11222,29 @@

6426

@@ -11324,29 +11234,29 @@

6427

if test "$ac_cv_cpp_ambiguity_resolving_using" = yes ; then

6428

cat >> confdefs.h <<\EOF

6429

#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1

6432

fi

6433

6434

echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6

6435

-echo "configure:11321: checking for \"std::\" namespace" >&5

6436

+echo "configure:11231: checking for \"std::\" namespace" >&5

6435

-echo "configure:11333: checking for \"std::\" namespace" >&5

6436

+echo "configure:11243: checking for \"std::\" namespace" >&5

6437

if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then

6438

echo $ac_n "(cached) $ac_c" 1>&6

6439

else

6440

cat > conftest.$ac_ext <<EOF

6441

-#line 11326 "configure"

6442

+#line 11236 "configure"

6441

-#line 11338 "configure"

6442

+#line 11248 "configure"

6443

#include "confdefs.h"

6444

#include <algorithm>

6445

int main() {

6446

return std::min(0, 1);

6447

; return 0; }

6448

EOF

6449

-if { (eval echo configure:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6450

+if { (eval echo configure:11243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6449

-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6450

+if { (eval echo configure:11255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6451

rm -rf conftest*

6452

ac_cv_cpp_namespace_std=yes

6453

else

6456

rm -rf conftest*

6457

ac_cv_cpp_namespace_std=no

6458

fi

6459

@@ -11345,32 +11255,32 @@

6459

@@ -11357,32 +11267,32 @@

6460

if test "$ac_cv_cpp_namespace_std" = yes ; then

6461

cat >> confdefs.h <<\EOF

6462

#define HAVE_CPP_NAMESPACE_STD 1

6465

fi

6466

6467

echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6

6468

-echo "configure:11354: checking whether standard template operator!=() is ambiguous" >&5

6469

+echo "configure:11264: checking whether standard template operator!=() is ambiguous" >&5

6468

-echo "configure:11366: checking whether standard template operator!=() is ambiguous" >&5

6469

+echo "configure:11276: checking whether standard template operator!=() is ambiguous" >&5

6470

if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then

6471

echo $ac_n "(cached) $ac_c" 1>&6

6472

else

6473

cat > conftest.$ac_ext <<EOF

6474

-#line 11359 "configure"

6475

+#line 11269 "configure"

6474

-#line 11371 "configure"

6475

+#line 11281 "configure"

6476

#include "confdefs.h"

6477

#include <algorithm>

6478

struct T1 {};

6482

T1 a,b; return a != b;

6483

; return 0; }

6484

EOF

6485

-if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6486

+if { (eval echo configure:11279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6485

-if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6486

+if { (eval echo configure:11291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6487

rm -rf conftest*

6488

ac_cv_cpp_unambiguous_std_notequal=unambiguous

6489

else

6492

rm -rf conftest*

6493

ac_cv_cpp_unambiguous_std_notequal=ambiguous

6494

fi

6495

@@ -11382,30 +11292,30 @@

6495

@@ -11394,30 +11304,30 @@

6496

cat >> confdefs.h <<\EOF

6497

#define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL 1

6498

EOF

6501

6502

6503

echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6

6504

-echo "configure:11391: checking for C++ reinterpret_cast" >&5

6505

+echo "configure:11301: checking for C++ reinterpret_cast" >&5

6504

-echo "configure:11403: checking for C++ reinterpret_cast" >&5

6505

+echo "configure:11313: checking for C++ reinterpret_cast" >&5

6506

if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then

6507

echo $ac_n "(cached) $ac_c" 1>&6

6508

else

6509

cat > conftest.$ac_ext <<EOF

6510

-#line 11396 "configure"

6511

+#line 11306 "configure"

6510

-#line 11408 "configure"

6511

+#line 11318 "configure"

6512

#include "confdefs.h"

6513

struct X { int i; };

6514

struct Y { int i; };

6516

X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);

6517

; return 0; }

6518

EOF

6519

-if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6520

+if { (eval echo configure:11314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6519

-if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6520

+if { (eval echo configure:11326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6521

rm -rf conftest*

6522

ac_cv_cpp_reinterpret_cast=yes

6523

else

6526

rm -rf conftest*

6527

ac_cv_cpp_reinterpret_cast=no

6528

fi

6529

@@ -11416,41 +11326,44 @@

6529

@@ -11428,41 +11338,44 @@

6530

if test "$ac_cv_cpp_reinterpret_cast" = yes ; then

6531

cat >> confdefs.h <<\EOF

6532

#define HAVE_CPP_NEW_CASTS 1

6535

fi

6536

6537

echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6

6538

-echo "configure:11425: checking for C++ dynamic_cast to void*" >&5

6539

+echo "configure:11335: checking for C++ dynamic_cast to void*" >&5

6538

-echo "configure:11437: checking for C++ dynamic_cast to void*" >&5

6539

+echo "configure:11347: checking for C++ dynamic_cast to void*" >&5

6540

if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then

6541

echo $ac_n "(cached) $ac_c" 1>&6

6542

else

6544

ac_cv_cpp_dynamic_cast_void_ptr=no

6545

else

6546

cat > conftest.$ac_ext <<EOF

6547

-#line 11433 "configure"

6548

+#line 11343 "configure"

6547

-#line 11445 "configure"

6548

+#line 11355 "configure"

6549

#include "confdefs.h"

6550

+#ifdef __cplusplus

6551

+extern "C" void exit(int);

6564

((void*)&mdo == dynamic_cast<void*>(suby))));

6565

}

6566

EOF

6567

-if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6568

+if { (eval echo configure:11362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6567

-if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6568

+if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6569

then

6570

ac_cv_cpp_dynamic_cast_void_ptr=yes

6571

else

6574

rm -fr conftest*

6575

ac_cv_cpp_dynamic_cast_void_ptr=no

6576

fi

6577

@@ -11464,29 +11377,29 @@

6577

@@ -11476,29 +11389,29 @@

6578

cat >> confdefs.h <<\EOF

6579

#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1

6580

EOF

6583

6584

6585

echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6

6586

-echo "configure:11473: checking whether C++ requires implementation of unused virtual methods" >&5

6587

+echo "configure:11386: checking whether C++ requires implementation of unused virtual methods" >&5

6586

-echo "configure:11485: checking whether C++ requires implementation of unused virtual methods" >&5

6587

+echo "configure:11398: checking whether C++ requires implementation of unused virtual methods" >&5

6588

if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then

6589

echo $ac_n "(cached) $ac_c" 1>&6

6590

else

6591

cat > conftest.$ac_ext <<EOF

6592

-#line 11478 "configure"

6593

+#line 11391 "configure"

6592

-#line 11490 "configure"

6593

+#line 11403 "configure"

6594

#include "confdefs.h"

6595

class X {private: virtual void never_called();};

6596

int main() {

6597

X x;

6598

; return 0; }

6599

EOF

6600

-if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6601

+if { (eval echo configure:11398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6600

-if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6601

+if { (eval echo configure:11410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6602

rm -rf conftest*

6603

ac_cv_cpp_unused_required=no

6604

else

6607

rm -rf conftest*

6608

ac_cv_cpp_unused_required=yes

6609

fi

6610

@@ -11499,33 +11412,33 @@

6610

@@ -11511,33 +11424,33 @@

6611

#define NEED_CPP_UNUSED_IMPLEMENTATIONS 1

6612

EOF

6613

6616

6617

6618

echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6

6619

-echo "configure:11508: checking for trouble comparing to zero near std::operator!=()" >&5

6620

+echo "configure:11421: checking for trouble comparing to zero near std::operator!=()" >&5

6619

-echo "configure:11520: checking for trouble comparing to zero near std::operator!=()" >&5

6620

+echo "configure:11433: checking for trouble comparing to zero near std::operator!=()" >&5

6621

if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then

6622

echo $ac_n "(cached) $ac_c" 1>&6

6623

else

6624

cat > conftest.$ac_ext <<EOF

6625

-#line 11513 "configure"

6626

+#line 11426 "configure"

6625

-#line 11525 "configure"

6626

+#line 11438 "configure"

6627

#include "confdefs.h"

6628

#include <algorithm>

6629

template <class T> class Foo {};

6634

Foo<int> f; return (0 != f);

6635

; return 0; }

6636

EOF

6637

-if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6638

+if { (eval echo configure:11437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6637

-if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6638

+if { (eval echo configure:11449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6639

rm -rf conftest*

6640

ac_cv_trouble_comparing_to_zero=no

6641

else

6644

rm -rf conftest*

6645

ac_cv_trouble_comparing_to_zero=yes

6646

fi

6647

@@ -11547,29 +11460,29 @@

6647

@@ -11559,29 +11472,29 @@

6648

ac_cpp='$CPP $CPPFLAGS'

6649

ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

6650

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

6653

6654

6655

echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6

6656

-echo "configure:11556: checking for LC_MESSAGES" >&5

6657

+echo "configure:11469: checking for LC_MESSAGES" >&5

6656

-echo "configure:11568: checking for LC_MESSAGES" >&5

6657

+echo "configure:11481: checking for LC_MESSAGES" >&5

6658

if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then

6659

echo $ac_n "(cached) $ac_c" 1>&6

6660

else

6661

cat > conftest.$ac_ext <<EOF

6662

-#line 11561 "configure"

6663

+#line 11474 "configure"

6662

-#line 11573 "configure"

6663

+#line 11486 "configure"

6664

#include "confdefs.h"

6665

#include <locale.h>

6666

int main() {

6667

int category = LC_MESSAGES;

6668

; return 0; }

6669

EOF

6670

-if { (eval echo configure:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6671

+if { (eval echo configure:11481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6670

-if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6671

+if { (eval echo configure:11493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

6672

rm -rf conftest*

6673

ac_cv_i18n_lc_messages=yes

6674

else

6677

rm -rf conftest*

6678

ac_cv_i18n_lc_messages=no

6679

fi

6680

@@ -11640,17 +11553,17 @@

6680

@@ -11652,17 +11565,17 @@

6681

NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config

6682

fi

6683

fi

6686

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

6687

set dummy nspr-config; ac_word=$2

6688

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

6689

-echo "configure:11649: checking for $ac_word" >&5

6690

+echo "configure:11562: checking for $ac_word" >&5

6689

-echo "configure:11661: checking for $ac_word" >&5

6690

+echo "configure:11574: checking for $ac_word" >&5

6691

if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then

6692

echo $ac_n "(cached) $ac_c" 1>&6

6693

else

6696

ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path.

6697

;;

6698

?:/*)

6699

@@ -11675,17 +11588,17 @@

6699

@@ -11687,17 +11600,17 @@

6700

if test -n "$NSPR_CONFIG"; then

6701

echo "$ac_t""$NSPR_CONFIG" 1>&6

6702

else

6705

6706

min_nspr_version=4.0.0

6707

echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6

6708

-echo "configure:11684: checking for NSPR - version >= $min_nspr_version (skipping)" >&5

6709

+echo "configure:11597: checking for NSPR - version >= $min_nspr_version (skipping)" >&5

6708

-echo "configure:11696: checking for NSPR - version >= $min_nspr_version (skipping)" >&5

6709

+echo "configure:11609: checking for NSPR - version >= $min_nspr_version (skipping)" >&5

6710

6711

no_nspr=""

6712

if test "$NSPR_CONFIG" = "no"; then

6715

NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`

6716

NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`

6717

6718

@@ -11777,17 +11690,17 @@

6718

@@ -11789,17 +11702,17 @@

6719

NSS_CONFIG=$nss_config_prefix/bin/nss-config

6720

fi

6721

fi

6724

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

6725

set dummy nss-config; ac_word=$2

6726

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

6727

-echo "configure:11786: checking for $ac_word" >&5

6728

+echo "configure:11699: checking for $ac_word" >&5

6727

-echo "configure:11798: checking for $ac_word" >&5

6728

+echo "configure:11711: checking for $ac_word" >&5

6729

if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then

6730

echo $ac_n "(cached) $ac_c" 1>&6

6731

else

6734

ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.

6735

;;

6736

?:/*)

6737

@@ -11812,17 +11725,17 @@

6737

@@ -11824,17 +11737,17 @@

6738

if test -n "$NSS_CONFIG"; then

6739

echo "$ac_t""$NSS_CONFIG" 1>&6

6740

else

6743

6744

min_nss_version=3.0.0

6745

echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6

6746

-echo "configure:11821: checking for NSS - version >= $min_nss_version (skipping)" >&5

6747

+echo "configure:11734: checking for NSS - version >= $min_nss_version (skipping)" >&5

6746

-echo "configure:11833: checking for NSS - version >= $min_nss_version (skipping)" >&5

6747

+echo "configure:11746: checking for NSS - version >= $min_nss_version (skipping)" >&5

6748

6749

no_nss=""

6750

if test "$NSS_CONFIG" = "no"; then

6753

NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`

6754

NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`

6755

6756

@@ -11844,17 +11757,17 @@

6756

@@ -11856,17 +11769,17 @@

6757

6758

6759

6772

$(DIST)/lib/$(DLL_PREFIX)ssl'$NSS_VERSION'$(DLL_SUFFIX) \\\

6773

$(DIST)/lib/$(DLL_PREFIX)nss'$NSS_VERSION'$(DLL_SUFFIX) \\\

6774

$(DIST)/lib/$(DLL_PREFIX)softokn'$NSS_VERSION'$(DLL_SUFFIX)'

6775

@@ -11885,36 +11798,36 @@

6775

@@ -11897,36 +11810,36 @@

6776

if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then

6777

CFLAGS="-I${JPEG_DIR}/include $CFLAGS"

6778

LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"

6781

SYSTEM_JPEG=

6782

else

6783

echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6

6784

-echo "configure:11894: checking for jpeg_destroy_compress in -ljpeg" >&5

6785

+echo "configure:11807: checking for jpeg_destroy_compress in -ljpeg" >&5

6784

-echo "configure:11906: checking for jpeg_destroy_compress in -ljpeg" >&5

6785

+echo "configure:11819: checking for jpeg_destroy_compress in -ljpeg" >&5

6786

ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`

6787

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

6788

echo $ac_n "(cached) $ac_c" 1>&6

6790

ac_save_LIBS="$LIBS"

6791

LIBS="-ljpeg $JPEG_LIBS $LIBS"

6792

cat > conftest.$ac_ext <<EOF

6793

-#line 11902 "configure"

6794

+#line 11815 "configure"

6793

-#line 11914 "configure"

6794

+#line 11827 "configure"

6795

#include "confdefs.h"

6796

/* Override any gcc2 internal prototype to avoid an error. */

6797

/* We use char because int might match the return type of a gcc2

6802

jpeg_destroy_compress()

6803

; return 0; }

6804

EOF

6805

-if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6806

+if { (eval echo configure:11826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6805

-if { (eval echo configure:11925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6806

+if { (eval echo configure:11838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6807

rm -rf conftest*

6808

eval "ac_cv_lib_$ac_lib_var=yes"

6809

else

6812

rm -rf conftest*

6813

eval "ac_cv_lib_$ac_lib_var=no"

6814

fi

6815

@@ -11927,37 +11840,37 @@

6815

@@ -11939,37 +11852,37 @@

6816

SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"

6817

else

6818

echo "$ac_t""no" 1>&6

6828

SYSTEM_JPEG=

6829

else

6830

cat > conftest.$ac_ext <<EOF

6831

-#line 11942 "configure"

6832

+#line 11855 "configure"

6831

-#line 11954 "configure"

6832

+#line 11867 "configure"

6833

#include "confdefs.h"

6834

#include <stdio.h>

6835

#include <sys/types.h>

6843

}

6844

6845

EOF

6846

-if { (eval echo configure:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6847

+if { (eval echo configure:11869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6846

-if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6847

+if { (eval echo configure:11881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6848

then

6849

SYSTEM_JPEG=1

6850

else

6853

rm -fr conftest*

6854

SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=

6855

fi

6856

@@ -11988,36 +11901,36 @@

6856

@@ -12000,36 +11913,36 @@

6857

if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then

6858

CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"

6859

LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"

6862

SYSTEM_ZLIB=

6863

else

6864

echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6

6865

-echo "configure:11997: checking for gzread in -lz" >&5

6866

+echo "configure:11910: checking for gzread in -lz" >&5

6865

-echo "configure:12009: checking for gzread in -lz" >&5

6866

+echo "configure:11922: checking for gzread in -lz" >&5

6867

ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`

6868

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

6869

echo $ac_n "(cached) $ac_c" 1>&6

6871

ac_save_LIBS="$LIBS"

6872

LIBS="-lz $ZLIB_LIBS $LIBS"

6873

cat > conftest.$ac_ext <<EOF

6874

-#line 12005 "configure"

6875

+#line 11918 "configure"

6874

-#line 12017 "configure"

6875

+#line 11930 "configure"

6876

#include "confdefs.h"

6877

/* Override any gcc2 internal prototype to avoid an error. */

6878

/* We use char because int might match the return type of a gcc2

6883

gzread()

6884

; return 0; }

6885

EOF

6886

-if { (eval echo configure:12016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6887

+if { (eval echo configure:11929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6886

-if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6887

+if { (eval echo configure:11941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6888

rm -rf conftest*

6889

eval "ac_cv_lib_$ac_lib_var=yes"

6890

else

6893

rm -rf conftest*

6894

eval "ac_cv_lib_$ac_lib_var=no"

6895

fi

6896

@@ -12029,23 +11942,23 @@

6896

@@ -12041,23 +11954,23 @@

6897

echo "$ac_t""yes" 1>&6

6898

SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"

6899

else

6909

SYSTEM_ZLIB=

6910

else

6911

cat > conftest.$ac_ext <<EOF

6912

-#line 12044 "configure"

6913

+#line 11957 "configure"

6912

-#line 12056 "configure"

6913

+#line 11969 "configure"

6914

#include "confdefs.h"

6915

6916

#include <stdio.h>

6919

int parse_version(const char *str, int *ver) {

6920

return (sscanf(str, "%d.%d.%d", ver, ver+1, ver+2)==3?0:1);

6921

}

6922

@@ -12056,17 +11969,17 @@

6922

@@ -12068,17 +11981,17 @@

6923

if ((sys[0] == req[0]) &&

6924

((sys[1] > req[1]) || ((sys[1] == req[1]) && (sys[2] >= req[2]))))

6925

exit(0);

6928

}

6929

6930

EOF

6931

-if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6932

+if { (eval echo configure:11978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6931

-if { (eval echo configure:12077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6932

+if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

6933

then

6934

SYSTEM_ZLIB=1

6935

else

6938

rm -fr conftest*

6939

SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=

6940

fi

6941

@@ -12099,36 +12012,36 @@

6941

@@ -12111,36 +12024,36 @@

6942

if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then

6943

CFLAGS="-I${PNG_DIR}/include $CFLAGS"

6944

LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"

6947

SYSTEM_PNG=

6948

else

6949

echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6

6950

-echo "configure:12108: checking for png_get_valid in -lpng" >&5

6951

+echo "configure:12021: checking for png_get_valid in -lpng" >&5

6950

-echo "configure:12120: checking for png_get_valid in -lpng" >&5

6951

+echo "configure:12033: checking for png_get_valid in -lpng" >&5

6952

ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`

6953

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

6954

echo $ac_n "(cached) $ac_c" 1>&6

6956

ac_save_LIBS="$LIBS"

6957

LIBS="-lpng $PNG_LIBS $LIBS"

6958

cat > conftest.$ac_ext <<EOF

6959

-#line 12116 "configure"

6960

+#line 12029 "configure"

6959

-#line 12128 "configure"

6960

+#line 12041 "configure"

6961

#include "confdefs.h"

6962

/* Override any gcc2 internal prototype to avoid an error. */

6963

/* We use char because int might match the return type of a gcc2

6968

png_get_valid()

6969

; return 0; }

6970

EOF

6971

-if { (eval echo configure:12127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6972

+if { (eval echo configure:12040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6971

-if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6972

+if { (eval echo configure:12052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

6973

rm -rf conftest*

6974

eval "ac_cv_lib_$ac_lib_var=yes"

6975

else

6978

rm -rf conftest*

6979

eval "ac_cv_lib_$ac_lib_var=no"

6980

fi

6981

@@ -12140,37 +12053,37 @@

6981

@@ -12152,37 +12065,37 @@

6982

echo "$ac_t""yes" 1>&6

6983

SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"

6984

else

6994

SYSTEM_PNG=

6995

else

6996

cat > conftest.$ac_ext <<EOF

6997

-#line 12155 "configure"

6998

+#line 12068 "configure"

6997

-#line 12167 "configure"

6998

+#line 12080 "configure"

6999

#include "confdefs.h"

7000

#include <stdio.h>

7001

#include <sys/types.h>

7009

}

7010

7011

EOF

7012

-if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7013

+if { (eval echo configure:12082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7012

-if { (eval echo configure:12181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7013

+if { (eval echo configure:12094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7014

then

7015

SYSTEM_PNG=1

7016

else

7019

rm -fr conftest*

7020

SYSTEM_PNG= PNG_CFLAGS= PNG_LIBS=

7021

fi

7022

@@ -12185,16 +12098,38 @@

7022

@@ -12197,16 +12110,38 @@

7023

7024

if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then

7025

PNG_CFLAGS="-I${PNG_DIR}/include"

7058

fi

7059

7060

7061

@@ -12410,17 +12345,17 @@

7061

@@ -12422,17 +12357,17 @@

7062

fi

7063

fi

7064

7067

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

7068

set dummy gtk-config; ac_word=$2

7069

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7070

-echo "configure:12419: checking for $ac_word" >&5

7071

+echo "configure:12354: checking for $ac_word" >&5

7070

-echo "configure:12431: checking for $ac_word" >&5

7071

+echo "configure:12366: checking for $ac_word" >&5

7072

if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then

7073

echo $ac_n "(cached) $ac_c" 1>&6

7074

else

7077

ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.

7078

;;

7079

?:/*)

7080

@@ -12445,17 +12380,17 @@

7080

@@ -12457,17 +12392,17 @@

7081

if test -n "$GTK_CONFIG"; then

7082

echo "$ac_t""$GTK_CONFIG" 1>&6

7083

else

7086

7087

min_gtk_version=$GTK_VERSION

7088

echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

7089

-echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5

7090

+echo "configure:12389: checking for GTK - version >= $min_gtk_version" >&5

7089

-echo "configure:12466: checking for GTK - version >= $min_gtk_version" >&5

7090

+echo "configure:12401: checking for GTK - version >= $min_gtk_version" >&5

7091

no_gtk=""

7092

if test "$GTK_CONFIG" = "no" ; then

7093

no_gtk=yes

7096

GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`

7097

gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \

7098

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

7099

@@ -12468,17 +12403,17 @@

7099

@@ -12480,17 +12415,17 @@

7100

ac_save_LIBS="$LIBS"

7101

CFLAGS="$CFLAGS $GTK_CFLAGS"

7102

LIBS="$LIBS $GTK_LIBS"

7105

echo $ac_n "cross compiling; assumed OK... $ac_c"

7106

else

7107

cat > conftest.$ac_ext <<EOF

7108

-#line 12477 "configure"

7109

+#line 12412 "configure"

7108

-#line 12489 "configure"

7109

+#line 12424 "configure"

7110

#include "confdefs.h"

7111

7112

#include <gtk/gtk.h>

7115

7116

int

7117

main ()

7118

@@ -12546,17 +12481,17 @@

7118

@@ -12558,17 +12493,17 @@

7119

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

7120

printf("*** so that the correct libraries are found at run-time))\n");

7121

}

7124

}

7125

7126

EOF

7127

-if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7128

+if { (eval echo configure:12490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7127

-if { (eval echo configure:12567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7128

+if { (eval echo configure:12502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

7129

then

7130

:

7131

else

7134

rm -fr conftest*

7135

no_gtk=yes

7136

fi

7137

@@ -12581,27 +12516,27 @@

7137

@@ -12593,27 +12528,27 @@

7138

else

7139

if test -f conf.gtktest ; then

7140

:

7143

CFLAGS="$CFLAGS $GTK_CFLAGS"

7144

LIBS="$LIBS $GTK_LIBS"

7145

cat > conftest.$ac_ext <<EOF

7146

-#line 12590 "configure"

7147

+#line 12525 "configure"

7146

-#line 12602 "configure"

7147

+#line 12537 "configure"

7148

#include "confdefs.h"

7149

7150

#include <gtk/gtk.h>

7154

return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));

7155

; return 0; }

7156

EOF

7157

-if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7158

+if { (eval echo configure:12535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7157

-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7158

+if { (eval echo configure:12547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7159

rm -rf conftest*

7160

echo "*** The test program compiled, but did not run. This usually means"

7161

echo "*** that the run-time linker is not finding GTK or finding the wrong"

7164

echo "*** to the installed location Also, make sure you have run ldconfig if that"

7165

echo "*** is required on your system"

7166

echo "***"

7167

@@ -12643,17 +12578,17 @@

7167

@@ -12655,17 +12590,17 @@

7168

then

7169

7170

succeeded=no

7173

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

7174

set dummy pkg-config; ac_word=$2

7175

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7176

-echo "configure:12652: checking for $ac_word" >&5

7177

+echo "configure:12587: checking for $ac_word" >&5

7176

-echo "configure:12664: checking for $ac_word" >&5

7177

+echo "configure:12599: checking for $ac_word" >&5

7178

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7179

echo $ac_n "(cached) $ac_c" 1>&6

7180

else

7183

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7184

;;

7185

?:/*)

7186

@@ -12687,29 +12622,29 @@

7186

@@ -12699,29 +12634,29 @@

7187

echo "*** The pkg-config script could not be found. Make sure it is"

7188

echo "*** in your path, or set the PKG_CONFIG environment variable"

7189

echo "*** to the full path to pkg-config."

7192

PKG_CONFIG_MIN_VERSION=0.9.0

7193

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7194

echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6

7195

-echo "configure:12696: checking for gtk+-2.0 >= 1.3.7" >&5

7196

+echo "configure:12631: checking for gtk+-2.0 >= 1.3.7" >&5

7195

-echo "configure:12708: checking for gtk+-2.0 >= 1.3.7" >&5

7196

+echo "configure:12643: checking for gtk+-2.0 >= 1.3.7" >&5

7197

7198

if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then

7199

echo "$ac_t""yes" 1>&6

7200

succeeded=yes

7201

7202

echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6

7203

-echo "configure:12703: checking MOZ_GTK2_CFLAGS" >&5

7204

+echo "configure:12638: checking MOZ_GTK2_CFLAGS" >&5

7203

-echo "configure:12715: checking MOZ_GTK2_CFLAGS" >&5

7204

+echo "configure:12650: checking MOZ_GTK2_CFLAGS" >&5

7205

MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`

7206

echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6

7207

7208

echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6

7209

-echo "configure:12708: checking MOZ_GTK2_LIBS" >&5

7210

+echo "configure:12643: checking MOZ_GTK2_LIBS" >&5

7209

-echo "configure:12720: checking MOZ_GTK2_LIBS" >&5

7210

+echo "configure:12655: checking MOZ_GTK2_LIBS" >&5

7211

## don't use --libs since that can do evil things like add

7212

## -Wl,--export-dynamic

7213

MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`"

7216

MOZ_GTK2_CFLAGS=""

7217

MOZ_GTK2_LIBS=""

7218

## If we have a custom action on failure, don't print errors, but

7219

@@ -12764,17 +12699,17 @@

7219

@@ -12776,17 +12711,17 @@

7220

if test -x "$QTDIR/bin/moc"; then

7221

HOST_MOC="$QTDIR/bin/moc"

7222

else

7225

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

7226

set dummy $ac_prog; ac_word=$2

7227

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7228

-echo "configure:12773: checking for $ac_word" >&5

7229

+echo "configure:12708: checking for $ac_word" >&5

7228

-echo "configure:12785: checking for $ac_word" >&5

7229

+echo "configure:12720: checking for $ac_word" >&5

7230

if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then

7231

echo $ac_n "(cached) $ac_c" 1>&6

7232

else

7235

else

7236

IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"

7237

ac_dummy="$PATH"

7238

@@ -12816,32 +12751,32 @@

7238

@@ -12828,32 +12763,32 @@

7239

ac_ext=C

7240

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

7241

ac_cpp='$CXXCPP $CPPFLAGS'

7244

cross_compiling=$ac_cv_prog_cxx_cross

7245

7246

echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6

7247

-echo "configure:12825: checking for main in -lqt" >&5

7248

+echo "configure:12760: checking for main in -lqt" >&5

7247

-echo "configure:12837: checking for main in -lqt" >&5

7248

+echo "configure:12772: checking for main in -lqt" >&5

7249

ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`

7250

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

7251

echo $ac_n "(cached) $ac_c" 1>&6

7253

ac_save_LIBS="$LIBS"

7254

LIBS="-lqt $LIBS"

7255

cat > conftest.$ac_ext <<EOF

7256

-#line 12833 "configure"

7257

+#line 12768 "configure"

7256

-#line 12845 "configure"

7257

+#line 12780 "configure"

7258

#include "confdefs.h"

7259

7260

int main() {

7261

main()

7262

; return 0; }

7263

EOF

7264

-if { (eval echo configure:12840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7265

+if { (eval echo configure:12775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7264

-if { (eval echo configure:12852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7265

+if { (eval echo configure:12787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7266

rm -rf conftest*

7267

eval "ac_cv_lib_$ac_lib_var=yes"

7268

else

7271

rm -rf conftest*

7272

eval "ac_cv_lib_$ac_lib_var=no"

7273

fi

7274

@@ -12850,32 +12785,32 @@

7274

@@ -12862,32 +12797,32 @@

7275

7276

fi

7277

if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then

7280

else

7281

echo "$ac_t""no" 1>&6

7282

echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6

7283

-echo "configure:12859: checking for main in -lqt-mt" >&5

7284

+echo "configure:12794: checking for main in -lqt-mt" >&5

7283

-echo "configure:12871: checking for main in -lqt-mt" >&5

7284

+echo "configure:12806: checking for main in -lqt-mt" >&5

7285

ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`

7286

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

7287

echo $ac_n "(cached) $ac_c" 1>&6

7289

ac_save_LIBS="$LIBS"

7290

LIBS="-lqt-mt $LIBS"

7291

cat > conftest.$ac_ext <<EOF

7292

-#line 12867 "configure"

7293

+#line 12802 "configure"

7292

-#line 12879 "configure"

7293

+#line 12814 "configure"

7294

#include "confdefs.h"

7295

7296

int main() {

7297

main()

7298

; return 0; }

7299

EOF

7300

-if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7301

+if { (eval echo configure:12809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7300

-if { (eval echo configure:12886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7301

+if { (eval echo configure:12821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7302

rm -rf conftest*

7303

eval "ac_cv_lib_$ac_lib_var=yes"

7304

else

7307

rm -rf conftest*

7308

eval "ac_cv_lib_$ac_lib_var=no"

7309

fi

7310

@@ -12901,30 +12836,30 @@

7310

@@ -12913,30 +12848,30 @@

7311

7312

_SAVE_CXXFLAGS=$CXXFLAGS

7313

_SAVE_LIBS=$LIBS

7316

LIBS="$LIBS $QT_LIBS"

7317

7318

echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6

7319

-echo "configure:12910: checking Qt - version >= $QT_VERSION" >&5

7320

+echo "configure:12845: checking Qt - version >= $QT_VERSION" >&5

7319

-echo "configure:12922: checking Qt - version >= $QT_VERSION" >&5

7320

+echo "configure:12857: checking Qt - version >= $QT_VERSION" >&5

7321

cat > conftest.$ac_ext <<EOF

7322

-#line 12912 "configure"

7323

+#line 12847 "configure"

7322

-#line 12924 "configure"

7323

+#line 12859 "configure"

7324

#include "confdefs.h"

7325

#include <qglobal.h>

7326

int main() {

7331

7332

; return 0; }

7333

EOF

7334

-if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7335

+if { (eval echo configure:12858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7334

-if { (eval echo configure:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7335

+if { (eval echo configure:12870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7336

rm -rf conftest*

7337

result="yes"

7338

else

7341

rm -rf conftest*

7342

result="no"

7343

fi

7344

@@ -13510,17 +13445,17 @@

7344

@@ -13522,17 +13457,17 @@

7345

7346

7347

succeeded=no

7350

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

7351

set dummy pkg-config; ac_word=$2

7352

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7353

-echo "configure:13519: checking for $ac_word" >&5

7354

+echo "configure:13454: checking for $ac_word" >&5

7353

-echo "configure:13531: checking for $ac_word" >&5

7354

+echo "configure:13466: checking for $ac_word" >&5

7355

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7356

echo $ac_n "(cached) $ac_c" 1>&6

7357

else

7360

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7361

;;

7362

?:/*)

7363

@@ -13554,29 +13489,29 @@

7363

@@ -13566,29 +13501,29 @@

7364

echo "*** The pkg-config script could not be found. Make sure it is"

7365

echo "*** in your path, or set the PKG_CONFIG environment variable"

7366

echo "*** to the full path to pkg-config."

7369

PKG_CONFIG_MIN_VERSION=0.9.0

7370

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7371

echo $ac_n "checking for xft""... $ac_c" 1>&6

7372

-echo "configure:13563: checking for xft" >&5

7373

+echo "configure:13498: checking for xft" >&5

7372

-echo "configure:13575: checking for xft" >&5

7373

+echo "configure:13510: checking for xft" >&5

7374

7375

if $PKG_CONFIG --exists "xft" ; then

7376

echo "$ac_t""yes" 1>&6

7377

succeeded=yes

7378

7379

echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6

7380

-echo "configure:13570: checking MOZ_XFT_CFLAGS" >&5

7381

+echo "configure:13505: checking MOZ_XFT_CFLAGS" >&5

7380

-echo "configure:13582: checking MOZ_XFT_CFLAGS" >&5

7381

+echo "configure:13517: checking MOZ_XFT_CFLAGS" >&5

7382

MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`

7383

echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6

7384

7385

echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6

7386

-echo "configure:13575: checking MOZ_XFT_LIBS" >&5

7387

+echo "configure:13510: checking MOZ_XFT_LIBS" >&5

7386

-echo "configure:13587: checking MOZ_XFT_LIBS" >&5

7387

+echo "configure:13522: checking MOZ_XFT_LIBS" >&5

7388

## don't use --libs since that can do evil things like add

7389

## -Wl,--export-dynamic

7390

MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"

7393

MOZ_XFT_CFLAGS=""

7394

MOZ_XFT_LIBS=""

7395

## If we have a custom action on failure, don't print errors, but

7396

@@ -13601,17 +13536,17 @@

7396

@@ -13613,17 +13548,17 @@

7397

7398

7399

succeeded=no

7402

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

7403

set dummy pkg-config; ac_word=$2

7404

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7405

-echo "configure:13610: checking for $ac_word" >&5

7406

+echo "configure:13545: checking for $ac_word" >&5

7405

-echo "configure:13622: checking for $ac_word" >&5

7406

+echo "configure:13557: checking for $ac_word" >&5

7407

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7408

echo $ac_n "(cached) $ac_c" 1>&6

7409

else

7412

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7413

;;

7414

?:/*)

7415

@@ -13645,29 +13580,29 @@

7415

@@ -13657,29 +13592,29 @@

7416

echo "*** The pkg-config script could not be found. Make sure it is"

7417

echo "*** in your path, or set the PKG_CONFIG environment variable"

7418

echo "*** to the full path to pkg-config."

7421

PKG_CONFIG_MIN_VERSION=0.9.0

7422

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7423

echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6

7424

-echo "configure:13654: checking for pango >= 1.1.0" >&5

7425

+echo "configure:13589: checking for pango >= 1.1.0" >&5

7424

-echo "configure:13666: checking for pango >= 1.1.0" >&5

7425

+echo "configure:13601: checking for pango >= 1.1.0" >&5

7426

7427

if $PKG_CONFIG --exists "pango >= 1.1.0" ; then

7428

echo "$ac_t""yes" 1>&6

7429

succeeded=yes

7430

7431

echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6

7432

-echo "configure:13661: checking _PANGOCHK_CFLAGS" >&5

7433

+echo "configure:13596: checking _PANGOCHK_CFLAGS" >&5

7432

-echo "configure:13673: checking _PANGOCHK_CFLAGS" >&5

7433

+echo "configure:13608: checking _PANGOCHK_CFLAGS" >&5

7434

_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`

7435

echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6

7436

7437

echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6

7438

-echo "configure:13666: checking _PANGOCHK_LIBS" >&5

7439

+echo "configure:13601: checking _PANGOCHK_LIBS" >&5

7438

-echo "configure:13678: checking _PANGOCHK_LIBS" >&5

7439

+echo "configure:13613: checking _PANGOCHK_LIBS" >&5

7440

## don't use --libs since that can do evil things like add

7441

## -Wl,--export-dynamic

7442

_PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"

7445

_PANGOCHK_CFLAGS=""

7446

_PANGOCHK_LIBS=""

7447

## If we have a custom action on failure, don't print errors, but

7448

@@ -13717,17 +13652,17 @@

7448

@@ -13729,17 +13664,17 @@

7449

7450

7451

succeeded=no

7454

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

7455

set dummy pkg-config; ac_word=$2

7456

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7457

-echo "configure:13726: checking for $ac_word" >&5

7458

+echo "configure:13661: checking for $ac_word" >&5

7457

-echo "configure:13738: checking for $ac_word" >&5

7458

+echo "configure:13673: checking for $ac_word" >&5

7459

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7460

echo $ac_n "(cached) $ac_c" 1>&6

7461

else

7464

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7465

;;

7466

?:/*)

7467

@@ -13761,29 +13696,29 @@

7467

@@ -13773,29 +13708,29 @@

7468

echo "*** The pkg-config script could not be found. Make sure it is"

7469

echo "*** in your path, or set the PKG_CONFIG environment variable"

7470

echo "*** to the full path to pkg-config."

7472

else

7473

PKG_CONFIG_MIN_VERSION=0.9.0

7474

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7475

echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6

7476

-echo "configure:13770: checking for pangoxft >= 1.6.0" >&5

7477

+echo "configure:13705: checking for pangoxft >= 1.6.0" >&5

7475

echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6

7476

-echo "configure:13782: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5

7477

+echo "configure:13717: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5

7478

7479

if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then

7479

if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then

7480

echo "$ac_t""yes" 1>&6

7481

succeeded=yes

7482

7483

echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6

7484

-echo "configure:13777: checking MOZ_PANGO_CFLAGS" >&5

7485

+echo "configure:13712: checking MOZ_PANGO_CFLAGS" >&5

7486

MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"`

7484

-echo "configure:13789: checking MOZ_PANGO_CFLAGS" >&5

7485

+echo "configure:13724: checking MOZ_PANGO_CFLAGS" >&5

7486

MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`

7487

echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6

7488

7489

echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6

7490

-echo "configure:13782: checking MOZ_PANGO_LIBS" >&5

7491

+echo "configure:13717: checking MOZ_PANGO_LIBS" >&5

7490

-echo "configure:13794: checking MOZ_PANGO_LIBS" >&5

7491

+echo "configure:13729: checking MOZ_PANGO_LIBS" >&5

7492

## don't use --libs since that can do evil things like add

7493

## -Wl,--export-dynamic

7494

MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`"

7494

MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"

7495

echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6

7496

else

7497

MOZ_PANGO_CFLAGS=""

7498

MOZ_PANGO_LIBS=""

7499

## If we have a custom action on failure, don't print errors, but

7500

@@ -13841,36 +13776,36 @@

7500

@@ -13853,36 +13788,36 @@

7501

fi

7502

7503

7506

_SAVE_LDFLAGS="$LDFLAGS"

7507

LDFLAGS="$XLDFLAGS $LDFLAGS"

7508

echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6

7509

-echo "configure:13850: checking for XpGetPrinterList in -lXp" >&5

7510

+echo "configure:13785: checking for XpGetPrinterList in -lXp" >&5

7509

-echo "configure:13862: checking for XpGetPrinterList in -lXp" >&5

7510

+echo "configure:13797: checking for XpGetPrinterList in -lXp" >&5

7511

ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`

7512

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

7513

echo $ac_n "(cached) $ac_c" 1>&6

7515

ac_save_LIBS="$LIBS"

7516

LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"

7517

cat > conftest.$ac_ext <<EOF

7518

-#line 13858 "configure"

7519

+#line 13793 "configure"

7518

-#line 13870 "configure"

7519

+#line 13805 "configure"

7520

#include "confdefs.h"

7521

/* Override any gcc2 internal prototype to avoid an error. */

7522

/* We use char because int might match the return type of a gcc2

7527

XpGetPrinterList()

7528

; return 0; }

7529

EOF

7530

-if { (eval echo configure:13869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7531

+if { (eval echo configure:13804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7530

-if { (eval echo configure:13881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7531

+if { (eval echo configure:13816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

7532

rm -rf conftest*

7533

eval "ac_cv_lib_$ac_lib_var=yes"

7534

else

7537

rm -rf conftest*

7538

eval "ac_cv_lib_$ac_lib_var=no"

7539

fi

7540

@@ -13933,17 +13868,17 @@

7540

@@ -13945,17 +13880,17 @@

7541

then

7542

7543

succeeded=no

7546

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

7547

set dummy pkg-config; ac_word=$2

7548

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7549

-echo "configure:13942: checking for $ac_word" >&5

7550

+echo "configure:13877: checking for $ac_word" >&5

7549

-echo "configure:13954: checking for $ac_word" >&5

7550

+echo "configure:13889: checking for $ac_word" >&5

7551

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7552

echo $ac_n "(cached) $ac_c" 1>&6

7553

else

7556

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7557

;;

7558

?:/*)

7559

@@ -13977,29 +13912,29 @@

7559

@@ -13989,29 +13924,29 @@

7560

echo "*** The pkg-config script could not be found. Make sure it is"

7561

echo "*** in your path, or set the PKG_CONFIG environment variable"

7562

echo "*** to the full path to pkg-config."

7565

PKG_CONFIG_MIN_VERSION=0.9.0

7566

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7567

echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6

7568

-echo "configure:13986: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5

7569

+echo "configure:13921: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5

7568

-echo "configure:13998: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5

7569

+echo "configure:13933: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5

7570

7571

if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then

7572

echo "$ac_t""yes" 1>&6

7573

succeeded=yes

7574

7575

echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6

7576

-echo "configure:13993: checking MOZ_GNOMEVFS_CFLAGS" >&5

7577

+echo "configure:13928: checking MOZ_GNOMEVFS_CFLAGS" >&5

7576

-echo "configure:14005: checking MOZ_GNOMEVFS_CFLAGS" >&5

7577

+echo "configure:13940: checking MOZ_GNOMEVFS_CFLAGS" >&5

7578

MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`

7579

echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6

7580

7581

echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6

7582

-echo "configure:13998: checking MOZ_GNOMEVFS_LIBS" >&5

7583

+echo "configure:13933: checking MOZ_GNOMEVFS_LIBS" >&5

7582

-echo "configure:14010: checking MOZ_GNOMEVFS_LIBS" >&5

7583

+echo "configure:13945: checking MOZ_GNOMEVFS_LIBS" >&5

7584

## don't use --libs since that can do evil things like add

7585

## -Wl,--export-dynamic

7586

MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`"

7589

MOZ_GNOMEVFS_CFLAGS=""

7590

MOZ_GNOMEVFS_LIBS=""

7591

## If we have a custom action on failure, don't print errors, but

7592

@@ -14040,17 +13975,17 @@

7592

@@ -14052,17 +13987,17 @@

7593

then

7594

7595

succeeded=no

7598

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

7599

set dummy pkg-config; ac_word=$2

7600

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7601

-echo "configure:14049: checking for $ac_word" >&5

7602

+echo "configure:13984: checking for $ac_word" >&5

7601

-echo "configure:14061: checking for $ac_word" >&5

7602

+echo "configure:13996: checking for $ac_word" >&5

7603

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7604

echo $ac_n "(cached) $ac_c" 1>&6

7605

else

7608

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7609

;;

7610

?:/*)

7611

@@ -14084,29 +14019,29 @@

7611

@@ -14096,29 +14031,29 @@

7612

echo "*** The pkg-config script could not be found. Make sure it is"

7613

echo "*** in your path, or set the PKG_CONFIG environment variable"

7614

echo "*** to the full path to pkg-config."

7617

PKG_CONFIG_MIN_VERSION=0.9.0

7618

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7619

echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6

7620

-echo "configure:14093: checking for gconf-2.0 >= $GCONF_VERSION" >&5

7621

+echo "configure:14028: checking for gconf-2.0 >= $GCONF_VERSION" >&5

7620

-echo "configure:14105: checking for gconf-2.0 >= $GCONF_VERSION" >&5

7621

+echo "configure:14040: checking for gconf-2.0 >= $GCONF_VERSION" >&5

7622

7623

if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then

7624

echo "$ac_t""yes" 1>&6

7625

succeeded=yes

7626

7627

echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6

7628

-echo "configure:14100: checking MOZ_GCONF_CFLAGS" >&5

7629

+echo "configure:14035: checking MOZ_GCONF_CFLAGS" >&5

7628

-echo "configure:14112: checking MOZ_GCONF_CFLAGS" >&5

7629

+echo "configure:14047: checking MOZ_GCONF_CFLAGS" >&5

7630

MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`

7631

echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6

7632

7633

echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6

7634

-echo "configure:14105: checking MOZ_GCONF_LIBS" >&5

7635

+echo "configure:14040: checking MOZ_GCONF_LIBS" >&5

7634

-echo "configure:14117: checking MOZ_GCONF_LIBS" >&5

7635

+echo "configure:14052: checking MOZ_GCONF_LIBS" >&5

7636

## don't use --libs since that can do evil things like add

7637

## -Wl,--export-dynamic

7638

MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`"

7641

MOZ_GCONF_CFLAGS=""

7642

MOZ_GCONF_LIBS=""

7643

## If we have a custom action on failure, don't print errors, but

7644

@@ -14143,17 +14078,17 @@

7644

@@ -14155,17 +14090,17 @@

7645

then

7646

7647

succeeded=no

7650

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

7651

set dummy pkg-config; ac_word=$2

7652

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7653

-echo "configure:14152: checking for $ac_word" >&5

7654

+echo "configure:14087: checking for $ac_word" >&5

7653

-echo "configure:14164: checking for $ac_word" >&5

7654

+echo "configure:14099: checking for $ac_word" >&5

7655

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7656

echo $ac_n "(cached) $ac_c" 1>&6

7657

else

7660

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7661

;;

7662

?:/*)

7663

@@ -14187,29 +14122,29 @@

7663

@@ -14199,29 +14134,29 @@

7664

echo "*** The pkg-config script could not be found. Make sure it is"

7665

echo "*** in your path, or set the PKG_CONFIG environment variable"

7666

echo "*** to the full path to pkg-config."

7669

PKG_CONFIG_MIN_VERSION=0.9.0

7670

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7671

echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6

7672

-echo "configure:14196: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5

7673

+echo "configure:14131: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5

7672

-echo "configure:14208: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5

7673

+echo "configure:14143: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5

7674

7675

if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then

7676

echo "$ac_t""yes" 1>&6

7677

succeeded=yes

7678

7679

echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6

7680

-echo "configure:14203: checking MOZ_LIBGNOME_CFLAGS" >&5

7681

+echo "configure:14138: checking MOZ_LIBGNOME_CFLAGS" >&5

7680

-echo "configure:14215: checking MOZ_LIBGNOME_CFLAGS" >&5

7681

+echo "configure:14150: checking MOZ_LIBGNOME_CFLAGS" >&5

7682

MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`

7683

echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6

7684

7685

echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6

7686

-echo "configure:14208: checking MOZ_LIBGNOME_LIBS" >&5

7687

+echo "configure:14143: checking MOZ_LIBGNOME_LIBS" >&5

7686

-echo "configure:14220: checking MOZ_LIBGNOME_LIBS" >&5

7687

+echo "configure:14155: checking MOZ_LIBGNOME_LIBS" >&5

7688

## don't use --libs since that can do evil things like add

7689

## -Wl,--export-dynamic

7690

MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`"

7693

MOZ_LIBGNOME_CFLAGS=""

7694

MOZ_LIBGNOME_LIBS=""

7695

## If we have a custom action on failure, don't print errors, but

7696

@@ -14277,17 +14212,17 @@

7696

@@ -14289,17 +14224,17 @@

7697

then

7698

7699

succeeded=no

7702

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

7703

set dummy pkg-config; ac_word=$2

7704

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7705

-echo "configure:14286: checking for $ac_word" >&5

7706

+echo "configure:14221: checking for $ac_word" >&5

7705

-echo "configure:14298: checking for $ac_word" >&5

7706

+echo "configure:14233: checking for $ac_word" >&5

7707

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

7708

echo $ac_n "(cached) $ac_c" 1>&6

7709

else

7712

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

7713

;;

7714

?:/*)

7715

@@ -14321,29 +14256,29 @@

7715

@@ -14333,29 +14268,29 @@

7716

echo "*** The pkg-config script could not be found. Make sure it is"

7717

echo "*** in your path, or set the PKG_CONFIG environment variable"

7718

echo "*** to the full path to pkg-config."

7721

PKG_CONFIG_MIN_VERSION=0.9.0

7722

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

7723

echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6

7724

-echo "configure:14330: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5

7725

+echo "configure:14265: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5

7724

-echo "configure:14342: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5

7725

+echo "configure:14277: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5

7726

7727

if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then

7728

echo "$ac_t""yes" 1>&6

7729

succeeded=yes

7730

7731

echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6

7732

-echo "configure:14337: checking MOZ_GNOMEUI_CFLAGS" >&5

7733

+echo "configure:14272: checking MOZ_GNOMEUI_CFLAGS" >&5

7732

-echo "configure:14349: checking MOZ_GNOMEUI_CFLAGS" >&5

7733

+echo "configure:14284: checking MOZ_GNOMEUI_CFLAGS" >&5

7734

MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`

7735

echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6

7736

7737

echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6

7738

-echo "configure:14342: checking MOZ_GNOMEUI_LIBS" >&5

7739

+echo "configure:14277: checking MOZ_GNOMEUI_LIBS" >&5

7738

-echo "configure:14354: checking MOZ_GNOMEUI_LIBS" >&5

7739

+echo "configure:14289: checking MOZ_GNOMEUI_LIBS" >&5

7740

## don't use --libs since that can do evil things like add

7741

## -Wl,--export-dynamic

7742

MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`"

7745

MOZ_GNOMEUI_CFLAGS=""

7746

MOZ_GNOMEUI_LIBS=""

7747

## If we have a custom action on failure, don't print errors, but

7748

@@ -14819,17 +14754,17 @@

7748

@@ -14831,17 +14766,17 @@

7749

JAVA_PATH="$JAVA_BIN_PATH"

7750

else

7751

JAVA_PATH="$JAVA_HOME/bin:$PATH"

7754

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

7755

set dummy javac; ac_word=$2

7756

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7757

-echo "configure:14828: checking for $ac_word" >&5

7758

+echo "configure:14763: checking for $ac_word" >&5

7757

-echo "configure:14840: checking for $ac_word" >&5

7758

+echo "configure:14775: checking for $ac_word" >&5

7759

if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then

7760

echo $ac_n "(cached) $ac_c" 1>&6

7761

else

7764

ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.

7765

;;

7766

?:/*)

7767

@@ -14855,17 +14790,17 @@

7767

@@ -14867,17 +14802,17 @@

7768

echo "$ac_t""$JAVAC" 1>&6

7769

else

7770

echo "$ac_t""no" 1>&6

7773

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

7774

set dummy jar; ac_word=$2

7775

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7776

-echo "configure:14864: checking for $ac_word" >&5

7777

+echo "configure:14799: checking for $ac_word" >&5

7776

-echo "configure:14876: checking for $ac_word" >&5

7777

+echo "configure:14811: checking for $ac_word" >&5

7778

if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then

7779

echo $ac_n "(cached) $ac_c" 1>&6

7780

else

7783

ac_cv_path_JAR="$JAR" # Let the user override the test with a path.

7784

;;

7785

?:/*)

7786

@@ -15102,36 +15037,36 @@

7786

@@ -15114,36 +15049,36 @@

7787

SVG_RENDERER=$SVG_DEFAULT_RENDERER

7788

fi

7789

7792

gdiplus)

7793

MOZ_SVG_RENDERER_GDIPLUS=1

7794

echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6

7795

-echo "configure:15111: checking for Gdiplus.h" >&5

7796

+echo "configure:15046: checking for Gdiplus.h" >&5

7795

-echo "configure:15123: checking for Gdiplus.h" >&5

7796

+echo "configure:15058: checking for Gdiplus.h" >&5

7797

7798

ac_ext=C

7799

# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

7803

cross_compiling=$ac_cv_prog_cxx_cross

7804

7805

cat > conftest.$ac_ext <<EOF

7806

-#line 15121 "configure"

7807

+#line 15056 "configure"

7806

-#line 15133 "configure"

7807

+#line 15068 "configure"

7808

#include "confdefs.h"

7809

#include <windows.h>

7810

#include <unknwn.h>

7813

7814

; return 0; }

7815

EOF

7816

-if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7817

+if { (eval echo configure:15065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7816

-if { (eval echo configure:15142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7817

+if { (eval echo configure:15077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7818

rm -rf conftest*

7819

echo "$ac_t""yes" 1>&6

7820

else

7823

rm -rf conftest*

7824

{ echo "configure: error: Building the SVG GDI+ renderer requires an appropriate Microsoft SDK." 1>&2; exit 1; }

7825

fi

7826

@@ -15201,17 +15136,17 @@

7826

@@ -15213,17 +15148,17 @@

7827

if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then

7828

# Disable installer for Windows builds that use the new toolkit if NSIS

7829

# isn't in the path.

7832

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

7833

set dummy $ac_prog; ac_word=$2

7834

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7835

-echo "configure:15210: checking for $ac_word" >&5

7836

+echo "configure:15145: checking for $ac_word" >&5

7835

-echo "configure:15222: checking for $ac_word" >&5

7836

+echo "configure:15157: checking for $ac_word" >&5

7837

if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then

7838

echo $ac_n "(cached) $ac_c" 1>&6

7839

else

7842

ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a path.

7843

;;

7844

?:/*)

7845

@@ -15246,17 +15181,17 @@

7845

@@ -15258,17 +15193,17 @@

7846

fi

7847

# The Windows build for NSIS requires the iconv command line utility to

7848

# convert the charset of the locale files.

7851

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

7852

set dummy $ac_prog; ac_word=$2

7853

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7854

-echo "configure:15255: checking for $ac_word" >&5

7855

+echo "configure:15190: checking for $ac_word" >&5

7854

-echo "configure:15267: checking for $ac_word" >&5

7855

+echo "configure:15202: checking for $ac_word" >&5

7856

if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then

7857

echo $ac_n "(cached) $ac_c" 1>&6

7858

else

7861

ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a path.

7862

;;

7863

?:/*)

7864

@@ -15315,23 +15250,23 @@

7864

@@ -15327,23 +15262,23 @@

7865

fi

7866

7867

# The Windows build requires the iconv command line utility

7870

msvc*|mks*|cygwin*|mingw*|wince*)

7871

if test -n "$MOZ_UPDATER"; then

7872

echo $ac_n "checking for iconv""... $ac_c" 1>&6

7873

-echo "configure:15324: checking for iconv" >&5

7874

+echo "configure:15259: checking for iconv" >&5

7873

-echo "configure:15336: checking for iconv" >&5

7874

+echo "configure:15271: checking for iconv" >&5

7875

for ac_prog in $HOST_ICONV "iconv"

7876

do

7877

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

7878

set dummy $ac_prog; ac_word=$2

7879

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

7880

-echo "configure:15330: checking for $ac_word" >&5

7881

+echo "configure:15265: checking for $ac_word" >&5

7880

-echo "configure:15342: checking for $ac_word" >&5

7881

+echo "configure:15277: checking for $ac_word" >&5

7882

if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then

7883

echo $ac_n "(cached) $ac_c" 1>&6

7884

else

7887

else

7888

IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"

7889

ac_dummy="$PATH"

7890

@@ -15464,16 +15399,31 @@

7890

@@ -15476,16 +15411,31 @@

7891

elif test "$enableval" = "yes"; then

7892

ENABLE_TESTS=1

7893

else

7919

if test "$enableval" = "yes"; then

7920

XPCOM_USE_LEA=1

7921

elif test "$enableval" = "no"; then

7922

@@ -15667,28 +15617,28 @@

7922

@@ -15679,28 +15629,28 @@

7923

;;

7924

esac

7925

MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DTRACING"

7928

7929

if test -n "$MOZ_DEBUG"; then

7930

echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6

7931

-echo "configure:15676: checking for valid debug flags" >&5

7932

+echo "configure:15626: checking for valid debug flags" >&5

7931

-echo "configure:15688: checking for valid debug flags" >&5

7932

+echo "configure:15638: checking for valid debug flags" >&5

7933

_SAVE_CFLAGS=$CFLAGS

7934

CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"

7935

cat > conftest.$ac_ext <<EOF

7936

-#line 15680 "configure"

7937

+#line 15630 "configure"

7936

-#line 15692 "configure"

7937

+#line 15642 "configure"

7938

#include "confdefs.h"

7939

#include <stdio.h>

7940

int main() {

7941

printf("Hello World\n");

7942

; return 0; }

7943

EOF

7944

-if { (eval echo configure:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7945

+if { (eval echo configure:15637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7944

-if { (eval echo configure:15699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7945

+if { (eval echo configure:15649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7946

rm -rf conftest*

7947

_results=yes

7948

else

7951

rm -rf conftest*

7952

_results=no

7953

fi

7954

@@ -15719,28 +15669,28 @@

7954

@@ -15731,28 +15681,28 @@

7955

else

7956

MOZ_OPTIMIZE=1

7957

fi

7960

if test "$COMPILE_ENVIRONMENT"; then

7961

if test -n "$MOZ_OPTIMIZE"; then

7962

echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6

7963

-echo "configure:15728: checking for valid optimization flags" >&5

7964

+echo "configure:15678: checking for valid optimization flags" >&5

7963

-echo "configure:15740: checking for valid optimization flags" >&5

7964

+echo "configure:15690: checking for valid optimization flags" >&5

7965

_SAVE_CFLAGS=$CFLAGS

7966

CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"

7967

cat > conftest.$ac_ext <<EOF

7968

-#line 15732 "configure"

7969

+#line 15682 "configure"

7968

-#line 15744 "configure"

7969

+#line 15694 "configure"

7970

#include "confdefs.h"

7971

#include <stdio.h>

7972

int main() {

7973

printf("Hello World\n");

7974

; return 0; }

7975

EOF

7976

-if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7977

+if { (eval echo configure:15689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7976

-if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7977

+if { (eval echo configure:15701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

7978

rm -rf conftest*

7979

_results=yes

7980

else

7983

rm -rf conftest*

7984

_results=no

7985

fi

7986

@@ -15947,36 +15897,36 @@

7986

@@ -15959,36 +15909,36 @@

7987

_ENABLE_EFENCE=

7988

else

7989

{ echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; }

7992

7993

if test -n "$_ENABLE_EFENCE"; then

7994

echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6

7995

-echo "configure:15956: checking for malloc in -lefence" >&5

7996

+echo "configure:15906: checking for malloc in -lefence" >&5

7995

-echo "configure:15968: checking for malloc in -lefence" >&5

7996

+echo "configure:15918: checking for malloc in -lefence" >&5

7997

ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`

7998

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

7999

echo $ac_n "(cached) $ac_c" 1>&6

8001

ac_save_LIBS="$LIBS"

8002

LIBS="-lefence $LIBS"

8003

cat > conftest.$ac_ext <<EOF

8004

-#line 15964 "configure"

8005

+#line 15914 "configure"

8004

-#line 15976 "configure"

8005

+#line 15926 "configure"

8006

#include "confdefs.h"

8007

/* Override any gcc2 internal prototype to avoid an error. */

8008

/* We use char because int might match the return type of a gcc2

8013

malloc()

8014

; return 0; }

8015

EOF

8016

-if { (eval echo configure:15975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8017

+if { (eval echo configure:15925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8016

-if { (eval echo configure:15987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8017

+if { (eval echo configure:15937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8018

rm -rf conftest*

8019

eval "ac_cv_lib_$ac_lib_var=yes"

8020

else

8023

rm -rf conftest*

8024

eval "ac_cv_lib_$ac_lib_var=no"

8025

fi

8026

@@ -16067,22 +16017,22 @@

8026

@@ -16079,22 +16029,22 @@

8027

ac_cpp='$CXXCPP $CPPFLAGS'

8028

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

8029

ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

8032

for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual

8033

do

8034

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

8035

-echo "configure:16076: checking for $ac_func" >&5

8036

+echo "configure:16026: checking for $ac_func" >&5

8035

-echo "configure:16088: checking for $ac_func" >&5

8036

+echo "configure:16038: checking for $ac_func" >&5

8037

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

8038

echo $ac_n "(cached) $ac_c" 1>&6

8039

else

8040

cat > conftest.$ac_ext <<EOF

8041

-#line 16081 "configure"

8042

+#line 16031 "configure"

8041

-#line 16093 "configure"

8042

+#line 16043 "configure"

8043

#include "confdefs.h"

8044

/* System header to define __stub macros and hopefully few prototypes,

8045

which can conflict with char $ac_func(); below. */

8048

#ifdef __cplusplus

8049

extern "C"

8050

#endif

8051

@@ -16098,17 +16048,17 @@

8051

@@ -16110,17 +16060,17 @@

8052

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

8053

choke me

8054

#else

8057

8058

; return 0; }

8059

EOF

8060

-if { (eval echo configure:16107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8061

+if { (eval echo configure:16057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8060

-if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8061

+if { (eval echo configure:16069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8062

rm -rf conftest*

8063

eval "ac_cv_func_$ac_func=yes"

8064

else

8067

rm -rf conftest*

8068

eval "ac_cv_func_$ac_func=no"

8069

fi

8070

@@ -16341,22 +16291,22 @@

8070

@@ -16353,22 +16303,22 @@

8071

ac_cpp='$CXXCPP $CPPFLAGS'

8072

ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

8073

ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

8076

for ac_func in __cxa_demangle

8077

do

8078

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

8079

-echo "configure:16350: checking for $ac_func" >&5

8080

+echo "configure:16300: checking for $ac_func" >&5

8079

-echo "configure:16362: checking for $ac_func" >&5

8080

+echo "configure:16312: checking for $ac_func" >&5

8081

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

8082

echo $ac_n "(cached) $ac_c" 1>&6

8083

else

8084

cat > conftest.$ac_ext <<EOF

8085

-#line 16355 "configure"

8086

+#line 16305 "configure"

8085

-#line 16367 "configure"

8086

+#line 16317 "configure"

8087

#include "confdefs.h"

8088

/* System header to define __stub macros and hopefully few prototypes,

8089

which can conflict with char $ac_func(); below. */

8092

#ifdef __cplusplus

8093

extern "C"

8094

#endif

8095

@@ -16372,17 +16322,17 @@

8095

@@ -16384,17 +16334,17 @@

8096

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

8097

choke me

8098

#else

8101

8102

; return 0; }

8103

EOF

8104

-if { (eval echo configure:16381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8105

+if { (eval echo configure:16331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8104

-if { (eval echo configure:16393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8105

+if { (eval echo configure:16343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8106

rm -rf conftest*

8107

eval "ac_cv_func_$ac_func=yes"

8108

else

8111

rm -rf conftest*

8112

eval "ac_cv_func_$ac_func=no"

8113

fi

8114

@@ -16510,39 +16460,39 @@

8114

@@ -16522,39 +16472,39 @@

8115

fi

8116

8117

8120

# Compiler Options

8121

8122

echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6

8123

-echo "configure:16519: checking for gcc -pipe support" >&5

8124

+echo "configure:16469: checking for gcc -pipe support" >&5

8123

-echo "configure:16531: checking for gcc -pipe support" >&5

8124

+echo "configure:16481: checking for gcc -pipe support" >&5

8125

if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then

8126

echo '#include <stdio.h>' > dummy-hello.c

8127

echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c

8136

_SAVE_CFLAGS=$CFLAGS

8137

CFLAGS="$CFLAGS -pipe"

8138

cat > conftest.$ac_ext <<EOF

8139

-#line 16534 "configure"

8140

+#line 16484 "configure"

8139

-#line 16546 "configure"

8140

+#line 16496 "configure"

8141

#include "confdefs.h"

8142

#include <stdio.h>

8143

int main() {

8144

printf("Hello World\n");

8145

; return 0; }

8146

EOF

8147

-if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8148

+if { (eval echo configure:16491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8147

-if { (eval echo configure:16553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8148

+if { (eval echo configure:16503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8149

rm -rf conftest*

8150

_res_gcc_pipe="yes"

8151

else

8154

rm -rf conftest*

8155

_res_gcc_pipe="no"

8156

fi

8157

@@ -16574,26 +16524,26 @@

8157

@@ -16586,26 +16536,26 @@

8158

fi

8159

fi

8160

8163

_SAVE_CFLAGS="$CFLAGS"

8164

CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"

8165

echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6

8166

-echo "configure:16583: checking whether compiler supports -Wno-long-long" >&5

8167

+echo "configure:16533: checking whether compiler supports -Wno-long-long" >&5

8166

-echo "configure:16595: checking whether compiler supports -Wno-long-long" >&5

8167

+echo "configure:16545: checking whether compiler supports -Wno-long-long" >&5

8168

cat > conftest.$ac_ext <<EOF

8169

-#line 16585 "configure"

8170

+#line 16535 "configure"

8169

-#line 16597 "configure"

8170

+#line 16547 "configure"

8171

#include "confdefs.h"

8172

8173

int main() {

8174

return(0);

8175

; return 0; }

8176

EOF

8177

-if { (eval echo configure:16592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8178

+if { (eval echo configure:16542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8177

-if { (eval echo configure:16604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8178

+if { (eval echo configure:16554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8179

rm -rf conftest*

8180

_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"

8181

_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"

8184

echo "configure: failed program was:" >&5

8185

cat conftest.$ac_ext >&5

8186

rm -rf conftest*

8187

@@ -16604,26 +16554,26 @@

8187

@@ -16616,26 +16566,26 @@

8188

CFLAGS="$_SAVE_CFLAGS"

8189

fi

8190

8193

CFLAGS="$CFLAGS -fprofile-generate"

8194

8195

echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6

8196

-echo "configure:16613: checking whether C compiler supports -fprofile-generate" >&5

8197

+echo "configure:16563: checking whether C compiler supports -fprofile-generate" >&5

8196

-echo "configure:16625: checking whether C compiler supports -fprofile-generate" >&5

8197

+echo "configure:16575: checking whether C compiler supports -fprofile-generate" >&5

8198

cat > conftest.$ac_ext <<EOF

8199

-#line 16615 "configure"

8200

+#line 16565 "configure"

8199

-#line 16627 "configure"

8200

+#line 16577 "configure"

8201

#include "confdefs.h"

8202

8203

int main() {

8204

return 0;

8205

; return 0; }

8206

EOF

8207

-if { (eval echo configure:16622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8208

+if { (eval echo configure:16572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8207

-if { (eval echo configure:16634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8208

+if { (eval echo configure:16584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8209

rm -rf conftest*

8210

PROFILE_GEN_CFLAGS="-fprofile-generate"

8211

result="yes"

8214

cat conftest.$ac_ext >&5

8215

rm -rf conftest*

8216

result="no"

8217

@@ -16631,26 +16581,26 @@

8217

@@ -16643,26 +16593,26 @@

8218

rm -f conftest*

8219

echo "$ac_t""$result" 1>&6

8220

8223

else

8224

CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"

8225

echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6

8226

-echo "configure:16640: checking whether C compiler supports -fprofile-arcs" >&5

8227

+echo "configure:16590: checking whether C compiler supports -fprofile-arcs" >&5

8226

-echo "configure:16652: checking whether C compiler supports -fprofile-arcs" >&5

8227

+echo "configure:16602: checking whether C compiler supports -fprofile-arcs" >&5

8228

cat > conftest.$ac_ext <<EOF

8229

-#line 16642 "configure"

8230

+#line 16592 "configure"

8229

-#line 16654 "configure"

8230

+#line 16604 "configure"

8231

#include "confdefs.h"

8232

8233

int main() {

8234

return 0;

8235

; return 0; }

8236

EOF

8237

-if { (eval echo configure:16649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8238

+if { (eval echo configure:16599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8237

-if { (eval echo configure:16661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8238

+if { (eval echo configure:16611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8239

rm -rf conftest*

8240

PROFILE_GEN_CFLAGS="-fprofile-arcs"

8241

result="yes"

8244

cat conftest.$ac_ext >&5

8245

rm -rf conftest*

8246

result="no"

8247

@@ -16686,26 +16636,26 @@

8247

@@ -16698,26 +16648,26 @@

8248

{ echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; }

8249

fi

8250

fi

8253

_SAVE_CXXFLAGS=$CXXFLAGS

8254

CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"

8255

echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6

8256

-echo "configure:16695: checking whether C++ compiler has -pedantic long long bug" >&5

8257

+echo "configure:16645: checking whether C++ compiler has -pedantic long long bug" >&5

8256

-echo "configure:16707: checking whether C++ compiler has -pedantic long long bug" >&5

8257

+echo "configure:16657: checking whether C++ compiler has -pedantic long long bug" >&5

8258

cat > conftest.$ac_ext <<EOF

8259

-#line 16697 "configure"

8260

+#line 16647 "configure"

8259

-#line 16709 "configure"

8260

+#line 16659 "configure"

8261

#include "confdefs.h"

8262

$configure_static_assert_macros

8263

int main() {

8264

CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)

8265

; return 0; }

8266

EOF

8267

-if { (eval echo configure:16704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8268

+if { (eval echo configure:16654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8267

-if { (eval echo configure:16716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8268

+if { (eval echo configure:16666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8269

rm -rf conftest*

8270

result="no"

8271

else

8274

rm -rf conftest*

8275

result="yes"

8276

fi

8277

@@ -16720,23 +16670,26 @@

8277

@@ -16732,23 +16682,26 @@

8278

;;

8279

yes)

8280

{ echo "configure: error: Your compiler appears to have a known bug where long long is miscompiled when using -pedantic. Reconfigure using --disable-pedantic. " 1>&2; exit 1; }

8283

fi

8284

8285

echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6

8286

-echo "configure:16729: checking for correct temporary object destruction order" >&5

8287

+echo "configure:16679: checking for correct temporary object destruction order" >&5

8286

-echo "configure:16741: checking for correct temporary object destruction order" >&5

8287

+echo "configure:16691: checking for correct temporary object destruction order" >&5

8288

if test "$cross_compiling" = yes; then

8289

result="maybe"

8290

else

8291

cat > conftest.$ac_ext <<EOF

8292

-#line 16734 "configure"

8293

+#line 16684 "configure"

8292

-#line 16746 "configure"

8293

+#line 16696 "configure"

8294

#include "confdefs.h"

8295

+#ifdef __cplusplus

8296

+extern "C" void exit(int);

8303

};

8304

void func(char **arg) {}

8305

int m=2;

8306

@@ -16745,17 +16698,17 @@

8306

@@ -16757,17 +16710,17 @@

8307

if (m==1) m = 0;

8308

}

8309

int main() {

8312

}

8313

8314

EOF

8315

-if { (eval echo configure:16754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8316

+if { (eval echo configure:16707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8315

-if { (eval echo configure:16766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8316

+if { (eval echo configure:16719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8317

then

8318

result="yes"

8319

else

8322

rm -fr conftest*

8323

result="no"

8324

fi

8325

@@ -16766,22 +16719,22 @@

8325

@@ -16778,22 +16731,22 @@

8326

8327

if test "$result" = "no"; then

8328

{ echo "configure: error: Your compiler does not follow the C++ specification for temporary object destruction order." 1>&2; exit 1; }

8331

_SAVE_CXXFLAGS=$CXXFLAGS

8332

CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"

8333

echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6

8334

-echo "configure:16775: checking for correct overload resolution with const and templates" >&5

8335

+echo "configure:16728: checking for correct overload resolution with const and templates" >&5

8334

-echo "configure:16787: checking for correct overload resolution with const and templates" >&5

8335

+echo "configure:16740: checking for correct overload resolution with const and templates" >&5

8336

if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then

8337

echo $ac_n "(cached) $ac_c" 1>&6

8338

else

8339

cat > conftest.$ac_ext <<EOF

8340

-#line 16780 "configure"

8341

+#line 16733 "configure"

8340

-#line 16792 "configure"

8341

+#line 16745 "configure"

8342

#include "confdefs.h"

8343

8344

template <class T>

8347

public:

8348

T* myPtr;

8349

};

8350

@@ -16801,17 +16754,17 @@

8350

@@ -16813,17 +16766,17 @@

8351

int main() {

8352

8353

Pointer<int> foo;

8356

8357

; return 0; }

8358

EOF

8359

-if { (eval echo configure:16810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8360

+if { (eval echo configure:16763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8359

-if { (eval echo configure:16822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8360

+if { (eval echo configure:16775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

8361

rm -rf conftest*

8362

ac_nscap_nonconst_opeq_bug="no"

8363

else

8366

rm -rf conftest*

8367

ac_nscap_nonconst_opeq_bug="yes"

8368

fi

8369

@@ -17093,17 +17046,17 @@

8369

@@ -17105,17 +17058,17 @@

8370

if test "$MOZ_ENABLE_GTK2"; then

8371

8372

succeeded=no

8375

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

8376

set dummy pkg-config; ac_word=$2

8377

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8378

-echo "configure:17102: checking for $ac_word" >&5

8379

+echo "configure:17055: checking for $ac_word" >&5

8378

-echo "configure:17114: checking for $ac_word" >&5

8379

+echo "configure:17067: checking for $ac_word" >&5

8380

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

8381

echo $ac_n "(cached) $ac_c" 1>&6

8382

else

8385

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

8386

;;

8387

?:/*)

8388

@@ -17137,29 +17090,29 @@

8388

@@ -17149,29 +17102,29 @@

8389

echo "*** The pkg-config script could not be found. Make sure it is"

8390

echo "*** in your path, or set the PKG_CONFIG environment variable"

8391

echo "*** to the full path to pkg-config."

8394

PKG_CONFIG_MIN_VERSION=0.9.0

8395

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

8396

echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6

8397

-echo "configure:17146: checking for libIDL-2.0 >= 0.8.0" >&5

8398

+echo "configure:17099: checking for libIDL-2.0 >= 0.8.0" >&5

8397

-echo "configure:17158: checking for libIDL-2.0 >= 0.8.0" >&5

8398

+echo "configure:17111: checking for libIDL-2.0 >= 0.8.0" >&5

8399

8400

if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then

8401

echo "$ac_t""yes" 1>&6

8402

succeeded=yes

8403

8404

echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6

8405

-echo "configure:17153: checking LIBIDL_CFLAGS" >&5

8406

+echo "configure:17106: checking LIBIDL_CFLAGS" >&5

8405

-echo "configure:17165: checking LIBIDL_CFLAGS" >&5

8406

+echo "configure:17118: checking LIBIDL_CFLAGS" >&5

8407

LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`

8408

echo "$ac_t""$LIBIDL_CFLAGS" 1>&6

8409

8410

echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6

8411

-echo "configure:17158: checking LIBIDL_LIBS" >&5

8412

+echo "configure:17111: checking LIBIDL_LIBS" >&5

8411

-echo "configure:17170: checking LIBIDL_LIBS" >&5

8412

+echo "configure:17123: checking LIBIDL_LIBS" >&5

8413

## don't use --libs since that can do evil things like add

8414

## -Wl,--export-dynamic

8415

LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"

8418

LIBIDL_CFLAGS=""

8419

LIBIDL_LIBS=""

8420

## If we have a custom action on failure, don't print errors, but

8421

@@ -17272,17 +17225,17 @@

8422

esac

8423

done

8424

8425

unset ac_cv_path_GLIB_CONFIG

8426

8427

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

8428

set dummy glib-config; ac_word=$2

8429

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8430

-echo "configure:17281: checking for $ac_word" >&5

8431

+echo "configure:17234: checking for $ac_word" >&5

8432

if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then

8433

echo $ac_n "(cached) $ac_c" 1>&6

8434

else

8435

case "$GLIB_CONFIG" in

8436

/*)

8437

ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.

8438

;;

8439

?:/*)

8440

@@ -17307,17 +17260,17 @@

8441

if test -n "$GLIB_CONFIG"; then

8442

echo "$ac_t""$GLIB_CONFIG" 1>&6

8443

else

8444

echo "$ac_t""no" 1>&6

8445

fi

8446

8447

min_glib_version=1.2.0

8448

echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6

8449

-echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5

8450

+echo "configure:17269: checking for GLIB - version >= $min_glib_version" >&5

8451

no_glib=""

8452

if test "$GLIB_CONFIG" = "no" ; then

8453

no_glib=yes

8454

else

8455

GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`

8456

GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`

8457

glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \

8458

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

8459

@@ -17330,17 +17283,17 @@

8460

ac_save_LIBS="$LIBS"

8461

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8462

LIBS="$GLIB_LIBS $LIBS"

8463

rm -f conf.glibtest

8464

if test "$cross_compiling" = yes; then

8465

echo $ac_n "cross compiling; assumed OK... $ac_c"

8466

else

8467

cat > conftest.$ac_ext <<EOF

8468

-#line 17339 "configure"

8469

+#line 17292 "configure"

8470

#include "confdefs.h"

8471

8472

#include <glib.h>

8473

#include <stdio.h>

8474

#include <stdlib.h>

8475

8476

int

8477

main ()

8478

@@ -17406,17 +17359,17 @@

8479

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8480

printf("*** so that the correct libraries are found at run-time))\n");

8481

}

8482

}

8483

return 1;

8484

}

8485

8486

EOF

8487

-if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8488

+if { (eval echo configure:17368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8489

then

8490

:

8491

else

8492

echo "configure: failed program was:" >&5

8493

cat conftest.$ac_ext >&5

8494

rm -fr conftest*

8495

no_glib=yes

8496

fi

8497

@@ -17440,27 +17393,27 @@

8498

else

8499

if test -f conf.glibtest ; then

8500

:

8501

else

8502

echo "*** Could not run GLIB test program, checking why..."

8503

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8504

LIBS="$LIBS $GLIB_LIBS"

8505

cat > conftest.$ac_ext <<EOF

8506

-#line 17449 "configure"

8507

+#line 17402 "configure"

8508

#include "confdefs.h"

8509

8510

#include <glib.h>

8511

#include <stdio.h>

8512

8513

int main() {

8514

return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));

8515

; return 0; }

8516

EOF

8517

-if { (eval echo configure:17459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8518

+if { (eval echo configure:17412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8519

rm -rf conftest*

8520

echo "*** The test program compiled, but did not run. This usually means"

8521

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

8522

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

8523

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8524

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8525

echo "*** is required on your system"

8526

echo "***"

8527

@@ -17494,17 +17447,17 @@

8528

rm -f conf.glibtest

8529

8530

8531

unset ac_cv_path_LIBIDL_CONFIG

8532

8533

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

8534

set dummy libIDL-config; ac_word=$2

8535

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8536

-echo "configure:17503: checking for $ac_word" >&5

8537

+echo "configure:17456: checking for $ac_word" >&5

8538

if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then

8539

echo $ac_n "(cached) $ac_c" 1>&6

8540

else

8541

case "$LIBIDL_CONFIG" in

8542

/*)

8543

ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.

8544

;;

8545

?:/*)

8546

@@ -17529,17 +17482,17 @@

8547

if test -n "$LIBIDL_CONFIG"; then

8548

echo "$ac_t""$LIBIDL_CONFIG" 1>&6

8549

else

8550

echo "$ac_t""no" 1>&6

8551

fi

8552

8553

min_libIDL_version=$LIBIDL_VERSION

8554

echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6

8555

-echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5

8556

+echo "configure:17491: checking for libIDL - version >= $min_libIDL_version" >&5

8557

no_libIDL=""

8558

if test "$LIBIDL_CONFIG" = "no" ; then

8559

no_libIDL=yes

8560

else

8561

LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`

8562

LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`

8563

# hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove

8564

# this after we start requiring libIDL 0.6.8 or anything higher

8565

@@ -17556,17 +17509,17 @@

8566

ac_save_LIBS="$LIBS"

8567

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8568

LIBS="$LIBIDL_LIBS $LIBS"

8569

rm -f conf.libIDLtest

8570

if test "$cross_compiling" = yes; then

8571

echo $ac_n "cross compiling; assumed OK... $ac_c"

8572

else

8573

cat > conftest.$ac_ext <<EOF

8574

-#line 17565 "configure"

8575

+#line 17518 "configure"

8576

#include "confdefs.h"

8577

8578

#include <stdio.h>

8579

#include <stdlib.h>

8580

#include <libIDL/IDL.h>

8581

8582

int

8583

main ()

8584

@@ -17642,17 +17595,17 @@

8585

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8586

printf("*** so that the correct libraries are found at run-time))\n");

8587

}

8588

}

8589

return 1;

8590

}

8591

8592

EOF

8593

-if { (eval echo configure:17651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8594

+if { (eval echo configure:17604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8595

then

8596

:

8597

else

8598

echo "configure: failed program was:" >&5

8599

cat conftest.$ac_ext >&5

8600

rm -fr conftest*

8601

no_libIDL=yes

8602

fi

8603

@@ -17676,28 +17629,28 @@

8604

else

8605

if test -f conf.libIDLtest ; then

8606

:

8607

else

8608

echo "*** Could not run libIDL test program, checking why..."

8609

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8610

LIBS="$LIBS $LIBIDL_LIBS"

8611

cat > conftest.$ac_ext <<EOF

8612

-#line 17685 "configure"

8613

+#line 17638 "configure"

8614

#include "confdefs.h"

8615

8616

#include <stdio.h>

8617

#include <stdlib.h>

8618

#include <libIDL/IDL.h>

8619

8620

int main() {

8621

return IDL_get_libver_string ? 1 : 0;

8622

; return 0; }

8623

EOF

8624

-if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8625

+if { (eval echo configure:17649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8626

rm -rf conftest*

8627

echo "*** The test program compiled, but did not run. This usually means"

8628

echo "*** that the run-time linker is not finding libIDL or finding the wrong"

8629

echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"

8630

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8631

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8632

echo "*** is required on your system"

8633

echo "***"

8634

@@ -17815,17 +17768,17 @@

8635

esac

8636

done

8637

8638

unset ac_cv_path_GLIB_CONFIG

8639

8640

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

8641

set dummy glib-config; ac_word=$2

8642

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8643

-echo "configure:17824: checking for $ac_word" >&5

8644

+echo "configure:17777: checking for $ac_word" >&5

8645

if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then

8646

echo $ac_n "(cached) $ac_c" 1>&6

8647

else

8648

case "$GLIB_CONFIG" in

8649

/*)

8650

ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.

8651

;;

8652

?:/*)

8653

@@ -17850,17 +17803,17 @@

8654

if test -n "$GLIB_CONFIG"; then

8655

echo "$ac_t""$GLIB_CONFIG" 1>&6

8656

else

8657

echo "$ac_t""no" 1>&6

8658

fi

8659

8660

min_glib_version=1.2.0

8661

echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6

8662

-echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5

8663

+echo "configure:17812: checking for GLIB - version >= $min_glib_version" >&5

8664

no_glib=""

8665

if test "$GLIB_CONFIG" = "no" ; then

8666

no_glib=yes

8667

else

8668

GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`

8669

GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`

8670

glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \

8671

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

8672

@@ -17873,17 +17826,17 @@

8673

ac_save_LIBS="$LIBS"

8674

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8675

LIBS="$GLIB_LIBS $LIBS"

8676

rm -f conf.glibtest

8677

if test "$cross_compiling" = yes; then

8678

echo $ac_n "cross compiling; assumed OK... $ac_c"

8679

else

8680

cat > conftest.$ac_ext <<EOF

8681

-#line 17882 "configure"

8682

+#line 17835 "configure"

8683

#include "confdefs.h"

8684

8685

#include <glib.h>

8686

#include <stdio.h>

8687

#include <stdlib.h>

8688

8689

int

8690

main ()

8691

@@ -17949,17 +17902,17 @@

8692

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8693

printf("*** so that the correct libraries are found at run-time))\n");

8694

}

8695

}

8696

return 1;

8697

}

8698

8699

EOF

8700

-if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8701

+if { (eval echo configure:17911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8702

then

8703

:

8704

else

8705

echo "configure: failed program was:" >&5

8706

cat conftest.$ac_ext >&5

8707

rm -fr conftest*

8708

no_glib=yes

8709

fi

8710

@@ -17983,27 +17936,27 @@

8711

else

8712

if test -f conf.glibtest ; then

8713

:

8714

else

8715

echo "*** Could not run GLIB test program, checking why..."

8716

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8717

LIBS="$LIBS $GLIB_LIBS"

8718

cat > conftest.$ac_ext <<EOF

8719

-#line 17992 "configure"

8720

+#line 17945 "configure"

8721

#include "confdefs.h"

8722

8723

#include <glib.h>

8724

#include <stdio.h>

8725

8726

int main() {

8727

return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));

8728

; return 0; }

8729

EOF

8730

-if { (eval echo configure:18002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8731

+if { (eval echo configure:17955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8732

rm -rf conftest*

8733

echo "*** The test program compiled, but did not run. This usually means"

8734

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

8735

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

8736

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8737

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8738

echo "*** is required on your system"

8739

echo "***"

8740

@@ -18037,17 +17990,17 @@

8741

rm -f conf.glibtest

8742

8743

8744

unset ac_cv_path_LIBIDL_CONFIG

8745

8746

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

8747

set dummy libIDL-config; ac_word=$2

8748

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8749

-echo "configure:18046: checking for $ac_word" >&5

8750

+echo "configure:17999: checking for $ac_word" >&5

8751

if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then

8752

echo $ac_n "(cached) $ac_c" 1>&6

8753

else

8754

case "$LIBIDL_CONFIG" in

8755

/*)

8756

ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.

8757

;;

8758

?:/*)

8759

@@ -18072,17 +18025,17 @@

8760

if test -n "$LIBIDL_CONFIG"; then

8761

echo "$ac_t""$LIBIDL_CONFIG" 1>&6

8762

else

8763

echo "$ac_t""no" 1>&6

8764

fi

8765

8766

min_libIDL_version=$LIBIDL_VERSION

8767

echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6

8768

-echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5

8769

+echo "configure:18034: checking for libIDL - version >= $min_libIDL_version" >&5

8770

no_libIDL=""

8771

if test "$LIBIDL_CONFIG" = "no" ; then

8772

no_libIDL=yes

8773

else

8774

LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`

8775

LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`

8776

# hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove

8777

# this after we start requiring libIDL 0.6.8 or anything higher

8778

@@ -18099,17 +18052,17 @@

8779

ac_save_LIBS="$LIBS"

8780

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8781

LIBS="$LIBIDL_LIBS $LIBS"

8782

rm -f conf.libIDLtest

8783

if test "$cross_compiling" = yes; then

8784

echo $ac_n "cross compiling; assumed OK... $ac_c"

8785

else

8786

cat > conftest.$ac_ext <<EOF

8787

-#line 18108 "configure"

8788

+#line 18061 "configure"

8789

#include "confdefs.h"

8790

8791

#include <stdio.h>

8792

#include <stdlib.h>

8793

#include <libIDL/IDL.h>

8794

8795

int

8796

main ()

8797

@@ -18185,17 +18138,17 @@

8798

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8799

printf("*** so that the correct libraries are found at run-time))\n");

8800

}

8801

}

8802

return 1;

8803

}

8804

8805

EOF

8806

-if { (eval echo configure:18194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8807

+if { (eval echo configure:18147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8808

then

8809

:

8810

else

8811

echo "configure: failed program was:" >&5

8812

cat conftest.$ac_ext >&5

8813

rm -fr conftest*

8814

no_libIDL=yes

8815

fi

8816

@@ -18219,28 +18172,28 @@

8817

else

8818

if test -f conf.libIDLtest ; then

8819

:

8820

else

8821

echo "*** Could not run libIDL test program, checking why..."

8822

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8823

LIBS="$LIBS $LIBIDL_LIBS"

8824

cat > conftest.$ac_ext <<EOF

8825

-#line 18228 "configure"

8826

+#line 18181 "configure"

8827

#include "confdefs.h"

8828

8829

#include <stdio.h>

8830

#include <stdlib.h>

8831

#include <libIDL/IDL.h>

8832

8833

int main() {

8834

return IDL_get_libver_string ? 1 : 0;

8835

; return 0; }

8836

EOF

8837

-if { (eval echo configure:18239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8838

+if { (eval echo configure:18192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8839

rm -rf conftest*

8840

echo "*** The test program compiled, but did not run. This usually means"

8841

echo "*** that the run-time linker is not finding libIDL or finding the wrong"

8842

echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"

8843

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8844

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8845

echo "*** is required on your system"

8846

echo "***"

8847

@@ -18271,17 +18224,17 @@

8421

@@ -17284,17 +17237,17 @@

8422

esac

8423

done

8424

8425

unset ac_cv_path_GLIB_CONFIG

8426

8427

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

8428

set dummy glib-config; ac_word=$2

8429

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8430

-echo "configure:17293: checking for $ac_word" >&5

8431

+echo "configure:17246: checking for $ac_word" >&5

8432

if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then

8433

echo $ac_n "(cached) $ac_c" 1>&6

8434

else

8435

case "$GLIB_CONFIG" in

8436

/*)

8437

ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.

8438

;;

8439

?:/*)

8440

@@ -17319,17 +17272,17 @@

8441

if test -n "$GLIB_CONFIG"; then

8442

echo "$ac_t""$GLIB_CONFIG" 1>&6

8443

else

8444

echo "$ac_t""no" 1>&6

8445

fi

8446

8447

min_glib_version=1.2.0

8448

echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6

8449

-echo "configure:17328: checking for GLIB - version >= $min_glib_version" >&5

8450

+echo "configure:17281: checking for GLIB - version >= $min_glib_version" >&5

8451

no_glib=""

8452

if test "$GLIB_CONFIG" = "no" ; then

8453

no_glib=yes

8454

else

8455

GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`

8456

GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`

8457

glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \

8458

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

8459

@@ -17342,17 +17295,17 @@

8460

ac_save_LIBS="$LIBS"

8461

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8462

LIBS="$GLIB_LIBS $LIBS"

8463

rm -f conf.glibtest

8464

if test "$cross_compiling" = yes; then

8465

echo $ac_n "cross compiling; assumed OK... $ac_c"

8466

else

8467

cat > conftest.$ac_ext <<EOF

8468

-#line 17351 "configure"

8469

+#line 17304 "configure"

8470

#include "confdefs.h"

8471

8472

#include <glib.h>

8473

#include <stdio.h>

8474

#include <stdlib.h>

8475

8476

int

8477

main ()

8478

@@ -17418,17 +17371,17 @@

8479

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8480

printf("*** so that the correct libraries are found at run-time))\n");

8481

}

8482

}

8483

return 1;

8484

}

8485

8486

EOF

8487

-if { (eval echo configure:17427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8488

+if { (eval echo configure:17380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8489

then

8490

:

8491

else

8492

echo "configure: failed program was:" >&5

8493

cat conftest.$ac_ext >&5

8494

rm -fr conftest*

8495

no_glib=yes

8496

fi

8497

@@ -17452,27 +17405,27 @@

8498

else

8499

if test -f conf.glibtest ; then

8500

:

8501

else

8502

echo "*** Could not run GLIB test program, checking why..."

8503

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8504

LIBS="$LIBS $GLIB_LIBS"

8505

cat > conftest.$ac_ext <<EOF

8506

-#line 17461 "configure"

8507

+#line 17414 "configure"

8508

#include "confdefs.h"

8509

8510

#include <glib.h>

8511

#include <stdio.h>

8512

8513

int main() {

8514

return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));

8515

; return 0; }

8516

EOF

8517

-if { (eval echo configure:17471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8518

+if { (eval echo configure:17424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8519

rm -rf conftest*

8520

echo "*** The test program compiled, but did not run. This usually means"

8521

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

8522

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

8523

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8524

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8525

echo "*** is required on your system"

8526

echo "***"

8527

@@ -17506,17 +17459,17 @@

8528

rm -f conf.glibtest

8529

8530

8531

unset ac_cv_path_LIBIDL_CONFIG

8532

8533

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

8534

set dummy libIDL-config; ac_word=$2

8535

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8536

-echo "configure:17515: checking for $ac_word" >&5

8537

+echo "configure:17468: checking for $ac_word" >&5

8538

if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then

8539

echo $ac_n "(cached) $ac_c" 1>&6

8540

else

8541

case "$LIBIDL_CONFIG" in

8542

/*)

8543

ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.

8544

;;

8545

?:/*)

8546

@@ -17541,17 +17494,17 @@

8547

if test -n "$LIBIDL_CONFIG"; then

8548

echo "$ac_t""$LIBIDL_CONFIG" 1>&6

8549

else

8550

echo "$ac_t""no" 1>&6

8551

fi

8552

8553

min_libIDL_version=$LIBIDL_VERSION

8554

echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6

8555

-echo "configure:17550: checking for libIDL - version >= $min_libIDL_version" >&5

8556

+echo "configure:17503: checking for libIDL - version >= $min_libIDL_version" >&5

8557

no_libIDL=""

8558

if test "$LIBIDL_CONFIG" = "no" ; then

8559

no_libIDL=yes

8560

else

8561

LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`

8562

LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`

8563

# hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove

8564

# this after we start requiring libIDL 0.6.8 or anything higher

8565

@@ -17568,17 +17521,17 @@

8566

ac_save_LIBS="$LIBS"

8567

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8568

LIBS="$LIBIDL_LIBS $LIBS"

8569

rm -f conf.libIDLtest

8570

if test "$cross_compiling" = yes; then

8571

echo $ac_n "cross compiling; assumed OK... $ac_c"

8572

else

8573

cat > conftest.$ac_ext <<EOF

8574

-#line 17577 "configure"

8575

+#line 17530 "configure"

8576

#include "confdefs.h"

8577

8578

#include <stdio.h>

8579

#include <stdlib.h>

8580

#include <libIDL/IDL.h>

8581

8582

int

8583

main ()

8584

@@ -17654,17 +17607,17 @@

8585

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8586

printf("*** so that the correct libraries are found at run-time))\n");

8587

}

8588

}

8589

return 1;

8590

}

8591

8592

EOF

8593

-if { (eval echo configure:17663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8594

+if { (eval echo configure:17616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8595

then

8596

:

8597

else

8598

echo "configure: failed program was:" >&5

8599

cat conftest.$ac_ext >&5

8600

rm -fr conftest*

8601

no_libIDL=yes

8602

fi

8603

@@ -17688,28 +17641,28 @@

8604

else

8605

if test -f conf.libIDLtest ; then

8606

:

8607

else

8608

echo "*** Could not run libIDL test program, checking why..."

8609

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8610

LIBS="$LIBS $LIBIDL_LIBS"

8611

cat > conftest.$ac_ext <<EOF

8612

-#line 17697 "configure"

8613

+#line 17650 "configure"

8614

#include "confdefs.h"

8615

8616

#include <stdio.h>

8617

#include <stdlib.h>

8618

#include <libIDL/IDL.h>

8619

8620

int main() {

8621

return IDL_get_libver_string ? 1 : 0;

8622

; return 0; }

8623

EOF

8624

-if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8625

+if { (eval echo configure:17661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8626

rm -rf conftest*

8627

echo "*** The test program compiled, but did not run. This usually means"

8628

echo "*** that the run-time linker is not finding libIDL or finding the wrong"

8629

echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"

8630

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8631

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8632

echo "*** is required on your system"

8633

echo "***"

8634

@@ -17827,17 +17780,17 @@

8635

esac

8636

done

8637

8638

unset ac_cv_path_GLIB_CONFIG

8639

8640

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

8641

set dummy glib-config; ac_word=$2

8642

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8643

-echo "configure:17836: checking for $ac_word" >&5

8644

+echo "configure:17789: checking for $ac_word" >&5

8645

if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then

8646

echo $ac_n "(cached) $ac_c" 1>&6

8647

else

8648

case "$GLIB_CONFIG" in

8649

/*)

8650

ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.

8651

;;

8652

?:/*)

8653

@@ -17862,17 +17815,17 @@

8654

if test -n "$GLIB_CONFIG"; then

8655

echo "$ac_t""$GLIB_CONFIG" 1>&6

8656

else

8657

echo "$ac_t""no" 1>&6

8658

fi

8659

8660

min_glib_version=1.2.0

8661

echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6

8662

-echo "configure:17871: checking for GLIB - version >= $min_glib_version" >&5

8663

+echo "configure:17824: checking for GLIB - version >= $min_glib_version" >&5

8664

no_glib=""

8665

if test "$GLIB_CONFIG" = "no" ; then

8666

no_glib=yes

8667

else

8668

GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`

8669

GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`

8670

glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \

8671

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

8672

@@ -17885,17 +17838,17 @@

8673

ac_save_LIBS="$LIBS"

8674

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8675

LIBS="$GLIB_LIBS $LIBS"

8676

rm -f conf.glibtest

8677

if test "$cross_compiling" = yes; then

8678

echo $ac_n "cross compiling; assumed OK... $ac_c"

8679

else

8680

cat > conftest.$ac_ext <<EOF

8681

-#line 17894 "configure"

8682

+#line 17847 "configure"

8683

#include "confdefs.h"

8684

8685

#include <glib.h>

8686

#include <stdio.h>

8687

#include <stdlib.h>

8688

8689

int

8690

main ()

8691

@@ -17961,17 +17914,17 @@

8692

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8693

printf("*** so that the correct libraries are found at run-time))\n");

8694

}

8695

}

8696

return 1;

8697

}

8698

8699

EOF

8700

-if { (eval echo configure:17970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8701

+if { (eval echo configure:17923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8702

then

8703

:

8704

else

8705

echo "configure: failed program was:" >&5

8706

cat conftest.$ac_ext >&5

8707

rm -fr conftest*

8708

no_glib=yes

8709

fi

8710

@@ -17995,27 +17948,27 @@

8711

else

8712

if test -f conf.glibtest ; then

8713

:

8714

else

8715

echo "*** Could not run GLIB test program, checking why..."

8716

CFLAGS="$CFLAGS $GLIB_CFLAGS"

8717

LIBS="$LIBS $GLIB_LIBS"

8718

cat > conftest.$ac_ext <<EOF

8719

-#line 18004 "configure"

8720

+#line 17957 "configure"

8721

#include "confdefs.h"

8722

8723

#include <glib.h>

8724

#include <stdio.h>

8725

8726

int main() {

8727

return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));

8728

; return 0; }

8729

EOF

8730

-if { (eval echo configure:18014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8731

+if { (eval echo configure:17967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8732

rm -rf conftest*

8733

echo "*** The test program compiled, but did not run. This usually means"

8734

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

8735

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

8736

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8737

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8738

echo "*** is required on your system"

8739

echo "***"

8740

@@ -18049,17 +18002,17 @@

8741

rm -f conf.glibtest

8742

8743

8744

unset ac_cv_path_LIBIDL_CONFIG

8745

8746

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

8747

set dummy libIDL-config; ac_word=$2

8748

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8749

-echo "configure:18058: checking for $ac_word" >&5

8750

+echo "configure:18011: checking for $ac_word" >&5

8751

if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then

8752

echo $ac_n "(cached) $ac_c" 1>&6

8753

else

8754

case "$LIBIDL_CONFIG" in

8755

/*)

8756

ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.

8757

;;

8758

?:/*)

8759

@@ -18084,17 +18037,17 @@

8760

if test -n "$LIBIDL_CONFIG"; then

8761

echo "$ac_t""$LIBIDL_CONFIG" 1>&6

8762

else

8763

echo "$ac_t""no" 1>&6

8764

fi

8765

8766

min_libIDL_version=$LIBIDL_VERSION

8767

echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6

8768

-echo "configure:18093: checking for libIDL - version >= $min_libIDL_version" >&5

8769

+echo "configure:18046: checking for libIDL - version >= $min_libIDL_version" >&5

8770

no_libIDL=""

8771

if test "$LIBIDL_CONFIG" = "no" ; then

8772

no_libIDL=yes

8773

else

8774

LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`

8775

LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`

8776

# hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove

8777

# this after we start requiring libIDL 0.6.8 or anything higher

8778

@@ -18111,17 +18064,17 @@

8779

ac_save_LIBS="$LIBS"

8780

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8781

LIBS="$LIBIDL_LIBS $LIBS"

8782

rm -f conf.libIDLtest

8783

if test "$cross_compiling" = yes; then

8784

echo $ac_n "cross compiling; assumed OK... $ac_c"

8785

else

8786

cat > conftest.$ac_ext <<EOF

8787

-#line 18120 "configure"

8788

+#line 18073 "configure"

8789

#include "confdefs.h"

8790

8791

#include <stdio.h>

8792

#include <stdlib.h>

8793

#include <libIDL/IDL.h>

8794

8795

int

8796

main ()

8797

@@ -18197,17 +18150,17 @@

8798

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

8799

printf("*** so that the correct libraries are found at run-time))\n");

8800

}

8801

}

8802

return 1;

8803

}

8804

8805

EOF

8806

-if { (eval echo configure:18206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8807

+if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8808

then

8809

:

8810

else

8811

echo "configure: failed program was:" >&5

8812

cat conftest.$ac_ext >&5

8813

rm -fr conftest*

8814

no_libIDL=yes

8815

fi

8816

@@ -18231,28 +18184,28 @@

8817

else

8818

if test -f conf.libIDLtest ; then

8819

:

8820

else

8821

echo "*** Could not run libIDL test program, checking why..."

8822

CFLAGS="$CFLAGS $LIBIDL_CFLAGS"

8823

LIBS="$LIBS $LIBIDL_LIBS"

8824

cat > conftest.$ac_ext <<EOF

8825

-#line 18240 "configure"

8826

+#line 18193 "configure"

8827

#include "confdefs.h"

8828

8829

#include <stdio.h>

8830

#include <stdlib.h>

8831

#include <libIDL/IDL.h>

8832

8833

int main() {

8834

return IDL_get_libver_string ? 1 : 0;

8835

; return 0; }

8836

EOF

8837

-if { (eval echo configure:18251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8838

+if { (eval echo configure:18204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

8839

rm -rf conftest*

8840

echo "*** The test program compiled, but did not run. This usually means"

8841

echo "*** that the run-time linker is not finding libIDL or finding the wrong"

8842

echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"

8843

echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"

8844

echo "*** to the installed location Also, make sure you have run ldconfig if that"

8845

echo "*** is required on your system"

8846

echo "***"

8847

@@ -18283,17 +18236,17 @@

8848

if test -z "$_LIBIDL_FOUND"; then

8849

8850

succeeded=no

8853

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

8854

set dummy pkg-config; ac_word=$2

8855

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8856

-echo "configure:18280: checking for $ac_word" >&5

8857

+echo "configure:18233: checking for $ac_word" >&5

8856

-echo "configure:18292: checking for $ac_word" >&5

8857

+echo "configure:18245: checking for $ac_word" >&5

8858

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

8859

echo $ac_n "(cached) $ac_c" 1>&6

8860

else

8863

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

8864

;;

8865

?:/*)

8866

@@ -18315,29 +18268,29 @@

8866

@@ -18327,29 +18280,29 @@

8867

echo "*** The pkg-config script could not be found. Make sure it is"

8868

echo "*** in your path, or set the PKG_CONFIG environment variable"

8869

echo "*** to the full path to pkg-config."

8872

PKG_CONFIG_MIN_VERSION=0.9.0

8873

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

8874

echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6

8875

-echo "configure:18324: checking for libIDL-2.0 >= 0.8.0" >&5

8876

+echo "configure:18277: checking for libIDL-2.0 >= 0.8.0" >&5

8875

-echo "configure:18336: checking for libIDL-2.0 >= 0.8.0" >&5

8876

+echo "configure:18289: checking for libIDL-2.0 >= 0.8.0" >&5

8877

8878

if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then

8879

echo "$ac_t""yes" 1>&6

8880

succeeded=yes

8881

8882

echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6

8883

-echo "configure:18331: checking LIBIDL_CFLAGS" >&5

8884

+echo "configure:18284: checking LIBIDL_CFLAGS" >&5

8883

-echo "configure:18343: checking LIBIDL_CFLAGS" >&5

8884

+echo "configure:18296: checking LIBIDL_CFLAGS" >&5

8885

LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`

8886

echo "$ac_t""$LIBIDL_CFLAGS" 1>&6

8887

8888

echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6

8889

-echo "configure:18336: checking LIBIDL_LIBS" >&5

8890

+echo "configure:18289: checking LIBIDL_LIBS" >&5

8889

-echo "configure:18348: checking LIBIDL_LIBS" >&5

8890

+echo "configure:18301: checking LIBIDL_LIBS" >&5

8891

## don't use --libs since that can do evil things like add

8892

## -Wl,--export-dynamic

8893

LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"

8896

LIBIDL_CFLAGS=""

8897

LIBIDL_LIBS=""

8898

## If we have a custom action on failure, don't print errors, but

8899

@@ -18363,17 +18316,17 @@

8899

@@ -18375,17 +18328,17 @@

8900

fi

8901

fi

8902

if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then

8905

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

8906

set dummy $ac_prog; ac_word=$2

8907

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8908

-echo "configure:18372: checking for $ac_word" >&5

8909

+echo "configure:18325: checking for $ac_word" >&5

8908

-echo "configure:18384: checking for $ac_word" >&5

8909

+echo "configure:18337: checking for $ac_word" >&5

8910

if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then

8911

echo $ac_n "(cached) $ac_c" 1>&6

8912

else

8915

ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path.

8916

;;

8917

?:/*)

8918

@@ -18400,49 +18353,49 @@

8918

@@ -18412,49 +18365,49 @@

8919

echo "$ac_t""no" 1>&6

8920

fi

8921

8924

8925

if test -n "$ORBIT_CONFIG"; then

8926

echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6

8927

-echo "configure:18409: checking for ORBit libIDL usability" >&5

8928

+echo "configure:18362: checking for ORBit libIDL usability" >&5

8927

-echo "configure:18421: checking for ORBit libIDL usability" >&5

8928

+echo "configure:18374: checking for ORBit libIDL usability" >&5

8929

_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`

8930

_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`

8931

_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`

8942

result="maybe"

8943

else

8944

cat > conftest.$ac_ext <<EOF

8945

-#line 18426 "configure"

8946

+#line 18379 "configure"

8945

-#line 18438 "configure"

8946

+#line 18391 "configure"

8947

#include "confdefs.h"

8948

8949

#include <stdlib.h>

8958

}

8959

8960

EOF

8961

-if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8962

+if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8961

-if { (eval echo configure:18453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8962

+if { (eval echo configure:18406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

8963

then

8964

_LIBIDL_FOUND=1

8965

result="yes"

8968

cat conftest.$ac_ext >&5

8969

rm -fr conftest*

8970

LIBIDL_CFLAGS=

8971

@@ -18489,17 +18442,17 @@

8971

@@ -18501,17 +18454,17 @@

8972

if test "$MOZ_ENABLE_GTK2"; then

8973

8974

succeeded=no

8977

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

8978

set dummy pkg-config; ac_word=$2

8979

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

8980

-echo "configure:18498: checking for $ac_word" >&5

8981

+echo "configure:18451: checking for $ac_word" >&5

8980

-echo "configure:18510: checking for $ac_word" >&5

8981

+echo "configure:18463: checking for $ac_word" >&5

8982

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

8983

echo $ac_n "(cached) $ac_c" 1>&6

8984

else

8987

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

8988

;;

8989

?:/*)

8990

@@ -18533,29 +18486,29 @@

8990

@@ -18545,29 +18498,29 @@

8991

echo "*** The pkg-config script could not be found. Make sure it is"

8992

echo "*** in your path, or set the PKG_CONFIG environment variable"

8993

echo "*** to the full path to pkg-config."

8996

PKG_CONFIG_MIN_VERSION=0.9.0

8997

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

8998

echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6

8999

-echo "configure:18542: checking for glib-2.0 >= 1.3.7" >&5

9000

+echo "configure:18495: checking for glib-2.0 >= 1.3.7" >&5

8999

-echo "configure:18554: checking for glib-2.0 >= 1.3.7" >&5

9000

+echo "configure:18507: checking for glib-2.0 >= 1.3.7" >&5

9001

9002

if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then

9003

echo "$ac_t""yes" 1>&6

9004

succeeded=yes

9005

9006

echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6

9007

-echo "configure:18549: checking GLIB_CFLAGS" >&5

9008

+echo "configure:18502: checking GLIB_CFLAGS" >&5

9007

-echo "configure:18561: checking GLIB_CFLAGS" >&5

9008

+echo "configure:18514: checking GLIB_CFLAGS" >&5

9009

GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"`

9010

echo "$ac_t""$GLIB_CFLAGS" 1>&6

9011

9012

echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6

9013

-echo "configure:18554: checking GLIB_LIBS" >&5

9014

+echo "configure:18507: checking GLIB_LIBS" >&5

9013

-echo "configure:18566: checking GLIB_LIBS" >&5

9014

+echo "configure:18519: checking GLIB_LIBS" >&5

9015

## don't use --libs since that can do evil things like add

9016

## -Wl,--export-dynamic

9017

GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`"

9020

GLIB_CFLAGS=""

9021

GLIB_LIBS=""

9022

## If we have a custom action on failure, don't print errors, but

9023

@@ -18629,17 +18582,17 @@

9023

@@ -18641,17 +18594,17 @@

9024

esac

9025

done

9026

9029

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

9030

set dummy glib-config; ac_word=$2

9031

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

9032

-echo "configure:18638: checking for $ac_word" >&5

9033

+echo "configure:18591: checking for $ac_word" >&5

9032

-echo "configure:18650: checking for $ac_word" >&5

9033

+echo "configure:18603: checking for $ac_word" >&5

9034

if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then

9035

echo $ac_n "(cached) $ac_c" 1>&6

9036

else

9039

ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.

9040

;;

9041

?:/*)

9042

@@ -18664,17 +18617,17 @@

9042

@@ -18676,17 +18629,17 @@

9043

if test -n "$GLIB_CONFIG"; then

9044

echo "$ac_t""$GLIB_CONFIG" 1>&6

9045

else

9048

9049

min_glib_version=${GLIB_VERSION}

9050

echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6

9051

-echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5

9052

+echo "configure:18626: checking for GLIB - version >= $min_glib_version" >&5

9051

-echo "configure:18685: checking for GLIB - version >= $min_glib_version" >&5

9052

+echo "configure:18638: checking for GLIB - version >= $min_glib_version" >&5

9053

no_glib=""

9054

if test "$GLIB_CONFIG" = "no" ; then

9055

no_glib=yes

9058

GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`

9059

glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \

9060

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

9061

@@ -18687,17 +18640,17 @@

9061

@@ -18699,17 +18652,17 @@

9062

ac_save_LIBS="$LIBS"

9063

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9064

LIBS="$GLIB_LIBS $LIBS"

9067

echo $ac_n "cross compiling; assumed OK... $ac_c"

9068

else

9069

cat > conftest.$ac_ext <<EOF

9070

-#line 18696 "configure"

9071

+#line 18649 "configure"

9070

-#line 18708 "configure"

9071

+#line 18661 "configure"

9072

#include "confdefs.h"

9073

9074

#include <glib.h>

9077

9078

int

9079

main ()

9080

@@ -18763,17 +18716,17 @@

9080

@@ -18775,17 +18728,17 @@

9081

printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

9082

printf("*** so that the correct libraries are found at run-time))\n");

9083

}

9086

}

9087

9088

EOF

9089

-if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9090

+if { (eval echo configure:18725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9089

-if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9090

+if { (eval echo configure:18737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9091

then

9092

:

9093

else

9096

rm -fr conftest*

9097

no_glib=yes

9098

fi

9099

@@ -18797,27 +18750,27 @@

9099

@@ -18809,27 +18762,27 @@

9100

else

9101

if test -f conf.glibtest ; then

9102

:

9105

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9106

LIBS="$LIBS $GLIB_LIBS"

9107

cat > conftest.$ac_ext <<EOF

9108

-#line 18806 "configure"

9109

+#line 18759 "configure"

9108

-#line 18818 "configure"

9109

+#line 18771 "configure"

9110

#include "confdefs.h"

9111

9112

#include <glib.h>

9116

return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));

9117

; return 0; }

9118

EOF

9119

-if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9120

+if { (eval echo configure:18769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9119

-if { (eval echo configure:18828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9120

+if { (eval echo configure:18781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9121

rm -rf conftest*

9122

echo "*** The test program compiled, but did not run. This usually means"

9123

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

9126

echo "*** to the installed location Also, make sure you have run ldconfig if that"

9127

echo "*** is required on your system"

9128

echo "***"

9129

@@ -18887,29 +18840,29 @@

9129

@@ -18899,29 +18852,29 @@

9130

;;

9131

*)

9132

MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'

9135

# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works

9136

# for constant arguments. Useless!

9137

echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6

9138

-echo "configure:18896: checking for working alloca.h" >&5

9139

+echo "configure:18849: checking for working alloca.h" >&5

9138

-echo "configure:18908: checking for working alloca.h" >&5

9139

+echo "configure:18861: checking for working alloca.h" >&5

9140

if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then

9141

echo $ac_n "(cached) $ac_c" 1>&6

9142

else

9143

cat > conftest.$ac_ext <<EOF

9144

-#line 18901 "configure"

9145

+#line 18854 "configure"

9144

-#line 18913 "configure"

9145

+#line 18866 "configure"

9146

#include "confdefs.h"

9147

#include <alloca.h>

9148

int main() {

9149

char *p = alloca(2 * sizeof(int));

9150

; return 0; }

9151

EOF

9152

-if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9153

+if { (eval echo configure:18861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9152

-if { (eval echo configure:18920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9153

+if { (eval echo configure:18873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9154

rm -rf conftest*

9155

ac_cv_header_alloca_h=yes

9156

else

9159

rm -rf conftest*

9160

ac_cv_header_alloca_h=no

9161

fi

9162

@@ -18920,22 +18873,22 @@

9162

@@ -18932,22 +18885,22 @@

9163

if test $ac_cv_header_alloca_h = yes; then

9164

cat >> confdefs.h <<\EOF

9165

#define HAVE_ALLOCA_H 1

9168

fi

9169

9170

echo $ac_n "checking for alloca""... $ac_c" 1>&6

9171

-echo "configure:18929: checking for alloca" >&5

9172

+echo "configure:18882: checking for alloca" >&5

9171

-echo "configure:18941: checking for alloca" >&5

9172

+echo "configure:18894: checking for alloca" >&5

9173

if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then

9174

echo $ac_n "(cached) $ac_c" 1>&6

9175

else

9176

cat > conftest.$ac_ext <<EOF

9177

-#line 18934 "configure"

9178

+#line 18887 "configure"

9177

-#line 18946 "configure"

9178

+#line 18899 "configure"

9179

#include "confdefs.h"

9180

9181

#ifdef __GNUC__

9184

# ifdef _MSC_VER

9185

# include <malloc.h>

9186

# define alloca _alloca

9187

@@ -18953,17 +18906,17 @@

9187

@@ -18965,17 +18918,17 @@

9188

# endif

9189

# endif

9190

#endif

9193

char *p = (char *) alloca(1);

9194

; return 0; }

9195

EOF

9196

-if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9197

+if { (eval echo configure:18915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9196

-if { (eval echo configure:18974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9197

+if { (eval echo configure:18927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9198

rm -rf conftest*

9199

ac_cv_func_alloca_works=yes

9200

else

9203

rm -rf conftest*

9204

ac_cv_func_alloca_works=no

9205

fi

9206

@@ -18985,22 +18938,22 @@

9206

@@ -18997,22 +18950,22 @@

9207

# use ar to extract alloca.o from them instead of compiling alloca.c.

9208

ALLOCA=alloca.${ac_objext}

9209

cat >> confdefs.h <<\EOF

9212

9213

9214

echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6

9215

-echo "configure:18994: checking whether alloca needs Cray hooks" >&5

9216

+echo "configure:18947: checking whether alloca needs Cray hooks" >&5

9215

-echo "configure:19006: checking whether alloca needs Cray hooks" >&5

9216

+echo "configure:18959: checking whether alloca needs Cray hooks" >&5

9217

if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then

9218

echo $ac_n "(cached) $ac_c" 1>&6

9219

else

9220

cat > conftest.$ac_ext <<EOF

9221

-#line 18999 "configure"

9222

+#line 18952 "configure"

9221

-#line 19011 "configure"

9222

+#line 18964 "configure"

9223

#include "confdefs.h"

9224

#if defined(CRAY) && ! defined(CRAY2)

9225

webecray

9228

#endif

9229

9230

EOF

9231

@@ -19015,22 +18968,22 @@

9231

@@ -19027,22 +18980,22 @@

9232

rm -f conftest*

9233

9234

fi

9237

if test $ac_cv_os_cray = yes; then

9238

for ac_func in _getb67 GETB67 getb67; do

9239

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

9240

-echo "configure:19024: checking for $ac_func" >&5

9241

+echo "configure:18977: checking for $ac_func" >&5

9240

-echo "configure:19036: checking for $ac_func" >&5

9241

+echo "configure:18989: checking for $ac_func" >&5

9242

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

9243

echo $ac_n "(cached) $ac_c" 1>&6

9244

else

9245

cat > conftest.$ac_ext <<EOF

9246

-#line 19029 "configure"

9247

+#line 18982 "configure"

9246

-#line 19041 "configure"

9247

+#line 18994 "configure"

9248

#include "confdefs.h"

9249

/* System header to define __stub macros and hopefully few prototypes,

9250

which can conflict with char $ac_func(); below. */

9253

/* We use char because int might match the return type of a gcc2

9254

builtin and then its argument prototype would still apply. */

9255

char $ac_func();

9256

@@ -19043,17 +18996,17 @@

9256

@@ -19055,17 +19008,17 @@

9257

#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

9258

choke me

9259

#else

9262

9263

; return 0; }

9264

EOF

9265

-if { (eval echo configure:19052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9266

+if { (eval echo configure:19005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9265

-if { (eval echo configure:19064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9266

+if { (eval echo configure:19017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

9267

rm -rf conftest*

9268

eval "ac_cv_func_$ac_func=yes"

9269

else

9272

rm -rf conftest*

9273

eval "ac_cv_func_$ac_func=no"

9274

fi

9275

@@ -19070,25 +19023,25 @@

9275

@@ -19082,25 +19035,25 @@

9276

else

9277

echo "$ac_t""no" 1>&6

9278

fi

9281

fi

9282

9283

echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6

9284

-echo "configure:19079: checking stack direction for C alloca" >&5

9285

+echo "configure:19032: checking stack direction for C alloca" >&5

9284

-echo "configure:19091: checking stack direction for C alloca" >&5

9285

+echo "configure:19044: checking stack direction for C alloca" >&5

9286

if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then

9287

echo $ac_n "(cached) $ac_c" 1>&6

9288

else

9290

ac_cv_c_stack_direction=0

9291

else

9292

cat > conftest.$ac_ext <<EOF

9293

-#line 19087 "configure"

9294

+#line 19040 "configure"

9293

-#line 19099 "configure"

9294

+#line 19052 "configure"

9295

#include "confdefs.h"

9296

find_stack_direction ()

9297

{

9300

if (addr == 0)

9301

{

9302

addr = &dummy;

9303

@@ -19097,17 +19050,17 @@

9303

@@ -19109,17 +19062,17 @@

9304

else

9305

return (&dummy > addr) ? 1 : -1;

9306

}

9309

exit (find_stack_direction() < 0);

9310

}

9311

EOF

9312

-if { (eval echo configure:19106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9313

+if { (eval echo configure:19059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9312

-if { (eval echo configure:19118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9313

+if { (eval echo configure:19071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

9314

then

9315

ac_cv_c_stack_direction=1

9316

else

9319

rm -fr conftest*

9320

ac_cv_c_stack_direction=-1

9321

fi

9322

@@ -19146,27 +19099,27 @@

9322

@@ -19158,27 +19111,27 @@

9323

9324

9325

if test "$MOZ_TREE_CAIRO"; then

9328

do

9329

ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

9330

echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

9331

-echo "configure:19155: checking for $ac_hdr" >&5

9332

+echo "configure:19108: checking for $ac_hdr" >&5

9331

-echo "configure:19167: checking for $ac_hdr" >&5

9332

+echo "configure:19120: checking for $ac_hdr" >&5

9333

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

9334

echo $ac_n "(cached) $ac_c" 1>&6

9335

else

9336

cat > conftest.$ac_ext <<EOF

9337

-#line 19160 "configure"

9338

+#line 19113 "configure"

9337

-#line 19172 "configure"

9338

+#line 19125 "configure"

9339

#include "confdefs.h"

9340

#include <$ac_hdr>

9341

EOF

9342

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

9343

-{ (eval echo configure:19165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

9344

+{ (eval echo configure:19118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

9343

-{ (eval echo configure:19177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

9344

+{ (eval echo configure:19130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

9345

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

9346

if test -z "$ac_err"; then

9347

rm -rf conftest*

9350

echo "$ac_err" >&5

9351

echo "configure: failed program was:" >&5

9352

cat conftest.$ac_ext >&5

9353

@@ -19247,17 +19200,17 @@

9353

@@ -19259,17 +19212,17 @@

9354

else

9355

9356

succeeded=no

9359

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

9360

set dummy pkg-config; ac_word=$2

9361

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

9362

-echo "configure:19256: checking for $ac_word" >&5

9363

+echo "configure:19209: checking for $ac_word" >&5

9362

-echo "configure:19268: checking for $ac_word" >&5

9363

+echo "configure:19221: checking for $ac_word" >&5

9364

if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

9365

echo $ac_n "(cached) $ac_c" 1>&6

9366

else

9369

ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

9370

;;

9371

?:/*)

9372

@@ -19291,29 +19244,29 @@

9372

@@ -19303,29 +19256,29 @@

9373

echo "*** The pkg-config script could not be found. Make sure it is"

9374

echo "*** in your path, or set the PKG_CONFIG environment variable"

9375

echo "*** to the full path to pkg-config."

9378

PKG_CONFIG_MIN_VERSION=0.9.0

9379

if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

9380

echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6

9381

-echo "configure:19300: checking for cairo >= $CAIRO_VERSION" >&5

9382

+echo "configure:19253: checking for cairo >= $CAIRO_VERSION" >&5

9381

-echo "configure:19312: checking for cairo >= $CAIRO_VERSION" >&5

9382

+echo "configure:19265: checking for cairo >= $CAIRO_VERSION" >&5

9383

9384

if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then

9385

echo "$ac_t""yes" 1>&6

9386

succeeded=yes

9387

9388

echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6

9389

-echo "configure:19307: checking CAIRO_CFLAGS" >&5

9390

+echo "configure:19260: checking CAIRO_CFLAGS" >&5

9389

-echo "configure:19319: checking CAIRO_CFLAGS" >&5

9390

+echo "configure:19272: checking CAIRO_CFLAGS" >&5

9391

CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`

9392

echo "$ac_t""$CAIRO_CFLAGS" 1>&6

9393

9394

echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6

9395

-echo "configure:19312: checking CAIRO_LIBS" >&5

9396

+echo "configure:19265: checking CAIRO_LIBS" >&5

9395

-echo "configure:19324: checking CAIRO_LIBS" >&5

9396

+echo "configure:19277: checking CAIRO_LIBS" >&5

9397

## don't use --libs since that can do evil things like add

9398

## -Wl,--export-dynamic

9399

CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"

9402

CAIRO_CFLAGS=""

9403

CAIRO_LIBS=""

9404

## If we have a custom action on failure, don't print errors, but

9405

@@ -19333,23 +19286,220 @@

9405

@@ -19345,23 +19298,220 @@

9406

if test $succeeded = yes; then

9407

:

9408

else

9421

+ # Extract the first word of "pkg-config", so it can be a program name with args.

9422

+set dummy pkg-config; ac_word=$2

9423

+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

9424

+echo "configure:19305: checking for $ac_word" >&5

9424

+echo "configure:19317: checking for $ac_word" >&5

9425

+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

9426

+ echo $ac_n "(cached) $ac_c" 1>&6

9427

+else

9465

+ PKG_CONFIG_MIN_VERSION=0.9.0

9466

+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

9467

+ echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6

9468

+echo "configure:19349: checking for cairo-xlib >= $CAIRO_VERSION" >&5

9468

+echo "configure:19361: checking for cairo-xlib >= $CAIRO_VERSION" >&5

9469

+

9470

+ if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then

9471

+ echo "$ac_t""yes" 1>&6

9472

+ succeeded=yes

9473

+

9474

+ echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6

9475

+echo "configure:19356: checking CAIRO_XLIB_CFLAGS" >&5

9475

+echo "configure:19368: checking CAIRO_XLIB_CFLAGS" >&5

9476

+ CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"`

9477

+ echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6

9478

+

9479

+ echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6

9480

+echo "configure:19361: checking CAIRO_XLIB_LIBS" >&5

9480

+echo "configure:19373: checking CAIRO_XLIB_LIBS" >&5

9481

+ ## don't use --libs since that can do evil things like add

9482

+ ## -Wl,--export-dynamic

9483

+ CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`"

9516

+ # Extract the first word of "pkg-config", so it can be a program name with args.

9517

+set dummy pkg-config; ac_word=$2

9518

+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

9519

+echo "configure:19400: checking for $ac_word" >&5

9519

+echo "configure:19412: checking for $ac_word" >&5

9520

+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then

9521

+ echo $ac_n "(cached) $ac_c" 1>&6

9522

+else

9560

+ PKG_CONFIG_MIN_VERSION=0.9.0

9561

+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

9562

+ echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6

9563

+echo "configure:19444: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5

9563

+echo "configure:19456: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5

9564

+

9565

+ if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then

9566

+ echo "$ac_t""yes" 1>&6

9567

+ succeeded=yes

9568

+

9569

+ echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6

9570

+echo "configure:19451: checking CAIRO_XRENDER_CFLAGS" >&5

9570

+echo "configure:19463: checking CAIRO_XRENDER_CFLAGS" >&5

9571

+ CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"`

9572

+ echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6

9573

+

9574

+ echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6

9575

+echo "configure:19456: checking CAIRO_XRENDER_LIBS" >&5

9575

+echo "configure:19468: checking CAIRO_XRENDER_LIBS" >&5

9576

+ ## don't use --libs since that can do evil things like add

9577

+ ## -Wl,--export-dynamic

9578

+ CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`"

9623

elif test "$enableval" = "yes"; then

9624

:

9625

else

9626

@@ -19368,17 +19518,17 @@

9626

@@ -19380,17 +19530,17 @@

9627

9628

9629

9632

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

9633

set dummy python; ac_word=$2

9634

echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

9635

-echo "configure:19377: checking for $ac_word" >&5

9636

+echo "configure:19527: checking for $ac_word" >&5

9635

-echo "configure:19389: checking for $ac_word" >&5

9636

+echo "configure:19539: checking for $ac_word" >&5

9637

if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then

9638

echo $ac_n "(cached) $ac_c" 1>&6

9639

else

9642

ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.

9643

;;

9644

?:/*)

9645

@@ -19644,24 +19794,24 @@

9645

@@ -19656,24 +19806,24 @@

9646

ac_ext=c

9647

# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

9648

ac_cpp='$CPP $CPPFLAGS'

9651

cross_compiling=$ac_cv_prog_cc_cross

9652

9653

cat > conftest.$ac_ext <<EOF

9654

-#line 19653 "configure"

9655

+#line 19803 "configure"

9654

-#line 19665 "configure"

9655

+#line 19815 "configure"

9656

#include "confdefs.h"

9657

#include <gmodule.h>

9658

int main() {

9659

int x = 1; x++;

9660

; return 0; }

9661

EOF

9662

-if { (eval echo configure:19660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9663

+if { (eval echo configure:19810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9662

-if { (eval echo configure:19672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9663

+if { (eval echo configure:19822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9664

:

9665

else

9666

echo "configure: failed program was:" >&5

9669

{ echo "configure: error: Cannot build ctl without gmodule support in glib." 1>&2; exit 1; }

9670

fi

9671

rm -f conftest*

9672

@@ -19835,16 +19985,17 @@

9672

@@ -19847,16 +19997,17 @@

9673

9674

9675

9687

$_MOZ_RTTI_FLAGS \

9688

$_MOZ_EXCEPTIONS_FLAGS \

9689

$_WARNINGS_CXXFLAGS \

9690

@@ -19958,33 +20109,33 @@

9690

@@ -19970,33 +20121,33 @@

9691

9692

fi

9693

9696

_SAVE_CFLAGS=$CFLAGS

9697

CFLAGS="$CFLAGS $XCFLAGS"

9698

cat > conftest.$ac_ext <<EOF

9699

-#line 19967 "configure"

9700

+#line 20118 "configure"

9699

-#line 19979 "configure"

9700

+#line 20130 "configure"

9701

#include "confdefs.h"

9702

9703

#include <stdio.h>

9713

9714

; return 0; }

9715

EOF

9716

-if { (eval echo configure:19983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9717

+if { (eval echo configure:20134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9716

-if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9717

+if { (eval echo configure:20146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

9718

:

9719

else

9720

echo "configure: failed program was:" >&5

9723

{ echo "configure: error: Could not compile basic X program." 1>&2; exit 1; }

9724

fi

9725

rm -f conftest*

9726

@@ -20192,44 +20343,25 @@

9726

@@ -20204,44 +20355,25 @@

9727

fi

9728

9729

rm -f confdefs.h.save

9777

9778

. ${srcdir}/allmakefiles.sh

9779

if test -z "${AS_PERL}"; then

9780

@@ -20459,16 +20591,19 @@

9780

@@ -20471,16 +20603,19 @@

9781

s%@LIBOBJS@%$LIBOBJS%g

9782

s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g

9783

s%@NSPR_CONFIG@%$NSPR_CONFIG%g

9797

s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g

9798

s%@HOST_MOC@%$HOST_MOC%g

9799

s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g

9800

@@ -20583,19 +20718,27 @@

9800

@@ -20595,19 +20730,27 @@

9801

s%@OS2_SURFACE_FEATURE@%$OS2_SURFACE_FEATURE%g

9802

s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g

9803

s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g

9825

s%@MOZ_PYTHON_VER@%$MOZ_PYTHON_VER%g

9826

s%@MOZ_PYTHON_VER_DOTTED@%$MOZ_PYTHON_VER_DOTTED%g

9827

s%@MOZ_PYTHON_DEBUG_SUFFIX@%$MOZ_PYTHON_DEBUG_SUFFIX%g

9828

@@ -20694,16 +20837,17 @@

9828

@@ -20706,16 +20849,17 @@

9829

s%@MOZ_XINERAMA_LIBS@%$MOZ_XINERAMA_LIBS%g

9830

s%@MOZ_ENABLE_XINERAMA@%$MOZ_ENABLE_XINERAMA%g

9831

s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g

9843

s%@MOZ_SINGLE_PROFILE@%$MOZ_SINGLE_PROFILE%g

9844

s%@MOZ_XPFE_COMPONENTS@%$MOZ_XPFE_COMPONENTS%g

9845

s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g

9846

@@ -21158,17 +21302,17 @@

9846

@@ -21170,17 +21314,17 @@

9847

# The eval makes quoting arguments work.

9848

if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir

9849

then :

9862

9863

if test -z "$MOZ_NATIVE_NSPR"; then

9864

# Hack to deal with the fact that we use NSPR_CFLAGS everywhere

9865

@@ -21301,15 +21445,15 @@

9865

@@ -21313,15 +21457,15 @@

9866

# The eval makes quoting arguments work.

9867

if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir

9868

then :