~ubuntu-branches/ubuntu/hardy/evince/hardy-proposed : revision 36

1

diff -Nur evince-0.9.2/configure evince-0.9.2.new/configure

2

--- evince-0.9.2/configure 2007-07-09 21:49:38.000000000 +0000

3

+++ evince-0.9.2.new/configure 2007-07-10 17:01:57.395932567 +0000

1

diff -Nur evince-0.9.3/configure evince-0.9.3.new/configure

2

--- evince-0.9.3/configure 2007-07-30 21:03:35.000000000 +0200

3

+++ evince-0.9.3.new/configure 2007-07-30 23:12:12.000000000 +0200

4

@@ -1,27 +1,56 @@

5

#! /bin/sh

6

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

7

-# Generated by GNU Autoconf 2.59 for Evince 0.9.2.

8

+# Generated by GNU Autoconf 2.61 for Evince 0.9.2.

7

-# Generated by GNU Autoconf 2.59 for Evince 0.9.3.

8

+# Generated by GNU Autoconf 2.61 for Evince 0.9.3.

9

#

10

# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=evince>.

11

#

699

# Identity of this package.

700

PACKAGE_NAME='Evince'

701

PACKAGE_TARNAME='evince'

702

@@ -430,42 +735,327 @@

702

@@ -430,42 +735,331 @@

703

# Factoring default headers for most tests.

704

ac_includes_default="\

705

#include <stdio.h>

749

# include <unistd.h>

750

#endif"

751

752

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GLIB_GENMARSHAL GLIB_MKENUMS ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE HAVE_GNOME_DOC_UTILS_TRUE HAVE_GNOME_DOC_UTILS_FALSE DISABLE_DEPRECATED WARN_CFLAGS WARN_CXXFLAGS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB_CFLAGS LIB_LIBS BACKEND_CFLAGS BACKEND_LIBS FRONTEND_CORE_CFLAGS FRONTEND_CORE_LIBS SHELL_CORE_CFLAGS SHELL_CORE_LIBS WITH_GNOME_TRUE WITH_GNOME_FALSE GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS GNOME_PRINT_CFLAGS GNOME_PRINT_LIBS GTK_PRINT_CFLAGS GTK_PRINT_LIBS WITH_GNOME_PRINT_TRUE WITH_GNOME_PRINT_FALSE WITH_GTK_PRINT_TRUE WITH_GTK_PRINT_FALSE DBUS_CFLAGS DBUS_LIBS DBUS_BINDING_TOOL SHELL_CFLAGS SHELL_LIBS FRONTEND_CFLAGS FRONTEND_LIBS ENABLE_DBUS_TRUE ENABLE_DBUS_FALSE DBUS_TOOL_NO_PREFIX_TRUE DBUS_TOOL_NO_PREFIX_FALSE NAUTILUS_CFLAGS NAUTILUS_LIBS HAVE_NAUTILUS_TRUE HAVE_NAUTILUS_FALSE ENABLE_THUMBNAILER_TRUE ENABLE_THUMBNAILER_FALSE GTK_RECENT_CFLAGS GTK_RECENT_LIBS HAVE_GTK_RECENT_TRUE HAVE_GTK_RECENT_FALSE GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL POPPLER_CFLAGS POPPLER_LIBS CAIRO_PDF_CFLAGS CAIRO_PDF_LIBS ENABLE_PDF_TRUE ENABLE_PDF_FALSE ENABLE_PS_TRUE ENABLE_PS_FALSE ENABLE_TIFF_TRUE ENABLE_TIFF_FALSE DJVU_CFLAGS DJVU_LIBS ENABLE_DJVU_TRUE ENABLE_DJVU_FALSE ENABLE_DVI_TRUE ENABLE_DVI_FALSE WITH_TYPE1_FONTS_TRUE WITH_TYPE1_FONTS_FALSE ENABLE_PIXBUF_TRUE ENABLE_PIXBUF_FALSE ENABLE_COMICS_TRUE ENABLE_COMICS_FALSE ENABLE_IMPRESS_TRUE ENABLE_IMPRESS_FALSE EVINCE_MIME_TYPES LIBOBJS LTLIBOBJS'

752

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GLIB_GENMARSHAL GLIB_MKENUMS ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE HAVE_GNOME_DOC_UTILS_TRUE HAVE_GNOME_DOC_UTILS_FALSE DISABLE_DEPRECATED WARN_CFLAGS WARN_CXXFLAGS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB_CFLAGS LIB_LIBS BACKEND_CFLAGS BACKEND_LIBS FRONTEND_CORE_CFLAGS FRONTEND_CORE_LIBS SHELL_CORE_CFLAGS SHELL_CORE_LIBS WITH_GNOME_TRUE WITH_GNOME_FALSE GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS GNOME_PRINT_CFLAGS GNOME_PRINT_LIBS GTK_PRINT_CFLAGS GTK_PRINT_LIBS WITH_GNOME_PRINT_TRUE WITH_GNOME_PRINT_FALSE WITH_GTK_PRINT_TRUE WITH_GTK_PRINT_FALSE DBUS_CFLAGS DBUS_LIBS DBUS_BINDING_TOOL SHELL_CFLAGS SHELL_LIBS FRONTEND_CFLAGS FRONTEND_LIBS ENABLE_DBUS_TRUE ENABLE_DBUS_FALSE DBUS_TOOL_NO_PREFIX_TRUE DBUS_TOOL_NO_PREFIX_FALSE NAUTILUS_CFLAGS NAUTILUS_LIBS HAVE_NAUTILUS_TRUE HAVE_NAUTILUS_FALSE ENABLE_THUMBNAILER_TRUE ENABLE_THUMBNAILER_FALSE GTK_RECENT_CFLAGS GTK_RECENT_LIBS HAVE_GTK_RECENT_TRUE HAVE_GTK_RECENT_FALSE GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL POPPLER_CFLAGS POPPLER_LIBS CAIRO_PDF_CFLAGS CAIRO_PDF_LIBS CAIRO_PS_CFLAGS CAIRO_PS_LIBS ENABLE_PDF_TRUE ENABLE_PDF_FALSE ENABLE_PS_TRUE ENABLE_PS_FALSE ENABLE_TIFF_TRUE ENABLE_TIFF_FALSE DJVU_CFLAGS DJVU_LIBS ENABLE_DJVU_TRUE ENABLE_DJVU_FALSE ENABLE_DVI_TRUE ENABLE_DVI_FALSE WITH_TYPE1_FONTS_TRUE WITH_TYPE1_FONTS_FALSE ENABLE_PIXBUF_TRUE ENABLE_PIXBUF_FALSE ENABLE_COMICS_TRUE ENABLE_COMICS_FALSE ENABLE_IMPRESS_TRUE ENABLE_IMPRESS_FALSE EVINCE_MIME_TYPES LIBOBJS LTLIBOBJS'

753

+ac_subst_vars='SHELL

754

+PATH_SEPARATOR

755

+PACKAGE_NAME

969

+POPPLER_LIBS

970

+CAIRO_PDF_CFLAGS

971

+CAIRO_PDF_LIBS

972

+CAIRO_PS_CFLAGS

973

+CAIRO_PS_LIBS

972

974

+ENABLE_PDF_TRUE

973

975

+ENABLE_PDF_FALSE

974

976

+ENABLE_PS_TRUE

1035

1037

+POPPLER_LIBS

1036

1038

+CAIRO_PDF_CFLAGS

1037

1039

+CAIRO_PDF_LIBS

1040

+CAIRO_PS_CFLAGS

1041

+CAIRO_PS_LIBS

1038

1042

+DJVU_CFLAGS

1039

1043

+DJVU_LIBS'

1040

1044

+

1041

1045

1042

1046

# Initialize some variables set by options.

1043

1047

ac_init_help=

1044

@@ -492,34 +1082,48 @@

1048

@@ -492,34 +1086,48 @@

1045

1049

# and all the variables that are supposed to be based on exec_prefix

1046

1050

# by default will actually change.

1047

1051

# Use braces instead of parens because sh, perl, etc. also accept them.

1097

1101

1098

1102

1099

1103

ac_prev=bindir ;;

1100

@@ -541,33 +1145,45 @@

1104

@@ -541,33 +1149,45 @@

1101

1105

--config-cache | -C)

1102

1106

cache_file=config.cache ;;

1103

1107

1156

1160

1157

1161

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

1158

1162

1159

@@ -594,6 +1210,12 @@

1163

@@ -594,6 +1214,12 @@

1160

1164

-host=* | --host=* | --hos=* | --ho=*)

1161

1165

host_alias=$ac_optarg ;;

1162

1166

1169

1173

-includedir | --includedir | --includedi | --included | --include \

1170

1174

| --includ | --inclu | --incl | --inc)

1171

1175

ac_prev=includedir ;;

1172

@@ -618,13 +1240,16 @@

1176

@@ -618,13 +1244,16 @@

1173

1177

| --libexe=* | --libex=* | --libe=*)

1174

1178

libexecdir=$ac_optarg ;;

1175

1179

1190

1194

localstatedir=$ac_optarg ;;

1191

1195

1192

1196

-mandir | --mandir | --mandi | --mand | --man | --ma | --m)

1193

@@ -689,6 +1314,16 @@

1197

@@ -689,6 +1318,16 @@

1194

1198

| --progr-tra=* | --program-tr=* | --program-t=*)

1195

1199

program_transform_name=$ac_optarg ;;

1196

1200

1207

1211

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

1208

1212

1209

1213

silent=yes ;;

1210

@@ -741,24 +1376,20 @@

1214

@@ -741,24 +1380,20 @@

1211

1215

-with-* | --with-*)

1212

1216

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

1213

1217

# Reject names that are not valid shell variable names.

1238

1242

1239

1243

--x)

1240

1244

# Obsolete; use --with-x.

1241

@@ -789,8 +1420,7 @@

1245

@@ -789,8 +1424,7 @@

1242

1246

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

1243

1247

{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2

1244

1248

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

1248

1252

export $ac_envvar ;;

1249

1253

1250

1254

*)

1251

@@ -810,27 +1440,19 @@

1255

@@ -810,27 +1444,19 @@

1252

1256

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

1253

1257

fi

1254

1258

1286

1290

done

1287

1291

1288

1292

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

1289

@@ -857,210 +1479,76 @@

1293

@@ -857,218 +1483,76 @@

1290

1294

test "$silent" = yes && exec 6>/dev/null

1291

1295

1292

1296

1517

1521

-ac_env_CAIRO_PDF_LIBS_value=$CAIRO_PDF_LIBS

1518

1522

-ac_cv_env_CAIRO_PDF_LIBS_set=${CAIRO_PDF_LIBS+set}

1519

1523

-ac_cv_env_CAIRO_PDF_LIBS_value=$CAIRO_PDF_LIBS

1524

-ac_env_CAIRO_PS_CFLAGS_set=${CAIRO_PS_CFLAGS+set}

1525

-ac_env_CAIRO_PS_CFLAGS_value=$CAIRO_PS_CFLAGS

1526

-ac_cv_env_CAIRO_PS_CFLAGS_set=${CAIRO_PS_CFLAGS+set}

1527

-ac_cv_env_CAIRO_PS_CFLAGS_value=$CAIRO_PS_CFLAGS

1528

-ac_env_CAIRO_PS_LIBS_set=${CAIRO_PS_LIBS+set}

1529

-ac_env_CAIRO_PS_LIBS_value=$CAIRO_PS_LIBS

1530

-ac_cv_env_CAIRO_PS_LIBS_set=${CAIRO_PS_LIBS+set}

1531

-ac_cv_env_CAIRO_PS_LIBS_value=$CAIRO_PS_LIBS

1520

1532

-ac_env_DJVU_CFLAGS_set=${DJVU_CFLAGS+set}

1521

1533

-ac_env_DJVU_CFLAGS_value=$DJVU_CFLAGS

1522

1534

-ac_cv_env_DJVU_CFLAGS_set=${DJVU_CFLAGS+set}

1554

1566

1555

1567

#

1556

1568

# Report the --help message.

1557

@@ -1089,9 +1577,6 @@

1569

@@ -1097,9 +1581,6 @@

1558

1570

-n, --no-create do not create output files

1559

1571

--srcdir=DIR find the sources in DIR [configure dir or \`..']

1560

1572

1564

1576

Installation directories:

1565

1577

--prefix=PREFIX install architecture-independent files in PREFIX

1566

1578

[$ac_default_prefix]

1567

@@ -1109,15 +1594,22 @@

1579

@@ -1117,15 +1598,22 @@

1568

1580

--bindir=DIR user executables [EPREFIX/bin]

1569

1581

--sbindir=DIR system admin executables [EPREFIX/sbin]

1570

1582

--libexecdir=DIR program executables [EPREFIX/libexec]

1590

1602

_ACEOF

1591

1603

1592

1604

cat <<\_ACEOF

1593

@@ -1144,10 +1636,8 @@

1605

@@ -1152,10 +1640,8 @@

1594

1606

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

1595

1607

--enable-maintainer-mode enable make rules and dependencies not useful

1596

1608

(and sometimes confusing) to the casual installer

1603

1615

--enable-fast-install[=PKGS]

1604

1616

optimize for fast installation [default=yes]

1605

1617

--disable-dependency-tracking speeds up one-time build

1606

@@ -1182,8 +1672,7 @@

1618

@@ -1190,8 +1676,7 @@

1607

1619

--with-gnu-ld assume the C compiler uses GNU ld [default=no]

1608

1620

--with-pic try to use only PIC/non-PIC objects [default=use

1609

1621

both]

1613

1625

--with-help-dir=DIR path to help docs

1614

1626

--with-omf-dir=DIR path to OMF files

1615

1627

--with-help-formats=FORMATS

1616

@@ -1201,8 +1690,9 @@

1628

@@ -1209,8 +1694,9 @@

1617

1629

CFLAGS C compiler flags

1618

1630

LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

1619

1631

nonstandard directory <lib dir>

1625

1637

CPP C preprocessor

1626

1638

CXX C++ compiler command

1627

1639

CXXFLAGS C++ compiler flags

1628

@@ -1265,120 +1755,86 @@

1640

@@ -1277,120 +1763,86 @@

1629

1641

1630

1642

Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=evince>.

1631

1643

_ACEOF

1761

1773

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

1762

1774

if $ac_init_version; then

1763

1775

cat <<\_ACEOF

1764

Evince configure 0.9.2

1776

Evince configure 0.9.3

1765

1777

-generated by GNU Autoconf 2.59

1766

1778

+generated by GNU Autoconf 2.61

1767

1779

1780

1792

This file contains any messages produced by compilers while

1781

1793

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

1782

1794

1783

It was created by Evince $as_me 0.9.2, which was

1795

It was created by Evince $as_me 0.9.3, which was

1784

1796

-generated by GNU Autoconf 2.59. Invocation command line was

1785

1797

+generated by GNU Autoconf 2.61. Invocation command line was

1786

1798

1791

1803

{

1792

1804

cat <<_ASUNAME

1793

1805

## --------- ##

1794

@@ -1397,7 +1853,7 @@

1806

@@ -1409,7 +1861,7 @@

1795

1807

/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`

1796

1808

/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`

1797

1809

/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`

1800

1812

/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`

1801

1813

/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`

1802

1814

/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`

1803

@@ -1411,6 +1867,7 @@

1815

@@ -1423,6 +1875,7 @@

1804

1816

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

1805

1817

echo "PATH: $as_dir"

1806

1818

done

1808

1820

1809

1821

} >&5

1810

1822

1811

@@ -1432,7 +1889,6 @@

1823

@@ -1444,7 +1897,6 @@

1812

1824

ac_configure_args=

1813

1825

ac_configure_args0=

1814

1826

ac_configure_args1=

1816

1828

ac_must_keep_next=false

1817

1829

for ac_pass in 1 2

1818

1830

do

1819

@@ -1443,7 +1899,7 @@

1831

@@ -1455,7 +1907,7 @@

1820

1832

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

1821

1833

1822

1834

continue ;;

1825

1837

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

1826

1838

esac

1827

1839

case $ac_pass in

1828

@@ -1465,9 +1921,7 @@

1840

@@ -1477,9 +1929,7 @@

1829

1841

-* ) ac_must_keep_next=true ;;

1830

1842

esac

1831

1843

fi

1836

1848

;;

1837

1849

esac

1838

1850

done

1839

@@ -1478,8 +1932,8 @@

1851

@@ -1490,8 +1940,8 @@

1840

1852

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

1841

1853

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

1842

1854

# would cause problems or look ugly.

1847

1859

trap 'exit_status=$?

1848

1860

# Save into config.log some information that might help in debugging.

1849

1861

{

1850

@@ -1492,20 +1946,34 @@

1862

@@ -1504,20 +1954,34 @@

1851

1863

_ASBOX

1852

1864

echo

1853

1865

# The following way of writing the cache mishandles newlines in values,

1892

1904

echo

1893

1905

1894

1906

cat <<\_ASBOX

1895

@@ -1516,22 +1984,28 @@

1907

@@ -1528,22 +1992,28 @@

1896

1908

echo

1897

1909

for ac_var in $ac_subst_vars

1898

1910

do

1928

1940

done | sort

1929

1941

echo

1930

1942

fi

1931

@@ -1543,26 +2017,24 @@

1943

@@ -1555,26 +2025,24 @@

1932

1944

## ----------- ##

1933

1945

_ASBOX

1934

1946

echo

1960

1972

1961

1973

# Predefined preprocessor variables.

1962

1974

1963

@@ -1593,14 +2065,17 @@

1975

@@ -1605,14 +2073,17 @@

1964

1976

1965

1977

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

1966

1978

# Prefer explicitly selected file to automatically selected ones.

1985

1997

if test -r "$ac_site_file"; then

1986

1998

{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

1987

1999

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

1988

@@ -1616,8 +2091,8 @@

2000

@@ -1628,8 +2099,8 @@

1989

2001

{ echo "$as_me:$LINENO: loading cache $cache_file" >&5

1990

2002

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

1991

2003

case $cache_file in

1996

2008

esac

1997

2009

fi

1998

2010

else

1999

@@ -1629,12 +2104,11 @@

2011

@@ -1641,12 +2112,11 @@

2000

2012

# Check that the precious variables saved in the cache have kept the same

2001

2013

# value.

2002

2014

ac_cache_corrupted=false

2012

2024

case $ac_old_set,$ac_new_set in

2013

2025

set,)

2014

2026

{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

2015

@@ -1659,8 +2133,7 @@

2027

@@ -1671,8 +2141,7 @@

2016

2028

# Pass precious variables to config.status.

2017

2029

if test "$ac_new_set" = set; then

2018

2030

case $ac_new_val in

2022

2034

*) ac_arg=$ac_var=$ac_new_val ;;

2023

2035

esac

2024

2036

case " $ac_configure_args " in

2025

@@ -1677,12 +2150,6 @@

2037

@@ -1689,12 +2158,6 @@

2026

2038

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

2027

2039

fi

2028

2040

2035

2047

2036

2048

2037

2049

2038

@@ -1707,33 +2174,44 @@

2050

@@ -1719,33 +2182,44 @@

2039

2051

2040

2052

2041

2053

2089

2101

2090

2102

# Find a good install program. We prefer a C program (faster),

2091

2103

# so one script is as good as another. But avoid the broken or

2092

@@ -1748,8 +2226,8 @@

2104

@@ -1760,8 +2234,8 @@

2093

2105

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

2094

2106

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

2095

2107

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

2100

2112

if test -z "$INSTALL"; then

2101

2113

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

2102

2114

echo $ECHO_N "(cached) $ECHO_C" >&6

2103

@@ -1771,7 +2249,7 @@

2115

@@ -1783,7 +2257,7 @@

2104

2116

# by default.

2105

2117

for ac_prog in ginstall scoinst install; do

2106

2118

for ac_exec_ext in '' $ac_executable_extensions; do

2109

2121

if test $ac_prog = install &&

2110

2122

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

2111

2123

# AIX install. It has an incompatible calling convention.

2112

@@ -1790,21 +2268,22 @@

2124

@@ -1802,21 +2276,22 @@

2113

2125

;;

2114

2126

esac

2115

2127

done

2137

2149

2138

2150

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

2139

2151

# It thinks the first close brace ends the variable substitution.

2140

@@ -1814,8 +2293,8 @@

2152

@@ -1826,8 +2301,8 @@

2141

2153

2142

2154

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

2143

2155

2148

2160

# Just in case

2149

2161

sleep 1

2150

2162

echo timestamp > conftest.file

2151

@@ -1857,20 +2336,20 @@

2163

@@ -1869,20 +2344,20 @@

2152

2164

Check your system clock" >&2;}

2153

2165

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

2154

2166

fi

2174

2186

2175

2187

# expand $ac_aux_dir to an absolute path

2176

2188

am_aux_dir=`cd $ac_aux_dir && pwd`

2177

@@ -1922,8 +2401,8 @@

2189

@@ -1934,8 +2409,8 @@

2178

2190

do

2179

2191

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

2180

2192

set dummy $ac_prog; ac_word=$2

2185

2197

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

2186

2198

echo $ECHO_N "(cached) $ECHO_C" >&6

2187

2199

else

2188

@@ -1936,54 +2415,57 @@

2200

@@ -1948,54 +2423,57 @@

2189

2201

IFS=$as_save_IFS

2190

2202

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

2191

2203

for ac_exec_ext in '' $ac_executable_extensions; do

2264

2276

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

2265

2277

fi

2266

2278

2267

@@ -2054,8 +2536,8 @@

2279

@@ -2066,8 +2544,8 @@

2268

2280

if test -n "$ac_tool_prefix"; then

2269

2281

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

2270

2282

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

2275

2287

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

2276

2288

echo $ECHO_N "(cached) $ECHO_C" >&6

2277

2289

else

2278

@@ -2068,32 +2550,34 @@

2290

@@ -2080,32 +2558,34 @@

2279

2291

IFS=$as_save_IFS

2280

2292

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

2281

2293

for ac_exec_ext in '' $ac_executable_extensions; do

2317

2329

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

2318

2330

echo $ECHO_N "(cached) $ECHO_C" >&6

2319

2331

else

2320

@@ -2106,27 +2590,41 @@

2332

@@ -2118,27 +2598,41 @@

2321

2333

IFS=$as_save_IFS

2322

2334

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

2323

2335

for ac_exec_ext in '' $ac_executable_extensions; do

2366

2378

else

2367

2379

STRIP="$ac_cv_prog_STRIP"

2368

2380

fi

2369

@@ -2147,20 +2645,20 @@

2381

@@ -2159,20 +2653,20 @@

2370

2382

2371

2383

2372

2384

2396

2408

2397

2409

2398

2410

if test $USE_MAINTAINER_MODE = yes; then

2399

@@ -2175,10 +2673,9 @@

2411

@@ -2187,10 +2681,9 @@

2400

2412

2401

2413

2402

2414

2409

2421

case $enableval in

2410

2422

yes) enable_shared=yes ;;

2411

2423

no) enable_shared=no ;;

2412

@@ -2197,12 +2694,12 @@

2424

@@ -2209,12 +2702,12 @@

2413

2425

esac

2414

2426

else

2415

2427

enable_shared=yes

2426

2438

case $enableval in

2427

2439

yes) enable_static=yes ;;

2428

2440

no) enable_static=no ;;

2429

@@ -2221,12 +2718,12 @@

2441

@@ -2233,12 +2726,12 @@

2430

2442

esac

2431

2443

else

2432

2444

enable_static=yes

2443

2455

case $enableval in

2444

2456

yes) enable_fast_install=yes ;;

2445

2457

no) enable_fast_install=no ;;

2446

@@ -2245,65 +2742,95 @@

2458

@@ -2257,65 +2750,95 @@

2447

2459

esac

2448

2460

else

2449

2461

enable_fast_install=yes

2571

2583

2572

2584

2573

2585

am_make=${MAKE-make}

2574

@@ -2313,8 +2840,8 @@

2586

@@ -2325,8 +2848,8 @@

2575

2587

.PHONY: am__doit

2576

2588

END

2577

2589

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

2582

2594

am__include="#"

2583

2595

am__quote=

2584

2596

_am_result=none

2585

@@ -2341,15 +2868,15 @@

2597

@@ -2353,15 +2876,15 @@

2586

2598

fi

2587

2599

2588

2600

2603

2615

if test "x$enable_dependency_tracking" != xno; then

2604

2616

am_depcomp="$ac_aux_dir/depcomp"

2605

2617

AMDEPBACKSLASH='\'

2606

@@ -2374,8 +2901,8 @@

2618

@@ -2386,8 +2909,8 @@

2607

2619

if test -n "$ac_tool_prefix"; then

2608

2620

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

2609

2621

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

2614

2626

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

2615

2627

echo $ECHO_N "(cached) $ECHO_C" >&6

2616

2628

else

2617

@@ -2388,32 +2915,34 @@

2629

@@ -2400,32 +2923,34 @@

2618

2630

IFS=$as_save_IFS

2619

2631

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

2620

2632

for ac_exec_ext in '' $ac_executable_extensions; do

2656

2668

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

2657

2669

echo $ECHO_N "(cached) $ECHO_C" >&6

2658

2670

else

2659

@@ -2426,36 +2955,51 @@

2671

@@ -2438,36 +2963,51 @@

2660

2672

IFS=$as_save_IFS

2661

2673

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

2662

2674

for ac_exec_ext in '' $ac_executable_extensions; do

2718

2730

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

2719

2731

echo $ECHO_N "(cached) $ECHO_C" >&6

2720

2732

else

2721

@@ -2468,74 +3012,34 @@

2733

@@ -2480,74 +3020,34 @@

2722

2734

IFS=$as_save_IFS

2723

2735

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

2724

2736

for ac_exec_ext in '' $ac_executable_extensions; do

2802

2814

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

2803

2815

echo $ECHO_N "(cached) $ECHO_C" >&6

2804

2816

else

2805

@@ -2549,7 +3053,7 @@

2817

@@ -2561,7 +3061,7 @@

2806

2818

IFS=$as_save_IFS

2807

2819

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

2808

2820

for ac_exec_ext in '' $ac_executable_extensions; do

2811

2823

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

2812

2824

ac_prog_rejected=yes

2813

2825

continue

2814

@@ -2560,6 +3064,7 @@

2826

@@ -2572,6 +3072,7 @@

2815

2827

fi

2816

2828

done

2817

2829

done

2819

2831

2820

2832

if test $ac_prog_rejected = yes; then

2821

2833

# We found a bogon in the path, so make sure we never use it.

2822

@@ -2577,22 +3082,23 @@

2834

@@ -2589,22 +3090,23 @@

2823

2835

fi

2824

2836

CC=$ac_cv_prog_CC

2825

2837

if test -n "$CC"; then

2850

2862

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

2851

2863

echo $ECHO_N "(cached) $ECHO_C" >&6

2852

2864

else

2853

@@ -2605,36 +3111,38 @@

2865

@@ -2617,36 +3119,38 @@

2854

2866

IFS=$as_save_IFS

2855

2867

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

2856

2868

for ac_exec_ext in '' $ac_executable_extensions; do

2897

2909

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

2898

2910

echo $ECHO_N "(cached) $ECHO_C" >&6

2899

2911

else

2900

@@ -2647,29 +3155,45 @@

2912

@@ -2659,29 +3163,45 @@

2901

2913

IFS=$as_save_IFS

2902

2914

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

2903

2915

for ac_exec_ext in '' $ac_executable_extensions; do

2949

2961

fi

2950

2962

2951

2963

fi

2952

@@ -2682,21 +3206,35 @@

2964

@@ -2694,21 +3214,35 @@

2953

2965

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

2954

2966

2955

2967

# Provide some information about the compiler.

2993

3005

ac_status=$?

2994

3006

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

2995

3007

(exit $ac_status); }

2996

@@ -2721,47 +3259,77 @@

3008

@@ -2733,47 +3267,77 @@

2997

3009

# Try to create an executable without -o first, disregard a.out.

2998

3010

# It will help us diagnose broken compilers, and finding out an intuition

2999

3011

# of exeext.

3093

3105

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

3094

3106

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

3095

3107

3096

@@ -2773,19 +3341,21 @@

3108

@@ -2785,19 +3349,21 @@

3097

3109

fi

3098

3110

3099

3111

ac_exeext=$ac_cv_exeext

3122

3134

ac_status=$?

3123

3135

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

3124

3136

(exit $ac_status); }; }; then

3125

@@ -2804,22 +3374,27 @@

3137

@@ -2816,22 +3382,27 @@

3126

3138

fi

3127

3139

fi

3128

3140

fi

3162

3174

ac_status=$?

3163

3175

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

3164

3176

(exit $ac_status); }; then

3165

@@ -2830,9 +3405,8 @@

3177

@@ -2842,9 +3413,8 @@

3166

3178

for ac_file in conftest.exe conftest conftest.*; do

3167

3179

test -f "$ac_file" || continue

3168

3180

case $ac_file in

3173

3185

break;;

3174

3186

* ) break;;

3175

3187

esac

3176

@@ -2846,14 +3420,14 @@

3188

@@ -2858,14 +3428,14 @@

3177

3189

fi

3178

3190

3179

3191

rm -f conftest$ac_cv_exeext

3192

3204

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

3193

3205

echo $ECHO_N "(cached) $ECHO_C" >&6

3194

3206

else

3195

@@ -2873,14 +3447,20 @@

3207

@@ -2885,14 +3455,20 @@

3196

3208

}

3197

3209

_ACEOF

3198

3210

rm -f conftest.o conftest.obj

3217

3229

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

3218

3230

break;;

3219

3231

esac

3220

@@ -2898,12 +3478,12 @@

3232

@@ -2910,12 +3486,12 @@

3221

3233

3222

3234

rm -f conftest.$ac_cv_objext conftest.$ac_ext

3223

3235

fi

3234

3246

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

3235

3247

echo $ECHO_N "(cached) $ECHO_C" >&6

3236

3248

else

3237

@@ -2926,50 +3506,49 @@

3249

@@ -2938,50 +3514,49 @@

3238

3250

}

3239

3251

_ACEOF

3240

3252

rm -f conftest.$ac_objext

3308

3320

/* confdefs.h. */

3309

3321

_ACEOF

3310

3322

cat confdefs.h >>conftest.$ac_ext

3311

@@ -2985,38 +3564,118 @@

3323

@@ -2997,38 +3572,118 @@

3312

3324

}

3313

3325

_ACEOF

3314

3326

rm -f conftest.$ac_objext

3443

3455

if test "$ac_test_CFLAGS" = set; then

3444

3456

CFLAGS=$ac_save_CFLAGS

3445

3457

elif test $ac_cv_prog_cc_g = yes; then

3446

@@ -3032,12 +3691,12 @@

3458

@@ -3044,12 +3699,12 @@

3447

3459

CFLAGS=

3448

3460

fi

3449

3461

fi

3460

3472

ac_save_CC=$CC

3461

3473

cat >conftest.$ac_ext <<_ACEOF

3462

3474

/* confdefs.h. */

3463

@@ -3071,12 +3730,17 @@

3475

@@ -3083,12 +3738,17 @@

3464

3476

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

3465

3477

function prototypes and stuff, but not '\xHH' hex character constants.

3466

3478

These don't provoke an error unfortunately, instead are silently treated

3480

3492

int test (int i, double x);

3481

3493

struct s1 {int (*f) (int a);};

3482

3494

struct s2 {int (*f) (double a);};

3483

@@ -3091,205 +3755,57 @@

3495

@@ -3103,205 +3763,57 @@

3484

3496

return 0;

3485

3497

}

3486

3498

_ACEOF

3716

3728

ac_ext=c

3717

3729

ac_cpp='$CPP $CPPFLAGS'

3718

3730

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

3719

@@ -3298,8 +3814,8 @@

3731

@@ -3310,8 +3822,8 @@

3720

3732

3721

3733

depcc="$CC" am_compiler_list=

3722

3734

3727

3739

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

3728

3740

echo $ECHO_N "(cached) $ECHO_C" >&6

3729

3741

else

3730

@@ -3388,8 +3904,8 @@

3742

@@ -3400,8 +3912,8 @@

3731

3743

fi

3732

3744

3733

3745

fi

3738

3750

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

3739

3751

3740

3752

3741

@@ -3405,8 +3921,8 @@

3753

@@ -3417,8 +3929,8 @@

3742

3754

fi

3743

3755

3744

3756

3749

3761

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

3750

3762

echo $ECHO_N "(cached) $ECHO_C" >&6

3751

3763

else

3752

@@ -3461,37 +3977,184 @@

3764

@@ -3473,37 +3985,184 @@

3753

3765

3754

3766

SED=$lt_cv_path_SED

3755

3767

3951

3963

case $host in

3952

3964

*-*-mingw*)

3953

3965

# gcc leaves a trailing carriage return which upsets mingw

3954

@@ -3520,11 +4183,11 @@

3966

@@ -3532,11 +4191,11 @@

3955

3967

;;

3956

3968

esac

3957

3969

elif test "$with_gnu_ld" = yes; then

3967

3979

fi

3968

3980

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

3969

3981

echo $ECHO_N "(cached) $ECHO_C" >&6

3970

@@ -3557,17 +4220,17 @@

3982

@@ -3569,17 +4228,17 @@

3971

3983

3972

3984

LD="$lt_cv_path_LD"

3973

3985

if test -n "$LD"; then

3991

4003

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

3992

4004

echo $ECHO_N "(cached) $ECHO_C" >&6

3993

4005

else

3994

@@ -3581,20 +4244,20 @@

4006

@@ -3593,20 +4252,20 @@

3995

4007

;;

3996

4008

esac

3997

4009

fi

4018

4030

reload_flag=$lt_cv_ld_reload_flag

4019

4031

case $reload_flag in

4020

4032

"" | " "*) ;;

4021

@@ -3611,8 +4274,8 @@

4033

@@ -3623,8 +4282,8 @@

4022

4034

;;

4023

4035

esac

4024

4036

4029

4041

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

4030

4042

echo $ECHO_N "(cached) $ECHO_C" >&6

4031

4043

else

4032

@@ -3660,23 +4323,23 @@

4044

@@ -3672,23 +4331,23 @@

4033

4045

test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

4034

4046

fi

4035

4047

fi

4063

4075

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

4064

4076

echo $ECHO_N "(cached) $ECHO_C" >&6

4065

4077

else

4066

@@ -3851,8 +4514,8 @@

4078

@@ -3863,8 +4522,8 @@

4067

4079

esac

4068

4080

4069

4081

fi

4074

4086

file_magic_cmd=$lt_cv_file_magic_cmd

4075

4087

deplibs_check_method=$lt_cv_deplibs_check_method

4076

4088

test -z "$deplibs_check_method" && deplibs_check_method=unknown

4077

@@ -3870,11 +4533,11 @@

4089

@@ -3882,11 +4541,11 @@

4078

4090

compiler=$CC

4079

4091

4080

4092

4089

4101

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

4090

4102

4091

4103

# Some flags need to be propagated to the compiler or linker for good

4092

@@ -3901,7 +4564,7 @@

4104

@@ -3913,7 +4572,7 @@

4093

4105

;;

4094

4106

*-*-irix6*)

4095

4107

# Find out which ABI we are using.

4096

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

4097

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

4108

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

4109

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

4098

4110

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

4099

4111

(eval $ac_compile) 2>&5

4100

4112

ac_status=$?

4101

@@ -3986,8 +4649,8 @@

4113

@@ -3998,8 +4657,8 @@

4102

4114

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

4103

4115

SAVE_CFLAGS="$CFLAGS"

4104

4116

CFLAGS="$CFLAGS -belf"

4109

4121

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

4110

4122

echo $ECHO_N "(cached) $ECHO_C" >&6

4111

4123

else

4112

@@ -4013,35 +4676,32 @@

4124

@@ -4025,35 +4684,32 @@

4113

4125

}

4114

4126

_ACEOF

4115

4127

rm -f conftest.$ac_objext conftest$ac_exeext

4160

4172

conftest$ac_exeext conftest.$ac_ext

4161

4173

ac_ext=c

4162

4174

ac_cpp='$CPP $CPPFLAGS'

4163

@@ -4050,8 +4710,8 @@

4175

@@ -4062,8 +4718,8 @@

4164

4176

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4165

4177

4166

4178

fi

4171

4183

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

4172

4184

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

4173

4185

CFLAGS="$SAVE_CFLAGS"

4174

@@ -4088,8 +4748,8 @@

4186

@@ -4100,8 +4756,8 @@

4175

4187

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

4176

4188

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

4177

4189

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4182

4194

# On Suns, sometimes $CPP names a directory.

4183

4195

if test -n "$CPP" && test -d "$CPP"; then

4184

4196

CPP=

4185

@@ -4123,24 +4783,22 @@

4197

@@ -4135,24 +4791,22 @@

4186

4198

#endif

4187

4199

Syntax error

4188

4200

_ACEOF

4218

4230

:

4219

4231

else

4220

4232

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

4221

@@ -4149,9 +4807,10 @@

4233

@@ -4161,9 +4815,10 @@

4222

4234

# Broken: fails on valid input.

4223

4235

continue

4224

4236

fi

4230

4242

# can be detected and how.

4231

4243

cat >conftest.$ac_ext <<_ACEOF

4232

4244

/* confdefs.h. */

4233

@@ -4161,24 +4820,22 @@

4245

@@ -4173,24 +4828,22 @@

4234

4246

/* end confdefs.h. */

4235

4247

#include <ac_nonexistent.h>

4236

4248

_ACEOF

4266

4278

# Broken: success on invalid input.

4267

4279

continue

4268

4280

else

4269

@@ -4189,6 +4846,7 @@

4281

@@ -4201,6 +4854,7 @@

4270

4282

ac_preproc_ok=:

4271

4283

break

4272

4284

fi

4274

4286

rm -f conftest.err conftest.$ac_ext

4275

4287

4276

4288

done

4277

@@ -4206,8 +4864,8 @@

4289

@@ -4218,8 +4872,8 @@

4278

4290

else

4279

4291

ac_cv_prog_CPP=$CPP

4280

4292

fi

4285

4297

ac_preproc_ok=false

4286

4298

for ac_c_preproc_warn_flag in '' yes

4287

4299

do

4288

@@ -4230,24 +4888,22 @@

4300

@@ -4242,24 +4896,22 @@

4289

4301

#endif

4290

4302

Syntax error

4291

4303

_ACEOF

4321

4333

:

4322

4334

else

4323

4335

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

4324

@@ -4256,9 +4912,10 @@

4336

@@ -4268,9 +4920,10 @@

4325

4337

# Broken: fails on valid input.

4326

4338

continue

4327

4339

fi

4333

4345

# can be detected and how.

4334

4346

cat >conftest.$ac_ext <<_ACEOF

4335

4347

/* confdefs.h. */

4336

@@ -4268,24 +4925,22 @@

4348

@@ -4280,24 +4933,22 @@

4337

4349

/* end confdefs.h. */

4338

4350

#include <ac_nonexistent.h>

4339

4351

_ACEOF

4369

4381

# Broken: success on invalid input.

4370

4382

continue

4371

4383

else

4372

@@ -4296,6 +4951,7 @@

4384

@@ -4308,6 +4959,7 @@

4373

4385

ac_preproc_ok=:

4374

4386

break

4375

4387

fi

4377

4389

rm -f conftest.err conftest.$ac_ext

4378

4390

4379

4391

done

4380

@@ -4318,8 +4974,8 @@

4392

@@ -4330,8 +4982,8 @@

4381

4393

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4382

4394

4383

4395

4388

4400

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

4389

4401

echo $ECHO_N "(cached) $ECHO_C" >&6

4390

4402

else

4391

@@ -4343,35 +4999,31 @@

4403

@@ -4355,35 +5007,31 @@

4392

4404

}

4393

4405

_ACEOF

4394

4406

rm -f conftest.$ac_objext

4438

4450

4439

4451

if test $ac_cv_header_stdc = yes; then

4440

4452

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

4441

@@ -4427,6 +5079,7 @@

4453

@@ -4439,6 +5087,7 @@

4442

4454

cat >>conftest.$ac_ext <<_ACEOF

4443

4455

/* end confdefs.h. */

4444

4456

#include <ctype.h>

4446

4458

#if ((' ' & 0x0FF) == 0x020)

4447

4459

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

4448

4460

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

4449

@@ -4446,18 +5099,27 @@

4461

@@ -4458,18 +5107,27 @@

4450

4462

for (i = 0; i < 256; i++)

4451

4463

if (XOR (islower (i), ISLOWER (i))

4452

4464

|| toupper (i) != TOUPPER (i))

4480

4492

ac_status=$?

4481

4493

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

4482

4494

(exit $ac_status); }; }; then

4483

@@ -4470,12 +5132,14 @@

4495

@@ -4482,12 +5140,14 @@

4484

4496

( exit $ac_status )

4485

4497

ac_cv_header_stdc=no

4486

4498

fi

4498

4510

if test $ac_cv_header_stdc = yes; then

4499

4511

4500

4512

cat >>confdefs.h <<\_ACEOF

4501

@@ -4498,9 +5162,9 @@

4513

@@ -4510,9 +5170,9 @@

4502

4514

inttypes.h stdint.h unistd.h

4503

4515

do

4504

4516

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

4511

4523

echo $ECHO_N "(cached) $ECHO_C" >&6

4512

4524

else

4513

4525

cat >conftest.$ac_ext <<_ACEOF

4514

@@ -4514,38 +5178,35 @@

4526

@@ -4526,38 +5186,35 @@

4515

4527

#include <$ac_header>

4516

4528

_ACEOF

4517

4529

rm -f conftest.$ac_objext

4567

4579

if test `eval echo '${'$as_ac_Header'}'` = yes; then

4568

4580

cat >>confdefs.h <<_ACEOF

4569

4581

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

4570

@@ -4560,18 +5221,19 @@

4582

@@ -4572,18 +5229,19 @@

4571

4583

for ac_header in dlfcn.h

4572

4584

do

4573

4585

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

4595

4607

cat >conftest.$ac_ext <<_ACEOF

4596

4608

/* confdefs.h. */

4597

4609

_ACEOF

4598

@@ -4582,41 +5244,37 @@

4610

@@ -4594,41 +5252,37 @@

4599

4611

#include <$ac_header>

4600

4612

_ACEOF

4601

4613

rm -f conftest.$ac_objext

4655

4667

cat >conftest.$ac_ext <<_ACEOF

4656

4668

/* confdefs.h. */

4657

4669

_ACEOF

4658

@@ -4625,24 +5283,22 @@

4670

@@ -4637,24 +5291,22 @@

4659

4671

/* end confdefs.h. */

4660

4672

#include <$ac_header>

4661

4673

_ACEOF

4691

4703

ac_header_preproc=yes

4692

4704

else

4693

4705

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

4694

@@ -4650,9 +5306,10 @@

4706

@@ -4662,9 +5314,10 @@

4695

4707

4696

4708

ac_header_preproc=no

4697

4709

fi

4704

4716

4705

4717

# So? What about this header?

4706

4718

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

4707

@@ -4676,25 +5333,24 @@

4719

@@ -4688,25 +5341,24 @@

4708

4720

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

4709

4721

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

4710

4722

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

4738

4750

4739

4751

fi

4740

4752

if test `eval echo '${'$as_ac_Header'}'` = yes; then

4741

@@ -4706,18 +5362,22 @@

4753

@@ -4718,18 +5370,22 @@

4742

4754

4743

4755

done

4744

4756

4766

4778

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

4767

4779

echo $ECHO_N "(cached) $ECHO_C" >&6

4768

4780

else

4769

@@ -4730,36 +5390,38 @@

4781

@@ -4742,36 +5398,38 @@

4770

4782

IFS=$as_save_IFS

4771

4783

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

4772

4784

for ac_exec_ext in '' $ac_executable_extensions; do

4813

4825

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

4814

4826

echo $ECHO_N "(cached) $ECHO_C" >&6

4815

4827

else

4816

@@ -4772,55 +5434,85 @@

4828

@@ -4784,55 +5442,85 @@

4817

4829

IFS=$as_save_IFS

4818

4830

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

4819

4831

for ac_exec_ext in '' $ac_executable_extensions; do

4917

4929

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

4918

4930

echo $ECHO_N "(cached) $ECHO_C" >&6

4919

4931

else

4920

@@ -4843,50 +5535,49 @@

4932

@@ -4855,50 +5543,49 @@

4921

4933

}

4922

4934

_ACEOF

4923

4935

rm -f conftest.$ac_objext

4991

5003

/* confdefs.h. */

4992

5004

_ACEOF

4993

5005

cat confdefs.h >>conftest.$ac_ext

4994

@@ -4902,160 +5593,134 @@

5006

@@ -4914,160 +5601,134 @@

4995

5007

}

4996

5008

_ACEOF

4997

5009

rm -f conftest.$ac_objext

5222

5234

ac_cpp='$CXXCPP $CPPFLAGS'

5223

5235

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5224

5236

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

5225

@@ -5063,8 +5728,8 @@

5237

@@ -5075,8 +5736,8 @@

5226

5238

5227

5239

depcc="$CXX" am_compiler_list=

5228

5240

5233

5245

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

5234

5246

echo $ECHO_N "(cached) $ECHO_C" >&6

5235

5247

else

5236

@@ -5153,8 +5818,8 @@

5248

@@ -5165,8 +5826,8 @@

5237

5249

fi

5238

5250

5239

5251

fi

5244

5256

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

5245

5257

5246

5258

5247

@@ -5175,13 +5840,13 @@

5259

@@ -5187,13 +5848,13 @@

5248

5260

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

5249

5261

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

5250

5262

(test "X$CXX" != "Xg++"))) ; then

5261

5273

if test -z "$CXXCPP"; then

5262

5274

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

5263

5275

echo $ECHO_N "(cached) $ECHO_C" >&6

5264

@@ -5211,24 +5876,22 @@

5276

@@ -5223,24 +5884,22 @@

5265

5277

#endif

5266

5278

Syntax error

5267

5279

_ACEOF

5297

5309

:

5298

5310

else

5299

5311

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

5300

@@ -5237,9 +5900,10 @@

5312

@@ -5249,9 +5908,10 @@

5301

5313

# Broken: fails on valid input.

5302

5314

continue

5303

5315

fi

5309

5321

# can be detected and how.

5310

5322

cat >conftest.$ac_ext <<_ACEOF

5311

5323

/* confdefs.h. */

5312

@@ -5249,24 +5913,22 @@

5324

@@ -5261,24 +5921,22 @@

5313

5325

/* end confdefs.h. */

5314

5326

#include <ac_nonexistent.h>

5315

5327

_ACEOF

5345

5357

# Broken: success on invalid input.

5346

5358

continue

5347

5359

else

5348

@@ -5277,6 +5939,7 @@

5360

@@ -5289,6 +5947,7 @@

5349

5361

ac_preproc_ok=:

5350

5362

break

5351

5363

fi

5353

5365

rm -f conftest.err conftest.$ac_ext

5354

5366

5355

5367

done

5356

@@ -5294,8 +5957,8 @@

5368

@@ -5306,8 +5965,8 @@

5357

5369

else

5358

5370

ac_cv_prog_CXXCPP=$CXXCPP

5359

5371

fi

5364

5376

ac_preproc_ok=false

5365

5377

for ac_cxx_preproc_warn_flag in '' yes

5366

5378

do

5367

@@ -5318,24 +5981,22 @@

5379

@@ -5330,24 +5989,22 @@

5368

5380

#endif

5369

5381

Syntax error

5370

5382

_ACEOF

5400

5412

:

5401

5413

else

5402

5414

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

5403

@@ -5344,9 +6005,10 @@

5415

@@ -5356,9 +6013,10 @@

5404

5416

# Broken: fails on valid input.

5405

5417

continue

5406

5418

fi

5412

5424

# can be detected and how.

5413

5425

cat >conftest.$ac_ext <<_ACEOF

5414

5426

/* confdefs.h. */

5415

@@ -5356,24 +6018,22 @@

5427

@@ -5368,24 +6026,22 @@

5416

5428

/* end confdefs.h. */

5417

5429

#include <ac_nonexistent.h>

5418

5430

_ACEOF

5448

5460

# Broken: success on invalid input.

5449

5461

continue

5450

5462

else

5451

@@ -5384,6 +6044,7 @@

5463

@@ -5396,6 +6052,7 @@

5452

5464

ac_preproc_ok=:

5453

5465

break

5454

5466

fi

5456

5468

rm -f conftest.err conftest.$ac_ext

5457

5469

5458

5470

done

5459

@@ -5399,7 +6060,7 @@

5471

@@ -5411,7 +6068,7 @@

5460

5472

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

5461

5473

fi

5462

5474

5465

5477

ac_cpp='$CXXCPP $CPPFLAGS'

5466

5478

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5467

5479

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

5468

@@ -5413,12 +6074,12 @@

5480

@@ -5425,12 +6082,12 @@

5469

5481

ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5470

5482

ac_compiler_gnu=$ac_cv_f77_compiler_gnu

5471

5483

if test -n "$ac_tool_prefix"; then

5481

5493

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

5482

5494

echo $ECHO_N "(cached) $ECHO_C" >&6

5483

5495

else

5484

@@ -5431,36 +6092,38 @@

5496

@@ -5443,36 +6100,38 @@

5485

5497

IFS=$as_save_IFS

5486

5498

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

5487

5499

for ac_exec_ext in '' $ac_executable_extensions; do

5528

5540

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

5529

5541

echo $ECHO_N "(cached) $ECHO_C" >&6

5530

5542

else

5531

@@ -5473,48 +6136,78 @@

5543

@@ -5485,48 +6144,78 @@

5532

5544

IFS=$as_save_IFS

5533

5545

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

5534

5546

for ac_exec_ext in '' $ac_executable_extensions; do

5581

5593

5582

5594

5583

5595

# Provide some information about the compiler.

5584

-echo "$as_me:5503:" \

5596

-echo "$as_me:5515:" \

5585

5597

- "checking for Fortran 77 compiler version" >&5

5586

5598

+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

5587

5599

ac_compiler=`set X $ac_compile; echo $2`

5621

5633

ac_status=$?

5622

5634

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

5623

5635

(exit $ac_status); }

5624

@@ -5524,8 +6217,8 @@

5636

@@ -5536,8 +6225,8 @@

5625

5637

# input file. (Note that this only needs to work for GNU compilers.)

5626

5638

ac_save_ext=$ac_ext

5627

5639

ac_ext=F

5632

5644

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

5633

5645

echo $ECHO_N "(cached) $ECHO_C" >&6

5634

5646

else

5635

@@ -5538,46 +6231,42 @@

5647

@@ -5550,46 +6239,42 @@

5636

5648

end

5637

5649

_ACEOF

5638

5650

rm -f conftest.$ac_objext

5697

5709

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

5698

5710

echo $ECHO_N "(cached) $ECHO_C" >&6

5699

5711

else

5700

@@ -5588,39 +6277,35 @@

5712

@@ -5600,39 +6285,35 @@

5701

5713

end

5702

5714

_ACEOF

5703

5715

rm -f conftest.$ac_objext

5753

5765

if test "$ac_test_FFLAGS" = set; then

5754

5766

FFLAGS=$ac_save_FFLAGS

5755

5767

elif test $ac_cv_prog_f77_g = yes; then

5756

@@ -5649,8 +6334,8 @@

5768

@@ -5661,8 +6342,8 @@

5757

5769

# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

5758

5770

5759

5771

# find the maximum length of command line arguments

5764

5776

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

5765

5777

echo $ECHO_N "(cached) $ECHO_C" >&6

5766

5778

else

5767

@@ -5758,19 +6443,19 @@

5779

@@ -5770,19 +6451,19 @@

5768

5780

fi

5769

5781

5770

5782

if test -n $lt_cv_sys_max_cmd_len ; then

5790

5802

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

5791

5803

echo $ECHO_N "(cached) $ECHO_C" >&6

5792

5804

else

5793

@@ -5974,15 +6659,15 @@

5805

@@ -5986,15 +6667,15 @@

5794

5806

lt_cv_sys_global_symbol_to_cdecl=

5795

5807

fi

5796

5808

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

5812

5824

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

5813

5825

echo $ECHO_N "(cached) $ECHO_C" >&6

5814

5826

else

5815

@@ -5996,8 +6681,8 @@

5827

@@ -6008,8 +6689,8 @@

5816

5828

fi

5817

5829

rmdir .libs 2>/dev/null

5818

5830

fi

5823

5835

objdir=$lt_cv_objdir

5824

5836

5825

5837

5826

@@ -6048,8 +6733,8 @@

5838

@@ -6060,8 +6741,8 @@

5827

5839

if test -n "$ac_tool_prefix"; then

5828

5840

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

5829

5841

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

5834

5846

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

5835

5847

echo $ECHO_N "(cached) $ECHO_C" >&6

5836

5848

else

5837

@@ -6062,32 +6747,34 @@

5849

@@ -6074,32 +6755,34 @@

5838

5850

IFS=$as_save_IFS

5839

5851

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

5840

5852

for ac_exec_ext in '' $ac_executable_extensions; do

5876

5888

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

5877

5889

echo $ECHO_N "(cached) $ECHO_C" >&6

5878

5890

else

5879

@@ -6100,27 +6787,41 @@

5891

@@ -6112,27 +6795,41 @@

5880

5892

IFS=$as_save_IFS

5881

5893

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

5882

5894

for ac_exec_ext in '' $ac_executable_extensions; do

5925

5937

else

5926

5938

AR="$ac_cv_prog_AR"

5927

5939

fi

5928

@@ -6128,8 +6829,8 @@

5940

@@ -6140,8 +6837,8 @@

5929

5941

if test -n "$ac_tool_prefix"; then

5930

5942

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

5931

5943

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

5936

5948

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

5937

5949

echo $ECHO_N "(cached) $ECHO_C" >&6

5938

5950

else

5939

@@ -6142,32 +6843,34 @@

5951

@@ -6154,32 +6851,34 @@

5940

5952

IFS=$as_save_IFS

5941

5953

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

5942

5954

for ac_exec_ext in '' $ac_executable_extensions; do

5978

5990

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

5979

5991

echo $ECHO_N "(cached) $ECHO_C" >&6

5980

5992

else

5981

@@ -6180,27 +6883,41 @@

5993

@@ -6192,27 +6891,41 @@

5982

5994

IFS=$as_save_IFS

5983

5995

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

5984

5996

for ac_exec_ext in '' $ac_executable_extensions; do

6027

6039

else

6028

6040

RANLIB="$ac_cv_prog_RANLIB"

6029

6041

fi

6030

@@ -6208,8 +6925,8 @@

6042

@@ -6220,8 +6933,8 @@

6031

6043

if test -n "$ac_tool_prefix"; then

6032

6044

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

6033

6045

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

6038

6050

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

6039

6051

echo $ECHO_N "(cached) $ECHO_C" >&6

6040

6052

else

6041

@@ -6222,32 +6939,34 @@

6053

@@ -6234,32 +6947,34 @@

6042

6054

IFS=$as_save_IFS

6043

6055

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

6044

6056

for ac_exec_ext in '' $ac_executable_extensions; do

6080

6092

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

6081

6093

echo $ECHO_N "(cached) $ECHO_C" >&6

6082

6094

else

6083

@@ -6260,27 +6979,41 @@

6095

@@ -6272,27 +6987,41 @@

6084

6096

IFS=$as_save_IFS

6085

6097

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

6086

6098

for ac_exec_ext in '' $ac_executable_extensions; do

6129

6141

else

6130

6142

STRIP="$ac_cv_prog_STRIP"

6131

6143

fi

6132

@@ -6339,8 +7072,8 @@

6144

@@ -6351,8 +7080,8 @@

6133

6145

case $deplibs_check_method in

6134

6146

file_magic*)

6135

6147

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

6140

6152

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

6141

6153

echo $ECHO_N "(cached) $ECHO_C" >&6

6142

6154

else

6143

@@ -6392,17 +7125,17 @@

6155

@@ -6404,17 +7133,17 @@

6144

6156

6145

6157

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6146

6158

if test -n "$MAGIC_CMD"; then

6164

6176

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

6165

6177

echo $ECHO_N "(cached) $ECHO_C" >&6

6166

6178

else

6167

@@ -6454,11 +7187,11 @@

6179

@@ -6466,11 +7195,11 @@

6168

6180

6169

6181

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6170

6182

if test -n "$MAGIC_CMD"; then

6180

6192

fi

6181

6193

6182

6194

else

6183

@@ -6473,21 +7206,21 @@

6195

@@ -6485,21 +7214,21 @@

6184

6196

enable_dlopen=no

6185

6197

enable_win32_dll=no

6186

6198

6209

6221

test -z "$pic_mode" && pic_mode=default

6210

6222

6211

6223

# Use C for the default configuration in the libtool script

6212

@@ -6545,8 +7278,8 @@

6224

@@ -6557,8 +7286,8 @@

6213

6225

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

6214

6226

6215

6227

6220

6232

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

6221

6233

echo $ECHO_N "(cached) $ECHO_C" >&6

6222

6234

else

6223

@@ -6563,11 +7296,11 @@

6235

@@ -6575,11 +7304,11 @@

6224

6236

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

6225

6237

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

6226

6238

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

6227

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

6228

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

6239

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

6240

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

6229

6241

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

6230

6242

ac_status=$?

6231

6243

cat conftest.err >&5

6232

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

6233

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

6244

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

6245

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

6234

6246

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

6235

6247

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

6236

6248

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

6237

@@ -6580,8 +7313,8 @@

6249

@@ -6592,8 +7321,8 @@

6238

6250

$rm conftest*

6239

6251

6240

6252

fi

6245

6257

6246

6258

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

6247

6259

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

6248

@@ -6595,8 +7328,8 @@

6260

@@ -6607,8 +7336,8 @@

6249

6261

lt_prog_compiler_pic=

6250

6262

lt_prog_compiler_static=

6251

6263

6256

6268

6257

6269

if test "$GCC" = yes; then

6258

6270

lt_prog_compiler_wl='-Wl,'

6259

@@ -6805,16 +7538,16 @@

6271

@@ -6817,16 +7546,16 @@

6260

6272

esac

6261

6273

fi

6262

6274

6277

6289

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

6278

6290

echo $ECHO_N "(cached) $ECHO_C" >&6

6279

6291

else

6280

@@ -6831,11 +7564,11 @@

6292

@@ -6843,11 +7572,11 @@

6281

6293

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

6282

6294

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

6283

6295

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

6284

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

6285

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

6296

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

6297

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

6286

6298

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

6287

6299

ac_status=$?

6288

6300

cat conftest.err >&5

6289

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

6290

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

6301

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

6302

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

6291

6303

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

6292

6304

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

6293

6305

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

6294

@@ -6848,8 +7581,8 @@

6306

@@ -6860,8 +7589,8 @@

6295

6307

$rm conftest*

6296

6308

6297

6309

fi

6302

6314

6303

6315

if test x"$lt_prog_compiler_pic_works" = xyes; then

6304

6316

case $lt_prog_compiler_pic in

6305

@@ -6876,8 +7609,8 @@

6317

@@ -6888,8 +7617,8 @@

6306

6318

# Check to make sure the static flag actually works.

6307

6319

#

6308

6320

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

6313

6325

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

6314

6326

echo $ECHO_N "(cached) $ECHO_C" >&6

6315

6327

else

6316

@@ -6904,8 +7637,8 @@

6328

@@ -6916,8 +7645,8 @@

6317

6329

LDFLAGS="$save_LDFLAGS"

6318

6330

6319

6331

fi

6324

6336

6325

6337

if test x"$lt_prog_compiler_static_works" = xyes; then

6326

6338

:

6327

@@ -6914,8 +7647,8 @@

6339

@@ -6926,8 +7655,8 @@

6328

6340

fi

6329

6341

6330

6342

6335

6347

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

6336

6348

echo $ECHO_N "(cached) $ECHO_C" >&6

6337

6349

else

6338

@@ -6935,11 +7668,11 @@

6350

@@ -6947,11 +7676,11 @@

6339

6351

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

6340

6352

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

6341

6353

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

6342

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

6343

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

6354

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

6355

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

6344

6356

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

6345

6357

ac_status=$?

6346

6358

cat out/conftest.err >&5

6347

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

6348

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

6359

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

6360

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

6349

6361

if (exit $ac_status) && test -s out/conftest2.$ac_objext

6350

6362

then

6351

6363

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

6352

@@ -6961,23 +7694,23 @@

6364

@@ -6973,23 +7702,23 @@

6353

6365

$rm conftest*

6354

6366

6355

6367

fi

6379

6391

if test "$hard_links" = no; then

6380

6392

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

6381

6393

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

6382

@@ -6987,8 +7720,8 @@

6394

@@ -6999,8 +7728,8 @@

6383

6395

need_locks=no

6384

6396

fi

6385

6397

6390

6402

6391

6403

runpath_var=

6392

6404

allow_undefined_flag=

6393

@@ -7403,27 +8136,23 @@

6394

}

6395

_ACEOF

6396

rm -f conftest.$ac_objext conftest$ac_exeext

6397

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

6398

- (eval $ac_link) 2>conftest.er1

6399

+if { (ac_try="$ac_link"

6400

+case "(($ac_try" in

6401

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6402

+ *) ac_try_echo=$ac_try;;

6403

+esac

6404

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6405

+ (eval "$ac_link") 2>conftest.er1

6406

ac_status=$?

6407

grep -v '^ *+' conftest.er1 >conftest.err

6408

rm -f conftest.er1

6409

cat conftest.err >&5

6410

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

6411

- (exit $ac_status); } &&

6412

- { ac_try='test -z "$ac_c_werror_flag"

6413

- || test ! -s conftest.err'

6414

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

6415

- (eval $ac_try) 2>&5

6416

- ac_status=$?

6417

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

6418

- (exit $ac_status); }; } &&

6419

- { ac_try='test -s conftest$ac_exeext'

6420

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

6421

- (eval $ac_try) 2>&5

6422

- ac_status=$?

6423

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

6424

- (exit $ac_status); }; }; then

6425

+ (exit $ac_status); } && {

6426

+ test -z "$ac_c_werror_flag" ||

6427

+ test ! -s conftest.err

6428

+ } && test -s conftest$ac_exeext &&

6429

+ $as_test_x conftest$ac_exeext; then

6430

6431

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6432

}'`

6433

@@ -7434,8 +8163,10 @@

6434

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

6435

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

6436

6437

+

6438

fi

6439

-rm -f conftest.err conftest.$ac_objext \

6440

+

6441

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6442

conftest$ac_exeext conftest.$ac_ext

6443

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6444

6445

@@ -7464,27 +8195,23 @@

6446

}

6447

_ACEOF

6448

rm -f conftest.$ac_objext conftest$ac_exeext

6449

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

6450

- (eval $ac_link) 2>conftest.er1

6451

+if { (ac_try="$ac_link"

6452

+case "(($ac_try" in

6453

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6454

+ *) ac_try_echo=$ac_try;;

6455

+esac

6456

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6457

+ (eval "$ac_link") 2>conftest.er1

6458

ac_status=$?

6459

grep -v '^ *+' conftest.er1 >conftest.err

6460

rm -f conftest.er1

6461

cat conftest.err >&5

6462

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

6463

- (exit $ac_status); } &&

6464

- { ac_try='test -z "$ac_c_werror_flag"

6465

- || test ! -s conftest.err'

6466

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

6467

- (eval $ac_try) 2>&5

6468

- ac_status=$?

6469

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

6470

- (exit $ac_status); }; } &&

6471

- { ac_try='test -s conftest$ac_exeext'

6472

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

6473

- (eval $ac_try) 2>&5

6474

- ac_status=$?

6475

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

6476

- (exit $ac_status); }; }; then

6477

+ (exit $ac_status); } && {

6478

+ test -z "$ac_c_werror_flag" ||

6479

+ test ! -s conftest.err

6480

+ } && test -s conftest$ac_exeext &&

6481

+ $as_test_x conftest$ac_exeext; then

6482

6483

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6484

}'`

6485

@@ -7495,8 +8222,10 @@

6486

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

6487

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

6488

6489

+

6490

fi

6491

-rm -f conftest.err conftest.$ac_objext \

6492

+

6493

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6494

conftest$ac_exeext conftest.$ac_ext

6495

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6496

6497

@@ -7945,8 +8674,8 @@

6405

@@ -7415,27 +8144,23 @@

6406

}

6407

_ACEOF

6408

rm -f conftest.$ac_objext conftest$ac_exeext

6409

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

6410

- (eval $ac_link) 2>conftest.er1

6411

+if { (ac_try="$ac_link"

6412

+case "(($ac_try" in

6413

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6414

+ *) ac_try_echo=$ac_try;;

6415

+esac

6416

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6417

+ (eval "$ac_link") 2>conftest.er1

6418

ac_status=$?

6419

grep -v '^ *+' conftest.er1 >conftest.err

6420

rm -f conftest.er1

6421

cat conftest.err >&5

6422

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

6423

- (exit $ac_status); } &&

6424

- { ac_try='test -z "$ac_c_werror_flag"

6425

- || test ! -s conftest.err'

6426

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

6427

- (eval $ac_try) 2>&5

6428

- ac_status=$?

6429

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

6430

- (exit $ac_status); }; } &&

6431

- { ac_try='test -s conftest$ac_exeext'

6432

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

6433

- (eval $ac_try) 2>&5

6434

- ac_status=$?

6435

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

6436

- (exit $ac_status); }; }; then

6437

+ (exit $ac_status); } && {

6438

+ test -z "$ac_c_werror_flag" ||

6439

+ test ! -s conftest.err

6440

+ } && test -s conftest$ac_exeext &&

6441

+ $as_test_x conftest$ac_exeext; then

6442

6443

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6444

}'`

6445

@@ -7446,8 +8171,10 @@

6446

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

6447

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

6448

6449

+

6450

fi

6451

-rm -f conftest.err conftest.$ac_objext \

6452

+

6453

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6454

conftest$ac_exeext conftest.$ac_ext

6455

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6456

6457

@@ -7476,27 +8203,23 @@

6458

}

6459

_ACEOF

6460

rm -f conftest.$ac_objext conftest$ac_exeext

6461

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

6462

- (eval $ac_link) 2>conftest.er1

6463

+if { (ac_try="$ac_link"

6464

+case "(($ac_try" in

6465

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6466

+ *) ac_try_echo=$ac_try;;

6467

+esac

6468

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6469

+ (eval "$ac_link") 2>conftest.er1

6470

ac_status=$?

6471

grep -v '^ *+' conftest.er1 >conftest.err

6472

rm -f conftest.er1

6473

cat conftest.err >&5

6474

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

6475

- (exit $ac_status); } &&

6476

- { ac_try='test -z "$ac_c_werror_flag"

6477

- || test ! -s conftest.err'

6478

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

6479

- (eval $ac_try) 2>&5

6480

- ac_status=$?

6481

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

6482

- (exit $ac_status); }; } &&

6483

- { ac_try='test -s conftest$ac_exeext'

6484

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

6485

- (eval $ac_try) 2>&5

6486

- ac_status=$?

6487

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

6488

- (exit $ac_status); }; }; then

6489

+ (exit $ac_status); } && {

6490

+ test -z "$ac_c_werror_flag" ||

6491

+ test ! -s conftest.err

6492

+ } && test -s conftest$ac_exeext &&

6493

+ $as_test_x conftest$ac_exeext; then

6494

6495

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6496

}'`

6497

@@ -7507,8 +8230,10 @@

6498

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

6499

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

6500

6501

+

6502

fi

6503

-rm -f conftest.err conftest.$ac_objext \

6504

+

6505

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6506

conftest$ac_exeext conftest.$ac_ext

6507

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6508

6509

@@ -7957,8 +8682,8 @@

6498

6510

esac

6499

6511

fi

6500

6512

6505

6517

test "$ld_shlibs" = no && can_build_shared=no

6506

6518

6507

6519

#

6508

@@ -7966,8 +8695,8 @@

6520

@@ -7978,8 +8703,8 @@

6509

6521

# Test whether the compiler implicitly links with -lc since on some

6510

6522

# systems, -lgcc has to come before -lc. If gcc already passes -lc

6511

6523

# to ld, don't add -lc before -lgcc.

6516

6528

$rm conftest*

6517

6529

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

6518

6530

6519

@@ -8004,16 +8733,16 @@

6531

@@ -8016,16 +8741,16 @@

6520

6532

cat conftest.err 1>&5

6521

6533

fi

6522

6534

$rm conftest*

6537

6549

library_names_spec=

6538

6550

libname_spec='lib$name'

6539

6551

soname_spec=

6540

@@ -8404,7 +9133,7 @@

6552

@@ -8416,7 +9141,7 @@

6541

6553

libsuff=

6542

6554

case "$host_cpu" in

6543

6555

x86_64*|s390x*|powerpc64*)

6544

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

6545

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

6556

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

6557

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

6546

6558

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

6547

6559

(eval $ac_compile) 2>&5

6548

6560

ac_status=$?

6549

@@ -8621,8 +9350,8 @@

6561

@@ -8633,8 +9358,8 @@

6550

6562

dynamic_linker=no

6551

6563

;;

6552

6564

esac

6557

6569

test "$dynamic_linker" = no && can_build_shared=no

6558

6570

6559

6571

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

6560

@@ -8630,8 +9359,8 @@

6572

@@ -8642,8 +9367,8 @@

6561

6573

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

6562

6574

fi

6563

6575

6568

6580

hardcode_action=

6569

6581

if test -n "$hardcode_libdir_flag_spec" || \

6570

6582

test -n "$runpath_var" || \

6571

@@ -8655,8 +9384,8 @@

6583

@@ -8667,8 +9392,8 @@

6572

6584

# directories.

6573

6585

hardcode_action=unsupported

6574

6586

fi

6579

6591

6580

6592

if test "$hardcode_action" = relink; then

6581

6593

# Fast installation is not supported

6582

@@ -8669,29 +9398,29 @@

6594

@@ -8681,29 +9406,29 @@

6583

6595

6584

6596

striplib=

6585

6597

old_striplib=

6619

6631

;;

6620

6632

esac

6621

6633

fi

6622

@@ -8723,8 +9452,8 @@

6634

@@ -8735,8 +9460,8 @@

6623

6635

6624

6636

darwin*)

6625

6637

# if libdl is installed we need to link against it

6630

6642

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

6631

6643

echo $ECHO_N "(cached) $ECHO_C" >&6

6632

6644

else

6633

@@ -8737,56 +9466,53 @@

6645

@@ -8749,56 +9474,53 @@

6634

6646

cat >>conftest.$ac_ext <<_ACEOF

6635

6647

/* end confdefs.h. */

6636

6648

6708

6720

if test $ac_cv_lib_dl_dlopen = yes; then

6709

6721

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

6710

6722

else

6711

@@ -8800,8 +9526,8 @@

6723

@@ -8812,8 +9534,8 @@

6712

6724

;;

6713

6725

6714

6726

*)

6719

6731

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

6720

6732

echo $ECHO_N "(cached) $ECHO_C" >&6

6721

6733

else

6722

@@ -8828,73 +9554,64 @@

6734

@@ -8840,73 +9562,64 @@

6723

6735

6724

6736

#undef shl_load

6725

6737

6817

6829

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

6818

6830

echo $ECHO_N "(cached) $ECHO_C" >&6

6819

6831

else

6820

@@ -8907,61 +9624,58 @@

6832

@@ -8919,61 +9632,58 @@

6821

6833

cat >>conftest.$ac_ext <<_ACEOF

6822

6834

/* end confdefs.h. */

6823

6835

6902

6914

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

6903

6915

echo $ECHO_N "(cached) $ECHO_C" >&6

6904

6916

else

6905

@@ -8988,73 +9702,64 @@

6917

@@ -9000,73 +9710,64 @@

6906

6918

6907

6919

#undef dlopen

6908

6920

7000

7012

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

7001

7013

echo $ECHO_N "(cached) $ECHO_C" >&6

7002

7014

else

7003

@@ -9067,61 +9772,58 @@

7015

@@ -9079,61 +9780,58 @@

7004

7016

cat >>conftest.$ac_ext <<_ACEOF

7005

7017

/* end confdefs.h. */

7006

7018

7085

7097

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

7086

7098

echo $ECHO_N "(cached) $ECHO_C" >&6

7087

7099

else

7088

@@ -9134,61 +9836,58 @@

7100

@@ -9146,61 +9844,58 @@

7089

7101

cat >>conftest.$ac_ext <<_ACEOF

7090

7102

/* end confdefs.h. */

7091

7103

7170

7182

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

7171

7183

echo $ECHO_N "(cached) $ECHO_C" >&6

7172

7184

else

7173

@@ -9201,56 +9900,53 @@

7185

@@ -9213,56 +9908,53 @@

7174

7186

cat >>conftest.$ac_ext <<_ACEOF

7175

7187

/* end confdefs.h. */

7176

7188

7248

7260

if test $ac_cv_lib_dld_dld_link = yes; then

7249

7261

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"

7250

7262

fi

7251

@@ -9290,8 +9986,8 @@

7263

@@ -9302,8 +9994,8 @@

7252

7264

save_LIBS="$LIBS"

7253

7265

LIBS="$lt_cv_dlopen_libs $LIBS"

7254

7266

7259

7271

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

7260

7272

echo $ECHO_N "(cached) $ECHO_C" >&6

7261

7273

else

7262

@@ -9301,7 +9997,7 @@

7274

@@ -9313,7 +10005,7 @@

7263

7275

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

7264

7276

lt_status=$lt_dlunknown

7265

7277

cat > conftest.$ac_ext <<EOF

7266

-#line 9304 "configure"

7267

+#line 10000 "configure"

7278

-#line 9316 "configure"

7279

+#line 10008 "configure"

7268

7280

#include "confdefs.h"

7269

7281

7270

7282

#if HAVE_DLFCN_H

7271

@@ -9385,13 +10081,13 @@

7283

@@ -9397,13 +10089,13 @@

7272

7284

7273

7285

7274

7286

fi

7286

7298

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

7287

7299

echo $ECHO_N "(cached) $ECHO_C" >&6

7288

7300

else

7289

@@ -9401,7 +10097,7 @@

7301

@@ -9413,7 +10105,7 @@

7290

7302

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

7291

7303

lt_status=$lt_dlunknown

7292

7304

cat > conftest.$ac_ext <<EOF

7293

-#line 9404 "configure"

7294

+#line 10100 "configure"

7305

-#line 9416 "configure"

7306

+#line 10108 "configure"

7295

7307

#include "confdefs.h"

7296

7308

7297

7309

#if HAVE_DLFCN_H

7298

@@ -9485,8 +10181,8 @@

7310

@@ -9497,8 +10189,8 @@

7299

7311

7300

7312

7301

7313

fi

7306

7318

fi

7307

7319

7308

7320

CPPFLAGS="$save_CPPFLAGS"

7309

@@ -9508,13 +10204,13 @@

7321

@@ -9520,13 +10212,13 @@

7310

7322

7311

7323

7312

7324

# Report which library types will actually be built

7326

7338

test "$can_build_shared" = "no" && enable_shared=no

7327

7339

7328

7340

# On AIX, shared libraries and static libraries use the same namespace, and

7329

@@ -9534,15 +10230,15 @@

7341

@@ -9546,15 +10238,15 @@

7330

7342

fi

7331

7343

;;

7332

7344

esac

7348

7360

7349

7361

# The else clause should only fire when bootstrapping the

7350

7362

# libtool distribution, otherwise you forgot to ship ltmain.sh

7351

@@ -10037,11 +10733,11 @@

7363

@@ -10049,11 +10741,11 @@

7352

7364

CC="$lt_save_CC"

7353

7365

7354

7366

7364

7376

7365

7377

if test -f "$ltmain" && test -n "$tagnames"; then

7366

7378

if test ! -f "${ofile}"; then

7367

@@ -10095,7 +10791,7 @@

7379

@@ -10107,7 +10799,7 @@

7368

7380

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

7369

7381

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

7370

7382

(test "X$CXX" != "Xg++"))) ; then

7373

7385

ac_cpp='$CXXCPP $CPPFLAGS'

7374

7386

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

7375

7387

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

7376

@@ -10214,18 +10910,18 @@

7388

@@ -10226,18 +10918,18 @@

7377

7389

# Set up default GNU C++ configuration

7378

7390

7379

7391

7398

7410

case $host in

7399

7411

*-*-mingw*)

7400

7412

# gcc leaves a trailing carriage return which upsets mingw

7401

@@ -10254,11 +10950,11 @@

7413

@@ -10266,11 +10958,11 @@

7402

7414

;;

7403

7415

esac

7404

7416

elif test "$with_gnu_ld" = yes; then

7414

7426

fi

7415

7427

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

7416

7428

echo $ECHO_N "(cached) $ECHO_C" >&6

7417

@@ -10291,17 +10987,17 @@

7429

@@ -10303,17 +10995,17 @@

7418

7430

7419

7431

LD="$lt_cv_path_LD"

7420

7432

if test -n "$LD"; then

7438

7450

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

7439

7451

echo $ECHO_N "(cached) $ECHO_C" >&6

7440

7452

else

7441

@@ -10315,8 +11011,8 @@

7453

@@ -10327,8 +11019,8 @@

7442

7454

;;

7443

7455

esac

7444

7456

fi

7449

7461

with_gnu_ld=$lt_cv_prog_gnu_ld

7450

7462

7451

7463

7452

@@ -10366,8 +11062,8 @@

7464

@@ -10378,8 +11070,8 @@

7453

7465

fi

7454

7466

7455

7467

# PORTME: fill in a description of your system's C++ link characteristics

7460

7472

ld_shlibs_CXX=yes

7461

7473

case $host_os in

7462

7474

aix3*)

7463

@@ -10479,27 +11175,23 @@

7464

}

7465

_ACEOF

7466

rm -f conftest.$ac_objext conftest$ac_exeext

7467

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

7468

- (eval $ac_link) 2>conftest.er1

7469

+if { (ac_try="$ac_link"

7470

+case "(($ac_try" in

7471

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7472

+ *) ac_try_echo=$ac_try;;

7473

+esac

7474

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7475

+ (eval "$ac_link") 2>conftest.er1

7476

ac_status=$?

7477

grep -v '^ *+' conftest.er1 >conftest.err

7478

rm -f conftest.er1

7479

cat conftest.err >&5

7480

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

7481

- (exit $ac_status); } &&

7482

- { ac_try='test -z "$ac_cxx_werror_flag"

7483

- || test ! -s conftest.err'

7484

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

7485

- (eval $ac_try) 2>&5

7486

- ac_status=$?

7487

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

7488

- (exit $ac_status); }; } &&

7489

- { ac_try='test -s conftest$ac_exeext'

7490

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

7491

- (eval $ac_try) 2>&5

7492

- ac_status=$?

7493

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

7494

- (exit $ac_status); }; }; then

7495

+ (exit $ac_status); } && {

7496

+ test -z "$ac_cxx_werror_flag" ||

7497

+ test ! -s conftest.err

7498

+ } && test -s conftest$ac_exeext &&

7499

+ $as_test_x conftest$ac_exeext; then

7500

7501

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

7502

}'`

7503

@@ -10510,8 +11202,10 @@

7504

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

7505

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

7506

7507

+

7508

fi

7509

-rm -f conftest.err conftest.$ac_objext \

7510

+

7511

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7512

conftest$ac_exeext conftest.$ac_ext

7513

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7514

7515

@@ -10541,27 +11235,23 @@

7516

}

7517

_ACEOF

7518

rm -f conftest.$ac_objext conftest$ac_exeext

7519

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

7520

- (eval $ac_link) 2>conftest.er1

7521

+if { (ac_try="$ac_link"

7522

+case "(($ac_try" in

7523

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7524

+ *) ac_try_echo=$ac_try;;

7525

+esac

7526

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7527

+ (eval "$ac_link") 2>conftest.er1

7528

ac_status=$?

7529

grep -v '^ *+' conftest.er1 >conftest.err

7530

rm -f conftest.er1

7531

cat conftest.err >&5

7532

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

7533

- (exit $ac_status); } &&

7534

- { ac_try='test -z "$ac_cxx_werror_flag"

7535

- || test ! -s conftest.err'

7536

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

7537

- (eval $ac_try) 2>&5

7538

- ac_status=$?

7539

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

7540

- (exit $ac_status); }; } &&

7541

- { ac_try='test -s conftest$ac_exeext'

7542

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

7543

- (eval $ac_try) 2>&5

7544

- ac_status=$?

7545

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

7546

- (exit $ac_status); }; }; then

7547

+ (exit $ac_status); } && {

7548

+ test -z "$ac_cxx_werror_flag" ||

7549

+ test ! -s conftest.err

7550

+ } && test -s conftest$ac_exeext &&

7551

+ $as_test_x conftest$ac_exeext; then

7552

7553

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

7554

}'`

7555

@@ -10572,8 +11262,10 @@

7556

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

7557

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

7558

7559

+

7560

fi

7561

-rm -f conftest.err conftest.$ac_objext \

7562

+

7563

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7564

conftest$ac_exeext conftest.$ac_ext

7565

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7566

7567

@@ -11304,8 +11996,8 @@

7475

@@ -10491,27 +11183,23 @@

7476

}

7477

_ACEOF

7478

rm -f conftest.$ac_objext conftest$ac_exeext

7479

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

7480

- (eval $ac_link) 2>conftest.er1

7481

+if { (ac_try="$ac_link"

7482

+case "(($ac_try" in

7483

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7484

+ *) ac_try_echo=$ac_try;;

7485

+esac

7486

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7487

+ (eval "$ac_link") 2>conftest.er1

7488

ac_status=$?

7489

grep -v '^ *+' conftest.er1 >conftest.err

7490

rm -f conftest.er1

7491

cat conftest.err >&5

7492

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

7493

- (exit $ac_status); } &&

7494

- { ac_try='test -z "$ac_cxx_werror_flag"

7495

- || test ! -s conftest.err'

7496

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

7497

- (eval $ac_try) 2>&5

7498

- ac_status=$?

7499

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

7500

- (exit $ac_status); }; } &&

7501

- { ac_try='test -s conftest$ac_exeext'

7502

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

7503

- (eval $ac_try) 2>&5

7504

- ac_status=$?

7505

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

7506

- (exit $ac_status); }; }; then

7507

+ (exit $ac_status); } && {

7508

+ test -z "$ac_cxx_werror_flag" ||

7509

+ test ! -s conftest.err

7510

+ } && test -s conftest$ac_exeext &&

7511

+ $as_test_x conftest$ac_exeext; then

7512

7513

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

7514

}'`

7515

@@ -10522,8 +11210,10 @@

7516

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

7517

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

7518

7519

+

7520

fi

7521

-rm -f conftest.err conftest.$ac_objext \

7522

+

7523

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7524

conftest$ac_exeext conftest.$ac_ext

7525

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7526

7527

@@ -10553,27 +11243,23 @@

7528

}

7529

_ACEOF

7530

rm -f conftest.$ac_objext conftest$ac_exeext

7531

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

7532

- (eval $ac_link) 2>conftest.er1

7533

+if { (ac_try="$ac_link"

7534

+case "(($ac_try" in

7535

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7536

+ *) ac_try_echo=$ac_try;;

7537

+esac

7538

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7539

+ (eval "$ac_link") 2>conftest.er1

7540

ac_status=$?

7541

grep -v '^ *+' conftest.er1 >conftest.err

7542

rm -f conftest.er1

7543

cat conftest.err >&5

7544

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

7545

- (exit $ac_status); } &&

7546

- { ac_try='test -z "$ac_cxx_werror_flag"

7547

- || test ! -s conftest.err'

7548

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

7549

- (eval $ac_try) 2>&5

7550

- ac_status=$?

7551

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

7552

- (exit $ac_status); }; } &&

7553

- { ac_try='test -s conftest$ac_exeext'

7554

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

7555

- (eval $ac_try) 2>&5

7556

- ac_status=$?

7557

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

7558

- (exit $ac_status); }; }; then

7559

+ (exit $ac_status); } && {

7560

+ test -z "$ac_cxx_werror_flag" ||

7561

+ test ! -s conftest.err

7562

+ } && test -s conftest$ac_exeext &&

7563

+ $as_test_x conftest$ac_exeext; then

7564

7565

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

7566

}'`

7567

@@ -10584,8 +11270,10 @@

7568

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

7569

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

7570

7571

+

7572

fi

7573

-rm -f conftest.err conftest.$ac_objext \

7574

+

7575

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7576

conftest$ac_exeext conftest.$ac_ext

7577

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7578

7579

@@ -11316,8 +12004,8 @@

7568

7580

ld_shlibs_CXX=no

7569

7581

;;

7570

7582

esac

7575

7587

test "$ld_shlibs_CXX" = no && can_build_shared=no

7576

7588

7577

7589

GCC_CXX="$GXX"

7578

@@ -11444,8 +12136,8 @@

7590

@@ -11456,8 +12144,8 @@

7579

7591

lt_prog_compiler_pic_CXX=

7580

7592

lt_prog_compiler_static_CXX=

7581

7593

7586

7598

7587

7599

# C++ specific cases for pic, static, wl, etc.

7588

7600

if test "$GXX" = yes; then

7589

@@ -11718,16 +12410,16 @@

7601

@@ -11730,16 +12418,16 @@

7590

7602

esac

7591

7603

fi

7592

7604

7607

7619

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

7608

7620

echo $ECHO_N "(cached) $ECHO_C" >&6

7609

7621

else

7610

@@ -11744,11 +12436,11 @@

7622

@@ -11756,11 +12444,11 @@

7611

7623

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

7612

7624

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

7613

7625

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

7614

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

7615

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

7626

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

7627

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

7616

7628

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

7617

7629

ac_status=$?

7618

7630

cat conftest.err >&5

7619

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

7620

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

7631

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

7632

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

7621

7633

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

7622

7634

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

7623

7635

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

7624

@@ -11761,8 +12453,8 @@

7636

@@ -11773,8 +12461,8 @@

7625

7637

$rm conftest*

7626

7638

7627

7639

fi

7632

7644

7633

7645

if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then

7634

7646

case $lt_prog_compiler_pic_CXX in

7635

@@ -11789,8 +12481,8 @@

7647

@@ -11801,8 +12489,8 @@

7636

7648

# Check to make sure the static flag actually works.

7637

7649

#

7638

7650

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

7643

7655

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

7644

7656

echo $ECHO_N "(cached) $ECHO_C" >&6

7645

7657

else

7646

@@ -11817,8 +12509,8 @@

7658

@@ -11829,8 +12517,8 @@

7647

7659

LDFLAGS="$save_LDFLAGS"

7648

7660

7649

7661

fi

7654

7666

7655

7667

if test x"$lt_prog_compiler_static_works_CXX" = xyes; then

7656

7668

:

7657

@@ -11827,8 +12519,8 @@

7669

@@ -11839,8 +12527,8 @@

7658

7670

fi

7659

7671

7660

7672

7665

7677

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

7666

7678

echo $ECHO_N "(cached) $ECHO_C" >&6

7667

7679

else

7668

@@ -11848,11 +12540,11 @@

7680

@@ -11860,11 +12548,11 @@

7669

7681

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

7670

7682

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

7671

7683

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

7672

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

7673

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

7684

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

7685

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

7674

7686

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

7675

7687

ac_status=$?

7676

7688

cat out/conftest.err >&5

7677

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

7678

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

7689

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

7690

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

7679

7691

if (exit $ac_status) && test -s out/conftest2.$ac_objext

7680

7692

then

7681

7693

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

7682

@@ -11874,23 +12566,23 @@

7694

@@ -11886,23 +12574,23 @@

7683

7695

$rm conftest*

7684

7696

7685

7697

fi

7709

7721

if test "$hard_links" = no; then

7710

7722

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

7711

7723

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

7712

@@ -11900,8 +12592,8 @@

7724

@@ -11912,8 +12600,8 @@

7713

7725

need_locks=no

7714

7726

fi

7715

7727

7720

7732

7721

7733

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

7722

7734

case $host_os in

7723

@@ -11925,8 +12617,8 @@

7735

@@ -11937,8 +12625,8 @@

7724

7736

;;

7725

7737

esac

7726

7738

7731

7743

test "$ld_shlibs_CXX" = no && can_build_shared=no

7732

7744

7733

7745

#

7734

@@ -11946,8 +12638,8 @@

7746

@@ -11958,8 +12646,8 @@

7735

7747

# Test whether the compiler implicitly links with -lc since on some

7736

7748

# systems, -lgcc has to come before -lc. If gcc already passes -lc

7737

7749

# to ld, don't add -lc before -lgcc.

7742

7754

$rm conftest*

7743

7755

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

7744

7756

7745

@@ -11984,16 +12676,16 @@

7757

@@ -11996,16 +12684,16 @@

7746

7758

cat conftest.err 1>&5

7747

7759

fi

7748

7760

$rm conftest*

7763

7775

library_names_spec=

7764

7776

libname_spec='lib$name'

7765

7777

soname_spec=

7766

@@ -12384,7 +13076,7 @@

7778

@@ -12396,7 +13084,7 @@

7767

7779

libsuff=

7768

7780

case "$host_cpu" in

7769

7781

x86_64*|s390x*|powerpc64*)

7770

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

7771

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

7782

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

7783

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

7772

7784

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

7773

7785

(eval $ac_compile) 2>&5

7774

7786

ac_status=$?

7775

@@ -12601,8 +13293,8 @@

7787

@@ -12613,8 +13301,8 @@

7776

7788

dynamic_linker=no

7777

7789

;;

7778

7790

esac

7783

7795

test "$dynamic_linker" = no && can_build_shared=no

7784

7796

7785

7797

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

7786

@@ -12610,8 +13302,8 @@

7798

@@ -12622,8 +13310,8 @@

7787

7799

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

7788

7800

fi

7789

7801

7794

7806

hardcode_action_CXX=

7795

7807

if test -n "$hardcode_libdir_flag_spec_CXX" || \

7796

7808

test -n "$runpath_var_CXX" || \

7797

@@ -12635,8 +13327,8 @@

7809

@@ -12647,8 +13335,8 @@

7798

7810

# directories.

7799

7811

hardcode_action_CXX=unsupported

7800

7812

fi

7805

7817

7806

7818

if test "$hardcode_action_CXX" = relink; then

7807

7819

# Fast installation is not supported

7808

@@ -13164,13 +13856,13 @@

7820

@@ -13176,13 +13864,13 @@

7809

7821

cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

7810

7822

7811

7823

7825

7837

test "$can_build_shared" = "no" && enable_shared=no

7826

7838

7827

7839

# On AIX, shared libraries and static libraries use the same namespace, and

7828

@@ -13189,15 +13881,15 @@

7840

@@ -13201,15 +13889,15 @@

7829

7841

fi

7830

7842

;;

7831

7843

esac

7847

7859

7848

7860

GCC_F77="$G77"

7849

7861

LD_F77="$LD"

7850

@@ -13206,8 +13898,8 @@

7862

@@ -13218,8 +13906,8 @@

7851

7863

lt_prog_compiler_pic_F77=

7852

7864

lt_prog_compiler_static_F77=

7853

7865

7858

7870

7859

7871

if test "$GCC" = yes; then

7860

7872

lt_prog_compiler_wl_F77='-Wl,'

7861

@@ -13416,16 +14108,16 @@

7873

@@ -13428,16 +14116,16 @@

7862

7874

esac

7863

7875

fi

7864

7876

7879

7891

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

7880

7892

echo $ECHO_N "(cached) $ECHO_C" >&6

7881

7893

else

7882

@@ -13442,11 +14134,11 @@

7894

@@ -13454,11 +14142,11 @@

7883

7895

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

7884

7896

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

7885

7897

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

7886

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

7887

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

7898

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

7899

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

7888

7900

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

7889

7901

ac_status=$?

7890

7902

cat conftest.err >&5

7891

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

7892

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

7903

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

7904

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

7893

7905

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

7894

7906

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

7895

7907

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

7896

@@ -13459,8 +14151,8 @@

7908

@@ -13471,8 +14159,8 @@

7897

7909

$rm conftest*

7898

7910

7899

7911

fi

7904

7916

7905

7917

if test x"$lt_prog_compiler_pic_works_F77" = xyes; then

7906

7918

case $lt_prog_compiler_pic_F77 in

7907

@@ -13487,8 +14179,8 @@

7919

@@ -13499,8 +14187,8 @@

7908

7920

# Check to make sure the static flag actually works.

7909

7921

#

7910

7922

wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"

7915

7927

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

7916

7928

echo $ECHO_N "(cached) $ECHO_C" >&6

7917

7929

else

7918

@@ -13515,8 +14207,8 @@

7930

@@ -13527,8 +14215,8 @@

7919

7931

LDFLAGS="$save_LDFLAGS"

7920

7932

7921

7933

fi

7926

7938

7927

7939

if test x"$lt_prog_compiler_static_works_F77" = xyes; then

7928

7940

:

7929

@@ -13525,8 +14217,8 @@

7941

@@ -13537,8 +14225,8 @@

7930

7942

fi

7931

7943

7932

7944

7937

7949

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

7938

7950

echo $ECHO_N "(cached) $ECHO_C" >&6

7939

7951

else

7940

@@ -13546,11 +14238,11 @@

7952

@@ -13558,11 +14246,11 @@

7941

7953

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

7942

7954

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

7943

7955

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

7944

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

7945

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

7956

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

7957

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

7946

7958

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

7947

7959

ac_status=$?

7948

7960

cat out/conftest.err >&5

7949

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

7950

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

7961

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

7962

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

7951

7963

if (exit $ac_status) && test -s out/conftest2.$ac_objext

7952

7964

then

7953

7965

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

7954

@@ -13572,23 +14264,23 @@

7966

@@ -13584,23 +14272,23 @@

7955

7967

$rm conftest*

7956

7968

7957

7969

fi

7981

7993

if test "$hard_links" = no; then

7982

7994

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

7983

7995

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

7984

@@ -13598,8 +14290,8 @@

7996

@@ -13610,8 +14298,8 @@

7985

7997

need_locks=no

7986

7998

fi

7987

7999

7992

8004

7993

8005

runpath_var=

7994

8006

allow_undefined_flag_F77=

7995

@@ -14004,27 +14696,23 @@

7996

end

7997

_ACEOF

7998

rm -f conftest.$ac_objext conftest$ac_exeext

7999

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

8000

- (eval $ac_link) 2>conftest.er1

8001

+if { (ac_try="$ac_link"

8002

+case "(($ac_try" in

8003

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8004

+ *) ac_try_echo=$ac_try;;

8005

+esac

8006

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8007

+ (eval "$ac_link") 2>conftest.er1

8008

ac_status=$?

8009

grep -v '^ *+' conftest.er1 >conftest.err

8010

rm -f conftest.er1

8011

cat conftest.err >&5

8012

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

8013

- (exit $ac_status); } &&

8014

- { ac_try='test -z "$ac_f77_werror_flag"

8015

- || test ! -s conftest.err'

8016

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

8017

- (eval $ac_try) 2>&5

8018

- ac_status=$?

8019

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

8020

- (exit $ac_status); }; } &&

8021

- { ac_try='test -s conftest$ac_exeext'

8022

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

8023

- (eval $ac_try) 2>&5

8024

- ac_status=$?

8025

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

8026

- (exit $ac_status); }; }; then

8027

+ (exit $ac_status); } && {

8028

+ test -z "$ac_f77_werror_flag" ||

8029

+ test ! -s conftest.err

8030

+ } && test -s conftest$ac_exeext &&

8031

+ $as_test_x conftest$ac_exeext; then

8032

8033

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8034

}'`

8035

@@ -14035,8 +14723,10 @@

8036

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

8037

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

8038

8039

+

8040

fi

8041

-rm -f conftest.err conftest.$ac_objext \

8042

+

8043

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8044

conftest$ac_exeext conftest.$ac_ext

8045

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8046

8047

@@ -14055,27 +14745,23 @@

8048

end

8049

_ACEOF

8050

rm -f conftest.$ac_objext conftest$ac_exeext

8051

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

8052

- (eval $ac_link) 2>conftest.er1

8053

+if { (ac_try="$ac_link"

8054

+case "(($ac_try" in

8055

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8056

+ *) ac_try_echo=$ac_try;;

8057

+esac

8058

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8059

+ (eval "$ac_link") 2>conftest.er1

8060

ac_status=$?

8061

grep -v '^ *+' conftest.er1 >conftest.err

8062

rm -f conftest.er1

8063

cat conftest.err >&5

8064

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

8065

- (exit $ac_status); } &&

8066

- { ac_try='test -z "$ac_f77_werror_flag"

8067

- || test ! -s conftest.err'

8068

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

8069

- (eval $ac_try) 2>&5

8070

- ac_status=$?

8071

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

8072

- (exit $ac_status); }; } &&

8073

- { ac_try='test -s conftest$ac_exeext'

8074

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

8075

- (eval $ac_try) 2>&5

8076

- ac_status=$?

8077

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

8078

- (exit $ac_status); }; }; then

8079

+ (exit $ac_status); } && {

8080

+ test -z "$ac_f77_werror_flag" ||

8081

+ test ! -s conftest.err

8082

+ } && test -s conftest$ac_exeext &&

8083

+ $as_test_x conftest$ac_exeext; then

8084

8085

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8086

}'`

8087

@@ -14086,8 +14772,10 @@

8088

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

8089

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

8090

8091

+

8092

fi

8093

-rm -f conftest.err conftest.$ac_objext \

8094

+

8095

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8096

conftest$ac_exeext conftest.$ac_ext

8097

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8098

8099

@@ -14536,8 +15224,8 @@

8007

@@ -14016,27 +14704,23 @@

8008

end

8009

_ACEOF

8010

rm -f conftest.$ac_objext conftest$ac_exeext

8011

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

8012

- (eval $ac_link) 2>conftest.er1

8013

+if { (ac_try="$ac_link"

8014

+case "(($ac_try" in

8015

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8016

+ *) ac_try_echo=$ac_try;;

8017

+esac

8018

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8019

+ (eval "$ac_link") 2>conftest.er1

8020

ac_status=$?

8021

grep -v '^ *+' conftest.er1 >conftest.err

8022

rm -f conftest.er1

8023

cat conftest.err >&5

8024

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

8025

- (exit $ac_status); } &&

8026

- { ac_try='test -z "$ac_f77_werror_flag"

8027

- || test ! -s conftest.err'

8028

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

8029

- (eval $ac_try) 2>&5

8030

- ac_status=$?

8031

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

8032

- (exit $ac_status); }; } &&

8033

- { ac_try='test -s conftest$ac_exeext'

8034

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

8035

- (eval $ac_try) 2>&5

8036

- ac_status=$?

8037

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

8038

- (exit $ac_status); }; }; then

8039

+ (exit $ac_status); } && {

8040

+ test -z "$ac_f77_werror_flag" ||

8041

+ test ! -s conftest.err

8042

+ } && test -s conftest$ac_exeext &&

8043

+ $as_test_x conftest$ac_exeext; then

8044

8045

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8046

}'`

8047

@@ -14047,8 +14731,10 @@

8048

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

8049

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

8050

8051

+

8052

fi

8053

-rm -f conftest.err conftest.$ac_objext \

8054

+

8055

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8056

conftest$ac_exeext conftest.$ac_ext

8057

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8058

8059

@@ -14067,27 +14753,23 @@

8060

end

8061

_ACEOF

8062

rm -f conftest.$ac_objext conftest$ac_exeext

8063

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

8064

- (eval $ac_link) 2>conftest.er1

8065

+if { (ac_try="$ac_link"

8066

+case "(($ac_try" in

8067

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8068

+ *) ac_try_echo=$ac_try;;

8069

+esac

8070

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8071

+ (eval "$ac_link") 2>conftest.er1

8072

ac_status=$?

8073

grep -v '^ *+' conftest.er1 >conftest.err

8074

rm -f conftest.er1

8075

cat conftest.err >&5

8076

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

8077

- (exit $ac_status); } &&

8078

- { ac_try='test -z "$ac_f77_werror_flag"

8079

- || test ! -s conftest.err'

8080

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

8081

- (eval $ac_try) 2>&5

8082

- ac_status=$?

8083

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

8084

- (exit $ac_status); }; } &&

8085

- { ac_try='test -s conftest$ac_exeext'

8086

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

8087

- (eval $ac_try) 2>&5

8088

- ac_status=$?

8089

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

8090

- (exit $ac_status); }; }; then

8091

+ (exit $ac_status); } && {

8092

+ test -z "$ac_f77_werror_flag" ||

8093

+ test ! -s conftest.err

8094

+ } && test -s conftest$ac_exeext &&

8095

+ $as_test_x conftest$ac_exeext; then

8096

8097

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8098

}'`

8099

@@ -14098,8 +14780,10 @@

8100

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

8101

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

8102

8103

+

8104

fi

8105

-rm -f conftest.err conftest.$ac_objext \

8106

+

8107

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8108

conftest$ac_exeext conftest.$ac_ext

8109

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8110

8111

@@ -14548,8 +15232,8 @@

8100

8112

esac

8101

8113

fi

8102

8114

8107

8119

test "$ld_shlibs_F77" = no && can_build_shared=no

8108

8120

8109

8121

#

8110

@@ -14557,8 +15245,8 @@

8122

@@ -14569,8 +15253,8 @@

8111

8123

# Test whether the compiler implicitly links with -lc since on some

8112

8124

# systems, -lgcc has to come before -lc. If gcc already passes -lc

8113

8125

# to ld, don't add -lc before -lgcc.

8118

8130

$rm conftest*

8119

8131

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

8120

8132

8121

@@ -14595,16 +15283,16 @@

8133

@@ -14607,16 +15291,16 @@

8122

8134

cat conftest.err 1>&5

8123

8135

fi

8124

8136

$rm conftest*

8139

8151

library_names_spec=

8140

8152

libname_spec='lib$name'

8141

8153

soname_spec=

8142

@@ -14995,7 +15683,7 @@

8154

@@ -15007,7 +15691,7 @@

8143

8155

libsuff=

8144

8156

case "$host_cpu" in

8145

8157

x86_64*|s390x*|powerpc64*)

8146

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

8147

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

8158

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

8159

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

8148

8160

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

8149

8161

(eval $ac_compile) 2>&5

8150

8162

ac_status=$?

8151

@@ -15212,8 +15900,8 @@

8163

@@ -15224,8 +15908,8 @@

8152

8164

dynamic_linker=no

8153

8165

;;

8154

8166

esac

8159

8171

test "$dynamic_linker" = no && can_build_shared=no

8160

8172

8161

8173

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

8162

@@ -15221,8 +15909,8 @@

8174

@@ -15233,8 +15917,8 @@

8163

8175

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

8164

8176

fi

8165

8177

8170

8182

hardcode_action_F77=

8171

8183

if test -n "$hardcode_libdir_flag_spec_F77" || \

8172

8184

test -n "$runpath_var_F77" || \

8173

@@ -15246,8 +15934,8 @@

8185

@@ -15258,8 +15942,8 @@

8174

8186

# directories.

8175

8187

hardcode_action_F77=unsupported

8176

8188

fi

8181

8193

8182

8194

if test "$hardcode_action_F77" = relink; then

8183

8195

# Fast installation is not supported

8184

@@ -15687,7 +16375,6 @@

8196

@@ -15699,7 +16383,6 @@

8185

8197

if test -n "$GCJ" && test "X$GCJ" != "Xno"; then

8186

8198

8187

8199

8189

8201

# Source file extension for Java test sources.

8190

8202

ac_ext=java

8191

8203

8192

@@ -15755,8 +16442,8 @@

8204

@@ -15767,8 +16450,8 @@

8193

8205

lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'

8194

8206

8195

8207

8200

8212

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

8201

8213

echo $ECHO_N "(cached) $ECHO_C" >&6

8202

8214

else

8203

@@ -15773,11 +16460,11 @@

8215

@@ -15785,11 +16468,11 @@

8204

8216

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

8205

8217

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

8206

8218

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

8207

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

8208

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

8219

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

8220

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

8209

8221

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

8210

8222

ac_status=$?

8211

8223

cat conftest.err >&5

8212

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

8213

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

8224

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

8225

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

8214

8226

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

8215

8227

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

8216

8228

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

8217

@@ -15790,8 +16477,8 @@

8229

@@ -15802,8 +16485,8 @@

8218

8230

$rm conftest*

8219

8231

8220

8232

fi

8225

8237

8226

8238

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

8227

8239

lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"

8228

@@ -15805,8 +16492,8 @@

8240

@@ -15817,8 +16500,8 @@

8229

8241

lt_prog_compiler_pic_GCJ=

8230

8242

lt_prog_compiler_static_GCJ=

8231

8243

8236

8248

8237

8249

if test "$GCC" = yes; then

8238

8250

lt_prog_compiler_wl_GCJ='-Wl,'

8239

@@ -16015,16 +16702,16 @@

8251

@@ -16027,16 +16710,16 @@

8240

8252

esac

8241

8253

fi

8242

8254

8257

8269

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

8258

8270

echo $ECHO_N "(cached) $ECHO_C" >&6

8259

8271

else

8260

@@ -16041,11 +16728,11 @@

8272

@@ -16053,11 +16736,11 @@

8261

8273

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

8262

8274

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

8263

8275

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

8264

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

8265

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

8276

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

8277

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

8266

8278

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

8267

8279

ac_status=$?

8268

8280

cat conftest.err >&5

8269

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

8270

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

8281

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

8282

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

8271

8283

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

8272

8284

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

8273

8285

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

8274

@@ -16058,8 +16745,8 @@

8286

@@ -16070,8 +16753,8 @@

8275

8287

$rm conftest*

8276

8288

8277

8289

fi

8282

8294

8283

8295

if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then

8284

8296

case $lt_prog_compiler_pic_GCJ in

8285

@@ -16086,8 +16773,8 @@

8297

@@ -16098,8 +16781,8 @@

8286

8298

# Check to make sure the static flag actually works.

8287

8299

#

8288

8300

wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"

8293

8305

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

8294

8306

echo $ECHO_N "(cached) $ECHO_C" >&6

8295

8307

else

8296

@@ -16114,8 +16801,8 @@

8308

@@ -16126,8 +16809,8 @@

8297

8309

LDFLAGS="$save_LDFLAGS"

8298

8310

8299

8311

fi

8304

8316

8305

8317

if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then

8306

8318

:

8307

@@ -16124,8 +16811,8 @@

8319

@@ -16136,8 +16819,8 @@

8308

8320

fi

8309

8321

8310

8322

8315

8327

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

8316

8328

echo $ECHO_N "(cached) $ECHO_C" >&6

8317

8329

else

8318

@@ -16145,11 +16832,11 @@

8330

@@ -16157,11 +16840,11 @@

8319

8331

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

8320

8332

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

8321

8333

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

8322

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

8323

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

8334

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

8335

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

8324

8336

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

8325

8337

ac_status=$?

8326

8338

cat out/conftest.err >&5

8327

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

8328

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

8339

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

8340

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

8329

8341

if (exit $ac_status) && test -s out/conftest2.$ac_objext

8330

8342

then

8331

8343

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

8332

@@ -16171,23 +16858,23 @@

8344

@@ -16183,23 +16866,23 @@

8333

8345

$rm conftest*

8334

8346

8335

8347

fi

8359

8371

if test "$hard_links" = no; then

8360

8372

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8361

8373

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

8362

@@ -16197,8 +16884,8 @@

8374

@@ -16209,8 +16892,8 @@

8363

8375

need_locks=no

8364

8376

fi

8365

8377

8370

8382

8371

8383

runpath_var=

8372

8384

allow_undefined_flag_GCJ=

8373

@@ -16613,27 +17300,23 @@

8374

}

8375

_ACEOF

8376

rm -f conftest.$ac_objext conftest$ac_exeext

8377

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

8378

- (eval $ac_link) 2>conftest.er1

8379

+if { (ac_try="$ac_link"

8380

+case "(($ac_try" in

8381

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8382

+ *) ac_try_echo=$ac_try;;

8383

+esac

8384

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8385

+ (eval "$ac_link") 2>conftest.er1

8386

ac_status=$?

8387

grep -v '^ *+' conftest.er1 >conftest.err

8388

rm -f conftest.er1

8389

cat conftest.err >&5

8390

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

8391

- (exit $ac_status); } &&

8392

- { ac_try='test -z "$ac_c_werror_flag"

8393

- || test ! -s conftest.err'

8394

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

8395

- (eval $ac_try) 2>&5

8396

- ac_status=$?

8397

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

8398

- (exit $ac_status); }; } &&

8399

- { ac_try='test -s conftest$ac_exeext'

8400

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

8401

- (eval $ac_try) 2>&5

8402

- ac_status=$?

8403

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

8404

- (exit $ac_status); }; }; then

8405

+ (exit $ac_status); } && {

8406

+ test -z "$ac_c_werror_flag" ||

8407

+ test ! -s conftest.err

8408

+ } && test -s conftest$ac_exeext &&

8409

+ $as_test_x conftest$ac_exeext; then

8410

8411

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8412

}'`

8413

@@ -16644,8 +17327,10 @@

8414

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

8415

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

8416

8417

+

8418

fi

8419

-rm -f conftest.err conftest.$ac_objext \

8420

+

8421

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8422

conftest$ac_exeext conftest.$ac_ext

8423

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8424

8425

@@ -16674,27 +17359,23 @@

8426

}

8427

_ACEOF

8428

rm -f conftest.$ac_objext conftest$ac_exeext

8429

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

8430

- (eval $ac_link) 2>conftest.er1

8431

+if { (ac_try="$ac_link"

8432

+case "(($ac_try" in

8433

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8434

+ *) ac_try_echo=$ac_try;;

8435

+esac

8436

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8437

+ (eval "$ac_link") 2>conftest.er1

8438

ac_status=$?

8439

grep -v '^ *+' conftest.er1 >conftest.err

8440

rm -f conftest.er1

8441

cat conftest.err >&5

8442

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

8443

- (exit $ac_status); } &&

8444

- { ac_try='test -z "$ac_c_werror_flag"

8445

- || test ! -s conftest.err'

8446

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

8447

- (eval $ac_try) 2>&5

8448

- ac_status=$?

8449

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

8450

- (exit $ac_status); }; } &&

8451

- { ac_try='test -s conftest$ac_exeext'

8452

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

8453

- (eval $ac_try) 2>&5

8454

- ac_status=$?

8455

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

8456

- (exit $ac_status); }; }; then

8457

+ (exit $ac_status); } && {

8458

+ test -z "$ac_c_werror_flag" ||

8459

+ test ! -s conftest.err

8460

+ } && test -s conftest$ac_exeext &&

8461

+ $as_test_x conftest$ac_exeext; then

8462

8463

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8464

}'`

8465

@@ -16705,8 +17386,10 @@

8466

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

8467

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

8468

8469

+

8470

fi

8471

-rm -f conftest.err conftest.$ac_objext \

8472

+

8473

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8474

conftest$ac_exeext conftest.$ac_ext

8475

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8476

8477

@@ -17155,8 +17838,8 @@

8385

@@ -16625,27 +17308,23 @@

8386

}

8387

_ACEOF

8388

rm -f conftest.$ac_objext conftest$ac_exeext

8389

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

8390

- (eval $ac_link) 2>conftest.er1

8391

+if { (ac_try="$ac_link"

8392

+case "(($ac_try" in

8393

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8394

+ *) ac_try_echo=$ac_try;;

8395

+esac

8396

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8397

+ (eval "$ac_link") 2>conftest.er1

8398

ac_status=$?

8399

grep -v '^ *+' conftest.er1 >conftest.err

8400

rm -f conftest.er1

8401

cat conftest.err >&5

8402

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

8403

- (exit $ac_status); } &&

8404

- { ac_try='test -z "$ac_c_werror_flag"

8405

- || test ! -s conftest.err'

8406

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

8407

- (eval $ac_try) 2>&5

8408

- ac_status=$?

8409

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

8410

- (exit $ac_status); }; } &&

8411

- { ac_try='test -s conftest$ac_exeext'

8412

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

8413

- (eval $ac_try) 2>&5

8414

- ac_status=$?

8415

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

8416

- (exit $ac_status); }; }; then

8417

+ (exit $ac_status); } && {

8418

+ test -z "$ac_c_werror_flag" ||

8419

+ test ! -s conftest.err

8420

+ } && test -s conftest$ac_exeext &&

8421

+ $as_test_x conftest$ac_exeext; then

8422

8423

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8424

}'`

8425

@@ -16656,8 +17335,10 @@

8426

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

8427

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

8428

8429

+

8430

fi

8431

-rm -f conftest.err conftest.$ac_objext \

8432

+

8433

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8434

conftest$ac_exeext conftest.$ac_ext

8435

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8436

8437

@@ -16686,27 +17367,23 @@

8438

}

8439

_ACEOF

8440

rm -f conftest.$ac_objext conftest$ac_exeext

8441

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

8442

- (eval $ac_link) 2>conftest.er1

8443

+if { (ac_try="$ac_link"

8444

+case "(($ac_try" in

8445

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8446

+ *) ac_try_echo=$ac_try;;

8447

+esac

8448

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8449

+ (eval "$ac_link") 2>conftest.er1

8450

ac_status=$?

8451

grep -v '^ *+' conftest.er1 >conftest.err

8452

rm -f conftest.er1

8453

cat conftest.err >&5

8454

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

8455

- (exit $ac_status); } &&

8456

- { ac_try='test -z "$ac_c_werror_flag"

8457

- || test ! -s conftest.err'

8458

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

8459

- (eval $ac_try) 2>&5

8460

- ac_status=$?

8461

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

8462

- (exit $ac_status); }; } &&

8463

- { ac_try='test -s conftest$ac_exeext'

8464

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

8465

- (eval $ac_try) 2>&5

8466

- ac_status=$?

8467

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

8468

- (exit $ac_status); }; }; then

8469

+ (exit $ac_status); } && {

8470

+ test -z "$ac_c_werror_flag" ||

8471

+ test ! -s conftest.err

8472

+ } && test -s conftest$ac_exeext &&

8473

+ $as_test_x conftest$ac_exeext; then

8474

8475

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8476

}'`

8477

@@ -16717,8 +17394,10 @@

8478

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

8479

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

8480

8481

+

8482

fi

8483

-rm -f conftest.err conftest.$ac_objext \

8484

+

8485

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8486

conftest$ac_exeext conftest.$ac_ext

8487

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8488

8489

@@ -17167,8 +17846,8 @@

8478

8490

esac

8479

8491

fi

8480

8492

8485

8497

test "$ld_shlibs_GCJ" = no && can_build_shared=no

8486

8498

8487

8499

#

8488

@@ -17176,8 +17859,8 @@

8500

@@ -17188,8 +17867,8 @@

8489

8501

# Test whether the compiler implicitly links with -lc since on some

8490

8502

# systems, -lgcc has to come before -lc. If gcc already passes -lc

8491

8503

# to ld, don't add -lc before -lgcc.

8496

8508

$rm conftest*

8497

8509

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

8498

8510

8499

@@ -17214,16 +17897,16 @@

8511

@@ -17226,16 +17905,16 @@

8500

8512

cat conftest.err 1>&5

8501

8513

fi

8502

8514

$rm conftest*

8517

8529

library_names_spec=

8518

8530

libname_spec='lib$name'

8519

8531

soname_spec=

8520

@@ -17614,7 +18297,7 @@

8532

@@ -17626,7 +18305,7 @@

8521

8533

libsuff=

8522

8534

case "$host_cpu" in

8523

8535

x86_64*|s390x*|powerpc64*)

8524

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

8525

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

8536

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

8537

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

8526

8538

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

8527

8539

(eval $ac_compile) 2>&5

8528

8540

ac_status=$?

8529

@@ -17831,8 +18514,8 @@

8541

@@ -17843,8 +18522,8 @@

8530

8542

dynamic_linker=no

8531

8543

;;

8532

8544

esac

8537

8549

test "$dynamic_linker" = no && can_build_shared=no

8538

8550

8539

8551

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

8540

@@ -17840,8 +18523,8 @@

8552

@@ -17852,8 +18531,8 @@

8541

8553

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

8542

8554

fi

8543

8555

8548

8560

hardcode_action_GCJ=

8549

8561

if test -n "$hardcode_libdir_flag_spec_GCJ" || \

8550

8562

test -n "$runpath_var_GCJ" || \

8551

@@ -17865,8 +18548,8 @@

8563

@@ -17877,8 +18556,8 @@

8552

8564

# directories.

8553

8565

hardcode_action_GCJ=unsupported

8554

8566

fi

8559

8571

8560

8572

if test "$hardcode_action_GCJ" = relink; then

8561

8573

# Fast installation is not supported

8562

@@ -18305,7 +18988,6 @@

8574

@@ -18317,7 +18996,6 @@

8563

8575

RC)

8564

8576

8565

8577

8567

8579

# Source file extension for RC test sources.

8568

8580

ac_ext=rc

8569

8581

8570

@@ -18840,13 +19522,12 @@

8582

@@ -18852,13 +19530,12 @@

8571

8583

8572

8584

8573

8585

8583

8595

cat >conftest.$ac_ext <<_ACEOF

8584

8596

/* confdefs.h. */

8585

8597

_ACEOF

8586

@@ -18854,115 +19535,73 @@

8598

@@ -18866,115 +19543,73 @@

8587

8599

cat >>conftest.$ac_ext <<_ACEOF

8588

8600

/* end confdefs.h. */

8589

8601

8740

8752

8741

8753

fi

8742

8754

8743

@@ -18974,8 +19613,8 @@

8755

@@ -18986,8 +19621,8 @@

8744

8756

if test -n "$ac_tool_prefix"; then

8745

8757

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

8746

8758

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

8751

8763

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

8752

8764

echo $ECHO_N "(cached) $ECHO_C" >&6

8753

8765

else

8754

@@ -18988,32 +19627,34 @@

8766

@@ -19000,32 +19635,34 @@

8755

8767

IFS=$as_save_IFS

8756

8768

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

8757

8769

for ac_exec_ext in '' $ac_executable_extensions; do

8793

8805

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

8794

8806

echo $ECHO_N "(cached) $ECHO_C" >&6

8795

8807

else

8796

@@ -19026,36 +19667,51 @@

8808

@@ -19038,36 +19675,51 @@

8797

8809

IFS=$as_save_IFS

8798

8810

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

8799

8811

for ac_exec_ext in '' $ac_executable_extensions; do

8855

8867

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

8856

8868

echo $ECHO_N "(cached) $ECHO_C" >&6

8857

8869

else

8858

@@ -19068,74 +19724,34 @@

8870

@@ -19080,74 +19732,34 @@

8859

8871

IFS=$as_save_IFS

8860

8872

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

8861

8873

for ac_exec_ext in '' $ac_executable_extensions; do

8939

8951

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

8940

8952

echo $ECHO_N "(cached) $ECHO_C" >&6

8941

8953

else

8942

@@ -19149,7 +19765,7 @@

8954

@@ -19161,7 +19773,7 @@

8943

8955

IFS=$as_save_IFS

8944

8956

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

8945

8957

for ac_exec_ext in '' $ac_executable_extensions; do

8948

8960

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

8949

8961

ac_prog_rejected=yes

8950

8962

continue

8951

@@ -19160,6 +19776,7 @@

8963

@@ -19172,6 +19784,7 @@

8952

8964

fi

8953

8965

done

8954

8966

done

8956

8968

8957

8969

if test $ac_prog_rejected = yes; then

8958

8970

# We found a bogon in the path, so make sure we never use it.

8959

@@ -19177,22 +19794,23 @@

8971

@@ -19189,22 +19802,23 @@

8960

8972

fi

8961

8973

CC=$ac_cv_prog_CC

8962

8974

if test -n "$CC"; then

8987

8999

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

8988

9000

echo $ECHO_N "(cached) $ECHO_C" >&6

8989

9001

else

8990

@@ -19205,36 +19823,38 @@

9002

@@ -19217,36 +19831,38 @@

8991

9003

IFS=$as_save_IFS

8992

9004

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

8993

9005

for ac_exec_ext in '' $ac_executable_extensions; do

9034

9046

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

9035

9047

echo $ECHO_N "(cached) $ECHO_C" >&6

9036

9048

else

9037

@@ -19247,29 +19867,45 @@

9049

@@ -19259,29 +19875,45 @@

9038

9050

IFS=$as_save_IFS

9039

9051

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

9040

9052

for ac_exec_ext in '' $ac_executable_extensions; do

9086

9098

fi

9087

9099

9088

9100

fi

9089

@@ -19282,27 +19918,41 @@

9101

@@ -19294,27 +19926,41 @@

9090

9102

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

9091

9103

9092

9104

# Provide some information about the compiler.

9138

9150

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

9139

9151

echo $ECHO_N "(cached) $ECHO_C" >&6

9140

9152

else

9141

@@ -19325,50 +19975,49 @@

9153

@@ -19337,50 +19983,49 @@

9142

9154

}

9143

9155

_ACEOF

9144

9156

rm -f conftest.$ac_objext

9212

9224

/* confdefs.h. */

9213

9225

_ACEOF

9214

9226

cat confdefs.h >>conftest.$ac_ext

9215

@@ -19384,38 +20033,118 @@

9227

@@ -19396,38 +20041,118 @@

9216

9228

}

9217

9229

_ACEOF

9218

9230

rm -f conftest.$ac_objext

9347

9359

if test "$ac_test_CFLAGS" = set; then

9348

9360

CFLAGS=$ac_save_CFLAGS

9349

9361

elif test $ac_cv_prog_cc_g = yes; then

9350

@@ -19431,12 +20160,12 @@

9362

@@ -19443,12 +20168,12 @@

9351

9363

CFLAGS=

9352

9364

fi

9353

9365

fi

9364

9376

ac_save_CC=$CC

9365

9377

cat >conftest.$ac_ext <<_ACEOF

9366

9378

/* confdefs.h. */

9367

@@ -19470,12 +20199,17 @@

9379

@@ -19482,12 +20207,17 @@

9368

9380

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

9369

9381

function prototypes and stuff, but not '\xHH' hex character constants.

9370

9382

These don't provoke an error unfortunately, instead are silently treated

9384

9396

int test (int i, double x);

9385

9397

struct s1 {int (*f) (int a);};

9386

9398

struct s2 {int (*f) (double a);};

9387

@@ -19490,205 +20224,57 @@

9399

@@ -19502,205 +20232,57 @@

9388

9400

return 0;

9389

9401

}

9390

9402

_ACEOF

9620

9632

ac_ext=c

9621

9633

ac_cpp='$CPP $CPPFLAGS'

9622

9634

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

9623

@@ -19697,8 +20283,8 @@

9635

@@ -19709,8 +20291,8 @@

9624

9636

9625

9637

depcc="$CC" am_compiler_list=

9626

9638

9631

9643

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

9632

9644

echo $ECHO_N "(cached) $ECHO_C" >&6

9633

9645

else

9634

@@ -19787,8 +20373,8 @@

9646

@@ -19799,8 +20381,8 @@

9635

9647

fi

9636

9648

9637

9649

fi

9642

9654

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

9643

9655

9644

9656

9645

@@ -19812,8 +20398,8 @@

9657

@@ -19824,8 +20406,8 @@

9646

9658

if test -n "$ac_tool_prefix"; then

9647

9659

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

9648

9660

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

9653

9665

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

9654

9666

echo $ECHO_N "(cached) $ECHO_C" >&6

9655

9667

else

9656

@@ -19826,32 +20412,34 @@

9668

@@ -19838,32 +20420,34 @@

9657

9669

IFS=$as_save_IFS

9658

9670

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

9659

9671

for ac_exec_ext in '' $ac_executable_extensions; do

9695

9707

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

9696

9708

echo $ECHO_N "(cached) $ECHO_C" >&6

9697

9709

else

9698

@@ -19864,36 +20452,51 @@

9710

@@ -19876,36 +20460,51 @@

9699

9711

IFS=$as_save_IFS

9700

9712

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

9701

9713

for ac_exec_ext in '' $ac_executable_extensions; do

9757

9769

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

9758

9770

echo $ECHO_N "(cached) $ECHO_C" >&6

9759

9771

else

9760

@@ -19906,74 +20509,34 @@

9772

@@ -19918,74 +20517,34 @@

9761

9773

IFS=$as_save_IFS

9762

9774

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

9763

9775

for ac_exec_ext in '' $ac_executable_extensions; do

9841

9853

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

9842

9854

echo $ECHO_N "(cached) $ECHO_C" >&6

9843

9855

else

9844

@@ -19987,7 +20550,7 @@

9856

@@ -19999,7 +20558,7 @@

9845

9857

IFS=$as_save_IFS

9846

9858

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

9847

9859

for ac_exec_ext in '' $ac_executable_extensions; do

9850

9862

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

9851

9863

ac_prog_rejected=yes

9852

9864

continue

9853

@@ -19998,6 +20561,7 @@

9865

@@ -20010,6 +20569,7 @@

9854

9866

fi

9855

9867

done

9856

9868

done

9858

9870

9859

9871

if test $ac_prog_rejected = yes; then

9860

9872

# We found a bogon in the path, so make sure we never use it.

9861

@@ -20015,22 +20579,23 @@

9873

@@ -20027,22 +20587,23 @@

9862

9874

fi

9863

9875

CC=$ac_cv_prog_CC

9864

9876

if test -n "$CC"; then

9889

9901

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

9890

9902

echo $ECHO_N "(cached) $ECHO_C" >&6

9891

9903

else

9892

@@ -20043,36 +20608,38 @@

9904

@@ -20055,36 +20616,38 @@

9893

9905

IFS=$as_save_IFS

9894

9906

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

9895

9907

for ac_exec_ext in '' $ac_executable_extensions; do

9936

9948

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

9937

9949

echo $ECHO_N "(cached) $ECHO_C" >&6

9938

9950

else

9939

@@ -20085,29 +20652,45 @@

9951

@@ -20097,29 +20660,45 @@

9940

9952

IFS=$as_save_IFS

9941

9953

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

9942

9954

for ac_exec_ext in '' $ac_executable_extensions; do

9988

10000

fi

9989

10001

9990

10002

fi

9991

@@ -20120,27 +20703,41 @@

10003

@@ -20132,27 +20711,41 @@

9992

10004

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

9993

10005

9994

10006

# Provide some information about the compiler.

10040

10052

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

10041

10053

echo $ECHO_N "(cached) $ECHO_C" >&6

10042

10054

else

10043

@@ -20163,50 +20760,49 @@

10055

@@ -20175,50 +20768,49 @@

10044

10056

}

10045

10057

_ACEOF

10046

10058

rm -f conftest.$ac_objext

10114

10126

/* confdefs.h. */

10115

10127

_ACEOF

10116

10128

cat confdefs.h >>conftest.$ac_ext

10117

@@ -20222,38 +20818,118 @@

10129

@@ -20234,38 +20826,118 @@

10118

10130

}

10119

10131

_ACEOF

10120

10132

rm -f conftest.$ac_objext

10249

10261

if test "$ac_test_CFLAGS" = set; then

10250

10262

CFLAGS=$ac_save_CFLAGS

10251

10263

elif test $ac_cv_prog_cc_g = yes; then

10252

@@ -20269,12 +20945,12 @@

10264

@@ -20281,12 +20953,12 @@

10253

10265

CFLAGS=

10254

10266

fi

10255

10267

fi

10266

10278

ac_save_CC=$CC

10267

10279

cat >conftest.$ac_ext <<_ACEOF

10268

10280

/* confdefs.h. */

10269

@@ -20308,12 +20984,17 @@

10281

@@ -20320,12 +20992,17 @@

10270

10282

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

10271

10283

function prototypes and stuff, but not '\xHH' hex character constants.

10272

10284

These don't provoke an error unfortunately, instead are silently treated

10286

10298

int test (int i, double x);

10287

10299

struct s1 {int (*f) (int a);};

10288

10300

struct s2 {int (*f) (double a);};

10289

@@ -20328,236 +21009,88 @@

10301

@@ -20340,236 +21017,88 @@

10290

10302

return 0;

10291

10303

}

10292

10304

_ACEOF

10584

10596

10585

10597

am_cv_CC_dependencies_compiler_type=none

10586

10598

if test "$am_compiler_list" = ""; then

10587

@@ -20625,8 +21158,8 @@

10599

@@ -20637,8 +21166,8 @@

10588

10600

fi

10589

10601

10590

10602

fi

10595

10607

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

10596

10608

10597

10609

10598

@@ -20645,18 +21178,22 @@

10610

@@ -20657,18 +21186,22 @@

10599

10611

10600

10612

am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc

10601

10613

10623

10635

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

10624

10636

echo $ECHO_N "(cached) $ECHO_C" >&6

10625

10637

else

10626

@@ -20669,36 +21206,38 @@

10638

@@ -20681,36 +21214,38 @@

10627

10639

IFS=$as_save_IFS

10628

10640

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

10629

10641

for ac_exec_ext in '' $ac_executable_extensions; do

10670

10682

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

10671

10683

echo $ECHO_N "(cached) $ECHO_C" >&6

10672

10684

else

10673

@@ -20711,55 +21250,85 @@

10685

@@ -20723,55 +21258,85 @@

10674

10686

IFS=$as_save_IFS

10675

10687

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

10676

10688

for ac_exec_ext in '' $ac_executable_extensions; do

10774

10786

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

10775

10787

echo $ECHO_N "(cached) $ECHO_C" >&6

10776

10788

else

10777

@@ -20782,50 +21351,49 @@

10789

@@ -20794,50 +21359,49 @@

10778

10790

}

10779

10791

_ACEOF

10780

10792

rm -f conftest.$ac_objext

10848

10860

/* confdefs.h. */

10849

10861

_ACEOF

10850

10862

cat confdefs.h >>conftest.$ac_ext

10851

@@ -20841,159 +21409,133 @@

10863

@@ -20853,159 +21417,133 @@

10852

10864

}

10853

10865

_ACEOF

10854

10866

rm -f conftest.$ac_objext

11077

11089

ac_ext=c

11078

11090

ac_cpp='$CPP $CPPFLAGS'

11079

11091

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

11080

@@ -21002,8 +21544,8 @@

11092

@@ -21014,8 +21552,8 @@

11081

11093

11082

11094

depcc="$CXX" am_compiler_list=

11083

11095

11088

11100

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

11089

11101

echo $ECHO_N "(cached) $ECHO_C" >&6

11090

11102

else

11091

@@ -21092,8 +21634,8 @@

11103

@@ -21104,8 +21642,8 @@

11092

11104

fi

11093

11105

11094

11106

fi

11099

11111

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

11100

11112

11101

11113

11102

@@ -21109,8 +21651,8 @@

11114

@@ -21121,8 +21659,8 @@

11103

11115

fi

11104

11116

11105

11117

11110

11122

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

11111

11123

echo $ECHO_N "(cached) $ECHO_C" >&6

11112

11124

else

11113

@@ -21134,35 +21676,31 @@

11125

@@ -21146,35 +21684,31 @@

11114

11126

}

11115

11127

_ACEOF

11116

11128

rm -f conftest.$ac_objext

11160

11172

11161

11173

if test $ac_cv_header_stdc = yes; then

11162

11174

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

11163

@@ -21218,6 +21756,7 @@

11175

@@ -21230,6 +21764,7 @@

11164

11176

cat >>conftest.$ac_ext <<_ACEOF

11165

11177

/* end confdefs.h. */

11166

11178

#include <ctype.h>

11168

11180

#if ((' ' & 0x0FF) == 0x020)

11169

11181

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

11170

11182

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

11171

@@ -21237,18 +21776,27 @@

11183

@@ -21249,18 +21784,27 @@

11172

11184

for (i = 0; i < 256; i++)

11173

11185

if (XOR (islower (i), ISLOWER (i))

11174

11186

|| toupper (i) != TOUPPER (i))

11202

11214

ac_status=$?

11203

11215

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

11204

11216

(exit $ac_status); }; }; then

11205

@@ -21261,12 +21809,14 @@

11217

@@ -21273,12 +21817,14 @@

11206

11218

( exit $ac_status )

11207

11219

ac_cv_header_stdc=no

11208

11220

fi

11220

11232

if test $ac_cv_header_stdc = yes; then

11221

11233

11222

11234

cat >>confdefs.h <<\_ACEOF

11223

@@ -21287,15 +21837,15 @@

11235

@@ -21299,15 +21845,15 @@

11224

11236

esac

11225

11237

11226

11238

if test -n "0.35.0"; then

11240

11252

test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||

11241

11253

{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5

11242

11254

echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}

11243

@@ -21350,8 +21900,8 @@

11255

@@ -21362,8 +21908,8 @@

11244

11256

11245

11257

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

11246

11258

set dummy perl; ac_word=$2

11251

11263

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

11252

11264

echo $ECHO_N "(cached) $ECHO_C" >&6

11253

11265

else

11254

@@ -21366,27 +21916,28 @@

11266

@@ -21378,27 +21924,28 @@

11255

11267

IFS=$as_save_IFS

11256

11268

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

11257

11269

for ac_exec_ext in '' $ac_executable_extensions; do

11286

11298

if test -z "$INTLTOOL_PERL"; then

11287

11299

{ { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5

11288

11300

echo "$as_me: error: perl not found; required for intltool" >&2;}

11289

@@ -21398,11 +21949,11 @@

11301

@@ -21410,11 +21957,11 @@

11290

11302

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

11291

11303

fi

11292

11304

if test "x" != "xno-xml"; then

11302

11314

else

11303

11315

{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

11304

11316

echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

11305

@@ -21412,8 +21963,8 @@

11317

@@ -21424,8 +21971,8 @@

11306

11318

11307

11319

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

11308

11320

set dummy iconv; ac_word=$2

11313

11325

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

11314

11326

echo $ECHO_N "(cached) $ECHO_C" >&6

11315

11327

else

11316

@@ -21428,32 +21979,33 @@

11328

@@ -21440,32 +21987,33 @@

11317

11329

IFS=$as_save_IFS

11318

11330

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

11319

11331

for ac_exec_ext in '' $ac_executable_extensions; do

11355

11367

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

11356

11368

echo $ECHO_N "(cached) $ECHO_C" >&6

11357

11369

else

11358

@@ -21468,32 +22020,33 @@

11370

@@ -21480,32 +22028,33 @@

11359

11371

IFS=$as_save_IFS

11360

11372

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

11361

11373

for ac_exec_ext in '' $ac_executable_extensions; do

11397

11409

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

11398

11410

echo $ECHO_N "(cached) $ECHO_C" >&6

11399

11411

else

11400

@@ -21508,32 +22061,33 @@

11412

@@ -21520,32 +22069,33 @@

11401

11413

IFS=$as_save_IFS

11402

11414

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

11403

11415

for ac_exec_ext in '' $ac_executable_extensions; do

11439

11451

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

11440

11452

echo $ECHO_N "(cached) $ECHO_C" >&6

11441

11453

else

11442

@@ -21548,29 +22102,30 @@

11454

@@ -21560,29 +22110,30 @@

11443

11455

IFS=$as_save_IFS

11444

11456

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

11445

11457

for ac_exec_ext in '' $ac_executable_extensions; do

11476

11488

# Substitute ALL_LINGUAS so we can use it in po/Makefile

11477

11489

11478

11490

11479

@@ -21594,36 +22149,32 @@

11491

@@ -21606,36 +22157,32 @@

11480

11492

}

11481

11493

_ACEOF

11482

11494

rm -f conftest.$ac_objext conftest$ac_exeext

11528

11540

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

11529

11541

echo $ECHO_N "(cached) $ECHO_C" >&6

11530

11542

else

11531

@@ -21650,68 +22201,59 @@

11543

@@ -21662,68 +22209,59 @@

11532

11544

11533

11545

#undef bind_textdomain_codeset

11534

11546

11619

11631

if test $ac_cv_func_bind_textdomain_codeset = yes; then

11620

11632

DATADIRNAME=share

11621

11633

else

11622

@@ -21724,7 +22266,8 @@

11634

@@ -21736,7 +22274,8 @@

11623

11635

;;

11624

11636

esac

11625

11637

fi

11629

11641

conftest$ac_exeext conftest.$ac_ext

11630

11642

fi

11631

11643

11632

@@ -21732,14 +22275,14 @@

11644

@@ -21744,14 +22283,14 @@

11633

11645

11634

11646

11635

11647

11659

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

11648

11660

echo $ECHO_N "(cached) $ECHO_C" >&6

11649

11661

else

11650

@@ -21754,31 +22297,32 @@

11662

@@ -21766,31 +22305,32 @@

11651

11663

IFS=$as_save_IFS

11652

11664

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

11653

11665

for ac_exec_ext in '' $ac_executable_extensions; do

11688

11700

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

11689

11701

echo $ECHO_N "(cached) $ECHO_C" >&6

11690

11702

else

11691

@@ -21793,31 +22337,32 @@

11703

@@ -21805,31 +22345,32 @@

11692

11704

IFS=$as_save_IFS

11693

11705

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

11694

11706

for ac_exec_ext in '' $ac_executable_extensions; do

11727

11739

ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"

11728

11740

if test -n "$ac_macro_dir"; then

11729

11741

ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"

11730

@@ -21831,8 +22376,8 @@

11742

@@ -21843,8 +22384,8 @@

11731

11743

if test -n "$ac_tool_prefix"; then

11732

11744

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

11733

11745

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

11738

11750

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

11739

11751

echo $ECHO_N "(cached) $ECHO_C" >&6

11740

11752

else

11741

@@ -21847,34 +22392,35 @@

11753

@@ -21859,34 +22400,35 @@

11742

11754

IFS=$as_save_IFS

11743

11755

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

11744

11756

for ac_exec_ext in '' $ac_executable_extensions; do

11782

11794

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

11783

11795

echo $ECHO_N "(cached) $ECHO_C" >&6

11784

11796

else

11785

@@ -21889,28 +22435,42 @@

11797

@@ -21901,28 +22443,42 @@

11786

11798

IFS=$as_save_IFS

11787

11799

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

11788

11800

for ac_exec_ext in '' $ac_executable_extensions; do

11832

11844

else

11833

11845

PKG_CONFIG="$ac_cv_path_PKG_CONFIG"

11834

11846

fi

11835

@@ -21918,14 +22478,14 @@

11847

@@ -21930,14 +22486,14 @@

11836

11848

fi

11837

11849

if test -n "$PKG_CONFIG"; then

11838

11850

_pkg_min_version=0.9.0

11853

11865

PKG_CONFIG=""

11854

11866

fi

11855

11867

11856

@@ -21954,45 +22514,45 @@

11868

@@ -21966,45 +22522,45 @@

11857

11869

11858

11870

11859

11871

11915

11927

11916

11928

11917

11929

if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then

11918

@@ -22028,13 +22588,13 @@

11930

@@ -22040,13 +22596,13 @@

11919

11931

11920

11932

11921

11933

11945

11934

11946

warnCFLAGS=

11935

11947

if test "x$GCC" != xyes; then

11936

@@ -22060,8 +22620,8 @@

11948

@@ -22072,8 +22628,8 @@

11937

11949

for option in -Wno-sign-compare; do

11938

11950

SAVE_CFLAGS="$CFLAGS"

11939

11951

CFLAGS="$CFLAGS $option"

11944

11956

cat >conftest.$ac_ext <<_ACEOF

11945

11957

/* confdefs.h. */

11946

11958

_ACEOF

11947

@@ -22078,38 +22638,34 @@

11959

@@ -22090,38 +22646,34 @@

11948

11960

}

11949

11961

_ACEOF

11950

11962

rm -f conftest.$ac_objext

11999

12011

if test $has_option = yes; then

12000

12012

warning_flags="$warning_flags $option"

12001

12013

fi

12002

@@ -22128,21 +22684,21 @@

12014

@@ -22140,21 +22692,21 @@

12003

12015

;;

12004

12016

esac

12005

12017

CFLAGS="$realsave_CFLAGS"

12031

12043

complCFLAGS=

12032

12044

if test "x$enable_iso_c" != "xno"; then

12033

12045

if test "x$GCC" = "xyes"; then

12034

@@ -22156,23 +22712,23 @@

12046

@@ -22168,23 +22720,23 @@

12035

12047

esac

12036

12048

fi

12037

12049

fi

12063

12075

warnCXXFLAGS=

12064

12076

if test "x$GCC" != xyes; then

12065

12077

enable_compile_warnings=no

12066

@@ -22191,19 +22747,19 @@

12078

@@ -22203,19 +22755,19 @@

12067

12079

fi

12068

12080

fi

12069

12081

fi

12091

12103

complCXXFLAGS=

12092

12104

if test "x$enable_iso_cxx" != "xno"; then

12093

12105

if test "x$GCC" = "xyes"; then

12094

@@ -22218,20 +22774,20 @@

12106

@@ -22230,20 +22782,20 @@

12095

12107

esac

12096

12108

fi

12097

12109

fi

12118

12130

12119

12131

if test x$enable_debug = xyes ; then

12120

12132

12121

@@ -22244,31 +22800,31 @@

12133

@@ -22256,31 +22808,31 @@

12122

12134

12123

12135

12124

12136

12160

12172

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

12161

12173

echo $ECHO_N "(cached) $ECHO_C" >&6

12162

12174

else

12163

@@ -22283,28 +22839,29 @@

12175

@@ -22295,28 +22847,29 @@

12164

12176

IFS=$as_save_IFS

12165

12177

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

12166

12178

for ac_exec_ext in '' $ac_executable_extensions; do

12196

12208

fi

12197

12209

if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then

12198

12210

have_gtk_doc=yes

12199

@@ -22312,14 +22869,14 @@

12211

@@ -22324,14 +22877,14 @@

12200

12212

12201

12213

gtk_doc_min_version=1.0

12202

12214

if test "$have_gtk_doc" = yes; then

12217

12229

have_gtk_doc=no

12218

12230

fi

12219

12231

fi

12220

@@ -22363,18 +22920,19 @@

12232

@@ -22375,18 +22928,19 @@

12221

12233

for ac_header in locale.h

12222

12234

do

12223

12235

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

12245

12257

cat >conftest.$ac_ext <<_ACEOF

12246

12258

/* confdefs.h. */

12247

12259

_ACEOF

12248

@@ -22385,41 +22943,37 @@

12260

@@ -22397,41 +22951,37 @@

12249

12261

#include <$ac_header>

12250

12262

_ACEOF

12251

12263

rm -f conftest.$ac_objext

12305

12317

cat >conftest.$ac_ext <<_ACEOF

12306

12318

/* confdefs.h. */

12307

12319

_ACEOF

12308

@@ -22428,24 +22982,22 @@

12320

@@ -22440,24 +22990,22 @@

12309

12321

/* end confdefs.h. */

12310

12322

#include <$ac_header>

12311

12323

_ACEOF

12341

12353

ac_header_preproc=yes

12342

12354

else

12343

12355

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

12344

@@ -22453,9 +23005,10 @@

12356

@@ -22465,9 +23013,10 @@

12345

12357

12346

12358

ac_header_preproc=no

12347

12359

fi

12354

12366

12355

12367

# So? What about this header?

12356

12368

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

12357

@@ -22479,25 +23032,24 @@

12369

@@ -22491,25 +23040,24 @@

12358

12370

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

12359

12371

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

12360

12372

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

12388

12400

12389

12401

fi

12390

12402

if test `eval echo '${'$as_ac_Header'}'` = yes; then

12391

@@ -22510,8 +23062,8 @@

12403

@@ -22522,8 +23070,8 @@

12392

12404

done

12393

12405

12394

12406

if test $ac_cv_header_locale_h = yes; then

12399

12411

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

12400

12412

echo $ECHO_N "(cached) $ECHO_C" >&6

12401

12413

else

12402

@@ -22531,39 +23083,36 @@

12414

@@ -22543,39 +23091,36 @@

12403

12415

}

12404

12416

_ACEOF

12405

12417

rm -f conftest.$ac_objext conftest$ac_exeext

12456

12468

if test $am_cv_val_LC_MESSAGES = yes; then

12457

12469

12458

12470

cat >>confdefs.h <<\_ACEOF

12459

@@ -22582,17 +23131,17 @@

12471

@@ -22594,17 +23139,17 @@

12460

12472

INTLLIBS=

12461

12473

12462

12474

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

12480

12492

cat >conftest.$ac_ext <<_ACEOF

12481

12493

/* confdefs.h. */

12482

12494

_ACEOF

12483

@@ -22603,41 +23152,37 @@

12495

@@ -22615,41 +23160,37 @@

12484

12496

#include <libintl.h>

12485

12497

_ACEOF

12486

12498

rm -f conftest.$ac_objext

12540

12552

cat >conftest.$ac_ext <<_ACEOF

12541

12553

/* confdefs.h. */

12542

12554

_ACEOF

12543

@@ -22646,24 +23191,22 @@

12555

@@ -22658,24 +23199,22 @@

12544

12556

/* end confdefs.h. */

12545

12557

#include <libintl.h>

12546

12558

_ACEOF

12576

12588

ac_header_preproc=yes

12577

12589

else

12578

12590

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

12579

@@ -22671,9 +23214,10 @@

12591

@@ -22683,9 +23222,10 @@

12580

12592

12581

12593

ac_header_preproc=no

12582

12594

fi

12589

12601

12590

12602

# So? What about this header?

12591

12603

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

12592

@@ -22697,25 +23241,23 @@

12604

@@ -22709,25 +23249,23 @@

12593

12605

echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

12594

12606

{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

12595

12607

echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

12621

12633

12622

12634

fi

12623

12635

if test $ac_cv_header_libintl_h = yes; then

12624

@@ -22725,8 +23267,8 @@

12636

@@ -22737,8 +23275,8 @@

12625

12637

#

12626

12638

# First check in libc

12627

12639

#

12632

12644

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

12633

12645

echo $ECHO_N "(cached) $ECHO_C" >&6

12634

12646

else

12635

@@ -22748,44 +23290,41 @@

12647

@@ -22760,44 +23298,41 @@

12636

12648

}

12637

12649

_ACEOF

12638

12650

rm -f conftest.$ac_objext conftest$ac_exeext

12696

12708

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

12697

12709

echo $ECHO_N "(cached) $ECHO_C" >&6

12698

12710

else

12699

@@ -22807,40 +23346,37 @@

12711

@@ -22819,40 +23354,37 @@

12700

12712

}

12701

12713

_ACEOF

12702

12714

rm -f conftest.$ac_objext conftest$ac_exeext

12754

12766

fi

12755

12767

12756

12768

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

12757

@@ -22848,9 +23384,9 @@

12769

@@ -22860,9 +23392,9 @@

12758

12770

for ac_func in bind_textdomain_codeset

12759

12771

do

12760

12772

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

12767

12779

echo $ECHO_N "(cached) $ECHO_C" >&6

12768

12780

else

12769

12781

cat >conftest.$ac_ext <<_ACEOF

12770

@@ -22876,68 +23412,60 @@

12782

@@ -22888,68 +23420,60 @@

12771

12783

12772

12784

#undef $ac_func

12773

12785

12859

12871

if test `eval echo '${'$as_ac_var'}'` = yes; then

12860

12872

cat >>confdefs.h <<_ACEOF

12861

12873

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

12862

@@ -22955,8 +23483,8 @@

12874

@@ -22967,8 +23491,8 @@

12863

12875

|| test "$gt_cv_func_ngettext_libc" != "yes" \

12864

12876

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

12865

12877

12870

12882

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

12871

12883

echo $ECHO_N "(cached) $ECHO_C" >&6

12872

12884

else

12873

@@ -22969,59 +23497,56 @@

12885

@@ -22981,59 +23505,56 @@

12874

12886

cat >>conftest.$ac_ext <<_ACEOF

12875

12887

/* end confdefs.h. */

12876

12888

12953

12965

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

12954

12966

echo $ECHO_N "(cached) $ECHO_C" >&6

12955

12967

else

12956

@@ -23034,59 +23559,56 @@

12968

@@ -23046,59 +23567,56 @@

12957

12969

cat >>conftest.$ac_ext <<_ACEOF

12958

12970

/* end confdefs.h. */

12959

12971

13036

13048

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

13037

13049

echo $ECHO_N "(cached) $ECHO_C" >&6

13038

13050

else

13039

@@ -23099,56 +23621,53 @@

13051

@@ -23111,56 +23629,53 @@

13040

13052

cat >>conftest.$ac_ext <<_ACEOF

13041

13053

/* end confdefs.h. */

13042

13054

13114

13126

if test $ac_cv_lib_intl_dgettext = yes; then

13115

13127

gt_cv_func_dgettext_libintl=yes

13116

13128

fi

13117

@@ -23159,12 +23678,12 @@

13129

@@ -23171,12 +23686,12 @@

13118

13130

13119

13131

13120

13132

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

13133

13145

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

13134

13146

echo $ECHO_N "(cached) $ECHO_C" >&6

13135

13147

else

13136

@@ -23177,59 +23696,56 @@

13148

@@ -23189,59 +23704,56 @@

13137

13149

cat >>conftest.$ac_ext <<_ACEOF

13138

13150

/* end confdefs.h. */

13139

13151

13216

13228

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

13217

13229

echo $ECHO_N "(cached) $ECHO_C" >&6

13218

13230

else

13219

@@ -23242,56 +23758,53 @@

13231

@@ -23254,56 +23766,53 @@

13220

13232

cat >>conftest.$ac_ext <<_ACEOF

13221

13233

/* end confdefs.h. */

13222

13234

13294

13306

if test $ac_cv_lib_intl_dcgettext = yes; then

13295

13307

gt_cv_func_dgettext_libintl=yes

13296

13308

libintl_extra_libs=-liconv

13297

@@ -23318,9 +23831,9 @@

13309

@@ -23330,9 +23839,9 @@

13298

13310

for ac_func in bind_textdomain_codeset

13299

13311

do

13300

13312

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

13307

13319

echo $ECHO_N "(cached) $ECHO_C" >&6

13308

13320

else

13309

13321

cat >conftest.$ac_ext <<_ACEOF

13310

@@ -23346,68 +23859,60 @@

13322

@@ -23358,68 +23867,60 @@

13311

13323

13312

13324

#undef $ac_func

13313

13325

13399

13411

if test `eval echo '${'$as_ac_var'}'` = yes; then

13400

13412

cat >>confdefs.h <<_ACEOF

13401

13413

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

13402

@@ -23446,8 +23951,8 @@

13414

@@ -23458,8 +23959,8 @@

13403

13415

13404

13416

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

13405

13417

set dummy msgfmt; ac_word=$2

13410

13422

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

13411

13423

echo $ECHO_N "(cached) $ECHO_C" >&6

13412

13424

else

13413

@@ -23473,11 +23978,11 @@

13425

@@ -23485,11 +23986,11 @@

13414

13426

fi

13415

13427

MSGFMT="$ac_cv_path_MSGFMT"

13416

13428

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

13426

13438

fi

13427

13439

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

13428

13440

glib_save_LIBS="$LIBS"

13429

@@ -23486,9 +23991,9 @@

13441

@@ -23498,9 +23999,9 @@

13430

13442

for ac_func in dcgettext

13431

13443

do

13432

13444

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

13439

13451

echo $ECHO_N "(cached) $ECHO_C" >&6

13440

13452

else

13441

13453

cat >conftest.$ac_ext <<_ACEOF

13442

@@ -23514,68 +24019,60 @@

13454

@@ -23526,68 +24027,60 @@

13443

13455

13444

13456

#undef $ac_func

13445

13457

13531

13543

if test `eval echo '${'$as_ac_var'}'` = yes; then

13532

13544

cat >>confdefs.h <<_ACEOF

13533

13545

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

13534

@@ -23585,8 +24082,8 @@

13546

@@ -23597,8 +24090,8 @@

13535

13547

done

13536

13548

13537

13549

MSGFMT_OPTS=

13542

13554

cat >conftest.foo <<_ACEOF

13543

13555

13544

13556

msgid ""

13545

@@ -23605,18 +24102,18 @@

13557

@@ -23617,18 +24110,18 @@

13546

13558

ac_status=$?

13547

13559

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

13548

13560

(exit $ac_status); }; then

13567

13579

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

13568

13580

echo $ECHO_N "(cached) $ECHO_C" >&6

13569

13581

else

13570

@@ -23631,32 +24128,33 @@

13582

@@ -23643,32 +24136,33 @@

13571

13583

IFS=$as_save_IFS

13572

13584

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

13573

13585

for ac_exec_ext in '' $ac_executable_extensions; do

13609

13621

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

13610

13622

echo $ECHO_N "(cached) $ECHO_C" >&6

13611

13623

else

13612

@@ -23682,11 +24180,11 @@

13624

@@ -23694,11 +24188,11 @@

13613

13625

fi

13614

13626

XGETTEXT="$ac_cv_path_XGETTEXT"

13615

13627

if test "$XGETTEXT" != ":"; then

13625

13637

fi

13626

13638

13627

13639

cat >conftest.$ac_ext <<_ACEOF

13628

@@ -23706,37 +24204,33 @@

13640

@@ -23718,37 +24212,33 @@

13629

13641

}

13630

13642

_ACEOF

13631

13643

rm -f conftest.$ac_objext conftest$ac_exeext

13678

13690

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

13679

13691

echo $ECHO_N "(cached) $ECHO_C" >&6

13680

13692

else

13681

@@ -23763,68 +24257,59 @@

13693

@@ -23775,68 +24265,59 @@

13682

13694

13683

13695

#undef bind_textdomain_codeset

13684

13696

13769

13781

if test $ac_cv_func_bind_textdomain_codeset = yes; then

13770

13782

CATOBJEXT=.gmo

13771

13783

DATADIRNAME=share

13772

@@ -23840,7 +24325,8 @@

13784

@@ -23852,7 +24333,8 @@

13773

13785

;;

13774

13786

esac

13775

13787

fi

13779

13791

conftest$ac_exeext conftest.$ac_ext

13780

13792

LIBS="$glib_save_LIBS"

13781

13793

INSTOBJEXT=.mo

13782

@@ -23865,8 +24351,8 @@

13794

@@ -23877,8 +24359,8 @@

13783

13795

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

13784

13796

: ;

13785

13797

else

13790

13802

XGETTEXT=":"

13791

13803

fi

13792

13804

fi

13793

@@ -23874,7 +24360,7 @@

13805

@@ -23886,7 +24368,7 @@

13794

13806

# We need to process the po/ directory.

13795

13807

POSUB=po

13796

13808

13799

13811

13800

13812

13801

13813

for lang in $ALL_LINGUAS; do

13802

@@ -23898,8 +24384,8 @@

13814

@@ -23910,8 +24392,8 @@

13803

13815

if test "x$ALL_LINGUAS" = "x"; then

13804

13816

LINGUAS=

13805

13817

else

13810

13822

NEW_LINGUAS=

13811

13823

for presentlang in $ALL_LINGUAS; do

13812

13824

useit=no

13813

@@ -23923,8 +24409,8 @@

13825

@@ -23935,8 +24417,8 @@

13814

13826

fi

13815

13827

done

13816

13828

LINGUAS=$NEW_LINGUAS

13821

13833

fi

13822

13834

13823

13835

if test -n "$LINGUAS"; then

13824

@@ -23978,8 +24464,8 @@

13836

@@ -23990,8 +24472,8 @@

13825

13837

13826

13838

13827

13839

pkg_failed=no

13832

13844

13833

13845

if test -n "$PKG_CONFIG"; then

13834

13846

if test -n "$LIB_CFLAGS"; then

13835

@@ -24083,14 +24569,14 @@

13847

@@ -24095,14 +24577,14 @@

13836

13848

else

13837

13849

LIB_CFLAGS=$pkg_cv_LIB_CFLAGS

13838

13850

LIB_LIBS=$pkg_cv_LIB_LIBS

13851

13863

13852

13864

if test -n "$PKG_CONFIG"; then

13853

13865

if test -n "$BACKEND_CFLAGS"; then

13854

@@ -24194,14 +24680,14 @@

13866

@@ -24206,14 +24688,14 @@

13855

13867

else

13856

13868

BACKEND_CFLAGS=$pkg_cv_BACKEND_CFLAGS

13857

13869

BACKEND_LIBS=$pkg_cv_BACKEND_LIBS

13870

13882

13871

13883

if test -n "$PKG_CONFIG"; then

13872

13884

if test -n "$FRONTEND_CORE_CFLAGS"; then

13873

@@ -24305,26 +24791,26 @@

13885

@@ -24317,26 +24799,26 @@

13874

13886

else

13875

13887

FRONTEND_CORE_CFLAGS=$pkg_cv_FRONTEND_CORE_CFLAGS

13876

13888

FRONTEND_CORE_LIBS=$pkg_cv_FRONTEND_CORE_LIBS

13904

13916

else

13905

13917

pkg_failed=yes

13906

13918

fi

13907

@@ -24337,12 +24823,12 @@

13919

@@ -24349,12 +24831,12 @@

13908

13920

pkg_cv_SHELL_CORE_LIBS="$SHELL_CORE_LIBS"

13909

13921

else

13910

13922

if test -n "$PKG_CONFIG" && \

13920

13932

else

13921

13933

pkg_failed=yes

13922

13934

fi

13923

@@ -24361,14 +24847,14 @@

13935

@@ -24373,14 +24855,14 @@

13924

13936

_pkg_short_errors_supported=no

13925

13937

fi

13926

13938

if test $_pkg_short_errors_supported = yes; then

13938

13950

13939

13951

$SHELL_CORE_PKG_ERRORS

13940

13952

13941

@@ -24379,7 +24865,7 @@

13953

@@ -24391,7 +24873,7 @@

13942

13954

and SHELL_CORE_LIBS to avoid the need to call pkg-config.

13943

13955

See the pkg-config man page for more details.

13944

13956

" >&5

13947

13959

13948

13960

$SHELL_CORE_PKG_ERRORS

13949

13961

13950

@@ -24416,16 +24902,15 @@

13962

@@ -24428,16 +24910,15 @@

13951

13963

else

13952

13964

SHELL_CORE_CFLAGS=$pkg_cv_SHELL_CORE_CFLAGS

13953

13965

SHELL_CORE_LIBS=$pkg_cv_SHELL_CORE_LIBS

13968

13980

yes) WITH_GNOME=yes ;;

13969

13981

no) WITH_GNOME=no ;;

13970

13982

*) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-libgnome" >&5

13971

@@ -24434,7 +24919,8 @@

13983

@@ -24446,7 +24927,8 @@

13972

13984

esac

13973

13985

else

13974

13986

WITH_GNOME=yes

13978

13990

13979

13991

if test x$WITH_GNOME = "xyes"; then

13980

13992

WITH_GNOME_TRUE=

13981

@@ -24448,8 +24934,8 @@

13993

@@ -24460,8 +24942,8 @@

13982

13994

if test x$WITH_GNOME = "xyes"; then

13983

13995

13984

13996

pkg_failed=no

13989

14001

13990

14002

if test -n "$PKG_CONFIG"; then

13991

14003

if test -n "$GNOME_CFLAGS"; then

13992

@@ -24553,14 +25039,14 @@

14004

@@ -24565,14 +25047,14 @@

13993

14005

else

13994

14006

GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS

13995

14007

GNOME_LIBS=$pkg_cv_GNOME_LIBS

14008

14020

14009

14021

if test -n "$PKG_CONFIG"; then

14010

14022

if test -n "$GNOMEUI_CFLAGS"; then

14011

@@ -24664,8 +25150,8 @@

14023

@@ -24676,8 +25158,8 @@

14012

14024

else

14013

14025

GNOMEUI_CFLAGS=$pkg_cv_GNOMEUI_CFLAGS

14014

14026

GNOMEUI_LIBS=$pkg_cv_GNOMEUI_LIBS

14019

14031

:

14020

14032

fi

14021

14033

14022

@@ -24679,18 +25165,18 @@

14034

@@ -24691,18 +25173,18 @@

14023

14035

14024

14036

14025

14037

14044

14056

14045

14057

if test -n "$PKG_CONFIG"; then

14046

14058

if test -n "$GNOME_PRINT_CFLAGS"; then

14047

@@ -24746,22 +25232,22 @@

14059

@@ -24758,22 +25240,22 @@

14048

14060

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

14049

14061

echo "$GNOME_PRINT_PKG_ERRORS" >&5

14050

14062

14073

14085

14074

14086

if test -n "$PKG_CONFIG"; then

14075

14087

if test -n "$GTK_PRINT_CFLAGS"; then

14076

@@ -24817,16 +25303,16 @@

14088

@@ -24829,16 +25311,16 @@

14077

14089

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

14078

14090

echo "$GTK_PRINT_PKG_ERRORS" >&5

14079

14091

14094

14106

enable_gtk_print=yes

14095

14107

fi

14096

14108

enable_print=no

14097

@@ -24902,8 +25388,8 @@

14109

@@ -24914,8 +25396,8 @@

14098

14110

14099

14111

14100

14112

pkg_failed=no

14105

14117

14106

14118

if test -n "$PKG_CONFIG"; then

14107

14119

if test -n "$DBUS_CFLAGS"; then

14108

@@ -24959,16 +25445,16 @@

14120

@@ -24971,16 +25453,16 @@

14109

14121

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

14110

14122

echo "$DBUS_PKG_ERRORS" >&5

14111

14123

14126

14138

enable_dbus=yes

14127

14139

fi

14128

14140

14129

@@ -24982,8 +25468,8 @@

14141

@@ -24994,8 +25476,8 @@

14130

14142

if test "x$enable_dbus" = "xyes" ; then

14131

14143

# Extract the first word of "dbus-binding-tool", so it can be a program name with args.

14132

14144

set dummy dbus-binding-tool; ac_word=$2

14137

14149

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

14138

14150

echo $ECHO_N "(cached) $ECHO_C" >&6

14139

14151

else

14140

@@ -24998,29 +25484,30 @@

14152

@@ -25010,29 +25492,30 @@

14141

14153

IFS=$as_save_IFS

14142

14154

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

14143

14155

for ac_exec_ext in '' $ac_executable_extensions; do

14174

14186

if test x$DBUS_BINDING_TOOL = "xno" ; then

14175

14187

{ { echo "$as_me:$LINENO: error: dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings" >&5

14176

14188

echo "$as_me: error: dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings" >&2;}

14177

@@ -25075,10 +25562,9 @@

14189

@@ -25087,10 +25570,9 @@

14178

14190

fi

14179

14191

14180

14192

14187

14199

yes) ENABLE_NAUTILUS=yes ;;

14188

14200

no) ENABLE_NAUTILUS=no ;;

14189

14201

*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5

14190

@@ -25087,12 +25573,13 @@

14202

@@ -25099,12 +25581,13 @@

14191

14203

esac

14192

14204

else

14193

14205

ENABLE_NAUTILUS=yes

14204

14216

14205

14217

if test -n "$PKG_CONFIG"; then

14206

14218

if test -n "$NAUTILUS_CFLAGS"; then

14207

@@ -25148,16 +25635,16 @@

14219

@@ -25160,16 +25643,16 @@

14208

14220

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

14209

14221

echo "$NAUTILUS_PKG_ERRORS" >&5

14210

14222

14225

14237

HAVE_NAUTILUS=yes

14226

14238

fi

14227

14239

fi

14228

@@ -25183,10 +25670,9 @@

14240

@@ -25195,10 +25678,9 @@

14229

14241

14230

14242

14231

14243

14238

14250

yes) ENABLE_THUMBNAILER=yes ;;

14239

14251

no) ENABLE_THUMBNAILER=no ;;

14240

14252

*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-thumbnailer" >&5

14241

@@ -25195,7 +25681,8 @@

14253

@@ -25207,7 +25689,8 @@

14242

14254

esac

14243

14255

else

14244

14256

ENABLE_THUMBNAILER=yes

14248

14260

14249

14261

if test x$ENABLE_THUMBNAILER = "xyes"; then

14250

14262

ENABLE_THUMBNAILER_TRUE=

14251

@@ -25209,8 +25696,8 @@

14263

@@ -25221,8 +25704,8 @@

14252

14264

14253

14265

14254

14266

pkg_failed=no

14259

14271

14260

14272

if test -n "$PKG_CONFIG"; then

14261

14273

if test -n "$GTK_RECENT_CFLAGS"; then

14262

@@ -25266,16 +25753,16 @@

14274

@@ -25278,16 +25761,16 @@

14263

14275

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

14264

14276

echo "$GTK_RECENT_PKG_ERRORS" >&5

14265

14277

14280

14292

HAVE_GTK_RECENT=yes

14281

14293

fi

14282

14294

if test x$HAVE_GTK_RECENT = xyes; then

14283

@@ -25304,41 +25791,41 @@

14295

@@ -25316,41 +25799,41 @@

14284

14296

fi

14285

14297

14286

14298

14338

14350

14339

14351

14340

14352

if test "$enable_schemas_install" != no; then

14341

@@ -25353,8 +25840,8 @@

14353

@@ -25365,8 +25848,8 @@

14342

14354

14343

14355

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

14344

14356

set dummy gconftool-2; ac_word=$2

14349

14361

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

14350

14362

echo $ECHO_N "(cached) $ECHO_C" >&6

14351

14363

else

14352

@@ -25369,28 +25856,29 @@

14364

@@ -25381,28 +25864,29 @@

14353

14365

IFS=$as_save_IFS

14354

14366

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

14355

14367

for ac_exec_ext in '' $ac_executable_extensions; do

14385

14397

if test "x$GCONFTOOL" = "xno"; then

14386

14398

{ { echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5

14387

14399

echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}

14388

@@ -25402,18 +25890,19 @@

14400

@@ -25414,18 +25898,19 @@

14389

14401

for ac_header in execinfo.h

14390

14402

do

14391

14403

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

14413

14425

cat >conftest.$ac_ext <<_ACEOF

14414

14426

/* confdefs.h. */

14415

14427

_ACEOF

14416

@@ -25424,41 +25913,37 @@

14428

@@ -25436,41 +25921,37 @@

14417

14429

#include <$ac_header>

14418

14430

_ACEOF

14419

14431

rm -f conftest.$ac_objext

14473

14485

cat >conftest.$ac_ext <<_ACEOF

14474

14486

/* confdefs.h. */

14475

14487

_ACEOF

14476

@@ -25467,24 +25952,22 @@

14488

@@ -25479,24 +25960,22 @@

14477

14489

/* end confdefs.h. */

14478

14490

#include <$ac_header>

14479

14491

_ACEOF

14509

14521

ac_header_preproc=yes

14510

14522

else

14511

14523

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

14512

@@ -25492,9 +25975,10 @@

14524

@@ -25504,9 +25983,10 @@

14513

14525

14514

14526

ac_header_preproc=no

14515

14527

fi

14522

14534

14523

14535

# So? What about this header?

14524

14536

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

14525

@@ -25518,25 +26002,24 @@

14537

@@ -25530,25 +26010,24 @@

14526

14538

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

14527

14539

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

14528

14540

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

14556

14568

14557

14569

fi

14558

14570

if test `eval echo '${'$as_ac_Header'}'` = yes; then

14559

@@ -25549,8 +26032,8 @@

14571

@@ -25561,8 +26040,8 @@

14560

14572

done

14561

14573

14562

14574

14567

14579

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

14568

14580

echo $ECHO_N "(cached) $ECHO_C" >&6

14569

14581

else

14570

@@ -25566,7 +26049,7 @@

14582

@@ -25578,7 +26057,7 @@

14571

14583

main ()

14572

14584

{

14573

14585

#ifndef _NL_MEASUREMENT_MEASUREMENT

14576

14588

#endif

14577

14589

14578

14590

;

14579

@@ -25574,38 +26057,34 @@

14591

@@ -25586,38 +26065,34 @@

14580

14592

}

14581

14593

_ACEOF

14582

14594

rm -f conftest.$ac_objext

14631

14643

if test $ac_cv_have_decl__NL_MEASUREMENT_MEASUREMENT = yes; then

14632

14644

14633

14645

14634

@@ -25617,20 +26096,20 @@

14646

@@ -25629,20 +26104,20 @@

14635

14647

fi

14636

14648

14637

14649

14658

14670

14659

14671

if test -n "$PKG_CONFIG"; then

14660

14672

if test -n "$POPPLER_CFLAGS"; then

14661

@@ -25686,16 +26165,16 @@

14673

@@ -25698,16 +26173,16 @@

14662

14674

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

14663

14675

echo "$POPPLER_PKG_ERRORS" >&5

14664

14676

14679

14691

enable_pdf=yes

14680

14692

fi

14681

14693

14682

@@ -25715,9 +26194,9 @@

14694

@@ -25727,9 +26202,9 @@

14683

14695

for ac_func in poppler_page_render

14684

14696

do

14685

14697

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

14692

14704

echo $ECHO_N "(cached) $ECHO_C" >&6

14693

14705

else

14694

14706

cat >conftest.$ac_ext <<_ACEOF

14695

@@ -25743,68 +26222,60 @@

14707

@@ -25755,68 +26230,60 @@

14696

14708

14697

14709

#undef $ac_func

14698

14710

14784

14796

if test `eval echo '${'$as_ac_var'}'` = yes; then

14785

14797

cat >>confdefs.h <<_ACEOF

14786

14798

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

14787

@@ -25817,9 +26288,9 @@

14799

@@ -25829,9 +26296,9 @@

14788

14800

for ac_func in poppler_form_field_button_get_button_type

14789

14801

do

14790

14802

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

14797

14809

echo $ECHO_N "(cached) $ECHO_C" >&6

14798

14810

else

14799

14811

cat >conftest.$ac_ext <<_ACEOF

14800

@@ -25845,68 +26316,60 @@

14801

14802

#undef $ac_func

14803

14804

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

14805

+/* Override any GCC internal prototype to avoid an error.

14806

+ Use char because int might match the return type of a GCC

14807

+ builtin and then its argument prototype would still apply. */

14808

#ifdef __cplusplus

14809

extern "C"

14810

-{

14811

#endif

14812

-/* We use char because int might match the return type of a gcc2

14813

- builtin and then its argument prototype would still apply. */

14814

char $ac_func ();

14815

/* The GNU C library defines this for functions which it implements

14816

to always fail with ENOSYS. Some functions are actually named

14817

something starting with __ and the normal name is an alias. */

14818

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

14819

+#if defined __stub_$ac_func || defined __stub___$ac_func

14820

choke me

14821

-#else

14822

-char (*f) () = $ac_func;

14823

-#endif

14824

-#ifdef __cplusplus

14825

-}

14826

#endif

14827

14828

int

14829

main ()

14830

{

14831

-return f != $ac_func;

14832

+return $ac_func ();

14833

;

14834

return 0;

14835

}

14836

_ACEOF

14837

rm -f conftest.$ac_objext conftest$ac_exeext

14838

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

14839

- (eval $ac_link) 2>conftest.er1

14840

+if { (ac_try="$ac_link"

14841

+case "(($ac_try" in

14842

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14843

+ *) ac_try_echo=$ac_try;;

14844

+esac

14845

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14846

+ (eval "$ac_link") 2>conftest.er1

14847

ac_status=$?

14848

grep -v '^ *+' conftest.er1 >conftest.err

14849

rm -f conftest.er1

14850

cat conftest.err >&5

14851

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

14852

- (exit $ac_status); } &&

14853

- { ac_try='test -z "$ac_c_werror_flag"

14854

- || test ! -s conftest.err'

14855

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

14856

- (eval $ac_try) 2>&5

14857

- ac_status=$?

14858

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

14859

- (exit $ac_status); }; } &&

14860

- { ac_try='test -s conftest$ac_exeext'

14861

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

14862

- (eval $ac_try) 2>&5

14863

- ac_status=$?

14864

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

14865

- (exit $ac_status); }; }; then

14866

+ (exit $ac_status); } && {

14867

+ test -z "$ac_c_werror_flag" ||

14868

+ test ! -s conftest.err

14869

+ } && test -s conftest$ac_exeext &&

14870

+ $as_test_x conftest$ac_exeext; then

14871

eval "$as_ac_var=yes"

14872

else

14873

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

14874

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

14875

14876

-eval "$as_ac_var=no"

14877

+ eval "$as_ac_var=no"

14878

fi

14879

-rm -f conftest.err conftest.$ac_objext \

14880

+

14881

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14882

conftest$ac_exeext conftest.$ac_ext

14883

fi

14884

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

14885

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

14886

+ac_res=`eval echo '${'$as_ac_var'}'`

14887

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

14888

+echo "${ECHO_T}$ac_res" >&6; }

14889

if test `eval echo '${'$as_ac_var'}'` = yes; then

14890

cat >>confdefs.h <<_ACEOF

14891

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

14892

@@ -25919,8 +26382,8 @@

14812

@@ -25857,68 +26324,60 @@

14813

14814

#undef $ac_func

14815

14816

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

14817

+/* Override any GCC internal prototype to avoid an error.

14818

+ Use char because int might match the return type of a GCC

14819

+ builtin and then its argument prototype would still apply. */

14820

#ifdef __cplusplus

14821

extern "C"

14822

-{

14823

#endif

14824

-/* We use char because int might match the return type of a gcc2

14825

- builtin and then its argument prototype would still apply. */

14826

char $ac_func ();

14827

/* The GNU C library defines this for functions which it implements

14828

to always fail with ENOSYS. Some functions are actually named

14829

something starting with __ and the normal name is an alias. */

14830

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

14831

+#if defined __stub_$ac_func || defined __stub___$ac_func

14832

choke me

14833

-#else

14834

-char (*f) () = $ac_func;

14835

-#endif

14836

-#ifdef __cplusplus

14837

-}

14838

#endif

14839

14840

int

14841

main ()

14842

{

14843

-return f != $ac_func;

14844

+return $ac_func ();

14845

;

14846

return 0;

14847

}

14848

_ACEOF

14849

rm -f conftest.$ac_objext conftest$ac_exeext

14850

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

14851

- (eval $ac_link) 2>conftest.er1

14852

+if { (ac_try="$ac_link"

14853

+case "(($ac_try" in

14854

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14855

+ *) ac_try_echo=$ac_try;;

14856

+esac

14857

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14858

+ (eval "$ac_link") 2>conftest.er1

14859

ac_status=$?

14860

grep -v '^ *+' conftest.er1 >conftest.err

14861

rm -f conftest.er1

14862

cat conftest.err >&5

14863

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

14864

- (exit $ac_status); } &&

14865

- { ac_try='test -z "$ac_c_werror_flag"

14866

- || test ! -s conftest.err'

14867

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

14868

- (eval $ac_try) 2>&5

14869

- ac_status=$?

14870

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

14871

- (exit $ac_status); }; } &&

14872

- { ac_try='test -s conftest$ac_exeext'

14873

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

14874

- (eval $ac_try) 2>&5

14875

- ac_status=$?

14876

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

14877

- (exit $ac_status); }; }; then

14878

+ (exit $ac_status); } && {

14879

+ test -z "$ac_c_werror_flag" ||

14880

+ test ! -s conftest.err

14881

+ } && test -s conftest$ac_exeext &&

14882

+ $as_test_x conftest$ac_exeext; then

14883

eval "$as_ac_var=yes"

14884

else

14885

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

14886

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

14887

14888

-eval "$as_ac_var=no"

14889

+ eval "$as_ac_var=no"

14890

fi

14891

-rm -f conftest.err conftest.$ac_objext \

14892

+

14893

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14894

conftest$ac_exeext conftest.$ac_ext

14895

fi

14896

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

14897

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

14898

+ac_res=`eval echo '${'$as_ac_var'}'`

14899

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

14900

+echo "${ECHO_T}$ac_res" >&6; }

14901

if test `eval echo '${'$as_ac_var'}'` = yes; then

14902

cat >>confdefs.h <<_ACEOF

14903

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

14904

@@ -25931,9 +26390,9 @@

14905

for ac_func in poppler_form_field_text_get_max_len

14906

do

14907

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

14908

-echo "$as_me:$LINENO: checking for $ac_func" >&5

14909

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

14910

-if eval "test \"\${$as_ac_var+set}\" = set"; then

14911

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

14912

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

14913

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

14914

echo $ECHO_N "(cached) $ECHO_C" >&6

14915

else

14916

cat >conftest.$ac_ext <<_ACEOF

14917

@@ -25959,68 +26418,60 @@

14918

14919

#undef $ac_func

14920

14921

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

14922

+/* Override any GCC internal prototype to avoid an error.

14923

+ Use char because int might match the return type of a GCC

14924

+ builtin and then its argument prototype would still apply. */

14925

#ifdef __cplusplus

14926

extern "C"

14927

-{

14928

#endif

14929

-/* We use char because int might match the return type of a gcc2

14930

- builtin and then its argument prototype would still apply. */

14931

char $ac_func ();

14932

/* The GNU C library defines this for functions which it implements

14933

to always fail with ENOSYS. Some functions are actually named

14934

something starting with __ and the normal name is an alias. */

14935

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

14936

+#if defined __stub_$ac_func || defined __stub___$ac_func

14937

choke me

14938

-#else

14939

-char (*f) () = $ac_func;

14940

-#endif

14941

-#ifdef __cplusplus

14942

-}

14943

#endif

14944

14945

int

14946

main ()

14947

{

14948

-return f != $ac_func;

14949

+return $ac_func ();

14950

;

14951

return 0;

14952

}

14953

_ACEOF

14954

rm -f conftest.$ac_objext conftest$ac_exeext

14955

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

14956

- (eval $ac_link) 2>conftest.er1

14957

+if { (ac_try="$ac_link"

14958

+case "(($ac_try" in

14959

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14960

+ *) ac_try_echo=$ac_try;;

14961

+esac

14962

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14963

+ (eval "$ac_link") 2>conftest.er1

14964

ac_status=$?

14965

grep -v '^ *+' conftest.er1 >conftest.err

14966

rm -f conftest.er1

14967

cat conftest.err >&5

14968

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

14969

- (exit $ac_status); } &&

14970

- { ac_try='test -z "$ac_c_werror_flag"

14971

- || test ! -s conftest.err'

14972

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

14973

- (eval $ac_try) 2>&5

14974

- ac_status=$?

14975

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

14976

- (exit $ac_status); }; } &&

14977

- { ac_try='test -s conftest$ac_exeext'

14978

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

14979

- (eval $ac_try) 2>&5

14980

- ac_status=$?

14981

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

14982

- (exit $ac_status); }; }; then

14983

+ (exit $ac_status); } && {

14984

+ test -z "$ac_c_werror_flag" ||

14985

+ test ! -s conftest.err

14986

+ } && test -s conftest$ac_exeext &&

14987

+ $as_test_x conftest$ac_exeext; then

14988

eval "$as_ac_var=yes"

14989

else

14990

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

14991

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

14992

14993

-eval "$as_ac_var=no"

14994

+ eval "$as_ac_var=no"

14995

fi

14996

-rm -f conftest.err conftest.$ac_objext \

14997

+

14998

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14999

conftest$ac_exeext conftest.$ac_ext

15000

fi

15001

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

15002

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

15003

+ac_res=`eval echo '${'$as_ac_var'}'`

15004

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

15005

+echo "${ECHO_T}$ac_res" >&6; }

15006

if test `eval echo '${'$as_ac_var'}'` = yes; then

15007

cat >>confdefs.h <<_ACEOF

15008

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

15009

@@ -26033,9 +26484,9 @@

15010

for ac_func in poppler_form_field_text_is_password

15011

do

15012

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

15013

-echo "$as_me:$LINENO: checking for $ac_func" >&5

15014

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

15015

-if eval "test \"\${$as_ac_var+set}\" = set"; then

15016

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

15017

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

15018

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

15019

echo $ECHO_N "(cached) $ECHO_C" >&6

15020

else

15021

cat >conftest.$ac_ext <<_ACEOF

15022

@@ -26061,68 +26512,60 @@

15023

15024

#undef $ac_func

15025

15026

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

15027

+/* Override any GCC internal prototype to avoid an error.

15028

+ Use char because int might match the return type of a GCC

15029

+ builtin and then its argument prototype would still apply. */

15030

#ifdef __cplusplus

15031

extern "C"

15032

-{

15033

#endif

15034

-/* We use char because int might match the return type of a gcc2

15035

- builtin and then its argument prototype would still apply. */

15036

char $ac_func ();

15037

/* The GNU C library defines this for functions which it implements

15038

to always fail with ENOSYS. Some functions are actually named

15039

something starting with __ and the normal name is an alias. */

15040

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

15041

+#if defined __stub_$ac_func || defined __stub___$ac_func

15042

choke me

15043

-#else

15044

-char (*f) () = $ac_func;

15045

-#endif

15046

-#ifdef __cplusplus

15047

-}

15048

#endif

15049

15050

int

15051

main ()

15052

{

15053

-return f != $ac_func;

15054

+return $ac_func ();

15055

;

15056

return 0;

15057

}

15058

_ACEOF

15059

rm -f conftest.$ac_objext conftest$ac_exeext

15060

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

15061

- (eval $ac_link) 2>conftest.er1

15062

+if { (ac_try="$ac_link"

15063

+case "(($ac_try" in

15064

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15065

+ *) ac_try_echo=$ac_try;;

15066

+esac

15067

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15068

+ (eval "$ac_link") 2>conftest.er1

15069

ac_status=$?

15070

grep -v '^ *+' conftest.er1 >conftest.err

15071

rm -f conftest.er1

15072

cat conftest.err >&5

15073

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

15074

- (exit $ac_status); } &&

15075

- { ac_try='test -z "$ac_c_werror_flag"

15076

- || test ! -s conftest.err'

15077

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

15078

- (eval $ac_try) 2>&5

15079

- ac_status=$?

15080

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

15081

- (exit $ac_status); }; } &&

15082

- { ac_try='test -s conftest$ac_exeext'

15083

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

15084

- (eval $ac_try) 2>&5

15085

- ac_status=$?

15086

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

15087

- (exit $ac_status); }; }; then

15088

+ (exit $ac_status); } && {

15089

+ test -z "$ac_c_werror_flag" ||

15090

+ test ! -s conftest.err

15091

+ } && test -s conftest$ac_exeext &&

15092

+ $as_test_x conftest$ac_exeext; then

15093

eval "$as_ac_var=yes"

15094

else

15095

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

15096

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

15097

15098

-eval "$as_ac_var=no"

15099

+ eval "$as_ac_var=no"

15100

fi

15101

-rm -f conftest.err conftest.$ac_objext \

15102

+

15103

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15104

conftest$ac_exeext conftest.$ac_ext

15105

fi

15106

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

15107

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

15108

+ac_res=`eval echo '${'$as_ac_var'}'`

15109

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

15110

+echo "${ECHO_T}$ac_res" >&6; }

15111

if test `eval echo '${'$as_ac_var'}'` = yes; then

15112

cat >>confdefs.h <<_ACEOF

15113

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

15114

@@ -26135,8 +26578,8 @@

14893

15115

14894

15116

14895

15117

pkg_failed=no

14900

15122

14901

15123

if test -n "$PKG_CONFIG"; then

14902

15124

if test -n "$CAIRO_PDF_CFLAGS"; then

14903

@@ -25976,16 +26439,16 @@

15125

@@ -26192,16 +26635,16 @@

14904

15126

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

14905

15127

echo "$CAIRO_PDF_PKG_ERRORS" >&5

14906

15128

14921

15143

enable_cairo_pdf=yes

14922

15144

fi

14923

15145

if test x$enable_cairo_pdf == xyes; then

14924

@@ -26012,13 +26475,13 @@

15146

@@ -26214,8 +26657,8 @@

15147

15148

15149

pkg_failed=no

15150

-echo "$as_me:$LINENO: checking for CAIRO_PS" >&5

15151

-echo $ECHO_N "checking for CAIRO_PS... $ECHO_C" >&6

15152

+{ echo "$as_me:$LINENO: checking for CAIRO_PS" >&5

15153

+echo $ECHO_N "checking for CAIRO_PS... $ECHO_C" >&6; }

15154

15155

if test -n "$PKG_CONFIG"; then

15156

if test -n "$CAIRO_PS_CFLAGS"; then

15157

@@ -26271,16 +26714,16 @@

15158

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

15159

echo "$CAIRO_PS_PKG_ERRORS" >&5

15160

15161

- echo "$as_me:$LINENO: result: no" >&5

15162

-echo "${ECHO_T}no" >&6

15163

+ { echo "$as_me:$LINENO: result: no" >&5

15164

+echo "${ECHO_T}no" >&6; }

15165

enable_cairo_ps=no

15166

elif test $pkg_failed = untried; then

15167

enable_cairo_ps=no

15168

else

15169

CAIRO_PS_CFLAGS=$pkg_cv_CAIRO_PS_CFLAGS

15170

CAIRO_PS_LIBS=$pkg_cv_CAIRO_PS_LIBS

15171

- echo "$as_me:$LINENO: result: yes" >&5

15172

-echo "${ECHO_T}yes" >&6

15173

+ { echo "$as_me:$LINENO: result: yes" >&5

15174

+echo "${ECHO_T}yes" >&6; }

15175

enable_cairo_ps=yes

15176

fi

15177

if test x$enable_cairo_ps == xyes; then

15178

@@ -26307,13 +26750,13 @@

14925

15179

fi

14926

15180

14927

15181

14939

15193

14940

15194

if test x$enable_ps = xyes; then

14941

15195

14942

@@ -26041,11 +26504,11 @@

15196

@@ -26336,11 +26779,11 @@

14943

15197

14944

15198

if test x$enable_ps = xyes; then

14945

15199

14955

15209

if test "$GS_VERSION" -lt "7"; then

14956

15210

{ { echo "$as_me:$LINENO: error: You need Ghostscript version >= 7 in order to run evince" >&5

14957

15211

echo "$as_me: error: You need Ghostscript version >= 7 in order to run evince" >&2;}

14958

@@ -26053,49 +26516,50 @@

15212

@@ -26348,49 +26791,50 @@

14959

15213

fi

14960

15214

14961

15215

15024

15278

cat >conftest.$ac_ext <<_ACEOF

15025

15279

/* confdefs.h. */

15026

15280

_ACEOF

15027

@@ -26106,41 +26570,37 @@

15281

@@ -26401,41 +26845,37 @@

15028

15282

#include <$ac_header>

15029

15283

_ACEOF

15030

15284

rm -f conftest.$ac_objext

15084

15338

cat >conftest.$ac_ext <<_ACEOF

15085

15339

/* confdefs.h. */

15086

15340

_ACEOF

15087

@@ -26149,24 +26609,22 @@

15341

@@ -26444,24 +26884,22 @@

15088

15342

/* end confdefs.h. */

15089

15343

#include <$ac_header>

15090

15344

_ACEOF

15120

15374

ac_header_preproc=yes

15121

15375

else

15122

15376

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

15123

@@ -26174,9 +26632,10 @@

15377

@@ -26469,9 +26907,10 @@

15124

15378

15125

15379

ac_header_preproc=no

15126

15380

fi

15133

15387

15134

15388

# So? What about this header?

15135

15389

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15136

@@ -26200,25 +26659,24 @@

15390

@@ -26495,25 +26934,24 @@

15137

15391

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

15138

15392

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

15139

15393

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

15167

15421

15168

15422

fi

15169

15423

if test `eval echo '${'$as_ac_Header'}'` = yes; then

15170

@@ -26233,8 +26691,8 @@

15424

@@ -26528,8 +26966,8 @@

15171

15425

done

15172

15426

15173

15427

if test "x$enable_tiff" = "xyes"; then

15178

15432

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

15179

15433

echo $ECHO_N "(cached) $ECHO_C" >&6

15180

15434

else

15181

@@ -26247,64 +26705,61 @@

15435

@@ -26542,64 +26980,61 @@

15182

15436

cat >>conftest.$ac_ext <<_ACEOF

15183

15437

/* end confdefs.h. */

15184

15438

15266

15520

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

15267

15521

echo $ECHO_N "(cached) $ECHO_C" >&6

15268

15522

else

15269

@@ -26317,56 +26772,53 @@

15523

@@ -26612,56 +27047,53 @@

15270

15524

cat >>conftest.$ac_ext <<_ACEOF

15271

15525

/* end confdefs.h. */

15272

15526

15344

15598

if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then

15345

15599

enable_tiff=yes

15346

15600

else

15347

@@ -26400,13 +26852,13 @@

15601

@@ -26695,13 +27127,13 @@

15348

15602

15349

15603

15350

15604

15362

15616

15363

15617

if test "x$enable_djvu" = "xyes"; then

15364

15618

15365

@@ -26414,8 +26866,8 @@

15619

@@ -26709,8 +27141,8 @@

15366

15620

15367

15621

15368

15622

pkg_failed=no

15373

15627

15374

15628

if test -n "$PKG_CONFIG"; then

15375

15629

if test -n "$DJVU_CFLAGS"; then

15376

@@ -26471,16 +26923,16 @@

15630

@@ -26766,16 +27198,16 @@

15377

15631

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

15378

15632

echo "$DJVU_PKG_ERRORS" >&5

15379

15633

15394

15648

enable_djvu=yes

15395

15649

fi

15396

15650

15397

@@ -26517,25 +26969,25 @@

15651

@@ -26812,25 +27244,25 @@

15398

15652

15399

15653

15400

15654

15430

15684

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

15431

15685

echo $ECHO_N "(cached) $ECHO_C" >&6

15432

15686

else

15433

@@ -26553,10 +27005,10 @@

15687

@@ -26848,10 +27280,10 @@

15434

15688

#ifndef __cplusplus

15435

15689

/* Ultrix mips cc rejects this. */

15436

15690

typedef int charset[2];

15444

15698

/* NEC SVR4.0.2 mips cc rejects this. */

15445

15699

struct point {int x, y;};

15446

15700

static struct point const zero = {0,0};

15447

@@ -26565,16 +27017,17 @@

15701

@@ -26860,16 +27292,17 @@

15448

15702

an arm of an if-expression whose if-part is not a constant

15449

15703

expression */

15450

15704

const char *g = "string";

15466

15720

}

15467

15721

{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */

15468

15722

int x[] = {25, 17};

15469

@@ -26593,7 +27046,9 @@

15723

@@ -26888,7 +27321,9 @@

15470

15724

}

15471

15725

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

15472

15726

const int foo = 10;

15476

15730

#endif

15477

15731

15478

15732

;

15479

@@ -26601,38 +27056,34 @@

15733

@@ -26896,38 +27331,34 @@

15480

15734

}

15481

15735

_ACEOF

15482

15736

rm -f conftest.$ac_objext

15531

15785

if test $ac_cv_c_const = no; then

15532

15786

15533

15787

cat >>confdefs.h <<\_ACEOF

15534

@@ -26641,8 +27092,8 @@

15788

@@ -26936,8 +27367,8 @@

15535

15789

15536

15790

fi

15537

15791

15542

15796

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

15543

15797

echo $ECHO_N "(cached) $ECHO_C" >&6

15544

15798

else

15545

@@ -26662,39 +27113,37 @@

15799

@@ -26957,39 +27388,37 @@

15546

15800

15547

15801

_ACEOF

15548

15802

rm -f conftest.$ac_objext

15600

15854

15601

15855

15602

15856

case $ac_cv_c_inline in

15603

@@ -26712,8 +27161,8 @@

15857

@@ -27007,8 +27436,8 @@

15604

15858

;;

15605

15859

esac

15606

15860

15611

15865

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

15612

15866

echo $ECHO_N "(cached) $ECHO_C" >&6

15613

15867

else

15614

@@ -26724,62 +27173,59 @@

15868

@@ -27019,62 +27448,59 @@

15615

15869

cat >>conftest.$ac_ext <<_ACEOF

15616

15870

/* end confdefs.h. */

15617

15871

$ac_includes_default

15696

15950

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

15697

15951

echo $ECHO_N "(cached) $ECHO_C" >&6

15698

15952

else

15699

@@ -26790,61 +27236,57 @@

15953

@@ -27085,61 +27511,57 @@

15700

15954

cat >>conftest.$ac_ext <<_ACEOF

15701

15955

/* end confdefs.h. */

15702

15956

$ac_includes_default

15783

16037

if test "$cross_compiling" = yes; then

15784

16038

# Depending upon the size, compute the lo and hi bounds.

15785

16039

cat >conftest.$ac_ext <<_ACEOF

15786

@@ -26854,10 +27296,11 @@

16040

@@ -27149,10 +27571,11 @@

15787

16041

cat >>conftest.$ac_ext <<_ACEOF

15788

16042

/* end confdefs.h. */

15789

16043

$ac_includes_default

15796

16050

test_array [0] = 0

15797

16051

15798

16052

;

15799

@@ -26865,27 +27308,22 @@

16053

@@ -27160,27 +27583,22 @@

15800

16054

}

15801

16055

_ACEOF

15802

16056

rm -f conftest.$ac_objext

15835

16089

ac_lo=0 ac_mid=0

15836

16090

while :; do

15837

16091

cat >conftest.$ac_ext <<_ACEOF

15838

@@ -26895,10 +27333,11 @@

16092

@@ -27190,10 +27608,11 @@

15839

16093

cat >>conftest.$ac_ext <<_ACEOF

15840

16094

/* end confdefs.h. */

15841

16095

$ac_includes_default

15848

16102

test_array [0] = 0

15849

16103

15850

16104

;

15851

@@ -26906,56 +27345,53 @@

16105

@@ -27201,56 +27620,53 @@

15852

16106

}

15853

16107

_ACEOF

15854

16108

rm -f conftest.$ac_objext

15927

16181

test_array [0] = 0

15928

16182

15929

16183

;

15930

@@ -26963,27 +27399,22 @@

16184

@@ -27258,27 +27674,22 @@

15931

16185

}

15932

16186

_ACEOF

15933

16187

rm -f conftest.$ac_objext

15966

16220

ac_hi=-1 ac_mid=-1

15967

16221

while :; do

15968

16222

cat >conftest.$ac_ext <<_ACEOF

15969

@@ -26993,10 +27424,11 @@

16223

@@ -27288,10 +27699,11 @@

15970

16224

cat >>conftest.$ac_ext <<_ACEOF

15971

16225

/* end confdefs.h. */

15972

16226

$ac_includes_default

15979

16233

test_array [0] = 0

15980

16234

15981

16235

;

15982

@@ -27004,50 +27436,48 @@

16236

@@ -27299,50 +27711,48 @@

15983

16237

}

15984

16238

_ACEOF

15985

16239

rm -f conftest.$ac_objext

16054

16308

# Binary search between lo and hi bounds.

16055

16309

while test "x$ac_lo" != "x$ac_hi"; do

16056

16310

ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`

16057

@@ -27058,10 +27488,11 @@

16311

@@ -27353,10 +27763,11 @@

16058

16312

cat >>conftest.$ac_ext <<_ACEOF

16059

16313

/* end confdefs.h. */

16060

16314

$ac_includes_default

16067

16321

test_array [0] = 0

16068

16322

16069

16323

;

16070

@@ -27069,52 +27500,45 @@

16324

@@ -27364,52 +27775,45 @@

16071

16325

}

16072

16326

_ACEOF

16073

16327

rm -f conftest.$ac_objext

16141

16395

cat >conftest.$ac_ext <<_ACEOF

16142

16396

/* confdefs.h. */

16143

16397

_ACEOF

16144

@@ -27122,8 +27546,9 @@

16398

@@ -27417,8 +27821,9 @@

16145

16399

cat >>conftest.$ac_ext <<_ACEOF

16146

16400

/* end confdefs.h. */

16147

16401

$ac_includes_default

16153

16407

#include <stdio.h>

16154

16408

#include <stdlib.h>

16155

16409

int

16156

@@ -27132,35 +27557,44 @@

16410

@@ -27427,35 +27832,44 @@

16157

16411

16158

16412

FILE *f = fopen ("conftest.val", "w");

16159

16413

if (! f)

16211

16465

ac_status=$?

16212

16466

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

16213

16467

(exit $ac_status); }; }; then

16214

@@ -27171,29 +27605,32 @@

16468

@@ -27466,29 +27880,32 @@

16215

16469

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

16216

16470

16217

16471

( exit $ac_status )

16256

16510

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

16257

16511

echo $ECHO_N "(cached) $ECHO_C" >&6

16258

16512

else

16259

@@ -27204,61 +27641,57 @@

16513

@@ -27499,61 +27916,57 @@

16260

16514

cat >>conftest.$ac_ext <<_ACEOF

16261

16515

/* end confdefs.h. */

16262

16516

$ac_includes_default

16343

16597

if test "$cross_compiling" = yes; then

16344

16598

# Depending upon the size, compute the lo and hi bounds.

16345

16599

cat >conftest.$ac_ext <<_ACEOF

16346

@@ -27268,10 +27701,11 @@

16600

@@ -27563,10 +27976,11 @@

16347

16601

cat >>conftest.$ac_ext <<_ACEOF

16348

16602

/* end confdefs.h. */

16349

16603

$ac_includes_default

16356

16610

test_array [0] = 0

16357

16611

16358

16612

;

16359

@@ -27279,27 +27713,22 @@

16613

@@ -27574,27 +27988,22 @@

16360

16614

}

16361

16615

_ACEOF

16362

16616

rm -f conftest.$ac_objext

16395

16649

ac_lo=0 ac_mid=0

16396

16650

while :; do

16397

16651

cat >conftest.$ac_ext <<_ACEOF

16398

@@ -27309,10 +27738,11 @@

16652

@@ -27604,10 +28013,11 @@

16399

16653

cat >>conftest.$ac_ext <<_ACEOF

16400

16654

/* end confdefs.h. */

16401

16655

$ac_includes_default

16408

16662

test_array [0] = 0

16409

16663

16410

16664

;

16411

@@ -27320,56 +27750,53 @@

16665

@@ -27615,56 +28025,53 @@

16412

16666

}

16413

16667

_ACEOF

16414

16668

rm -f conftest.$ac_objext

16487

16741

test_array [0] = 0

16488

16742

16489

16743

;

16490

@@ -27377,27 +27804,22 @@

16744

@@ -27672,27 +28079,22 @@

16491

16745

}

16492

16746

_ACEOF

16493

16747

rm -f conftest.$ac_objext

16526

16780

ac_hi=-1 ac_mid=-1

16527

16781

while :; do

16528

16782

cat >conftest.$ac_ext <<_ACEOF

16529

@@ -27407,10 +27829,11 @@

16783

@@ -27702,10 +28104,11 @@

16530

16784

cat >>conftest.$ac_ext <<_ACEOF

16531

16785

/* end confdefs.h. */

16532

16786

$ac_includes_default

16539

16793

test_array [0] = 0

16540

16794

16541

16795

;

16542

@@ -27418,50 +27841,48 @@

16796

@@ -27713,50 +28116,48 @@

16543

16797

}

16544

16798

_ACEOF

16545

16799

rm -f conftest.$ac_objext

16614

16868

# Binary search between lo and hi bounds.

16615

16869

while test "x$ac_lo" != "x$ac_hi"; do

16616

16870

ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`

16617

@@ -27472,10 +27893,11 @@

16871

@@ -27767,10 +28168,11 @@

16618

16872

cat >>conftest.$ac_ext <<_ACEOF

16619

16873

/* end confdefs.h. */

16620

16874

$ac_includes_default

16627

16881

test_array [0] = 0

16628

16882

16629

16883

;

16630

@@ -27483,52 +27905,45 @@

16884

@@ -27778,52 +28180,45 @@

16631

16885

}

16632

16886

_ACEOF

16633

16887

rm -f conftest.$ac_objext

16701

16955

cat >conftest.$ac_ext <<_ACEOF

16702

16956

/* confdefs.h. */

16703

16957

_ACEOF

16704

@@ -27536,8 +27951,9 @@

16958

@@ -27831,8 +28226,9 @@

16705

16959

cat >>conftest.$ac_ext <<_ACEOF

16706

16960

/* end confdefs.h. */

16707

16961

$ac_includes_default

16713

16967

#include <stdio.h>

16714

16968

#include <stdlib.h>

16715

16969

int

16716

@@ -27546,35 +27962,44 @@

16970

@@ -27841,35 +28237,44 @@

16717

16971

16718

16972

FILE *f = fopen ("conftest.val", "w");

16719

16973

if (! f)

16771

17025

ac_status=$?

16772

17026

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

16773

17027

(exit $ac_status); }; }; then

16774

@@ -27585,29 +28010,32 @@

17028

@@ -27880,29 +28285,32 @@

16775

17029

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

16776

17030

16777

17031

( exit $ac_status )

16816

17070

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

16817

17071

echo $ECHO_N "(cached) $ECHO_C" >&6

16818

17072

else

16819

@@ -27618,61 +28046,57 @@

17073

@@ -27913,61 +28321,57 @@

16820

17074

cat >>conftest.$ac_ext <<_ACEOF

16821

17075

/* end confdefs.h. */

16822

17076

$ac_includes_default

16903

17157

if test "$cross_compiling" = yes; then

16904

17158

# Depending upon the size, compute the lo and hi bounds.

16905

17159

cat >conftest.$ac_ext <<_ACEOF

16906

@@ -27682,10 +28106,11 @@

17160

@@ -27977,10 +28381,11 @@

16907

17161

cat >>conftest.$ac_ext <<_ACEOF

16908

17162

/* end confdefs.h. */

16909

17163

$ac_includes_default

16916

17170

test_array [0] = 0

16917

17171

16918

17172

;

16919

@@ -27693,27 +28118,22 @@

17173

@@ -27988,27 +28393,22 @@

16920

17174

}

16921

17175

_ACEOF

16922

17176

rm -f conftest.$ac_objext

16955

17209

ac_lo=0 ac_mid=0

16956

17210

while :; do

16957

17211

cat >conftest.$ac_ext <<_ACEOF

16958

@@ -27723,10 +28143,11 @@

17212

@@ -28018,10 +28418,11 @@

16959

17213

cat >>conftest.$ac_ext <<_ACEOF

16960

17214

/* end confdefs.h. */

16961

17215

$ac_includes_default

16968

17222

test_array [0] = 0

16969

17223

16970

17224

;

16971

@@ -27734,56 +28155,53 @@

17225

@@ -28029,56 +28430,53 @@

16972

17226

}

16973

17227

_ACEOF

16974

17228

rm -f conftest.$ac_objext

17047

17301

test_array [0] = 0

17048

17302

17049

17303

;

17050

@@ -27791,27 +28209,22 @@

17304

@@ -28086,27 +28484,22 @@

17051

17305

}

17052

17306

_ACEOF

17053

17307

rm -f conftest.$ac_objext

17086

17340

ac_hi=-1 ac_mid=-1

17087

17341

while :; do

17088

17342

cat >conftest.$ac_ext <<_ACEOF

17089

@@ -27821,10 +28234,11 @@

17343

@@ -28116,10 +28509,11 @@

17090

17344

cat >>conftest.$ac_ext <<_ACEOF

17091

17345

/* end confdefs.h. */

17092

17346

$ac_includes_default

17099

17353

test_array [0] = 0

17100

17354

17101

17355

;

17102

@@ -27832,50 +28246,48 @@

17356

@@ -28127,50 +28521,48 @@

17103

17357

}

17104

17358

_ACEOF

17105

17359

rm -f conftest.$ac_objext

17174

17428

# Binary search between lo and hi bounds.

17175

17429

while test "x$ac_lo" != "x$ac_hi"; do

17176

17430

ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`

17177

@@ -27886,10 +28298,11 @@

17431

@@ -28181,10 +28573,11 @@

17178

17432

cat >>conftest.$ac_ext <<_ACEOF

17179

17433

/* end confdefs.h. */

17180

17434

$ac_includes_default

17187

17441

test_array [0] = 0

17188

17442

17189

17443

;

17190

@@ -27897,52 +28310,45 @@

17444

@@ -28192,52 +28585,45 @@

17191

17445

}

17192

17446

_ACEOF

17193

17447

rm -f conftest.$ac_objext

17261

17515

cat >conftest.$ac_ext <<_ACEOF

17262

17516

/* confdefs.h. */

17263

17517

_ACEOF

17264

@@ -27950,8 +28356,9 @@

17518

@@ -28245,8 +28631,9 @@

17265

17519

cat >>conftest.$ac_ext <<_ACEOF

17266

17520

/* end confdefs.h. */

17267

17521

$ac_includes_default

17273

17527

#include <stdio.h>

17274

17528

#include <stdlib.h>

17275

17529

int

17276

@@ -27960,35 +28367,44 @@

17530

@@ -28255,35 +28642,44 @@

17277

17531

17278

17532

FILE *f = fopen ("conftest.val", "w");

17279

17533

if (! f)

17331

17585

ac_status=$?

17332

17586

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

17333

17587

(exit $ac_status); }; }; then

17334

@@ -27999,29 +28415,32 @@

17588

@@ -28294,29 +28690,32 @@

17335

17589

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

17336

17590

17337

17591

( exit $ac_status )

17376

17630

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

17377

17631

echo $ECHO_N "(cached) $ECHO_C" >&6

17378

17632

else

17379

@@ -28032,61 +28451,57 @@

17633

@@ -28327,61 +28726,57 @@

17380

17634

cat >>conftest.$ac_ext <<_ACEOF

17381

17635

/* end confdefs.h. */

17382

17636

$ac_includes_default

17463

17717

if test "$cross_compiling" = yes; then

17464

17718

# Depending upon the size, compute the lo and hi bounds.

17465

17719

cat >conftest.$ac_ext <<_ACEOF

17466

@@ -28096,10 +28511,11 @@

17720

@@ -28391,10 +28786,11 @@

17467

17721

cat >>conftest.$ac_ext <<_ACEOF

17468

17722

/* end confdefs.h. */

17469

17723

$ac_includes_default

17476

17730

test_array [0] = 0

17477

17731

17478

17732

;

17479

@@ -28107,27 +28523,22 @@

17733

@@ -28402,27 +28798,22 @@

17480

17734

}

17481

17735

_ACEOF

17482

17736

rm -f conftest.$ac_objext

17515

17769

ac_lo=0 ac_mid=0

17516

17770

while :; do

17517

17771

cat >conftest.$ac_ext <<_ACEOF

17518

@@ -28137,10 +28548,11 @@

17772

@@ -28432,10 +28823,11 @@

17519

17773

cat >>conftest.$ac_ext <<_ACEOF

17520

17774

/* end confdefs.h. */

17521

17775

$ac_includes_default

17528

17782

test_array [0] = 0

17529

17783

17530

17784

;

17531

@@ -28148,56 +28560,53 @@

17785

@@ -28443,56 +28835,53 @@

17532

17786

}

17533

17787

_ACEOF

17534

17788

rm -f conftest.$ac_objext

17607

17861

test_array [0] = 0

17608

17862

17609

17863

;

17610

@@ -28205,27 +28614,22 @@

17864

@@ -28500,27 +28889,22 @@

17611

17865

}

17612

17866

_ACEOF

17613

17867

rm -f conftest.$ac_objext

17646

17900

ac_hi=-1 ac_mid=-1

17647

17901

while :; do

17648

17902

cat >conftest.$ac_ext <<_ACEOF

17649

@@ -28235,10 +28639,11 @@

17903

@@ -28530,10 +28914,11 @@

17650

17904

cat >>conftest.$ac_ext <<_ACEOF

17651

17905

/* end confdefs.h. */

17652

17906

$ac_includes_default

17659

17913

test_array [0] = 0

17660

17914

17661

17915

;

17662

@@ -28246,50 +28651,48 @@

17916

@@ -28541,50 +28926,48 @@

17663

17917

}

17664

17918

_ACEOF

17665

17919

rm -f conftest.$ac_objext

17734

17988

# Binary search between lo and hi bounds.

17735

17989

while test "x$ac_lo" != "x$ac_hi"; do

17736

17990

ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`

17737

@@ -28300,10 +28703,11 @@

17991

@@ -28595,10 +28978,11 @@

17738

17992

cat >>conftest.$ac_ext <<_ACEOF

17739

17993

/* end confdefs.h. */

17740

17994

$ac_includes_default

17747

18001

test_array [0] = 0

17748

18002

17749

18003

;

17750

@@ -28311,52 +28715,45 @@

18004

@@ -28606,52 +28990,45 @@

17751

18005

}

17752

18006

_ACEOF

17753

18007

rm -f conftest.$ac_objext

17821

18075

cat >conftest.$ac_ext <<_ACEOF

17822

18076

/* confdefs.h. */

17823

18077

_ACEOF

17824

@@ -28364,8 +28761,9 @@

18078

@@ -28659,8 +29036,9 @@

17825

18079

cat >>conftest.$ac_ext <<_ACEOF

17826

18080

/* end confdefs.h. */

17827

18081

$ac_includes_default

17833

18087

#include <stdio.h>

17834

18088

#include <stdlib.h>

17835

18089

int

17836

@@ -28374,35 +28772,44 @@

18090

@@ -28669,35 +29047,44 @@

17837

18091

17838

18092

FILE *f = fopen ("conftest.val", "w");

17839

18093

if (! f)

17891

18145

ac_status=$?

17892

18146

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

17893

18147

(exit $ac_status); }; }; then

17894

@@ -28413,29 +28820,32 @@

18148

@@ -28708,29 +29095,32 @@

17895

18149

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

17896

18150

17897

18151

( exit $ac_status )

17936

18190

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

17937

18191

echo $ECHO_N "(cached) $ECHO_C" >&6

17938

18192

else

17939

@@ -28448,56 +28858,53 @@

18193

@@ -28743,56 +29133,53 @@

17940

18194

cat >>conftest.$ac_ext <<_ACEOF

17941

18195

/* end confdefs.h. */

17942

18196

18014

18268

if test $ac_cv_lib_kpathsea_kpse_init_prog = yes; then

18015

18269

enable_dvi=yes

18016

18270

else

18017

@@ -28529,8 +28936,8 @@

18271

@@ -28824,8 +29211,8 @@

18018

18272

18019

18273

if test "x$enable_dvi" = "xyes"; then

18020

18274

if test "x$enable_type1_fonts" = "xyes"; then

18025

18279

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

18026

18280

echo $ECHO_N "(cached) $ECHO_C" >&6

18027

18281

else

18028

@@ -28543,56 +28950,53 @@

18282

@@ -28838,56 +29225,53 @@

18029

18283

cat >>conftest.$ac_ext <<_ACEOF

18030

18284

/* end confdefs.h. */

18031

18285

18103

18357

if test $ac_cv_lib_t1_T1_InitLib = yes; then

18104

18358

enable_type1_fonts=yes

18105

18359

else

18106

@@ -28624,13 +29028,13 @@

18360

@@ -28919,13 +29303,13 @@

18107

18361

18108

18362

18109

18363

18121

18375

if test "x$enable_pixbuf" = "xyes"; then

18122

18376

18123

18377

cat >>confdefs.h <<\_ACEOF

18124

@@ -28651,13 +29055,13 @@

18378

@@ -28946,13 +29330,13 @@

18125

18379

18126

18380

18127

18381

18139

18393

if test "x$enable_comics" = "xyes"; then

18140

18394

18141

18395

cat >>confdefs.h <<\_ACEOF

18142

@@ -28678,13 +29082,13 @@

18396

@@ -28973,13 +29357,13 @@

18143

18397

18144

18398

18145

18399

18157

18411

if test "x$enable_impress" = "xyes"; then

18158

18412

18159

18413

cat >>confdefs.h <<\_ACEOF

18160

@@ -28731,7 +29135,7 @@

18414

@@ -29026,7 +29410,7 @@

18161

18415

fi

18162

18416

18163

18417

18166

18420

18167

18421

18168

18422

cat >confcache <<\_ACEOF

18169

@@ -28752,39 +29156,58 @@

18423

@@ -29047,39 +29431,58 @@

18170

18424

18171

18425

# The following way of writing the cache mishandles newlines in values,

18172

18426

# but we know of no workaround that is simple, portable, and efficient.

18241

18495

fi

18242

18496

fi

18243

18497

rm -f confcache

18244

@@ -28793,32 +29216,18 @@

18498

@@ -29088,32 +29491,18 @@

18245

18499

# Let make expand exec_prefix.

18246

18500

test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

18247

18501

18280

18534

done

18281

18535

LIBOBJS=$ac_libobjs

18282

18536

18283

@@ -28875,7 +29284,7 @@

18537

@@ -29170,7 +29559,7 @@

18284

18538

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

18285

18539

fi

18286

18540

18289

18543

18290

18544

18291

18545

if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then

18292

@@ -29056,17 +29465,45 @@

18546

@@ -29351,17 +29740,45 @@

18293

18547

## M4sh Initialization. ##

18294

18548

## --------------------- ##

18295

18549

18339

18593

18340

18594

# Support unset when possible.

18341

18595

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

18342

@@ -29076,8 +29513,43 @@

18596

@@ -29371,8 +29788,43 @@

18343

18597

fi

18344

18598

18345

18599

18384

18638

PS1='$ '

18385

18639

PS2='> '

18386

18640

PS4='+ '

18387

@@ -29091,18 +29563,19 @@

18641

@@ -29386,18 +29838,19 @@

18388

18642

if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

18389

18643

eval $as_var=C; export $as_var

18390

18644

else

18407

18661

as_basename=basename

18408

18662

else

18409

18663

as_basename=false

18410

@@ -29110,159 +29583,120 @@

18664

@@ -29405,159 +29858,120 @@

18411

18665

18412

18666

18413

18667

# Name of the executable.

18424

18678

- /^X\/$\/$.*/{ s//\1/; q; }

18425

18679

- s/.*/./; q'`

18426

18680

-

18427

-

18681

+ sed '/^.*\/$[^/][^/]*$\/*$/{

18682

+ s//\1/

18683

+ q

18684

+ }

18685

+ /^X\/$\/\/$$/{

18686

+ s//\1/

18687

+ q

18688

+ }

18689

+ /^X\/$\/$.*/{

18690

+ s//\1/

18691

+ q

18692

+ }

18693

+ s/.*/./; q'`

18694

18428

18695

-# PATH needs CR, and LINENO needs CR and PATH.

18429

18696

-# Avoid depending upon Character Ranges.

18430

18697

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

18432

18699

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

18433

18700

-as_cr_digits='0123456789'

18434

18701

-as_cr_alnum=$as_cr_Letters$as_cr_digits

18435

+ sed '/^.*\/$[^/][^/]*$\/*$/{

18436

+ s//\1/

18437

+ q

18438

+ }

18439

+ /^X\/$\/\/$$/{

18440

+ s//\1/

18441

+ q

18442

+ }

18443

+ /^X\/$\/$.*/{

18444

+ s//\1/

18445

+ q

18446

+ }

18447

+ s/.*/./; q'`

18702

+# CDPATH.

18703

+$as_unset CDPATH

18448

18704

18449

18705

-# The user is always right.

18450

18706

-if test "${PATH_SEPARATOR+set}" != set; then

18458

18714

- fi

18459

18715

- rm -f conf$$.sh

18460

18716

-fi

18461

+# CDPATH.

18462

+$as_unset CDPATH

18463

18464

18465

- as_lineno_1=$LINENO

18466

- as_lineno_2=$LINENO

18717

18718

18719

as_lineno_1=$LINENO

18720

as_lineno_2=$LINENO

18467

18721

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

18468

- test "x$as_lineno_1" != "x$as_lineno_2" &&

18722

test "x$as_lineno_1" != "x$as_lineno_2" &&

18469

18723

- test "x$as_lineno_3" = "x$as_lineno_2" || {

18470

18724

- # Find who we are. Look in the path if we contain no path at all

18471

18725

- # relative or not.

18478

18732

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

18479

18733

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

18480

18734

-done

18481

18735

-

18482

18736

- ;;

18483

18737

- esac

18484

18738

- # We did not find ourselves, most probably we were run as `sh COMMAND'

18502

18756

- case $as_dir in

18503

18757

- /*)

18504

18758

- if ("$as_dir/$as_base" -c '

18505

as_lineno_1=$LINENO

18506

as_lineno_2=$LINENO

18759

- as_lineno_1=$LINENO

18760

- as_lineno_2=$LINENO

18507

18761

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

18508

test "x$as_lineno_1" != "x$as_lineno_2" &&

18762

- test "x$as_lineno_1" != "x$as_lineno_2" &&

18509

18763

- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then

18510

18764

- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

18511

18765

- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

18638

18892

18639

18893

if mkdir -p . 2>/dev/null; then

18640

18894

as_mkdir_p=:

18641

@@ -29271,7 +29705,28 @@

18895

@@ -29566,7 +29980,28 @@

18642

18896

as_mkdir_p=false

18643

18897

fi

18644

18898

18668

18922

18669

18923

# Sed expression to map a string onto a valid CPP name.

18670

18924

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

18671

@@ -29280,31 +29735,14 @@

18925

@@ -29575,31 +30010,14 @@

18672

18926

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

18673

18927

18674

18928

18698

18952

-

18699

18953

+# values after options handling.

18700

18954

+ac_log="

18701

This file was extended by Evince $as_me 0.9.2, which was

18955

This file was extended by Evince $as_me 0.9.3, which was

18702

18956

-generated by GNU Autoconf 2.59. Invocation command line was

18703

18957

+generated by GNU Autoconf 2.61. Invocation command line was

18704

18958

18705

18959

CONFIG_FILES = $CONFIG_FILES

18706

18960

CONFIG_HEADERS = $CONFIG_HEADERS

18707

@@ -29312,30 +29750,20 @@

18961

@@ -29607,30 +30025,20 @@

18708

18962

CONFIG_COMMANDS = $CONFIG_COMMANDS

18709

18963

$ $0 $@

18710

18964

18721

18975

-if test -n "$ac_config_files"; then

18722

18976

- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS

18723

18977

-fi

18724

-

18978

+config_files="$ac_config_files"

18979

+config_headers="$ac_config_headers"

18980

+config_commands="$ac_config_commands"

18981

18725

18982

-if test -n "$ac_config_headers"; then

18726

18983

- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS

18727

18984

-fi

18729

18986

-if test -n "$ac_config_links"; then

18730

18987

- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS

18731

18988

-fi

18732

+config_files="$ac_config_files"

18733

+config_headers="$ac_config_headers"

18734

+config_commands="$ac_config_commands"

18735

18989

-

18736

18990

-if test -n "$ac_config_commands"; then

18737

18991

- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS

18738

18992

-fi

18743

18997

ac_cs_usage="\

18744

18998

\`$as_me' instantiates files from templates according to the

18745

18999

current configuration.

18746

@@ -29343,7 +29771,7 @@

19000

@@ -29638,7 +30046,7 @@

18747

19001

Usage: $0 [OPTIONS] [FILE]...

18748

19002

18749

19003

-h, --help print this help, then exit

18752

19006

-q, --quiet do not print progress messages

18753

19007

-d, --debug don't remove temporary files

18754

19008

--recheck update $as_me by reconfiguring in the same conditions

18755

@@ -29362,19 +29790,21 @@

19009

@@ -29657,19 +30065,21 @@

18756

19010

$config_commands

18757

19011

18758

19012

Report bugs to <bug-autoconf@gnu.org>."

18761

19015

+_ACEOF

18762

19016

cat >>$CONFIG_STATUS <<_ACEOF

18763

19017

ac_cs_version="\\

18764

Evince config.status 0.9.2

19018

Evince config.status 0.9.3

18765

19019

-configured by $0, generated by GNU Autoconf 2.59,

18766

19020

- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

18767

19021

+configured by $0, generated by GNU Autoconf 2.61,

18780

19034

_ACEOF

18781

19035

18782

19036

cat >>$CONFIG_STATUS <<\_ACEOF

18783

@@ -29385,39 +29815,24 @@

19037

@@ -29680,39 +30090,24 @@

18784

19038

do

18785

19039

case $1 in

18786

19040

--*=*)

18826

19080

debug=: ;;

18827

19081

--file | --fil | --fi | --f )

18828

19082

$ac_shift

18829

@@ -29427,18 +29842,24 @@

19083

@@ -29722,18 +30117,24 @@

18830

19084

$ac_shift

18831

19085

CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

18832

19086

ac_need_defaults=false;;

18856

19110

18857

19111

esac

18858

19112

shift

18859

@@ -29454,17 +29875,28 @@

19113

@@ -29749,17 +30150,28 @@

18860

19114

_ACEOF

18861

19115

cat >>$CONFIG_STATUS <<_ACEOF

18862

19116

if \$ac_cs_recheck; then

18889

19143

AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"

18890

19144

INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'

18891

19145

prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"

18892

@@ -29475,65 +29907,66 @@

19146

@@ -29770,65 +30182,66 @@

18893

19147

18894

19148

_ACEOF

18895

19149

19006

19260

# If the user did not use the arguments to specify the items to instantiate,

19007

19261

# then the envvar interface is used. Set only those that are not.

19008

19262

# We use the long form for the default assignment because of an extremely

19009

@@ -29545,741 +29978,769 @@

19263

@@ -29840,743 +30253,771 @@

19010

19264

fi

19011

19265

19012

19266

# Have a temporary directory for convenience. Make it in the build tree

19275

19529

-s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t

19276

19530

-s,@CAIRO_PDF_CFLAGS@,$CAIRO_PDF_CFLAGS,;t t

19277

19531

-s,@CAIRO_PDF_LIBS@,$CAIRO_PDF_LIBS,;t t

19532

-s,@CAIRO_PS_CFLAGS@,$CAIRO_PS_CFLAGS,;t t

19533

-s,@CAIRO_PS_LIBS@,$CAIRO_PS_LIBS,;t t

19278

19534

-s,@ENABLE_PDF_TRUE@,$ENABLE_PDF_TRUE,;t t

19279

19535

-s,@ENABLE_PDF_FALSE@,$ENABLE_PDF_FALSE,;t t

19280

19536

-s,@ENABLE_PS_TRUE@,$ENABLE_PS_TRUE,;t t

19601

19857

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

19602

19858

+ ac_eof=`expr $ac_eof + 1`

19603

19859

+fi

19604

+

19860

19605

19861

+cat >>$CONFIG_STATUS <<_ACEOF

19606

19862

+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

19607

19863

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

19618

19874

+rm -f conf$$subs.sed

19619

19875

+cat >>$CONFIG_STATUS <<_ACEOF

19620

19876

+CEOF$ac_eof

19621

+_ACEOF

19877

_ACEOF

19622

19878

+

19623

19879

+

19624

19880

+ac_delim='%!_!# '

19649

19905

+POPPLER_LIBS!$POPPLER_LIBS$ac_delim

19650

19906

+CAIRO_PDF_CFLAGS!$CAIRO_PDF_CFLAGS$ac_delim

19651

19907

+CAIRO_PDF_LIBS!$CAIRO_PDF_LIBS$ac_delim

19908

+CAIRO_PS_CFLAGS!$CAIRO_PS_CFLAGS$ac_delim

19909

+CAIRO_PS_LIBS!$CAIRO_PS_LIBS$ac_delim

19652

19910

+ENABLE_PDF_TRUE!$ENABLE_PDF_TRUE$ac_delim

19653

19911

+ENABLE_PDF_FALSE!$ENABLE_PDF_FALSE$ac_delim

19654

19912

+ENABLE_PS_TRUE!$ENABLE_PS_TRUE$ac_delim

19673

19931

+LIBOBJS!$LIBOBJS$ac_delim

19674

19932

+LTLIBOBJS!$LTLIBOBJS$ac_delim

19675

19933

+_ACEOF

19676

19677

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then

19934

+

19935

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then

19678

19936

+ break

19679

19937

+ elif $ac_last_try; then

19680

19938

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

19694

19952

+cat >>$CONFIG_STATUS <<_ACEOF

19695

19953

+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof

19696

19954

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

19697

_ACEOF

19955

+_ACEOF

19698

19956

+sed '

19699

19957

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

19700

19958

+s/^/s,@/; s/!/@,|#_!!_#|/

19761

20019

+ shift

19762

20020

+ ac_file=$1

19763

20021

+ shift

19764

+

20022

20023

- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.

20024

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

19765

20025

+ case $ac_mode in

19766

20026

+ :L) ac_source=$1;;

19767

20027

+ :[FH])

19795

20055

+ { echo "$as_me:$LINENO: creating $ac_file" >&5

19796

20056

+echo "$as_me: creating $ac_file" >&6;}

19797

20057

+ fi

19798

19799

- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.

19800

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

20058

+

19801

20059

+ case $ac_tag in

19802

20060

+ *:-:* | *:-) cat >"$tmp/stdin";;

19803

20061

+ esac

20426

20684

# Compute $ac_file's index in $config_headers.

20427

20685

_am_stamp_count=1

20428

20686

for _am_header in $config_headers :; do

20429

@@ -30290,135 +30751,39 @@

20687

@@ -30587,135 +31028,39 @@

20430

20688

_am_stamp_count=`expr $_am_stamp_count + 1` ;;

20431

20689

esac

20432

20690

done

20588

20846

# Strip MF so we end up with the name of the file.

20589

20847

mf=`echo "$mf" | sed -e 's/:.*$//'`

20590

20848

# Check whether this is an Automake generated Makefile or not.

20591

@@ -30428,18 +30793,29 @@

20849

@@ -30725,18 +31070,29 @@

20592

20850

# each Makefile.in and add a new line on top of each file to say so.

20593

20851

# So let's grep whole file.

20594

20852

if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

20626

20884

else

20627

20885

continue

20628

20886

fi

20629

@@ -30461,49 +30837,76 @@

20887

@@ -30758,49 +31114,76 @@

20630

20888

sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

20631

20889

# Make sure the directory exists.

20632

20890

test -f "$dirpart/$file" && continue

20730

20988

20731

20989

for file in intltool-extract intltool-merge intltool-update; do

20732

20990

sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \

20733

@@ -30524,10 +30927,10 @@

20991

@@ -30821,10 +31204,10 @@

20734

20992

done

20735

20993

20736

20994

;;

20743

21001

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

20744

21002

>"po/stamp-it.tmp"

20745

21003

sed '/^#/d

20746

@@ -30550,11 +30953,10 @@

21004

@@ -30847,11 +31230,10 @@

20747

21005

rm -f "po/Makefile.tmp"

20748

21006

mv "po/stamp-it.tmp" "po/stamp-it"

20749

21007

;;