summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-01-21 17:47:03 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-01-21 17:47:03 +0000
commit815f157c05ebc20e91a050823f048a977b8ae103 (patch)
tree5b3e4f8884af72c5c4c8ddd849e72abe3d6fb4c8
parent024e577dc34f1a978dadf4ad82b8ea45fd81de07 (diff)
CWS-TOOLING: integrate CWS configuretoplevel
2009-01-19 15:47:39 +0100 rene r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39) 2009-01-18 00:35:31 +0100 rene r266462 : #i10000# Mac OS X "of course" has other paths... 2009-01-16 13:24:23 +0100 rene r266415 : make OS2 use STLport... 2009-01-15 22:08:38 +0100 rene r266393 : STLport for FreeBSD 2009-01-15 01:23:51 +0100 rene r266333 : #i98048# harmonize STL default; default to *NOT* use STLport 2009-01-09 22:44:43 +0100 rene r266120 : #i97428# try to find out XLIB via pkg-config 2009-01-09 22:41:18 +0100 rene r266119 : #i97827# fail when we don't find make 2008-12-27 01:19:34 +0100 rene r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh 2008-12-27 01:16:31 +0100 rene r265811 : fix makefile.rc for config.*/config_office move 2008-12-26 22:37:54 +0100 rene r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call 2008-12-26 17:55:11 +0100 rene r265806 : actually commit Makefile.in 2008-12-25 19:24:24 +0100 rene r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38) 2008-12-10 22:51:06 +0100 rene r265232 : #i96912# revert, cws swffixes02 has the right fix 2008-12-08 18:47:10 +0100 rene r265014 : xulrunner has no /plugin or /nspr 2008-12-08 17:51:28 +0100 rene r265013 : i96912# fix --with-system-mozilla 2008-12-05 13:05:55 +0100 rene r264903 : #i95339# 2008-12-04 17:53:53 +0100 rene r264865 : fix merge error #i80238# add help for --with-epm 2008-12-04 17:44:28 +0100 rene r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one 2008-12-04 17:40:48 +0100 rene r264863 : i93429# check for sanity for expand.exe 2008-12-04 17:34:20 +0100 rene r264862 : config_office changes from m33 to m37 2008-12-04 17:28:55 +0100 rene r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37) 2008-12-04 16:49:03 +0100 rene r264856 : fix cws. part 5 2008-12-04 16:45:06 +0100 rene r264855 : fix cws, part 4 2008-12-04 16:01:49 +0100 rene r264850 : fix cws, part 3 2008-12-04 15:14:12 +0100 rene r264848 : fix cws, part 2
Diffstat
-rw-r--r--Makefile.in17
-rw-r--r--acinclude.m4 (renamed from config_office/acinclude.m4)0
-rw-r--r--aclocal.m4 (renamed from config_office/aclocal.m4)0
-rw-r--r--bootstrap.1 (renamed from config_office/bootstrap.1)4
-rwxr-xr-xconfig.guess (renamed from solenv/bin/config.guess)0
-rwxr-xr-xconfig.sub (renamed from solenv/bin/config.sub)0
-rw-r--r--config_office/README1
-rwxr-xr-xconfig_office/configure.cmd7
-rw-r--r--config_office/guw/guw.cc689
-rw-r--r--config_office/guw/makefile4
-rwxr-xr-xconfigure (renamed from config_office/configure)18536
-rwxr-xr-xconfigure.cmd7
-rw-r--r--configure.in (renamed from config_office/configure.in)275
-rw-r--r--guw/guw.cc2067
-rw-r--r--guw/makefile12
-rw-r--r--install-sh (renamed from solenv/bin/install-sh)0
-rw-r--r--makefile.rc (renamed from config_office/makefile.rc)6
-rwxr-xr-xoowintool (renamed from config_office/oowintool)0
-rw-r--r--scp2/source/base/file_base.scp2
-rw-r--r--scp2/source/base/makefile.mk4
-rw-r--r--set_soenv.in (renamed from config_office/set_soenv.in)42
21 files changed, 12059 insertions, 9614 deletions
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000000000000..be50d1d4034d
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,17 @@
+# just dumb wrapper; make install comes later
+
+SHELL=/bin/sh
+
+all:
+ . ./*Env.Set.sh && \
+ ./bootstrap && \
+ cd instsetoo_native && ../solenv/bin/build.pl --all
+
+distclean:
+ . ./*Env.Set.sh && \
+ dmake distclean
+
+clean:
+ . ./*Env.Set.sh && \
+ dmake clean
+
diff --git a/config_office/acinclude.m4 b/acinclude.m4
index 71f01544d11b..71f01544d11b 100644
--- a/config_office/acinclude.m4
+++ b/acinclude.m4
diff --git a/config_office/aclocal.m4 b/aclocal.m4
index 2a954fbba32e..2a954fbba32e 100644
--- a/config_office/aclocal.m4
+++ b/aclocal.m4
diff --git a/config_office/bootstrap.1 b/bootstrap.1
index 90fa5458450b..146d6f9443dd 100644
--- a/config_office/bootstrap.1
+++ b/bootstrap.1
@@ -65,11 +65,11 @@ fi
if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
echo ""
echo "Calling $GNUMAKE in guw"
- cd "$SRC_ROOT/config_office/guw" || exit
+ cd "$SRC_ROOT/guw" || exit
$GNUMAKE || exit
echo ""
echo "guw has been successfully made"
- cp -f "$SRC_ROOT/config_office/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
+ cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
echo ""
echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT"
fi
diff --git a/solenv/bin/config.guess b/config.guess
index 82294713260e..82294713260e 100755
--- a/solenv/bin/config.guess
+++ b/config.guess
diff --git a/solenv/bin/config.sub b/config.sub
index 0f84ac2c51e2..0f84ac2c51e2 100755
--- a/solenv/bin/config.sub
+++ b/config.sub
diff --git a/config_office/README b/config_office/README
deleted file mode 100644
index b14f4b6e32d5..000000000000
--- a/config_office/README
+++ /dev/null
@@ -1 +0,0 @@
-See <http://tools.openoffice.org/#Build> for build instructions.
diff --git a/config_office/configure.cmd b/config_office/configure.cmd
deleted file mode 100755
index ceed8029635c..000000000000
--- a/config_office/configure.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-setlocal
-SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
-SET JAVA_HOME=e:\java150
-SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-sh -c "configure --with-system-python --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
-endlocal
diff --git a/config_office/guw/guw.cc b/config_office/guw/guw.cc
deleted file mode 100644
index e7748a908ff1..000000000000
--- a/config_office/guw/guw.cc
+++ /dev/null
@@ -1,689 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: guw.cc,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// guw - A wrapper program to execute windows programs with parameters that
-// contain cygwin (POSIX) style pathnames.
-
-// Todo: Add a -? switch to guw to issue a help page.
-
-#include <string>
-#include <list>
-#include <vector>
-
-#include <iostream>
-#include <sstream>
-#include <fstream>
-
-#include <cstddef>
-#include <cerrno>
-
-#include <sys/cygwin.h>
-#include <windows.h>
-#include <regex.h>
-
-
-using std::string;
-using std::list;
-using std::vector;
-using std::cout;
-using std::cerr;
-using std::endl;
-using std::size_t;
-
-void init_ignorepara(string command);
-bool is_ignorepara(const string &para);
-int winFormat(string &para);
-void do_atcommand(string &para);
-void myCygpath(string &path, int shortname = 1 );
-void replace_cyg_env( void );
-void Fatal( const string text );
-
-int match2s(const string argument, const char *pattern, string &sub1, string &sub2);
-void rep_subn_cyg(string &argument);
-void rep_subn( string &argument, const char *pattern, int subexp, const char repl);
-void rep_char( string &argument, const char from, const char to);
-
-bool debug = false;
-bool debug_light = false;
-
-// The commands are treated case insensitive, the parameters
-// are case sensitive.
-const string ignorepara[] = { "echo /TEST",
- "cl -clr: -Z",
- "climaker StarOffice/OpenOffice",
- "csc -target:",
- "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
- " -DBUILD_ID -DSC_INFO_OSVERSION",
- "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
- " -DPACKAGE -DU_MAKE",
- "lib /OUT: -out: -def: -machine:",
- "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
- " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
- " /STACK: /SUBSYSTEM: -NODEFAULTLIB:"
- " -def: delayload: -implib: -map: -out:",
- "rc -D",
- "regcomp -env: vnd.sun.star.expand:"
- " vnd.openoffice.pymodule: file:",
- "regmerge /UCR",
- "rsc -DOOO_" };
-
-vector<string> ignorepara_vec;
-
-// environment variables that are "winformatted" when -env is given
-const string transformvars[] = { "SOLAR_VERSION",
- "SOLARVERSION",
- "SOLARVER",
- "SRC_ROOT",
- "LOCALINI",
- "GLOBALINI",
- "SOLARENV",
- "STAR_INSTPATH",
- "STAR_SOLARPATH",
- "STAR_PACKMISC",
- "STAR_SOLARENVPATH",
- "STAR_INITROOT",
- "STAR_STANDLST",
- "CLASSPATH",
- "JAVA_HOME" };
-
-
-int main(int argc, char **argv) {
-
- // initialize arglist with arguments
- list<string> arglist(argv, argv + argc);
-
- // Drop the first (filename) argument
- arglist.pop_front();
-
- // iterarot over cmdline elements
- list<string>::iterator ele = arglist.begin();
-
- // Allowed switch values
- bool conv_cyg_arg = false;
-
- // Look for switches to guw
- // Supported: -env
- // -dbg
- // -ldbg
- while ( !arglist.empty()
- && ele!=arglist.end()
- && (ele->find("-", 0) == 0) ) {
- if (ele->find("-env", 0) == 0) {
- if ( conv_cyg_arg )
- Fatal("-env used twice!");
-
- conv_cyg_arg = true;
- ele = arglist.erase(ele);
- continue;
- }
- else if (ele->find("-dbg", 0) == 0) {
-
- debug = true;
- ele = arglist.erase(ele);
- continue;
- }
- else if (ele->find("-ldbg", 0) == 0) {
-
- debug_light = true;
- ele = arglist.erase(ele);
- continue;
- }
- else {
- // Ignore this switch
- ++ele;
- }
- }
-
- // The next entry must be the program
- string command;
- if ( !arglist.empty() ) {
- command.assign(*arglist.begin());
- arglist.pop_front();
- }
- else
- Fatal("guw needs at least one parameter.");
-
- if ( debug )
- cerr << "Command: " << command << "\n" << endl;
- // Initialize parameter exception list (for this command)
- init_ignorepara(command);
-
-
- // Do something if -env was found
- if ( conv_cyg_arg )
- replace_cyg_env();
-
-
- // loop and and DOSify the parameters
- if ( debug )
- cerr << "Transform the parameter\n" << endl;
-
- ele=arglist.begin();
- while ( ele != arglist.end() ) {
-
- if ((*ele)[0] == '@')
- do_atcommand(*ele);
- else if (!is_ignorepara(*ele)) {
- if ( debug ) {
- cerr << "----------------" << endl;
- cerr << "Process parameter: " << *ele << endl;
- }
- winFormat(*ele);
- if ( debug )
- cerr << "Transformed to: " << *ele << "\n" << endl;
- }
-
- ++ele;
- }
-
- // create the argv[] for execvp(argv[0], argv);
- ele=arglist.begin();
-
- // const char *nargv[arglist.size()+2]; // or ..
- char *nargv[arglist.size()+2];
-
- // nargv[0] = command.c_str(); // or ..
- nargv[0] = new char[command.length()+1];
- // strcpy(nargv[0], command.c_str());
- command.copy(nargv[0], command.length());
- nargv[0][command.length()] = 0;
-
- if ( debug )
- cerr << "----------------\n" << endl;
- if ( debug || debug_light )
- cerr << "Execute: " << nargv[0];
-
- int count = 1, sLen;
- while ( ele != arglist.end() ) {
- // nargv[count] = ele->c_str(); // or ..
- sLen = ele->length();
- nargv[count] = new char[sLen+1];
- // strcpy(nargv[count], ele->c_str());
- ele->copy(nargv[count], sLen);
- nargv[count][sLen] = 0;
-
- if ( debug || debug_light )
- cerr << " " << nargv[count];
-
- ++count;
- ++ele;
- }
- // last nargv[] must be NULL
- nargv[count] = NULL;
- if ( debug || debug_light )
- cerr << endl;
-
- // Unfortunately the prototype of execvp does not like const char*,
- // actually not const char* nargv[] coming from .c_str(). So either
- // we copy everything into newly allocated variables or we force it
- // with a cast. const_cast<char * const *>()
- // execvp(nargv[0], const_cast<char * const *>(nargv) );
- if ( execvp(nargv[0], nargv ) < 0 ) {
- perror("Execvp error. Aborting.");
- exit(1);
- }
-
- // Omit the deleting of the dynamically allocated nargv[] elements
- // here as this part will never be reached.
-
- return 0;
-}
-
-// Initialize exception list from global var ignorepara[]
-void init_ignorepara(string fullcommand) {
- const size_t kplen = sizeof(ignorepara)/sizeof(string *);
- string shortcommand, cmd, para, sub2;
-
- // First lowercase everything
- for(size_t i=0;i<fullcommand.length();i++)
- fullcommand[i] = tolower(fullcommand[i]);
-
- // Remove a potential .exe
- size_t slen = fullcommand.length();
-
- // for slen == 3 this would yield string::npos otherwise
- if ( slen > 4 && fullcommand.rfind(".exe") == slen - 4 )
- fullcommand.erase(slen-4);
-
- // get the program name - Only one subexpression
- if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
- shortcommand, sub2)) {
- Fatal("No basename found in: " + fullcommand);
- }
-
- for (size_t i=0; i != kplen; ++i) {
- std::istringstream line(ignorepara[i]);
- line >> cmd;
- if (shortcommand == cmd)
- while (line >> para) {
- ignorepara_vec.push_back(para);
- }
- }
- return ;
-}
-
-// Check if command/parameter is in exception list.
-bool is_ignorepara(const string &para) {
-
- for( vector<string>::iterator it = ignorepara_vec.begin();
- it != ignorepara_vec.end(); it++ ) {
- if ( para.find(*it) != string::npos ) {
- if ( debug )
- cerr << "Found execption para: " << para << endl;
-
- return true;
- }
- }
-
- return false;
-}
-
-// Reformat para to DOSish format
-int winFormat(string &para) {
- string su1, su2;
-
- // Instead of ([/[:alnum:]_~. +-]+) use ((/?[[:alnum:]_~. +-]+)+)
-
- // find [-][-]X<something>=<path>, sometimes with quotes or "/" at the end
- if (match2s(para, "^(-?-?[[:alpha:]][[:alnum:]_.-]*=)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
- su1, su2)) {
-
- myCygpath(su2);
- para.assign(su1 + su2);
- if ( debug )
- cerr << " WinFormat - ([-][-]<something>=<path>)\n"
- << " " << para << endl;
-
- }
- // find -X<something>:<path>, sometimes with quotes or "/" at the end
- else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_.]*:)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
- su1, su2)) {
-
- myCygpath(su2);
- para.assign(su1 + su2);
- if ( debug )
- cerr << " WinFormat - (-<something>:<path>)\n"
- << " " << para << endl;
-
- }
- // find -X<something>:<NO-path>, and prevents translating of these.
- else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_]*:)(.*)$",
- su1, su2)) {
-
- // myCygpath(su2);
- // para.assign(su1 + su2);
- if ( debug )
- cerr << " WinFormat - (-<something>:<NO-path>)\n"
- << " " << para << endl;
-
- }
- // See iz35982 for the reason for the special treatment of this switch.
- // This regex evaluates <something>:///<path>, sometimes with
- // quotes or "/" at the end
- else if (match2s(para, "^([[:alpha:]][[:alnum:]_]*:)[\'\"]?///((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
- su1, su2)) {
-
- myCygpath(su2);
- para.assign(su1 + "///" + su2);
- // Replace \ to /
- rep_char( para, '\\', '/');
-
- if ( debug )
- cerr << " WinFormat - (<something>:///<path>)\n"
- << " " << para << endl;
-
- }
- // find -X<absolute path>, sometimes with quotes or "/" at the end
- else if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)[\'\"]?$",
- su1, su2)) {
-
- myCygpath(su2);
- para.assign(su1 + su2);
- if ( debug )
- cerr << " WinFormat - (-X<absolute path>)\n"
- << " " << para << endl;
-
- }
- // find -FX<path> (MSVC switches for output naming), sometimes with quotes
- // or "/" at the end
- else if (match2s(para, "^(-F[ARdemopr])[\'\"]?(/[/[:alnum:]_~. +-]+)[\'\"]?$",
- su1, su2)) {
-
- myCygpath(su2);
- para.assign(su1 + su2);
- if ( debug )
- cerr << " WinFormat - (compiler naming (-FX<absolute path>) path)\n"
- << " " << para << endl;
-
- }
- else{
- // No parameter found, assume a path
-
- // replace the colon in drives with 0x1F"
- // (Unused ascii US - unit separator)
- rep_subn( para, "(^|[;,])[[:alpha:]](:)", 2, 0x1F);
-
- // Replace remaining : to ;
- rep_char( para, ':', ';');
-
- // Replace back US to ':';
- rep_char( para, 0x1F, ':');
-
- /* Search for posix path ;entry; (The regex accepts valid paths with at
- * least one /) and replace with DOS path, accept quotes.
- * since iz28717 we also accept ',' as path seperator. */
- rep_subn_cyg(para);
-
- if ( debug )
- cerr << " WinFormat - full path\n"
- << " " << para << endl;
-
- }
-
- // Sanity check for -X<abspath>
- if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
- su1, su2)) {
- Fatal("Not converted -X/... type switch in :" + para);
- }
- // Sanity check for [-]X<something>(:|=)<abspath> case
- if (match2s(para, "^(-?[[:alpha:]][[:alnum:]_.]+[=:])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
- su1, su2)) {
- Fatal("Not processed [-]X<something>(=|:)/... in :" + para);
- }
-
-
- return 1;
-}
-
-// Reformat para to DOSish format
-void do_atcommand(string &para) {
- string at, filename, token;
-
- // Workaround, iz28717, keep number of @'s.
- match2s(para, "^(@+)(.*)",at ,filename);
- if ( debug ) {
- cerr << "----------------" << endl;
- cerr << "Process @-file" << endl;
- cerr << " :" << at << ": before filename :" << filename << ":" << endl;
- }
-
- // Read at file into memory
- std::ifstream atin(filename.c_str());
- list<string> newtoken;
- while (atin >> token) {
- // Read / transform tokens
- if ( debug )
- cerr << "@ token :" << token << ":" << endl;
- if (!is_ignorepara(token))
- winFormat(token);
-
- newtoken.push_back(token);
- }
- atin.close();
-
- // Write token tokens bak to file
- if ( debug || debug_light )
- cerr << "New @-file parameter:" << endl;
-
- // for debugging ..
- // filename += ".bak";
-
- std::ofstream atout(filename.c_str());
- list<string>::iterator tok = newtoken.begin();
- while ( tok != newtoken.end() ) {
- if ( debug || debug_light )
- cerr << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
-
- atout << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
- ++tok;
- }
- // We want a dos file
- atout << '\r' << endl;
- atout.close();
-
- // Transform the filename
- winFormat(filename);
- para = at + filename;
- if ( debug || debug_light ) {
- cerr << "\nNew @-file name: " << para << "\n" << endl;
- }
-}
-
-void myCygpath(string &path, int shortname /* =1 */ )
-{
- static char convpath[MAX_PATH];
- static char buf[MAX_PATH];
- int err;
-
- // Only use cygwin_conv_to_win32_path() on absolute paths as it errors
- // out if its path doen't exist. Unfortunatelt there are a lot of not
- // existing relative pathes used as parameters during an OOo build.
- if( path.find("/", 0) == 0) {
- err = cygwin_conv_to_win32_path( path.c_str(), convpath );
- }
- else {
- rep_char( path, '/', '\\');
- // see below, we copy convpath back to path, that's stupid
- path.copy( convpath, path.length());
- convpath[path.length()] = 0;
- err = 0;
- }
-
- if (err)
- Fatal("converting: " + path + " - " + strerror(errno) );
-
- // Only convert to short dos names when space is present
- if (shortname && (path.find(" ", 0) != string::npos) ) {
- DWORD len = GetShortPathName (convpath, buf, MAX_PATH);
- if (!len) {
- Fatal("cannot create short name of " + string(convpath) );
- }
-
- path.assign(buf);
- }
- else
- path.assign(convpath);
-
-}
-
-void replace_cyg_env( void ) {
- // Transform certain environment variables
- if ( debug )
- cerr << "Transforming some environment variables" << endl;
-
- const size_t nvars = sizeof(transformvars)/sizeof(string *);
-
- char *currvar;
- string newvar;
-
- for (size_t i=0; i != nvars; ++i) {
- if ( currvar = getenv(transformvars[i].c_str() ) ) {
- // Only transform existent vars
- if ( debug )
- cerr << "Transform variable: " << transformvars[i] << "="
- << currvar << endl;
- newvar.assign(currvar);
- winFormat(newvar);
- if( setenv(transformvars[i].c_str(), newvar.c_str(), 1) )
- Fatal("setenv failed on " + transformvars[i] + "=" + newvar +
- " with error: " + strerror(errno));
- if ( debug )
- cerr << "To: " << transformvars[i] << "="
- << newvar << "\n" << endl;
- }
- }
-}
-
-
-void Fatal( const string text ) {
- // End with error
- cerr << "Error: " << text << endl;
- exit(1);
-}
-
-
-int
-match2s(const string argument, const char *pattern, string &sub1, string &sub2)
-{
- int status;
- regex_t re;
-
- const int maxsub = 3; // Only 3 needed, 4 is for debug
- regmatch_t match[maxsub];
-
- if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
- Fatal("regcomp had a problem."); /* report error */
- }
- status = regexec(&re, argument.c_str(), maxsub, match, 0);
- regfree(&re);
-
- if (status == REG_NOMATCH) {
- return(0); /* no match */
- } else if (status == 0) {
- string tstr(argument.c_str() + match[0].rm_so,
- match[0].rm_eo - match[0].rm_so);
- // cout << "Match: " << tstr << endl;
-
- sub1.assign(argument.c_str() + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
- // cout << "Match1: " << sub1 << endl;
-
- sub2.assign(argument.c_str() + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
- // cout << "Match2: " << sub2 << endl;
-
- return(1); /* match found */
- } else {
- Fatal("regexec had a problem.");
- }
-
- // Not reached.
- return(1);
-}
-
-
-// Replace path entry with myCygpath() version
-void rep_subn_cyg(string &argument)
-{
- // accept ["']<entry>["']:["']<entry>["']:... to make the
- // $(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)"
- // work in ?tg_app.mk.
- // FIXME: Better would be to use a DOSified $(APP1ICON) there and remove
- // the special " treatment here.
- const char *pattern = "(^|[;,])[\'\"]?([[:alnum:]_~. +-]*(/[[:alnum:]_~. +-]+)+/?)[\'\"]?([;,]|$)";
- const int subexp = 2;
-
- int status, pos=0;
- regex_t re;
-
- string repstr;
- string::size_type oLen, nLen;
-
- const int maxsub = subexp+1; // One more than the maximal subexpression
- regmatch_t match[maxsub];
-
- if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
- Fatal("regcomp had a problem."); /* report error */
- }
- status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
- while (status == 0) { /* While matches found. */
- // Classical assert()
- if (match[subexp].rm_eo == -1) {
- Fatal("Nonexisting subexpression specified!");
- }
-
- oLen = match[subexp].rm_eo - match[subexp].rm_so;
- repstr.assign(argument.c_str() + pos + match[subexp].rm_so, oLen);
-
- // Do not replace with shortpaths
- myCygpath(repstr, 0);
- nLen = repstr.length();
-
- // replace
- argument.replace( pos + match[subexp].rm_so, oLen, repstr );
-
- /* Substring found between match[0].rm_so and match[0].rm_eo. */
- /* This call to regexec() finds the next match. */
-
- pos += match[0].rm_eo + nLen - oLen ;
-
- // Either the last match did end in ';' or we are at the end of para.
- // REG_NOTBOL is not used because we skip over the ';' by using pos.
- status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
- }
-
- if (status != REG_NOMATCH) {
- Fatal("regexec had a problem.");
- }
-
- regfree(&re);
-}
-
-// Replace all occurences of subexpression number "subexp" with "repl"
-void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
-{
- int status, pos=0;
- regex_t re;
-
- const int maxsub = subexp+1; // One more than the maximal subexpression
- regmatch_t match[maxsub];
-
- if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
- Fatal("regcomp had a problem."); /* report error */
- }
- status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
- while (status == 0) { /* While matches found. */
- // Classical assert()
- if (match[subexp].rm_eo == -1) {
- Fatal("Nonexisting subexpression specified!");
- }
-
- argument[pos + match[subexp].rm_so] = repl;
-
- /* Substring found between match[0].rm_so and match[0].rm_eo. */
- /* This call to regexec() finds the next match. */
- pos += match[0].rm_eo;
- status = regexec (&re, argument.c_str() + pos, maxsub, match, REG_NOTBOL);
- }
-
- if (status != REG_NOMATCH) {
- Fatal("regexec had a problem.");
- }
-
- regfree(&re);
-}
-
-// Replace all char1 with char2
-void rep_char( string &argument, const char from, const char to)
-{
- string::size_type loc = 0;
-
- while ( (loc = argument.find( from, loc )) != string::npos ) {
- argument[loc] = to;
- }
-}
diff --git a/config_office/guw/makefile b/config_office/guw/makefile
deleted file mode 100644
index 6436dccfb2b8..000000000000
--- a/config_office/guw/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-sources = guw.cc
-
-guw : $(sources)
- g++ -Wall -o guw $(sources)
diff --git a/config_office/configure b/configure
index 35f37e768f99..c39a3e16512a 100755
--- a/config_office/configure
+++ b/configure
@@ -1,26 +1,55 @@
#! /bin/sh
# From configure.in Revision: 1.290 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -30,8 +59,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -45,18 +109,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -64,157 +129,388 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
+fi
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
fi
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+IFS=$as_save_IFS
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell autoconf@gnu.org about your system,
+ echo including any error possibly output before this
+ echo message
+}
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
+ chmod +x "$as_me.lineno" ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -223,7 +519,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -232,39 +549,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
@@ -275,42 +580,426 @@ PACKAGE_BUGREPORT=
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
-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 EGREP AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH STLPORT4 STLPORT_VER USE_SYSTEM_STL HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB DISABLE_XAW XAU_LIBS SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTDESIGN SYSTEM_JFREEREPORT JCOMMON_JAR SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR JCOMMON_SERIALIZER_JAR MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS WITH_WRITER2LATEX SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
+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
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+GREP
+EGREP
+AWK
+SED
+LOCAL_SOLENV
+_solenv
+UPD
+SOURCEVERSION
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+target
+target_cpu
+target_vendor
+target_os
+OSVERSION
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+ENABLE_CRASHDUMP
+VC_STANDARD
+ENABLE_WERROR
+ENABLE_DEBUG
+PRODUCT
+PROFULLSWITCH
+PROEXT
+ENABLE_SYMBOLS
+DISABLE_STRIP
+ENABLE_CUPS
+ENABLE_FONTCONFIG
+WITH_BINFILTER
+ENABLE_DIRECTX
+DISABLE_ACTIVEX
+DISABLE_ATL
+ENABLE_RPATH
+WITH_MYSPELL_DICTS
+SYSTEM_DICTS
+DICT_SYSTEM_DIR
+HYPH_SYSTEM_DIR
+THES_SYSTEM_DIR
+USE_SHELL
+WITH_MINGWIN
+SHELLPATH
+GCC_HOME
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+COMPATH
+GCCVER
+ENABLE_PCH
+GNUMAKE
+_cc
+HAVE_LD_HASH_STYLE
+PERL
+MSPDB_PATH
+COMEX
+USE_MINGW
+MIDL_PATH
+CSC_PATH
+FRAME_HOME
+CPP
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXCPP
+SIZEOF_LONG
+WORDS_BIGENDIAN
+LFS_CFLAGS
+ENABLE_VBA
+VBA_EXTENSION
+PAM
+NEW_SHADOW_API
+PAM_LINK
+CRYPT_LINK
+GXX_INCLUDE_PATH
+MINGW_LIB_INCLUDE_PATH
+STLPORT4
+STLPORT_VER
+USE_SYSTEM_STL
+HAVE_GCC_VISIBILITY_FEATURE
+ALLOC
+BUILD_VER_STRING
+SOLAR_JAVA
+JAVAINTERPRETER
+JAVACOMPILER
+JAVACISGCJ
+JAVADOC
+AWTLIB
+JAVAAOTCOMPILER
+JAVA_HOME
+JDK
+JAVAFLAGS
+DMAKE
+BUILD_DMAKE
+EPM
+DPKG
+PKGMK
+BUILD_EPM
+PKGFORMAT
+RPM
+GPERF
+MINGWCXX
+MINGWSTRIP
+BUILD_UNOWINREG
+BUILD_QADEVOOO
+SYSTEM_STDLIBS
+SYSTEM_ZLIB
+SYSTEM_JPEG
+SYSTEM_EXPAT
+PKG_CONFIG
+LIBWPD_CFLAGS
+LIBWPD_LIBS
+SYSTEM_LIBWPD
+FREETYPE_CFLAGS
+FREETYPE_LIBS
+USE_FT_EMBOLDEN
+LIBXSLT_CFLAGS
+LIBXSLT_LIBS
+XSLTPROC
+SYSTEM_LIBXSLT
+LIBXML_CFLAGS
+LIBXML_LIBS
+SYSTEM_LIBXML
+PYTHON
+PYTHON_VERSION
+PYTHON_PREFIX
+PYTHON_EXEC_PREFIX
+PYTHON_PLATFORM
+pythondir
+pkgpythondir
+pyexecdir
+pkgpyexecdir
+BZIP2
+SYSTEM_PYTHON
+PYTHON_CFLAGS
+PYTHON_LIBS
+HOME
+SYSTEM_DB
+DB_VERSION
+DB_INCLUDES
+DB_JAR
+SYSTEM_LUCENE
+LUCENE_CORE_JAR
+LUCENE_ANALYZERS_JAR
+SYSTEM_HSQLDB
+HSQLDB_JAR
+SYSTEM_BSH
+BSH_JAR
+SERIALIZER_JAR
+SYSTEM_SAXON
+SAXON_JAR
+CURLCONFIG
+SYSTEM_CURL
+CURL_CFLAGS
+CURL_LIBS
+SYSTEM_BOOST
+SYSTEM_VIGRA
+SYSTEM_ODBC_HEADERS
+WITH_MOZILLA
+WITH_LDAP
+WITH_OPENLDAP
+MOZ_NSS_CFLAGS
+MOZ_NSS_LIBS
+NSS_LIB
+MOZ_NSPR_CFLAGS
+MOZ_NSPR_LIBS
+NSPR_LIB
+MOZILLAXPCOM_CFLAGS
+MOZILLAXPCOM_LIBS
+MOZILLA_VERSION
+MOZILLA_TOOLKIT
+MOZGTK2_CFLAGS
+MOZGTK2_LIBS
+MOZLIBREQ_CFLAGS
+MOZLIBREQ_LIBS
+BUILD_MOZAB
+SYSTEM_MOZILLA
+MOZ_FLAVOUR
+MOZ_INC
+MOZ_LIB
+MOZ_LIB_XPCOM
+MOZ_LDAP_CFLAGS
+SYSTEM_SANE_HEADER
+SYSTEM_GENBRK
+SYSTEM_GENCCODE
+SYSTEM_GENCMN
+SYSTEM_ICU
+XMKMF
+X_CFLAGS
+X_PRE_LIBS
+X_LIBS
+X_EXTRA_LIBS
+XINC
+XLIB
+DISABLE_XAW
+XAU_LIBS
+SYSTEM_XRENDER_HEADERS
+XRENDER_LINK
+XRANDR_CFLAGS
+XRANDR_LIBS
+XRANDR_DLOPEN
+ENABLE_RANDR
+DISABLE_NEON
+NEON_CFLAGS
+NEON_LIBS
+OPENSSL_CFLAGS
+OPENSSL_LIBS
+SYSTEM_OPENSSL
+SYSTEM_NEON
+NEON_VERSION
+ENABLE_AGG
+AGG_CFLAGS
+AGG_LIBS
+SYSTEM_AGG
+AGG_VERSION
+REDLAND_CFLAGS
+REDLAND_LIBS
+SYSTEM_REDLAND
+HUNSPELL_CFLAGS
+HUNSPELL_LIBS
+SYSTEM_HUNSPELL
+SYSTEM_HYPH
+HYPHEN_LIB
+SYSTEM_MYTHES
+SYSTEM_LPSOLVE
+PSDK_HOME
+WINDOWS_VISTA_PSDK
+DIRECTXSDK_HOME
+DIRECTXSDK_LIB
+NSIS_PATH
+BISON
+FLEX
+PATCH
+GNUCP
+GNUPATCH
+CYGWIN_PATH
+ML_EXE
+ASM_HOME
+ZIP
+UNZIP
+ZIP_HOME
+WITH_GPC
+ENABLE_GTK
+ENABLE_KDE
+GCONF_CFLAGS
+GCONF_LIBS
+ENABLE_GCONF
+GNOMEVFS_CFLAGS
+GNOMEVFS_LIBS
+ENABLE_GNOMEVFS
+GTK_CFLAGS
+GTK_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
+GIO_CFLAGS
+GIO_LIBS
+ENABLE_GIO
+ENABLE_DBUS
+ENABLE_SYSTRAY_GTK
+CAIRO_CFLAGS
+CAIRO_LIBS
+ENABLE_CAIRO
+BUILD_PIXMAN
+SYSTEM_CAIRO
+ENABLE_OPENGL
+ENABLE_MINIMIZER
+ENABLE_PRESENTER_SCREEN
+POPPLER_CFLAGS
+POPPLER_LIBS
+ENABLE_PDFIMPORT
+SYSTEM_POPPLER
+ENABLE_MEDIAWIKI
+SYSTEM_APACHE_COMMONS
+COMMONS_CODEC_JAR
+COMMONS_LANG_JAR
+COMMONS_HTTPCLIENT_JAR
+COMMONS_LOGGING_JAR
+SYSTEM_SERVLETAPI
+SERVLETAPI_JAR
+ENABLE_REPORTBUILDER
+SYSTEM_JFREEREPORT
+JCOMMON_JAR
+SAC_JAR
+LIBXML_JAR
+FLUTE_JAR
+JFREEREPORT_JAR
+LIBLAYOUT_JAR
+LIBLOADER_JAR
+LIBFORMULA_JAR
+LIBREPOSITORY_JAR
+LIBFONTS_JAR
+JCOMMON_SERIALIZER_JAR
+MOC
+KDE_CFLAGS
+KDE_LIBS
+ENABLE_LOCKDOWN
+GOBJECT_CFLAGS
+GOBJECT_LIBS
+ENABLE_EVOAB2
+ENABLE_KAB
+WITH_FONTOOO
+SYSTEM_MSPACK
+WITH_FONTS
+WITHOUT_PPDS
+WITHOUT_AFMS
+WITH_WRITER2LATEX
+SCPDEFS
+USE_XINERAMA
+XINERAMA_LINK
+ANT
+ANT_HOME
+ANT_LIB
+WITH_LANG
+WITH_POOR_HELP_LOCALIZATIONS
+WITH_DICT
+INTRO_BITMAPS
+ABOUT_BITMAPS
+OOO_VENDOR
+UNIXWRAPPERNAME
+ENABLE_STATIC_GTK
+ENABLE_LAYOUT
+VERBOSE
+LOCAL_SOLVER
+BUILD_TYPE
+LIBOBJS
+LTLIBOBJS'
ac_subst_files=''
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+XMKMF'
+
# Initialize some variables set by options.
ac_init_help=
@@ -337,34 +1026,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -386,33 +1089,45 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -439,6 +1154,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -463,13 +1184,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -534,6 +1258,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -586,24 +1320,20 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -634,8 +1364,7 @@ Try \`$0 --help' for more information." >&2
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
@@ -655,27 +1384,19 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+# Be sure to have absolute directory names.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
- eval ac_val=$`echo $ac_var`
+ eval ac_val=\$$ac_var
case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -702,86 +1423,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$0" ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
- fi
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -810,9 +1521,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -830,15 +1538,22 @@ Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1004,17 +1719,15 @@ Optional Features:
--enable-minimizer enables the build of the Presentation Minimizer extension
- --enable-presenter-screen enables the build of the Presenter Screen extension
+ --enable-presenter-console enables the build of the Presenter Console extension
- --disable-pdfimport disables the build of the PDF Import extension and xpdf
+ --enable-pdfimport enables the build of the PDF Import extension and xpdf
- --disable-mediawiki disables the build of the MediaWiki Editor extension
+ --enable-wiki-publisher enables the build of the Wiki Publisher extension
--enable-ogltrans enables the build of the OGLTrans extension
- --disable-reportdesign disables the build of the Report Builder extension
-
- --disable-minimizer disables the build of the Presentation Minimizer extension
+ --enable-report-builder disables the build of the Report Builder extension
--disable-neon Disable neon and the compilation of webdav binding
@@ -1088,6 +1801,11 @@ Optional Packages:
distributions where AFM files or TrueType Fonts
are known to be available.
+ --with-epm Decides which epm to use. Default is to use
+ the one from the system if one is built. When
+ either this is not there or you say =internal
+ epm will be built.
+
--with-package-format specify package format(s) for OOo installsets.
Default is "normal" one of the OS/Distribution.
@@ -1318,12 +2036,12 @@ Optional Packages:
Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
- --with-local-solenv If you have solenv in a location other than ../solenv,
+ --with-local-solenv If you have solenv in a location other than ./solenv,
please supply the path here.
Usage: --with-local-solenv=<absolute path to solenv>
- --with-local-solver if you have solver in a location other than ../solver,
+ --with-local-solver if you have solver in a location other than ./solver,
please supply the path here.
Usage: --with-local-solver=<absolute path to solver>
@@ -1423,129 +2141,99 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
+ XMKMF Path to xmkmf, Makefile generator for X Window System
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" || continue
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.61
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
_ACEOF
+exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1564,7 +2252,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1578,6 +2266,7 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
+IFS=$as_save_IFS
} >&5
@@ -1599,7 +2288,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1610,7 +2298,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1632,9 +2320,7 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
@@ -1645,8 +2331,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1659,20 +2345,34 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
@@ -1683,22 +2383,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1710,26 +2416,24 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
# Predefined preprocessor variables.
@@ -1760,14 +2464,17 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1783,8 +2490,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
@@ -1796,12 +2503,11 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1826,8 +2532,7 @@ echo "$as_me: current value: $ac_new_val" >&2;}
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1844,12 +2549,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
{ (exit 1); exit 1; }; }
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
@@ -1866,1011 +2565,1022 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$@" >config.parms
-# Check whether --with-gnu-patch or --without-gnu-patch was given.
+# Check whether --with-gnu-patch was given.
if test "${with_gnu_patch+set}" = set; then
- withval="$with_gnu_patch"
+ withval=$with_gnu_patch;
+fi
-fi;
-# Check whether --with-agg or --without-agg was given.
+# Check whether --with-agg was given.
if test "${with_agg+set}" = set; then
- withval="$with_agg"
-
+ withval=$with_agg;
else
with_agg=yes
-fi;
+fi
+
-# Check whether --with-gnu-cp or --without-gnu-cp was given.
+# Check whether --with-gnu-cp was given.
if test "${with_gnu_cp+set}" = set; then
- withval="$with_gnu_cp"
+ withval=$with_gnu_cp;
+fi
-fi;
-# Check whether --with-gpc or --without-gpc was given.
+# Check whether --with-gpc was given.
if test "${with_gpc+set}" = set; then
- withval="$with_gpc"
-
+ withval=$with_gpc;
else
- if test ! -e ../external/gpc/gpc.c && test ! -e ../external/gpc/gpc.h; then without_gpc=yes; fi
-fi;
-# Check whether --enable-ldap or --disable-ldap was given.
+ if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi
+fi
+
+# Check whether --enable-ldap was given.
if test "${enable_ldap+set}" = set; then
- enableval="$enable_ldap"
+ enableval=$enable_ldap;
+fi
-fi;
-# Check whether --with-openldap or --without-openldap was given.
+# Check whether --with-openldap was given.
if test "${with_openldap+set}" = set; then
- withval="$with_openldap"
+ withval=$with_openldap;
+fi
-fi;
-# Check whether --enable-lockdown or --disable-lockdown was given.
+# Check whether --enable-lockdown was given.
if test "${enable_lockdown+set}" = set; then
- enableval="$enable_lockdown"
+ enableval=$enable_lockdown;
+fi
-fi;
-# Check whether --enable-vba or --disable-vba was given.
+# Check whether --enable-vba was given.
if test "${enable_vba+set}" = set; then
- enableval="$enable_vba"
+ enableval=$enable_vba;
+fi
-fi;
-# Check whether --with-vba-package-format or --without-vba-package-format was given.
+# Check whether --with-vba-package-format was given.
if test "${with_vba_package_format+set}" = set; then
- withval="$with_vba_package_format"
+ withval=$with_vba_package_format;
+fi
-fi;
-# Check whether --enable-pch or --disable-pch was given.
+# Check whether --enable-pch was given.
if test "${enable_pch+set}" = set; then
- enableval="$enable_pch"
+ enableval=$enable_pch;
+fi
-fi;
-# Check whether --enable-mozilla or --disable-mozilla was given.
+# Check whether --enable-mozilla was given.
if test "${enable_mozilla+set}" = set; then
- enableval="$enable_mozilla"
-
+ enableval=$enable_mozilla;
else
enable_mozilla="yes"
-fi;
+fi
-# Check whether --with-fonts or --without-fonts was given.
+
+# Check whether --with-fonts was given.
if test "${with_fonts+set}" = set; then
- withval="$with_fonts"
+ withval=$with_fonts;
+fi
-fi;
-# Check whether --with-ppds or --without-ppds was given.
+# Check whether --with-ppds was given.
if test "${with_ppds+set}" = set; then
- withval="$with_ppds"
+ withval=$with_ppds;
+fi
-fi;
-# Check whether --with-afms or --without-afms was given.
+# Check whether --with-afms was given.
if test "${with_afms+set}" = set; then
- withval="$with_afms"
+ withval=$with_afms;
+fi
-fi;
-# Check whether --enable-epm or --disable-epm was given.
+# Check whether --enable-epm was given.
if test "${enable_epm+set}" = set; then
- enableval="$enable_epm"
-
+ enableval=$enable_epm;
else
enable_epm="yes"
-fi;
+fi
-# Check whether --with-package-format or --without-package-format was given.
+
+# Check whether --with-epm was given.
+if test "${with_epm+set}" = set; then
+ withval=$with_epm;
+fi
+
+
+# Check whether --with-package-format was given.
if test "${with_package_format+set}" = set; then
- withval="$with_package_format"
+ withval=$with_package_format;
+fi
-fi;
-# Check whether --enable-odk or --disable-odk was given.
+# Check whether --enable-odk was given.
if test "${enable_odk+set}" = set; then
- enableval="$enable_odk"
-
+ enableval=$enable_odk;
else
enable_odk="yes"
-fi;
-# Check whether --enable-qadevooo or --disable-qadevooo was given.
-if test "${enable_qadevooo+set}" = set; then
- enableval="$enable_qadevooo"
+fi
+# Check whether --enable-qadevooo was given.
+if test "${enable_qadevooo+set}" = set; then
+ enableval=$enable_qadevooo;
else
enable_qadevooo="yes"
-fi;
-# Check whether --enable-fontooo or --disable-fontooo was given.
-if test "${enable_fontooo+set}" = set; then
- enableval="$enable_fontooo"
+fi
+# Check whether --enable-fontooo was given.
+if test "${enable_fontooo+set}" = set; then
+ enableval=$enable_fontooo;
else
enable_fontooo="yes"
-fi;
-# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
-if test "${enable_mathmldtd+set}" = set; then
- enableval="$enable_mathmldtd"
+fi
+# Check whether --enable-mathmldtd was given.
+if test "${enable_mathmldtd+set}" = set; then
+ enableval=$enable_mathmldtd;
else
enable_mathmldtd="yes"
-fi;
-# Check whether --enable-evolution2 or --disable-evolution2 was given.
+fi
+
+# Check whether --enable-evolution2 was given.
if test "${enable_evolution2+set}" = set; then
- enableval="$enable_evolution2"
+ enableval=$enable_evolution2;
+fi
-fi;
-# Check whether --with-system-stdlibs or --without-system-stdlibs was given.
+# Check whether --with-system-stdlibs was given.
if test "${with_system_stdlibs+set}" = set; then
- withval="$with_system_stdlibs"
-
+ withval=$with_system_stdlibs;
else
checkforprelink=yes
-fi;
+fi
+
-# Check whether --with-system-mspack or --without-system-mspack was given.
+# Check whether --with-system-mspack was given.
if test "${with_system_mspack+set}" = set; then
- withval="$with_system_mspack"
+ withval=$with_system_mspack;
+fi
-fi;
-# Check whether --enable-cups or --disable-cups was given.
+# Check whether --enable-cups was given.
if test "${enable_cups+set}" = set; then
- enableval="$enable_cups"
-
+ enableval=$enable_cups;
else
enable_cups=yes
-fi;
-# Check whether --enable-fontconfig or --disable-fontconfig was given.
-if test "${enable_fontconfig+set}" = set; then
- enableval="$enable_fontconfig"
+fi
+# Check whether --enable-fontconfig was given.
+if test "${enable_fontconfig+set}" = set; then
+ enableval=$enable_fontconfig;
else
enable_fontconfig=yes
-fi;
-# Check whether --enable-directx or --disable-directx was given.
-if test "${enable_directx+set}" = set; then
- enableval="$enable_directx"
+fi
+# Check whether --enable-directx was given.
+if test "${enable_directx+set}" = set; then
+ enableval=$enable_directx;
else
enable_directx=yes
-fi;
-# Check whether --enable-activex or --disable-activex was given.
+fi
+
+# Check whether --enable-activex was given.
if test "${enable_activex+set}" = set; then
- enableval="$enable_activex"
+ enableval=$enable_activex;
+fi
-fi;
-# Check whether --enable-atl or --disable-atl was given.
+# Check whether --enable-atl was given.
if test "${enable_atl+set}" = set; then
- enableval="$enable_atl"
+ enableval=$enable_atl;
+fi
-fi;
-# Check whether --enable-symbols or --disable-symbols was given.
+# Check whether --enable-symbols was given.
if test "${enable_symbols+set}" = set; then
- enableval="$enable_symbols"
+ enableval=$enable_symbols;
+fi
-fi;
-# Check whether --enable-strip-solver or --disable-strip-solver was given.
+# Check whether --enable-strip-solver was given.
if test "${enable_strip_solver+set}" = set; then
- enableval="$enable_strip_solver"
+ enableval=$enable_strip_solver;
+fi
-fi;
-# Check whether --enable-werror or --disable-werror was given.
+# Check whether --enable-werror was given.
if test "${enable_werror+set}" = set; then
- enableval="$enable_werror"
+ enableval=$enable_werror;
+fi
-fi;
-# Check whether --enable-debug or --disable-debug was given.
+# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
+ enableval=$enable_debug;
+fi
-fi;
-# Check whether --enable-dbgutil or --disable-dbgutil was given.
+# Check whether --enable-dbgutil was given.
if test "${enable_dbgutil+set}" = set; then
- enableval="$enable_dbgutil"
+ enableval=$enable_dbgutil;
+fi
-fi;
-# Check whether --enable-crashdump or --disable-crashdump was given.
+# Check whether --enable-crashdump was given.
if test "${enable_crashdump+set}" = set; then
- enableval="$enable_crashdump"
-
+ enableval=$enable_crashdump;
else
enable_crashdump=no
-fi;
-# Check whether --enable-cl-standard or --disable-cl-standard was given.
+fi
+
+# Check whether --enable-cl-standard was given.
if test "${enable_cl_standard+set}" = set; then
- enableval="$enable_cl_standard"
+ enableval=$enable_cl_standard;
+fi
-fi;
-# Check whether --enable-gtk or --disable-gtk was given.
+# Check whether --enable-gtk was given.
if test "${enable_gtk+set}" = set; then
- enableval="$enable_gtk"
-
+ enableval=$enable_gtk;
else
enable_gtk=yes
-fi;
-# Check whether --enable-systray or --disable-systray was given.
-if test "${enable_systray+set}" = set; then
- enableval="$enable_systray"
+fi
+# Check whether --enable-systray was given.
+if test "${enable_systray+set}" = set; then
+ enableval=$enable_systray;
else
enable_systray=yes
-fi;
-# Check whether --enable-cairo or --disable-cairo was given.
-if test "${enable_cairo+set}" = set; then
- enableval="$enable_cairo"
+fi
+# Check whether --enable-cairo was given.
+if test "${enable_cairo+set}" = set; then
+ enableval=$enable_cairo;
else
enable_cairo=no
-fi;
+fi
-# Check whether --with-system-cairo or --without-system-cairo was given.
+
+# Check whether --with-system-cairo was given.
if test "${with_system_cairo+set}" = set; then
- withval="$with_system_cairo"
+ withval=$with_system_cairo;
+fi
-fi;
-# Check whether --enable-opengl or --disable-opengl was given.
+# Check whether --enable-opengl was given.
if test "${enable_opengl+set}" = set; then
- enableval="$enable_opengl"
-
+ enableval=$enable_opengl;
else
enable_opengl=no
-fi;
-# Check whether --enable-dbus or --disable-dbus was given.
-if test "${enable_dbus+set}" = set; then
- enableval="$enable_dbus"
+fi
+# Check whether --enable-dbus was given.
+if test "${enable_dbus+set}" = set; then
+ enableval=$enable_dbus;
else
enable_dbus=no
-fi;
-# Check whether --enable-gconf or --disable-gconf was given.
-if test "${enable_gconf+set}" = set; then
- enableval="$enable_gconf"
+fi
+# Check whether --enable-gconf was given.
+if test "${enable_gconf+set}" = set; then
+ enableval=$enable_gconf;
else
enable_gconf=yes
-fi;
-# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given.
-if test "${enable_gnome_vfs+set}" = set; then
- enableval="$enable_gnome_vfs"
+fi
+# Check whether --enable-gnome-vfs was given.
+if test "${enable_gnome_vfs+set}" = set; then
+ enableval=$enable_gnome_vfs;
else
enable_gnome_vfs=yes
-fi;
-# Check whether --enable-gio or --disable-gio was given.
-if test "${enable_gio+set}" = set; then
- enableval="$enable_gio"
+fi
+# Check whether --enable-gio was given.
+if test "${enable_gio+set}" = set; then
+ enableval=$enable_gio;
else
enable_gio=no
-fi;
-# Check whether --enable-static-gtk or --disable-static-gtk was given.
+fi
+
+# Check whether --enable-static-gtk was given.
if test "${enable_static_gtk+set}" = set; then
- enableval="$enable_static_gtk"
+ enableval=$enable_static_gtk;
+fi
-fi;
-# Check whether --enable-layout or --disable-layout was given.
+# Check whether --enable-layout was given.
if test "${enable_layout+set}" = set; then
- enableval="$enable_layout"
+ enableval=$enable_layout;
+fi
-fi;
-# Check whether --enable-build-mozilla or --disable-build-mozilla was given.
+# Check whether --enable-build-mozilla was given.
if test "${enable_build_mozilla+set}" = set; then
- enableval="$enable_build_mozilla"
+ enableval=$enable_build_mozilla;
+fi
-fi;
-# Check whether --with-mozilla-version or --without-mozilla-version was given.
+# Check whether --with-mozilla-version was given.
if test "${with_mozilla_version+set}" = set; then
- withval="$with_mozilla_version"
+ withval=$with_mozilla_version;
+fi
-fi;
-# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given.
+# Check whether --with-mozilla-toolkit was given.
if test "${with_mozilla_toolkit+set}" = set; then
- withval="$with_mozilla_toolkit"
+ withval=$with_mozilla_toolkit;
+fi
-fi;
-# Check whether --enable-kde or --disable-kde was given.
+# Check whether --enable-kde was given.
if test "${enable_kde+set}" = set; then
- enableval="$enable_kde"
+ enableval=$enable_kde;
+fi
-fi;
-# Check whether --enable-kdeab or --disable-kdeab was given.
+# Check whether --enable-kdeab was given.
if test "${enable_kdeab+set}" = set; then
- enableval="$enable_kdeab"
-
+ enableval=$enable_kdeab;
else
if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
-fi;
-# Check whether --enable-binfilter or --disable-binfilter was given.
-if test "${enable_binfilter+set}" = set; then
- enableval="$enable_binfilter"
+fi
+# Check whether --enable-binfilter was given.
+if test "${enable_binfilter+set}" = set; then
+ enableval=$enable_binfilter;
else
- if ! test -d ../binfilter; then enable_binfilter=no; fi
-fi;
-# Check whether --enable-rpath or --disable-rpath was given.
+ if ! test -d ./binfilter; then enable_binfilter=no; fi
+fi
+
+# Check whether --enable-rpath was given.
if test "${enable_rpath+set}" = set; then
- enableval="$enable_rpath"
+ enableval=$enable_rpath;
+fi
-fi;
-# Check whether --enable-pam or --disable-pam was given.
+# Check whether --enable-pam was given.
if test "${enable_pam+set}" = set; then
- enableval="$enable_pam"
+ enableval=$enable_pam;
+fi
-fi;
-# Check whether --enable-pam-link or --disable-pam-link was given.
+# Check whether --enable-pam-link was given.
if test "${enable_pam_link+set}" = set; then
- enableval="$enable_pam_link"
+ enableval=$enable_pam_link;
+fi
-fi;
-# Check whether --enable-crypt-link or --disable-crypt-link was given.
+# Check whether --enable-crypt-link was given.
if test "${enable_crypt_link+set}" = set; then
- enableval="$enable_crypt_link"
-
+ enableval=$enable_crypt_link;
else
enable_crypt_link=yes
-fi;
-# Check whether --enable-xrender-link or --disable-xrender-link was given.
+fi
+
+# Check whether --enable-xrender-link was given.
if test "${enable_xrender_link+set}" = set; then
- enableval="$enable_xrender_link"
+ enableval=$enable_xrender_link;
+fi
-fi;
-# Check whether --enable-randr or --disable-randr was given.
+# Check whether --enable-randr was given.
if test "${enable_randr+set}" = set; then
- enableval="$enable_randr"
-
+ enableval=$enable_randr;
else
enable_randr=yes
-fi;
-# Check whether --enable-randr-link or --disable-randr-link was given.
-if test "${enable_randr_link+set}" = set; then
- enableval="$enable_randr_link"
+fi
+# Check whether --enable-randr-link was given.
+if test "${enable_randr_link+set}" = set; then
+ enableval=$enable_randr_link;
else
enable_randr_link=yes
-fi;
+fi
-# Check whether --with-myspell-dicts or --without-myspell-dicts was given.
+
+# Check whether --with-myspell-dicts was given.
if test "${with_myspell_dicts+set}" = set; then
- withval="$with_myspell_dicts"
+ withval=$with_myspell_dicts;
+fi
-fi;
-# Check whether --with-system-dicts or --without-system-dicts was given.
+# Check whether --with-system-dicts was given.
if test "${with_system_dicts+set}" = set; then
- withval="$with_system_dicts"
+ withval=$with_system_dicts;
+fi
-fi;
-# Check whether --with-external-dict-dir or --without-external-dict-dir was given.
+# Check whether --with-external-dict-dir was given.
if test "${with_external_dict_dir+set}" = set; then
- withval="$with_external_dict_dir"
+ withval=$with_external_dict_dir;
+fi
-fi;
-# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given.
+# Check whether --with-external-hyph-dir was given.
if test "${with_external_hyph_dir+set}" = set; then
- withval="$with_external_hyph_dir"
+ withval=$with_external_hyph_dir;
+fi
-fi;
-# Check whether --with-external-thes-dir or --without-external-thes-dir was given.
+# Check whether --with-external-thes-dir was given.
if test "${with_external_thes_dir+set}" = set; then
- withval="$with_external_thes_dir"
+ withval=$with_external_thes_dir;
+fi
-fi;
-# Check whether --with-writer2latex or --without-writer2latex was given.
+# Check whether --with-writer2latex was given.
if test "${with_writer2latex+set}" = set; then
- withval="$with_writer2latex"
+ withval=$with_writer2latex;
+fi
-fi;
-# Check whether --with-system-libs or --without-system-libs was given.
+# Check whether --with-system-libs was given.
if test "${with_system_libs+set}" = set; then
- withval="$with_system_libs"
+ withval=$with_system_libs;
+fi
-fi;
-# Check whether --with-system-headers or --without-system-headers was given.
+# Check whether --with-system-headers was given.
if test "${with_system_headers+set}" = set; then
- withval="$with_system_headers"
+ withval=$with_system_headers;
+fi
-fi;
-# Check whether --with-system-jars or --without-system-jars was given.
+# Check whether --with-system-jars was given.
if test "${with_system_jars+set}" = set; then
- withval="$with_system_jars"
+ withval=$with_system_jars;
+fi
-fi;
-# Check whether --with-system-zlib or --without-system-zlib was given.
+# Check whether --with-system-zlib was given.
if test "${with_system_zlib+set}" = set; then
- withval="$with_system_zlib"
+ withval=$with_system_zlib;
+fi
-fi;
-# Check whether --with-system-openssl or --without-system-openssl was given.
+# Check whether --with-system-openssl was given.
if test "${with_system_openssl+set}" = set; then
- withval="$with_system_openssl"
+ withval=$with_system_openssl;
+fi
-fi;
-# Check whether --with-system-jpeg or --without-system-jpeg was given.
+# Check whether --with-system-jpeg was given.
if test "${with_system_jpeg+set}" = set; then
- withval="$with_system_jpeg"
+ withval=$with_system_jpeg;
+fi
-fi;
-# Check whether --with-system-expat or --without-system-expat was given.
+# Check whether --with-system-expat was given.
if test "${with_system_expat+set}" = set; then
- withval="$with_system_expat"
+ withval=$with_system_expat;
+fi
-fi;
-# Check whether --with-system-libwpd or --without-system-libwpd was given.
+# Check whether --with-system-libwpd was given.
if test "${with_system_libwpd+set}" = set; then
- withval="$with_system_libwpd"
+ withval=$with_system_libwpd;
+fi
-fi;
-# Check whether --with-system-libxml or --without-system-libxml was given.
+# Check whether --with-system-libxml was given.
if test "${with_system_libxml+set}" = set; then
- withval="$with_system_libxml"
+ withval=$with_system_libxml;
+fi
-fi;
-# Check whether --with-system-python or --without-system-python was given.
+# Check whether --with-system-python was given.
if test "${with_system_python+set}" = set; then
- withval="$with_system_python"
+ withval=$with_system_python;
+fi
-fi;
-# Check whether --with-system-icu or --without-system-icu was given.
+# Check whether --with-system-icu was given.
if test "${with_system_icu+set}" = set; then
- withval="$with_system_icu"
+ withval=$with_system_icu;
+fi
-fi;
-# Check whether --with-system-poppler or --without-system-poppler was given.
+# Check whether --with-system-poppler was given.
if test "${with_system_poppler+set}" = set; then
- withval="$with_system_poppler"
+ withval=$with_system_poppler;
+fi
-fi;
-# Check whether --with-system-db or --without-system-db was given.
+# Check whether --with-system-db was given.
if test "${with_system_db+set}" = set; then
- withval="$with_system_db"
+ withval=$with_system_db;
+fi
-fi;
-# Check whether --with-system-lucene or --without-system-lucene was given.
+# Check whether --with-system-lucene was given.
if test "${with_system_lucene+set}" = set; then
- withval="$with_system_lucene"
+ withval=$with_system_lucene;
+fi
-fi;
-# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given.
+# Check whether --with-lucene-core-jar was given.
if test "${with_lucene_core_jar+set}" = set; then
- withval="$with_lucene_core_jar"
- LUCENE_CORE_JAR="$withval"
+ withval=$with_lucene_core_jar; LUCENE_CORE_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given.
+# Check whether --with-lucene-analyzers-jar was given.
if test "${with_lucene_analyzers_jar+set}" = set; then
- withval="$with_lucene_analyzers_jar"
- LUCENE_ANALYZERS_JAR="$withval"
+ withval=$with_lucene_analyzers_jar; LUCENE_ANALYZERS_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-system-hsqldb or --without-system-hsqldb was given.
+# Check whether --with-system-hsqldb was given.
if test "${with_system_hsqldb+set}" = set; then
- withval="$with_system_hsqldb"
+ withval=$with_system_hsqldb;
+fi
-fi;
-# Check whether --with-hsqldb-jar or --without-hsqldb-jar was given.
+# Check whether --with-hsqldb-jar was given.
if test "${with_hsqldb_jar+set}" = set; then
- withval="$with_hsqldb_jar"
- HSQLDB_JAR="$withval"
+ withval=$with_hsqldb_jar; HSQLDB_JAR="$withval"
-fi;
+fi
-# Check whether --with-system-beanshell or --without-system-beanshell was given.
+
+# Check whether --with-system-beanshell was given.
if test "${with_system_beanshell+set}" = set; then
- withval="$with_system_beanshell"
+ withval=$with_system_beanshell;
+fi
-fi;
-# Check whether --with-beanshell-jar or --without-beanshell-jar was given.
+# Check whether --with-beanshell-jar was given.
if test "${with_beanshell_jar+set}" = set; then
- withval="$with_beanshell_jar"
- BSH_JAR="$withval"
+ withval=$with_beanshell_jar; BSH_JAR="$withval"
+
+fi
-fi;
-# Check whether --enable-minimizer or --disable-minimizer was given.
+# Check whether --enable-minimizer was given.
if test "${enable_minimizer+set}" = set; then
- enableval="$enable_minimizer"
+ enableval=$enable_minimizer;
+fi
-fi;
-# Check whether --enable-presenter-screen or --disable-presenter-screen was given.
-if test "${enable_presenter_screen+set}" = set; then
- enableval="$enable_presenter_screen"
+# Check whether --enable-presenter-console was given.
+if test "${enable_presenter_console+set}" = set; then
+ enableval=$enable_presenter_console;
+fi
-fi;
-# Check whether --enable-pdfimport or --disable-pdfimport was given.
+# Check whether --enable-pdfimport was given.
if test "${enable_pdfimport+set}" = set; then
- enableval="$enable_pdfimport"
+ enableval=$enable_pdfimport;
+fi
-fi;
-# Check whether --enable-mediawiki or --disable-mediawiki was given.
-if test "${enable_mediawiki+set}" = set; then
- enableval="$enable_mediawiki"
+# Check whether --enable-wiki-publisher was given.
+if test "${enable_wiki_publisher+set}" = set; then
+ enableval=$enable_wiki_publisher;
+fi
-fi;
-# Check whether --with-commons-codec-jar or --without-commons-codec-jar was given.
+# Check whether --with-commons-codec-jar was given.
if test "${with_commons_codec_jar+set}" = set; then
- withval="$with_commons_codec_jar"
- COMMONS_CODEC_JAR="$withval"
+ withval=$with_commons_codec_jar; COMMONS_CODEC_JAR="$withval"
-fi;
+fi
-# Check whether --with-commons-lang-jar or --without-commons-lang-jar was given.
+
+# Check whether --with-commons-lang-jar was given.
if test "${with_commons_lang_jar+set}" = set; then
- withval="$with_commons_lang_jar"
- COMMONS_LANG_JAR="$withval"
+ withval=$with_commons_lang_jar; COMMONS_LANG_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-commons-httpclient-jar or --without-commons-httpclient-jar was given.
+# Check whether --with-commons-httpclient-jar was given.
if test "${with_commons_httpclient_jar+set}" = set; then
- withval="$with_commons_httpclient_jar"
- COMMONS_HTTPCLIENT_JAR="$withval"
+ withval=$with_commons_httpclient_jar; COMMONS_HTTPCLIENT_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-commons-logging-jar or --without-commons-logging-jar was given.
+# Check whether --with-commons-logging-jar was given.
if test "${with_commons_logging_jar+set}" = set; then
- withval="$with_commons_logging_jar"
- COMMONS_LOGGING_JAR="$withval"
+ withval=$with_commons_logging_jar; COMMONS_LOGGING_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-servlet-api-jar or --without-servlet-api-jar was given.
+# Check whether --with-servlet-api-jar was given.
if test "${with_servlet_api_jar+set}" = set; then
- withval="$with_servlet_api_jar"
- SERVLETAPI_JAR="$withval"
+ withval=$with_servlet_api_jar; SERVLETAPI_JAR="$withval"
-fi;
-# Check whether --enable-ogltrans or --disable-ogltrans was given.
-if test "${enable_ogltrans+set}" = set; then
- enableval="$enable_ogltrans"
+fi
-fi;
-# Check whether --enable-reportdesign or --disable-reportdesign was given.
-if test "${enable_reportdesign+set}" = set; then
- enableval="$enable_reportdesign"
+# Check whether --enable-ogltrans was given.
+if test "${enable_ogltrans+set}" = set; then
+ enableval=$enable_ogltrans;
+fi
-fi;
-# Check whether --enable-minimizer or --disable-minimizer was given.
-if test "${enable_minimizer+set}" = set; then
- enableval="$enable_minimizer"
+# Check whether --enable-report-builder was given.
+if test "${enable_report_builder+set}" = set; then
+ enableval=$enable_report_builder;
+fi
-else
- enable_minimizer=yes
-fi;
-# Check whether --with-system-jfreereport or --without-system-jfreereport was given.
+# Check whether --with-system-jfreereport was given.
if test "${with_system_jfreereport+set}" = set; then
- withval="$with_system_jfreereport"
+ withval=$with_system_jfreereport;
+fi
-fi;
-# Check whether --with-jcommon-jar or --without-jcommon-jar was given.
+# Check whether --with-jcommon-jar was given.
if test "${with_jcommon_jar+set}" = set; then
- withval="$with_jcommon_jar"
- JCOMMON_JAR="$withval"
+ withval=$with_jcommon_jar; JCOMMON_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-sac-jar or --without-sac-jar was given.
+# Check whether --with-sac-jar was given.
if test "${with_sac_jar+set}" = set; then
- withval="$with_sac_jar"
- SAC_JAR="$withval"
+ withval=$with_sac_jar; SAC_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-libxml-jar or --without-libxml-jar was given.
+# Check whether --with-libxml-jar was given.
if test "${with_libxml_jar+set}" = set; then
- withval="$with_libxml_jar"
- LIBXML_JAR="$withval"
+ withval=$with_libxml_jar; LIBXML_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-flute-jar or --without-flute-jar was given.
+# Check whether --with-flute-jar was given.
if test "${with_flute_jar+set}" = set; then
- withval="$with_flute_jar"
- FLUTE_JAR="$withval"
+ withval=$with_flute_jar; FLUTE_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-jfreereport-jar or --without-jfreereport-jar was given.
+# Check whether --with-jfreereport-jar was given.
if test "${with_jfreereport_jar+set}" = set; then
- withval="$with_jfreereport_jar"
- JFREEREPORT_JAR="$withval"
+ withval=$with_jfreereport_jar; JFREEREPORT_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-liblayout-jar or --without-liblayout-jar was given.
+# Check whether --with-liblayout-jar was given.
if test "${with_liblayout_jar+set}" = set; then
- withval="$with_liblayout_jar"
- LIBLAYOUT_JAR="$withval"
+ withval=$with_liblayout_jar; LIBLAYOUT_JAR="$withval"
-fi;
+fi
-# Check whether --with-libloader-jar or --without-libloader-jar was given.
+
+# Check whether --with-libloader-jar was given.
+if test "${with_libloader_jar+set}" = set; then
+ withval=$with_libloader_jar; LIBLOADER_JAR="$withval"
+
+fi
+
+
+# Check whether --with-libloader-jar was given.
if test "${with_libloader_jar+set}" = set; then
- withval="$with_libloader_jar"
- LIBLOADER_JAR="$withval"
+ withval=$with_libloader_jar; LIBLOADER_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-libformula-jar or --without-libformula-jar was given.
+# Check whether --with-libformula-jar was given.
if test "${with_libformula_jar+set}" = set; then
- withval="$with_libformula_jar"
- LIBFORMULA_JAR="$withval"
+ withval=$with_libformula_jar; LIBFORMULA_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-librepository-jar or --without-librepository-jar was given.
+# Check whether --with-librepository-jar was given.
if test "${with_librepository_jar+set}" = set; then
- withval="$with_librepository_jar"
- LIBREPOSITORY_JAR="$withval"
+ withval=$with_librepository_jar; LIBREPOSITORY_JAR="$withval"
-fi;
+fi
-# Check whether --with-libfonts-java-jar or --without-libfonts-java-jar was given.
-if test "${with_libfonts_java_jar+set}" = set; then
- withval="$with_libfonts_java_jar"
- LIBFONTS_JAR="$withval"
-fi;
+# Check whether --with-libfonts-jar was given.
+if test "${with_libfonts_jar+set}" = set; then
+ withval=$with_libfonts_jar; LIBFONTS_JAR="$withval"
-# Check whether --with-jcommon-serializer-jar or --without-jcommon-serializer-jar was given.
+fi
+
+
+# Check whether --with-jcommon-serializer-jar was given.
if test "${with_jcommon_serializer_jar+set}" = set; then
- withval="$with_jcommon_serializer_jar"
- JCOMMON_SERIALIZER_JAR="$withval"
+ withval=$with_jcommon_serializer_jar; JCOMMON_SERIALIZER_JAR="$withval"
+
+fi
-fi;
-# Check whether --with-system-saxon or --without-system-saxon was given.
+# Check whether --with-system-saxon was given.
if test "${with_system_saxon+set}" = set; then
- withval="$with_system_saxon"
+ withval=$with_system_saxon;
+fi
-fi;
-# Check whether --with-saxon-jar or --without-saxon-jar was given.
+# Check whether --with-saxon-jar was given.
if test "${with_saxon_jar+set}" = set; then
- withval="$with_saxon_jar"
- SAXON_JAR="$withval"
+ withval=$with_saxon_jar; SAXON_JAR="$withval"
-fi;
+fi
-# Check whether --with-system-libxslt or --without-system-libxslt was given.
+
+# Check whether --with-system-libxslt was given.
if test "${with_system_libxslt+set}" = set; then
- withval="$with_system_libxslt"
+ withval=$with_system_libxslt;
+fi
-fi;
-# Check whether --with-system-odbc or --without-system-odbc was given.
+# Check whether --with-system-odbc was given.
if test "${with_system_odbc+set}" = set; then
- withval="$with_system_odbc"
+ withval=$with_system_odbc;
+fi
-fi;
-# Check whether --with-system-sane or --without-system-sane was given.
+# Check whether --with-system-sane was given.
if test "${with_system_sane+set}" = set; then
- withval="$with_system_sane"
+ withval=$with_system_sane;
+fi
-fi;
-# Check whether --with-system-xrender or --without-system-xrender was given.
+# Check whether --with-system-xrender was given.
if test "${with_system_xrender+set}" = set; then
- withval="$with_system_xrender"
+ withval=$with_system_xrender;
+fi
-fi;
-# Check whether --with-system-curl or --without-system-curl was given.
+# Check whether --with-system-curl was given.
if test "${with_system_curl+set}" = set; then
- withval="$with_system_curl"
+ withval=$with_system_curl;
+fi
-fi;
-# Check whether --with-system-boost or --without-system-boost was given.
+# Check whether --with-system-boost was given.
if test "${with_system_boost+set}" = set; then
- withval="$with_system_boost"
+ withval=$with_system_boost;
+fi
-fi;
-# Check whether --with-system-vigra or --without-system-vigra was given.
+# Check whether --with-system-vigra was given.
if test "${with_system_vigra+set}" = set; then
- withval="$with_system_vigra"
+ withval=$with_system_vigra;
+fi
-fi;
-# Check whether --enable-neon or --disable-neon was given.
+# Check whether --enable-neon was given.
if test "${enable_neon+set}" = set; then
- enableval="$enable_neon"
+ enableval=$enable_neon;
+fi
-fi;
-# Check whether --enable-Xaw or --disable-Xaw was given.
+# Check whether --enable-Xaw was given.
if test "${enable_Xaw+set}" = set; then
- enableval="$enable_Xaw"
+ enableval=$enable_Xaw;
+fi
-fi;
-# Check whether --with-system-neon or --without-system-neon was given.
+# Check whether --with-system-neon was given.
if test "${with_system_neon+set}" = set; then
- withval="$with_system_neon"
+ withval=$with_system_neon;
+fi
-fi;
-# Check whether --with-system-agg or --without-system-agg was given.
+# Check whether --with-system-agg was given.
if test "${with_system_agg+set}" = set; then
- withval="$with_system_agg"
+ withval=$with_system_agg;
+fi
-fi;
-# Check whether --with-system-hunspell or --without-system-hunspell was given.
+# Check whether --with-system-hunspell was given.
if test "${with_system_hunspell+set}" = set; then
- withval="$with_system_hunspell"
+ withval=$with_system_hunspell;
+fi
-fi;
-# Check whether --with-system-mythes or --without-system-mythes was given.
+# Check whether --with-system-mythes was given.
if test "${with_system_mythes+set}" = set; then
- withval="$with_system_mythes"
+ withval=$with_system_mythes;
+fi
-fi;
-# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given.
+# Check whether --with-system-altlinuxhyph was given.
if test "${with_system_altlinuxhyph+set}" = set; then
- withval="$with_system_altlinuxhyph"
+ withval=$with_system_altlinuxhyph;
+fi
-fi;
-# Check whether --with-system-lpsolve or --without-system-lpsolve was given.
+# Check whether --with-system-lpsolve was given.
if test "${with_system_lpsolve+set}" = set; then
- withval="$with_system_lpsolve"
+ withval=$with_system_lpsolve;
+fi
-fi;
-# Check whether --with-system-mozilla or --without-system-mozilla was given.
+# Check whether --with-system-mozilla was given.
if test "${with_system_mozilla+set}" = set; then
- withval="$with_system_mozilla"
- WITH_SYSTEM_MOZILLA=$withval
+ withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval
else
WITH_SYSTEM_MOZILLA=no
-fi;
+fi
-# Check whether --with-stlport or --without-stlport was given.
+
+# Check whether --with-stlport was given.
if test "${with_stlport+set}" = set; then
- withval="$with_stlport"
- WITH_STLPORT=$withval
+ withval=$with_stlport; WITH_STLPORT=$withval
else
WITH_STLPORT=auto
-fi;
+fi
+
-# Check whether --with-jdk-home or --without-jdk-home was given.
+# Check whether --with-jdk-home was given.
if test "${with_jdk_home+set}" = set; then
- withval="$with_jdk_home"
+ withval=$with_jdk_home;
+fi
-fi;
-# Check whether --with-gxx_include_path or --without-gxx_include_path was given.
+# Check whether --with-gxx_include_path was given.
if test "${with_gxx_include_path+set}" = set; then
- withval="$with_gxx_include_path"
+ withval=$with_gxx_include_path;
+fi
-fi;
-# Check whether --with-java or --without-java was given.
+# Check whether --with-java was given.
if test "${with_java+set}" = set; then
- withval="$with_java"
- if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
+ withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
else
WITH_JAVA=java
-fi;
-# Check whether --enable-gcjaot or --disable-gcjaot was given.
+fi
+
+# Check whether --enable-gcjaot was given.
if test "${enable_gcjaot+set}" = set; then
- enableval="$enable_gcjaot"
+ enableval=$enable_gcjaot;
+fi
-fi;
-# Check whether --with-ant-home or --without-ant-home was given.
+# Check whether --with-ant-home was given.
if test "${with_ant_home+set}" = set; then
- withval="$with_ant_home"
+ withval=$with_ant_home;
+fi
-fi;
-# Check whether --with-perl-home or --without-perl-home was given.
+# Check whether --with-perl-home was given.
if test "${with_perl_home+set}" = set; then
- withval="$with_perl_home"
+ withval=$with_perl_home;
+fi
-fi;
-# Check whether --with-cl-home or --without-cl-home was given.
+# Check whether --with-cl-home was given.
if test "${with_cl_home+set}" = set; then
- withval="$with_cl_home"
+ withval=$with_cl_home;
+fi
-fi;
-# Check whether --with-mspdb-path or --without-mspdb-path was given.
+# Check whether --with-mspdb-path was given.
if test "${with_mspdb_path+set}" = set; then
- withval="$with_mspdb_path"
+ withval=$with_mspdb_path;
+fi
-fi;
-# Check whether --with-midl-path or --without-midl-path was given.
+# Check whether --with-midl-path was given.
if test "${with_midl_path+set}" = set; then
- withval="$with_midl_path"
+ withval=$with_midl_path;
+fi
-fi;
-# Check whether --with-csc-path or --without-csc-path was given.
+# Check whether --with-csc-path was given.
if test "${with_csc_path+set}" = set; then
- withval="$with_csc_path"
+ withval=$with_csc_path;
+fi
-fi;
-# Check whether --with-nsis-path or --without-nsis-path was given.
+# Check whether --with-nsis-path was given.
if test "${with_nsis_path+set}" = set; then
- withval="$with_nsis_path"
+ withval=$with_nsis_path;
+fi
-fi;
-# Check whether --with-frame-home or --without-frame-home was given.
+# Check whether --with-frame-home was given.
if test "${with_frame_home+set}" = set; then
- withval="$with_frame_home"
+ withval=$with_frame_home;
+fi
-fi;
-# Check whether --with-psdk-home or --without-psdk-home was given.
+# Check whether --with-psdk-home was given.
if test "${with_psdk_home+set}" = set; then
- withval="$with_psdk_home"
+ withval=$with_psdk_home;
+fi
-fi;
-# Check whether --with-directx-home or --without-directx-home was given.
+# Check whether --with-directx-home was given.
if test "${with_directx_home+set}" = set; then
- withval="$with_directx_home"
+ withval=$with_directx_home;
+fi
-fi;
-# Check whether --with-local-solenv or --without-local-solenv was given.
+# Check whether --with-local-solenv was given.
if test "${with_local_solenv+set}" = set; then
- withval="$with_local_solenv"
+ withval=$with_local_solenv;
+fi
-fi;
-# Check whether --with-local-solver or --without-local-solver was given.
+# Check whether --with-local-solver was given.
if test "${with_local_solver+set}" = set; then
- withval="$with_local_solver"
+ withval=$with_local_solver;
+fi
-fi;
-# Check whether --enable-check-only or --disable-check-only was given.
+# Check whether --enable-check-only was given.
if test "${enable_check_only+set}" = set; then
- enableval="$enable_check_only"
+ enableval=$enable_check_only;
+fi
-fi;
-# Check whether --with-lang or --without-lang was given.
+# Check whether --with-lang was given.
if test "${with_lang+set}" = set; then
- withval="$with_lang"
+ withval=$with_lang;
+fi
-fi;
-# Check whether --with-poor-help-localizations or --without-poor-help-localizations was given.
+# Check whether --with-poor-help-localizations was given.
if test "${with_poor_help_localizations+set}" = set; then
- withval="$with_poor_help_localizations"
+ withval=$with_poor_help_localizations;
+fi
-fi;
-# Check whether --with-dict or --without-dict was given.
+# Check whether --with-dict was given.
if test "${with_dict+set}" = set; then
- withval="$with_dict"
+ withval=$with_dict;
+fi
-fi;
-# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given.
+# Check whether --with-intro-bitmaps was given.
if test "${with_intro_bitmaps+set}" = set; then
- withval="$with_intro_bitmaps"
+ withval=$with_intro_bitmaps;
+fi
-fi;
-# Check whether --with-about-bitmaps or --without-about-bitmaps was given.
+# Check whether --with-about-bitmaps was given.
if test "${with_about_bitmaps+set}" = set; then
- withval="$with_about_bitmaps"
+ withval=$with_about_bitmaps;
+fi
-fi;
-# Check whether --with-vendor or --without-vendor was given.
+# Check whether --with-vendor was given.
if test "${with_vendor+set}" = set; then
- withval="$with_vendor"
+ withval=$with_vendor;
+fi
-fi;
-# Check whether --with-unix-wrapper or --without-unix-wrapper was given.
+# Check whether --with-unix-wrapper was given.
if test "${with_unix_wrapper+set}" = set; then
- withval="$with_unix_wrapper"
+ withval=$with_unix_wrapper;
+fi
-fi;
-# Check whether --with-asm-home or --without-asm-home was given.
+# Check whether --with-asm-home was given.
if test "${with_asm_home+set}" = set; then
- withval="$with_asm_home"
+ withval=$with_asm_home;
+fi
-fi;
-# Check whether --with-os-version or --without-os-version was given.
+# Check whether --with-os-version was given.
if test "${with_os_version+set}" = set; then
- withval="$with_os_version"
+ withval=$with_os_version;
+fi
-fi;
-# Check whether --with-unzip-home or --without-unzip-home was given.
+# Check whether --with-unzip-home was given.
if test "${with_unzip_home+set}" = set; then
- withval="$with_unzip_home"
+ withval=$with_unzip_home;
+fi
-fi;
-# Check whether --with-zip-home or --without-zip-home was given.
+# Check whether --with-zip-home was given.
if test "${with_zip_home+set}" = set; then
- withval="$with_zip_home"
+ withval=$with_zip_home;
+fi
-fi;
-# Check whether --with-mingwin or --without-mingwin was given.
+# Check whether --with-mingwin was given.
if test "${with_mingwin+set}" = set; then
- withval="$with_mingwin"
- WITH_MINGWIN=$withval
+ withval=$with_mingwin; WITH_MINGWIN=$withval
else
WITH_MINGWIN=0
-fi;
+fi
-# Check whether --with-use-shell or --without-use-shell was given.
+
+# Check whether --with-use-shell was given.
if test "${with_use_shell+set}" = set; then
- withval="$with_use_shell"
- with_use_shell=$withval
+ withval=$with_use_shell; with_use_shell=$withval
else
with_use_shell="tcsh"
-fi;
+fi
-# Check whether --with-build-version or --without-build-version was given.
+
+# Check whether --with-build-version was given.
if test "${with_build_version+set}" = set; then
- withval="$with_build_version"
- with_build_version=$withval
-fi;
-# Check whether --enable-sgistl or --disable-sgistl was given.
+ withval=$with_build_version; with_build_version=$withval
+fi
+
+# Check whether --enable-sgistl was given.
if test "${enable_sgistl+set}" = set; then
- enableval="$enable_sgistl"
+ enableval=$enable_sgistl;
+fi
-fi;
-# Check whether --with-alloc or --without-alloc was given.
+# Check whether --with-alloc was given.
if test "${with_alloc+set}" = set; then
- withval="$with_alloc"
+ withval=$with_alloc;
+fi
-fi;
-# Check whether --enable-verbose or --disable-verbose was given.
+# Check whether --enable-verbose was given.
if test "${enable_verbose+set}" = set; then
- enableval="$enable_verbose"
+ enableval=$enable_verbose;
+fi
-fi;
BUILD_TYPE="OOo"
@@ -2897,27 +3607,174 @@ echo "* *"
echo "********************************************************************"
echo ""
cat /dev/null > warn
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2930,32 +3787,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$AWK" && break
done
# Extract the first word of "$AWK", so it can be a program name with args.
set dummy $AWK; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2970,27 +3829,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
AWK=$ac_cv_path_AWK
-
if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$AWK"; then
{ { echo "$as_me:$LINENO: error: install awk to run this script" >&5
echo "$as_me: error: install awk to run this script" >&2;}
@@ -3001,8 +3861,8 @@ for ac_prog in sed
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3017,27 +3877,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SED=$ac_cv_path_SED
-
if test -n "$SED"; then
- echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+ { echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$SED" && break
done
@@ -3047,30 +3908,31 @@ echo "$as_me: error: install sed to run this script" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: checking for solenv environment" >&5
-echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for solenv environment" >&5
+echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6; }
if test -z "$with_local_solenv"; then
LOCAL_SOLENV="DEFAULT"
- echo "$as_me:$LINENO: result: default" >&5
-echo "${ECHO_T}default" >&6
+ { echo "$as_me:$LINENO: result: default" >&5
+echo "${ECHO_T}default" >&6; }
else
LOCAL_SOLENV=$with_local_solenv
- echo "$as_me:$LINENO: result: $with_local_solenv" >&5
-echo "${ECHO_T}$with_local_solenv" >&6
+ { echo "$as_me:$LINENO: result: $with_local_solenv" >&5
+echo "${ECHO_T}$with_local_solenv" >&6; }
fi
if test "$LOCAL_SOLENV" = "DEFAULT"; then
- _solenv="../solenv"
+ _solenv="./solenv"
else
_solenv="$LOCAL_SOLENV"
fi
+
if test -e $_solenv/inc/minor.mk; then
- # Get UPD number from ../solenv/inc/minor.mk
- UPD="`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ # Get UPD number from ./solenv/inc/minor.mk
+ UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
- SOURCEVERSION="`grep SOURCEVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
else
{ { echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5
@@ -3079,104 +3941,154 @@ echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/o
fi
ac_aux_dir=
-for ac_dir in $_solenv/bin; do
- if test -f $ac_dir/install-sh; then
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
- elif test -f $ac_dir/install.sh; then
+ elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
- elif test -f $ac_dir/shtool; then
+ elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $_solenv/bin" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $_solenv/bin" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
+fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
if test "${ac_cv_target+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
- ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+ if test "x$target_alias" = x; then
+ ac_cv_target=$ac_cv_host
+else
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
{ (exit 1); exit 1; }; }
+fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+echo "$as_me: error: invalid value of canonical target" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
# The aliases save the names the user supplied, while $host etc.
@@ -3193,11 +4105,11 @@ echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2
fi
if echo "$build_os" | grep cygwin; then
- echo "$as_me:$LINENO: checking Cygwin version" >&5
-echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking Cygwin version" >&5
+echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6; }
CygwinVer=`uname -r`
- echo "$as_me:$LINENO: result: $CygwinVer" >&5
-echo "${ECHO_T}$CygwinVer" >&6
+ { echo "$as_me:$LINENO: result: $CygwinVer" >&5
+echo "${ECHO_T}$CygwinVer" >&6; }
if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
{ { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5
echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;}
@@ -3217,23 +4129,23 @@ case "$build_os" in
test_freetype=yes
_os=SunOS
- echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
-echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
+echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6; }
_os_release=`echo $build_os | $SED -e s/solaris2\.//`
if test "$_os_release" -lt "6"; then
{ { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5
echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
-echo "${ECHO_T}ok ($_os_release)" >&6
+ { echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
+echo "${ECHO_T}ok ($_os_release)" >&6; }
fi
- echo "$as_me:$LINENO: checking the processor type" >&5
-echo $ECHO_N "checking the processor type... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the processor type" >&5
+echo $ECHO_N "checking the processor type... $ECHO_C" >&6; }
if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
- echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
-echo "${ECHO_T}ok ($build_cpu)" >&6
+ { echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
+echo "${ECHO_T}ok ($build_cpu)" >&6; }
else
{ { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5
echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
@@ -3291,17 +4203,17 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --
test_cups=yes
test_randr=yes
test_freetype=yes
- echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
-echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
+echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6; }
if test -n "$with_os_version"; then
OSVERSION="$with_os_version"
else
OSVERSION=`/sbin/sysctl -n kern.osreldate`
fi
- echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5
-echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6
- echo "$as_me:$LINENO: checking which thread library to use" >&5
-echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5
+echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6; }
+ { echo "$as_me:$LINENO: checking which thread library to use" >&5
+echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6; }
if test "$OSVERSION" -lt "500016"; then
PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
@@ -3312,8 +4224,8 @@ echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6
PTHREAD_CFLAGS=""
PTHREAD_LIBS="-pthread"
fi
- echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
-echo "${ECHO_T}$PTHREAD_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
+echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
_os=FreeBSD
;;
osf)
@@ -3357,24 +4269,24 @@ esac
-echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
-echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
+echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6; }
if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
ENABLE_CRASHDUMP="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
BUILD_TYPE="$BUILD_TYPE CRASHREP"
else
if test "$enable_crashdump" = "STATIC"; then
ENABLE_CRASHDUMP="STATIC"
- echo "$as_me:$LINENO: result: yes, STATIC" >&5
-echo "${ECHO_T}yes, STATIC" >&6
+ { echo "$as_me:$LINENO: result: yes, STATIC" >&5
+echo "${ECHO_T}yes, STATIC" >&6; }
BUILD_TYPE="$BUILD_TYPE CRASHREP"
else
if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
ENABLE_CRASHDUMP=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
else
{ { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5
echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;}
@@ -3389,26 +4301,26 @@ if test "$_os" = "WINNT"; then
fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5
-echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5
+echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6; }
if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
VC_STANDARD=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
else
VC_STANDARD="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
fi
-echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5
-echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5
+echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6; }
if test -n "$enable_werror" && test "$enable_werror" != "no"; then
ENABLE_WERROR="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
{ echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5
echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;}
{ echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5
@@ -3416,58 +4328,58 @@ echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;
echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
else
ENABLE_WERROR="FALSE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to do a debug build" >&5
-echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to do a debug build" >&5
+echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6; }
if test -n "$enable_debug" && test "$enable_debug" != "no"; then
ENABLE_DEBUG="TRUE"
if test -z "$enable_symbols"; then
enable_symbols="yes"
fi
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_DEBUG="FALSE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5
-echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5
+echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6; }
if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
PROEXT=""
PRODUCT=""
PROFULLSWITCH=""
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
PRODUCT="full"
PROFULLSWITCH="product=full"
PROEXT=".pro"
- echo "$as_me:$LINENO: result: no, full product build" >&5
-echo "${ECHO_T}no, full product build" >&6
+ { echo "$as_me:$LINENO: result: no, full product build" >&5
+echo "${ECHO_T}no, full product build" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5
-echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5
+echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6; }
if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
ENABLE_SYMBOLS="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
ENABLE_SYMBOLS="SMALL"
- echo "$as_me:$LINENO: result: yes, small ones" >&5
-echo "${ECHO_T}yes, small ones" >&6
+ { echo "$as_me:$LINENO: result: yes, small ones" >&5
+echo "${ECHO_T}yes, small ones" >&6; }
else if test "$enable_symbols" != "no" ; then
echo enable symbols is: $enable_symbols
{ { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5
@@ -3480,13 +4392,13 @@ echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as paramet
fi
else
ENABLE_SYMBOLS=
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5
-echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5
+echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6; }
if test -n "$enable_strip_solver"; then
if test "$enable_strip_solver" = "yes"; then
DISABLE_STRIP=
@@ -3507,151 +4419,151 @@ else
fi
-echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5
-echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5
+echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6; }
if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
ENABLE_CUPS="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_CUPS=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5
-echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5
+echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
ENABLE_FONTCONFIG="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_FONTCONFIG=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
-echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
+echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6; }
if test "$enable_binfilter" = "no"; then
WITH_BINFILTER="NO"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
else
WITH_BINFILTER="YES"
BUILD_TYPE="$BUILD_TYPE BINFILTER"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking whether to use DirectX" >&5
-echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use DirectX" >&5
+echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6; }
if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
ENABLE_DIRECTX="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_DIRECTX=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- echo "$as_me:$LINENO: checking whether to use ActiveX" >&5
-echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use ActiveX" >&5
+echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6; }
if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
DISABLE_ACTIVEX=""
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
DISABLE_ACTIVEX="TRUE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- echo "$as_me:$LINENO: checking whether to use ATL" >&5
-echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use ATL" >&5
+echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6; }
if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
DISABLE_ATL=""
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
DISABLE_ATL="TRUE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
-echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5
-echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5
+echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6; }
if test "$enable_rpath" = "no"; then
ENABLE_RPATH="no"
else
ENABLE_RPATH="yes"
fi
-echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
-echo "${ECHO_T}$ENABLE_RPATH" >&6
+{ echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
+echo "${ECHO_T}$ENABLE_RPATH" >&6; }
-echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
-echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
+echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6; }
if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_MYSPELL_DICTS=YES
BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_MYSPELL_DICTS=NO
fi
if test "$WITH_MYSPELL_DICTS" = "NO"; then
- echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5
-echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5
+echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6; }
if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SYSTEM_DICTS=YES
- echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5
-echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5
+echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6; }
if test -n "$with_external_dict_dir"; then
DICT_SYSTEM_DIR=file://$with_external_dict_dir
else
DICT_SYSTEM_DIR=file:///usr/share/hunspell
fi
- echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5
-echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6
- echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5
-echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5
+echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6; }
+ { echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5
+echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6; }
if test -n "$with_external_hyph_dir"; then
HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
else
HYPH_SYSTEM_DIR=file:///usr/share/hyphen
fi
- echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5
-echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6
- echo "$as_me:$LINENO: checking for thesaurus directory" >&5
-echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5
+echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6; }
+ { echo "$as_me:$LINENO: checking for thesaurus directory" >&5
+echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6; }
if test -n "$with_external_thes_dir"; then
THES_SYSTEM_DIR=file://$with_external_thes_dir
else
THES_SYSTEM_DIR=file:///usr/share/mythes
fi
- echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
-echo "${ECHO_T}$THES_SYSTEM_DIR" >&6
+ { echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
+echo "${ECHO_T}$THES_SYSTEM_DIR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SYSTEM_DICTS=NO
fi
fi
@@ -3660,10 +4572,17 @@ fi
-echo "$as_me:$LINENO: checking which shell to use" >&5
-echo $ECHO_N "checking which shell to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which shell to use" >&5
+echo $ECHO_N "checking which shell to use... $ECHO_C" >&6; }
if test $_os = "WINNT"; then
- if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
+ if test -x "/usr/bin/expand.exe" ; then
+ { { echo "$as_me:$LINENO: error: cygwin has expand.exe!
+The expand.exe in cygwin could cause build error. Please remove or rename it." >&5
+echo "$as_me: error: cygwin has expand.exe!
+The expand.exe in cygwin could cause build error. Please remove or rename it." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
{ { echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5
echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;}
{ (exit 1); exit 1; }; }
@@ -3707,17 +4626,17 @@ echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
fi
fi
USE_SHELL="$with_use_shell"
-echo "$as_me:$LINENO: result: $USE_SHELL" >&5
-echo "${ECHO_T}$USE_SHELL" >&6
+{ echo "$as_me:$LINENO: result: $USE_SHELL" >&5
+echo "${ECHO_T}$USE_SHELL" >&6; }
if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then
- echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
-echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
+echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6; }
if which gcc > /dev/null && which g++ > /dev/null ; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5
echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;}
@@ -3729,8 +4648,8 @@ fi
if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SHELLPATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3745,27 +4664,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SHELLPATH=$ac_cv_path_SHELLPATH
-
if test -n "$SHELLPATH"; then
- echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-echo "${ECHO_T}$SHELLPATH" >&6
+ { echo "$as_me:$LINENO: result: $SHELLPATH" >&5
+echo "${ECHO_T}$SHELLPATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$SHELLPATH"; then
{ { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5
echo "$as_me: error: tcsh not found in \$PATH" >&2;}
@@ -3776,8 +4696,8 @@ echo "$as_me: error: tcsh not found in \$PATH" >&2;}
elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SHELLPATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3792,27 +4712,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SHELLPATH=$ac_cv_path_SHELLPATH
-
if test -n "$SHELLPATH"; then
- echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-echo "${ECHO_T}$SHELLPATH" >&6
+ { echo "$as_me:$LINENO: result: $SHELLPATH" >&5
+echo "${ECHO_T}$SHELLPATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$SHELLPATH"; then
{ { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
echo "$as_me: error: bash not found in \$PATH" >&2;}
@@ -3827,15 +4748,15 @@ echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;}
fi
-echo "$as_me:$LINENO: checking gcc home" >&5
-echo $ECHO_N "checking gcc home... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking gcc home" >&5
+echo $ECHO_N "checking gcc home... $ECHO_C" >&6; }
if test -z "$with_gcc_home"; then
GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
else
GCC_HOME="$with_gcc_home"
fi
-echo "$as_me:$LINENO: result: $GCC_HOME" >&5
-echo "${ECHO_T}$GCC_HOME" >&6
+{ echo "$as_me:$LINENO: result: $GCC_HOME" >&5
+echo "${ECHO_T}$GCC_HOME" >&6; }
if test -n "$with_gcc_home"; then
@@ -3853,8 +4774,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3867,32 +4788,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3905,36 +4828,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3947,74 +4885,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4028,7 +4926,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4039,6 +4937,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -4056,22 +4955,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4084,36 +4984,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4126,29 +5028,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -4161,21 +5079,35 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -4200,47 +5132,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
break;;
* )
break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4252,19 +5214,21 @@ See \`config.log' for more details." >&2;}
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4283,22 +5247,27 @@ See \`config.log' for more details." >&2;}
fi
fi
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4309,9 +5278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
break;;
* ) break;;
esac
@@ -4325,14 +5293,14 @@ See \`config.log' for more details." >&2;}
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4352,14 +5320,20 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
@@ -4377,12 +5351,12 @@ fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4405,50 +5379,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4464,38 +5437,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -4511,12 +5564,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4550,12 +5603,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -4570,205 +5628,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4783,8 +5693,8 @@ if test "$COMPATH" = "." ; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_COMPATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4799,27 +5709,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
COMPATH=$ac_cv_path_COMPATH
-
if test -n "$COMPATH"; then
- echo "$as_me:$LINENO: result: $COMPATH" >&5
-echo "${ECHO_T}$COMPATH" >&6
+ { echo "$as_me:$LINENO: result: $COMPATH" >&5
+echo "${ECHO_T}$COMPATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$COMPATH" && break
done
@@ -4828,8 +5739,8 @@ fi
GCCVER=20995
if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
- echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
-echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
+echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6; }
_gcc_version=`$CC -dumpversion`
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
_gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
@@ -4848,33 +5759,33 @@ echo "$as_me: error: version \"$_gcc_version\" gives internal error with small."
fi
fi
fi
- echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
-echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
+ { echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
+echo "${ECHO_T}checked (gcc $_gcc_version)" >&6; }
if test "$_os" = "SunOS"; then
- echo "$as_me:$LINENO: checking gcc linker" >&5
-echo $ECHO_N "checking gcc linker... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking gcc linker" >&5
+echo $ECHO_N "checking gcc linker... $ECHO_C" >&6; }
if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
{ { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5
echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
-echo "${ECHO_T}ok (GNU ld)" >&6
+ { echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
+echo "${ECHO_T}ok (GNU ld)" >&6; }
fi
fi
-echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
-echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
+echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6; }
if test -n "$enable_pch" && test "$enable_pch" != "no"; then
if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
ENABLE_PCH="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
ENABLE_PCH="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_PCH=""
{ echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5
@@ -4882,13 +5793,13 @@ echo "$as_me: WARNING: Precompiled header not yet supported for your platform/co
fi
else
ENABLE_PCH=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking for GNU make" >&5
-echo $ECHO_N "checking for GNU make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GNU make" >&5
+echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; }
for a in "$MAKE" $GNUMAKE make gmake gnumake; do
$a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
if test $? -eq 0; then
@@ -4896,36 +5807,35 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
break
fi
done
-echo "$as_me:$LINENO: result: $GNUMAKE" >&5
-echo "${ECHO_T}$GNUMAKE" >&6
-
-echo "$as_me:$LINENO: checking the GNU make version" >&5
-echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: result: $GNUMAKE" >&5
+echo "${ECHO_T}$GNUMAKE" >&6; }
if test -z "$GNUMAKE"; then
- { echo "$as_me:$LINENO: WARNING: not found build may fail" >&5
-echo "$as_me: WARNING: not found build may fail" >&2;}
- echo "GNU make not found build may fail" >> warn
-else
- _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
- _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
- if test "$_make_longver" -ge "037901" ; then
- echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-echo "${ECHO_T}$GNUMAKE $_make_version" >&6
- else
- if test "$_os" = "Darwin"; then
- if test "$_make_longver" -ge "037900" ; then
- echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-echo "${ECHO_T}$GNUMAKE $_make_version" >&6
- else
- { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
-echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;}
- fi
+ { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5
+echo "$as_me: error: not found. install GNU make." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+{ echo "$as_me:$LINENO: checking the GNU make version" >&5
+echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6; }
+_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+if test "$_make_longver" -ge "037901" ; then
+ { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
+echo "${ECHO_T}$GNUMAKE $_make_version" >&6; }
+else
+ if test "$_os" = "Darwin"; then
+ if test "$_make_longver" -ge "037900" ; then
+ { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
+echo "${ECHO_T}$GNUMAKE $_make_version" >&6; }
else
- { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
+ { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
+echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;}
+ fi
+ else
+ { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
{ (exit 1); exit 1; }; }
- fi
- fi
+ fi
fi
@@ -4935,8 +5845,8 @@ if test "$_os" = "SunOS"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path__cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4951,33 +5861,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
_cc=$ac_cv_path__cc
-
if test -n "$_cc"; then
- echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
+ { echo "$as_me:$LINENO: result: $_cc" >&5
+echo "${ECHO_T}$_cc" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$_cc" && break
done
COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
- echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
-echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
+echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6; }
_sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
_sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
_sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
@@ -4992,16 +5903,16 @@ echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7
echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
fi
if test "$GCC" = "yes"; then
- echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5
-echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5
+echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6; }
hash_style_ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
@@ -5025,42 +5936,39 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
HAVE_LD_HASH_STYLE=TRUE
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-HAVE_LD_HASH_STYLE=FALSE
+ HAVE_LD_HASH_STYLE=FALSE
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
- echo "$as_me:$LINENO: result: found " >&5
-echo "${ECHO_T}found " >&6
+ { echo "$as_me:$LINENO: result: found " >&5
+echo "${ECHO_T}found " >&6; }
else
- echo "$as_me:$LINENO: result: not found " >&5
-echo "${ECHO_T}not found " >&6
+ { echo "$as_me:$LINENO: result: not found " >&5
+echo "${ECHO_T}not found " >&6; }
fi
LDFLAGS=$hash_style_ldflags_save
fi
@@ -5072,8 +5980,8 @@ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path__cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5088,33 +5996,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
_cc=$ac_cv_path__cc
-
if test -n "$_cc"; then
- echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
+ { echo "$as_me:$LINENO: result: $_cc" >&5
+echo "${ECHO_T}$_cc" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$_cc" && break
done
COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
- echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
-echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
+echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6; }
_mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
_mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
if test "$_mipspro_major" != "7"; then
@@ -5128,8 +6037,8 @@ echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of th
echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
@@ -5141,8 +6050,8 @@ if test "$_os" = "OSF1"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path__cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5157,35 +6066,36 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
_cc=$ac_cv_path__cc
-
if test -n "$_cc"; then
- echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
+ { echo "$as_me:$LINENO: result: $_cc" >&5
+echo "${ECHO_T}$_cc" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$_cc" && break
done
COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
{ echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
- echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
-echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
+echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6; }
_compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
_compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
if test "$_compaqc_major" != "T6"; then
@@ -5193,8 +6103,8 @@ echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6
echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
@@ -5202,8 +6112,8 @@ fi
if test -z "$with_perl_home"; then
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5218,27 +6128,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
PERL=$ac_cv_path_PERL
-
if test -n "$PERL"; then
- echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
+ { echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
else
if test "$_os" = "WINNT"; then
with_perl_home=`cygpath -u "$with_perl_home"`
@@ -5254,8 +6165,8 @@ echo "$as_me: error: $_perl_path not found" >&2;}
fi
if test "$PERL"; then
- echo "$as_me:$LINENO: checking the Perl version" >&5
-echo $ECHO_N "checking the Perl version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Perl version" >&5
+echo $ECHO_N "checking the Perl version... $ECHO_C" >&6; }
${PERL} -e "exit($]);"
_perl_version=$?
if test "$_perl_version" -lt 5; then
@@ -5263,8 +6174,8 @@ echo $ECHO_N "checking the Perl version... $ECHO_C" >&6
echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
-echo "${ECHO_T}checked (perl $_perl_version)" >&6
+ { echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
+echo "${ECHO_T}checked (perl $_perl_version)" >&6; }
else
{ { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5
echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
@@ -5272,11 +6183,11 @@ echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
fi
-echo "$as_me:$LINENO: checking for required Perl modules" >&5
-echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for required Perl modules" >&5
+echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6; }
if `$PERL -e 'use Archive::Zip;'`; then
- echo "$as_me:$LINENO: result: all modules found" >&5
-echo "${ECHO_T}all modules found" >&6
+ { echo "$as_me:$LINENO: result: all modules found" >&5
+echo "${ECHO_T}all modules found" >&6; }
else
{ { echo "$as_me:$LINENO: error: Failed to find some modules" >&5
echo "$as_me: error: Failed to find some modules" >&2;}
@@ -5285,19 +6196,19 @@ fi
if test "$_os" = "WINNT"; then
if test "$WITH_MINGWIN" != "yes"; then
- echo "$as_me:$LINENO: checking for friendly registry keys" >&5
-echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for friendly registry keys" >&5
+echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6; }
# VS.Net 2003, VS.Net 2005
if test -z "$with_cl_home"; then
- vctest=`./oowintool --msvc-productdir`;
+ vctest=`./solenv/bin/oowintool --msvc-productdir`;
if test -x "$vctest/bin/cl.exe"; then
with_cl_home=$vctest;
fi
else
with_cl_home=`cygpath -u "$with_cl_home"`
fi
- echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6
+ { echo "$as_me:$LINENO: result: done" >&5
+echo "${ECHO_T}done" >&6; }
if test -n "$with_mspdb_path";then
with_mspdb_path=`cygpath -u "$with_mspdb_path"`
@@ -5318,8 +6229,8 @@ echo "${ECHO_T}done" >&6
if test -z "$MSPDB_PATH";then
# Extract the first word of "mspdb80.dll", so it can be a program name with args.
set dummy mspdb80.dll; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5334,31 +6245,32 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-
if test -n "$MSPDB_PATH"; then
- echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-echo "${ECHO_T}$MSPDB_PATH" >&6
+ { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "mspdb71.dll", so it can be a program name with args.
set dummy mspdb71.dll; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5373,27 +6285,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-
if test -n "$MSPDB_PATH"; then
- echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-echo "${ECHO_T}$MSPDB_PATH" >&6
+ { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
MSPDB_PATH=`dirname "$MSPDB_PATH"`
fi
@@ -5406,15 +6319,15 @@ echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the p
MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
PATH="$MSPDB_PATH:$PATH"
- echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
-echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
+echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6; }
if test -x "$with_cl_home/bin/cl.exe"; then
CC="$with_cl_home/bin/cl.exe"
else
# Extract the first word of "cl.exe", so it can be a program name with args.
set dummy cl.exe; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5429,39 +6342,40 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
CC=$ac_cv_path_CC
-
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -e "$CC"; then
# This gives us a posix path with 8.3 filename restrictions
CC=`cygpath -d "$CC"`
CC=`cygpath -u "$CC"`
# Remove /cl.exe from CC case insensitive
- echo "$as_me:$LINENO: result: found ($CC)" >&5
-echo "${ECHO_T}found ($CC)" >&6
+ { echo "$as_me:$LINENO: result: found ($CC)" >&5
+echo "${ECHO_T}found ($CC)" >&6; }
COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'`
export INCLUDE=`cygpath -d "$COMPATH/../Include"`
- echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
-echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
+echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6; }
CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
x = match( \\\$0, /..\\...\\...../ )
CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -5470,20 +6384,20 @@ echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
printf (\"%04d\",vertoken[i] )
}
}"`
- echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
-echo "${ECHO_T}found Compiler version $CCNUMVER." >&6
+ { echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
+echo "${ECHO_T}found Compiler version $CCNUMVER." >&6; }
if test "$CCNUMVER" -ge "001500000000"; then
COMEX=12
- echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
-echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6
+ { echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
+echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6; }
elif test "$CCNUMVER" -ge "001400000000"; then
COMEX=11
- echo "$as_me:$LINENO: result: found .NET 2005." >&5
-echo "${ECHO_T}found .NET 2005." >&6
+ { echo "$as_me:$LINENO: result: found .NET 2005." >&5
+echo "${ECHO_T}found .NET 2005." >&6; }
elif test "$CCNUMVER" -ge "001300102240"; then
COMEX=10
- echo "$as_me:$LINENO: result: found .NET 2003." >&5
-echo "${ECHO_T}found .NET 2003." >&6
+ { echo "$as_me:$LINENO: result: found .NET 2003." >&5
+echo "${ECHO_T}found .NET 2003." >&6; }
else
{ { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5
echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;}
@@ -5495,11 +6409,11 @@ echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or s
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
-echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
+echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6; }
if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
- echo "$as_me:$LINENO: result: found." >&5
-echo "${ECHO_T}found." >&6
+ { echo "$as_me:$LINENO: result: found." >&5
+echo "${ECHO_T}found." >&6; }
if $CC -dumpspecs | grep -q "mno-cygwin"; then
USE_MINGW="cygwin"
else
@@ -5520,8 +6434,8 @@ if test "$_os" = "WINNT"; then
if test "$COMEX" -ge "10"; then
# Extract the first word of "midl.exe", so it can be a program name with args.
set dummy midl.exe; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MIDL_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5536,27 +6450,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
MIDL_PATH=$ac_cv_path_MIDL_PATH
-
if test -n "$MIDL_PATH"; then
- echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
-echo "${ECHO_T}$MIDL_PATH" >&6
+ { echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
+echo "${ECHO_T}$MIDL_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -n "$MIDL_PATH";then
MIDL_PATH=`dirname "$MIDL_PATH"`
fi
@@ -5570,13 +6485,13 @@ fi
MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
fi
if test -z "$MIDL_PATH" ; then
- vstest=`./oowintool --msvs-productdir`;
+ vstest=`./solenv/bin/oowintool --msvs-productdir`;
if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
MIDL_PATH="$vstest/Common7/Tools/Bin"
fi
fi
if test -z "$MIDL_PATH" ; then
- psdktest=`./oowintool --psdk-home`
+ psdktest=`./solenv/bin/oowintool --psdk-home`
if test -x "$psdktest/Bin/midl.exe" ; then
MIDL_PATH="$psdktest/Bin"
fi
@@ -5592,8 +6507,8 @@ echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --wit
# Extract the first word of "csc.exe", so it can be a program name with args.
set dummy csc.exe; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_CSC_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5608,27 +6523,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
CSC_PATH=$ac_cv_path_CSC_PATH
-
if test -n "$CSC_PATH"; then
- echo "$as_me:$LINENO: result: $CSC_PATH" >&5
-echo "${ECHO_T}$CSC_PATH" >&6
+ { echo "$as_me:$LINENO: result: $CSC_PATH" >&5
+echo "${ECHO_T}$CSC_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -n "$CSC_PATH";then
CSC_PATH=`dirname "$CSC_PATH"`
fi
@@ -5638,7 +6554,7 @@ fi
if test -x "$with_csc_path/csc.exe"; then
CSC_PATH="$with_csc_path"
else
- csctest=`./oowintool --csc-compilerdir`;
+ csctest=`./solenv/bin/oowintool --csc-compilerdir`;
if test -x "$csctest/csc.exe"; then
CSC_PATH="$csctest"
fi
@@ -5652,8 +6568,8 @@ echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with
CSC_PATH=`cygpath -d "$CSC_PATH"`
CSC_PATH=`cygpath -u "$CSC_PATH"`
- echo "$as_me:$LINENO: checking .NET Framework" >&5
-echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking .NET Framework" >&5
+echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6; }
if test -n "$with_frame_home"; then
with_frame_home=`cygpath -u "$with_frame_home"`
fi
@@ -5664,11 +6580,11 @@ echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
FRAME_HOME="$with_cl_home/../SDK/v1.1"
fi
if test -z "$FRAME_HOME" ; then
- frametest=`./oowintool --dotnetsdk-dir`
+ frametest=`./solenv/bin/oowintool --dotnetsdk-dir`
if test -f "$frametest/lib/mscoree.lib"; then
FRAME_HOME="$frametest"
else
- frametest=`./oowintool --psdk-home`
+ frametest=`./solenv/bin/oowintool --psdk-home`
if test -f "$frametest/lib/mscoree.lib"; then
FRAME_HOME="$frametest"
fi
@@ -5679,8 +6595,8 @@ echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
# Convert to posix path with 8.3 filename restrictions ( No spaces )
FRAME_HOME=`cygpath -d "$FRAME_HOME"`
FRAME_HOME=`cygpath -u "$FRAME_HOME"`
@@ -5696,8 +6612,8 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -5731,24 +6647,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5757,9 +6671,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5769,24 +6684,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5797,6 +6710,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5814,8 +6728,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -5838,24 +6752,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5864,9 +6776,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5876,24 +6789,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5904,6 +6815,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5926,8 +6838,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5951,35 +6863,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -6035,6 +6943,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -6054,18 +6963,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -6078,12 +6996,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -6095,18 +7015,22 @@ fi
fi
if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6119,36 +7043,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CXX" && break
done
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6161,55 +7087,85 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CXX" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
fi
-
+ fi
+fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6232,50 +7188,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
GXX=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6291,172 +7246,146 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=cc
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6486,24 +7415,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -6512,9 +7439,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6524,24 +7452,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -6552,6 +7478,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -6569,8 +7496,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@ -6593,24 +7520,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -6619,9 +7544,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6631,24 +7557,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -6659,6 +7583,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -6689,8 +7614,8 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -6724,24 +7649,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -6750,9 +7673,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6762,24 +7686,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -6790,6 +7712,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -6807,8 +7730,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -6831,24 +7754,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -6857,9 +7778,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6869,24 +7791,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -6897,6 +7817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -6935,9 +7856,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -6951,38 +7872,35 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -6993,8 +7911,8 @@ fi
done
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7005,61 +7923,57 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+typedef long ac__type_new_;
int
main ()
{
-if ((long *) 0)
+if ((ac__type_new_ *) 0)
return 0;
-if (sizeof (long))
+if (sizeof (ac__type_new_))
return 0;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_type_long=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
@@ -7069,10 +7983,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
@@ -7080,27 +7995,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
@@ -7110,10 +8020,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -7121,56 +8032,53 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
@@ -7178,27 +8086,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
@@ -7208,10 +8111,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
@@ -7219,50 +8123,48 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7273,10 +8175,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -7284,52 +8187,45 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+'') if test "$ac_cv_type_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long=0
+ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7337,8 +8233,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+ typedef long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
@@ -7347,35 +8244,44 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
- exit (1);
- if (((long) (sizeof (long))) < 0)
+ return 1;
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
- long i = longval ();
- if (i != ((long) (sizeof (long))))
- exit (1);
+ long int i = longval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
fprintf (f, "%ld\n", i);
}
else
{
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (long))))
- exit (1);
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ return 1;
fprintf (f, "%lu\n", i);
}
- exit (ferror (f) || fclose (f) != 0);
+ return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -7386,22 +8292,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+if test "$ac_cv_type_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_long=0
+ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
-fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+
+
+
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
@@ -7409,8 +8318,8 @@ _ACEOF
SIZEOF_LONG=$ac_cv_sizeof_long
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7427,7 +8336,8 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
bogus endian macros
#endif
@@ -7436,27 +8346,22 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
# It does; now see whether it defined to BIG_ENDIAN or not.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7479,40 +8384,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_c_bigendian=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-# It does not; compile a test program.
+ # It does not; compile a test program.
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
@@ -7522,11 +8423,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
@@ -7537,27 +8438,22 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
ac_cv_c_bigendian=yes
fi
@@ -7573,8 +8469,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7582,27 +8480,41 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
+
/* Are we little or big endian? From Harbison&Steele. */
union
{
- long l;
- char c[sizeof (long)];
+ long int l;
+ char c[sizeof (long int)];
} u;
u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
+ return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -7615,13 +8527,16 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in
yes)
@@ -7642,15 +8557,15 @@ esac
WORDS_BIGENDIAN=$ac_cv_c_bigendian
-# Check whether --enable-largefile or --disable-largefile was given.
+# Check whether --enable-largefile was given.
if test "${enable_largefile+set}" = set; then
- enableval="$enable_largefile"
+ enableval=$enable_largefile;
+fi
-fi;
if test "$enable_largefile" != no; then
- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7658,8 +8573,8 @@ else
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7683,84 +8598,77 @@ main ()
return 0;
}
_ACEOF
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+
+rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
break
done
CC=$ac_save_CC
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
- ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7785,34 +8693,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_sys_file_offset_bits=no; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7838,54 +8743,53 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
break
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-if test "$ac_cv_sys_file_offset_bits" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
cat >>confdefs.h <<_ACEOF
#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
_ACEOF
-
-fi
+;;
+esac
rm -f conftest*
- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
- ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7910,34 +8814,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_sys_large_files=no; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7963,47 +8864,47 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
break
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-if test "$ac_cv_sys_large_files" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
cat >>confdefs.h <<_ACEOF
#define _LARGE_FILES $ac_cv_sys_large_files
_ACEOF
-
-fi
+;;
+esac
rm -f conftest*
+ fi
fi
if test -n "$ac_cv_sys_file_offset_bits"; then
@@ -8014,33 +8915,33 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th
fi
-echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
-echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
+echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6; }
if test -n "$enable_vba" && test "$enable_vba" = "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ENABLE_VBA=NO
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
ENABLE_VBA=YES
fi
if test "$ENABLE_VBA" = "YES"; then
- echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5
-echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5
+echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6; }
if test -n "$with_vba_package_format"; then
if test "$with_vba_package_format" = "extn"; then
VBA_EXTENSION=YES
- echo "$as_me:$LINENO: result: uno extension" >&5
-echo "${ECHO_T}uno extension" >&6
+ { echo "$as_me:$LINENO: result: uno extension" >&5
+echo "${ECHO_T}uno extension" >&6; }
{ echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5
echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;}
else if test "$with_vba_package_format" = "builtin"; then
VBA_EXTENSION=NO
- echo "$as_me:$LINENO: result: build into installset" >&5
-echo "${ECHO_T}build into installset" >&6
+ { echo "$as_me:$LINENO: result: build into installset" >&5
+echo "${ECHO_T}build into installset" >&6; }
else
{ { echo "$as_me:$LINENO: error: unknown packaging method" >&5
echo "$as_me: error: unknown packaging method" >&2;}
@@ -8050,8 +8951,8 @@ echo "$as_me: error: unknown packaging method" >&2;}
else
VBA_EXTENSION=NO
- echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
-echo "${ECHO_T}defaulting to build into installset" >&6
+ { echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
+echo "${ECHO_T}defaulting to build into installset" >&6; }
fi
else
VBA_EXTENSION=NO
@@ -8062,17 +8963,17 @@ fi
if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
if test "${ac_cv_header_cups_cups_h+set}" = set; then
- echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; }
if test "${ac_cv_header_cups_cups_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
-echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
+echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8083,41 +8984,37 @@ $ac_includes_default
#include <cups/cups.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
-echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
+echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8126,24 +9023,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <cups/cups.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -8151,9 +9046,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -8177,25 +9073,18 @@ echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled
echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; }
if test "${ac_cv_header_cups_cups_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_cups_cups_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; }
fi
if test $ac_cv_header_cups_cups_h = yes; then
@@ -8210,24 +9099,24 @@ fi
fi
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
- echo "$as_me:$LINENO: checking whether to enable pam support" >&5
-echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to enable pam support" >&5
+echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6; }
if test -z "$enable_pam" || test "$enable_pam" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
PAM=YES
if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
-echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8238,41 +9127,37 @@ $ac_includes_default
#include <security/pam_appl.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
-echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
+echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8281,24 +9166,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <security/pam_appl.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -8306,9 +9189,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -8332,25 +9216,18 @@ echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be
echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_security_pam_appl_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
fi
if test $ac_cv_header_security_pam_appl_h = yes; then
@@ -8362,15 +9239,15 @@ echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel miss
fi
- echo "$as_me:$LINENO: checking whether to link to libpam" >&5
-echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to link to libpam" >&5
+echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6; }
if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
PAM_LINK=YES
-echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
if test "${ac_cv_lib_pam_pam_start+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8383,56 +9260,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char pam_start ();
int
main ()
{
-pam_start ();
+return pam_start ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_pam_pam_start=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pam_pam_start=no
+ ac_cv_lib_pam_pam_start=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
if test $ac_cv_lib_pam_pam_start = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
@@ -8447,13 +9321,13 @@ echo "$as_me: error: libpam not found or functional" >&2;}
fi
else
- echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+ { echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6; }
PAM_LINK=NO
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
PAM=NO
PAM_LINK=NO
@@ -8464,8 +9338,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5
-echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5
+echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6; }
if test "${ac_cv_func_which_getspnam_r+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8507,34 +9381,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_func_which_getspnam_r=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
#
# FIVE ARGUMENTS
@@ -8566,34 +9437,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_func_which_getspnam_r=five
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -8627,34 +9495,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_func_which_getspnam_r=four
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -8665,24 +9530,24 @@ fi
case "$ac_cv_func_which_getspnam_r" in
five)
- echo "$as_me:$LINENO: result: five" >&5
-echo "${ECHO_T}five" >&6
+ { echo "$as_me:$LINENO: result: five" >&5
+echo "${ECHO_T}five" >&6; }
NEW_SHADOW_API=YES
;;
four)
- echo "$as_me:$LINENO: result: four" >&5
-echo "${ECHO_T}four" >&6
+ { echo "$as_me:$LINENO: result: four" >&5
+echo "${ECHO_T}four" >&6; }
;;
no)
- echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
-echo "${ECHO_T}cannot find function declaration in shadow.h" >&6
+ { echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
+echo "${ECHO_T}cannot find function declaration in shadow.h" >&6; }
;;
unknown)
- echo "$as_me:$LINENO: result: can't tell" >&5
-echo "${ECHO_T}can't tell" >&6
+ { echo "$as_me:$LINENO: result: can't tell" >&5
+echo "${ECHO_T}can't tell" >&6; }
;;
*)
@@ -8707,15 +9572,15 @@ fi
if test "$_os" = "Linux"; then
- echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5
-echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5
+echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6; }
if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
CRYPT_LINK=YES
-echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8728,56 +9593,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char crypt ();
int
main ()
{
-crypt ();
+return crypt ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_crypt_crypt=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
+ ac_cv_lib_crypt_crypt=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
if test $ac_cv_lib_crypt_crypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
@@ -8792,8 +9654,8 @@ echo "$as_me: error: libcrypt not found or functional" >&2;}
fi
else
- echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+ { echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6; }
CRYPT_LINK=NO
fi
fi
@@ -8812,18 +9674,22 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
fi
if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8836,36 +9702,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CXX" && break
done
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8878,55 +9746,85 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CXX" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
fi
-
+ fi
+fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8949,50 +9847,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
GXX=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9008,159 +9905,133 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9170,20 +10041,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "$GXX" = "yes"; then
- echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
-echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
+echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6; }
_gpp_version=`$CXX -dumpversion`
_gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'`
_gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'`
- echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
-echo "${ECHO_T}checked (g++ $_gpp_version)" >&6
+ { echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
+echo "${ECHO_T}checked (g++ $_gpp_version)" >&6; }
if test "$_gpp_major" = "3"; then
if test "$_gpp_minor" = "4"; then
- echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5
-echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5
+echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -9221,13 +10092,22 @@ main (void)
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9240,11 +10120,13 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
fi
@@ -9252,8 +10134,8 @@ fi
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
# often contains an i386 which is expanded as a macro. Solved in stlport.
if test "$GXX" = "yes"; then
- echo "$as_me:$LINENO: checking for g++ include path" >&5
-echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for g++ include path" >&5
+echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6; }
if test -z "$with_gxx_include_path"; then
with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
@@ -9267,18 +10149,18 @@ echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6
fi
if test -z "$with_gxx_include_path"; then
with_gxx_include_path="NO_GXX_INCLUDE"
- echo "$as_me:$LINENO: result: no g++ includes" >&5
-echo "${ECHO_T}no g++ includes" >&6
+ { echo "$as_me:$LINENO: result: no g++ includes" >&5
+echo "${ECHO_T}no g++ includes" >&6; }
else
- echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5
-echo "${ECHO_T}$with_gxx_include_path" >&6
+ { echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5
+echo "${ECHO_T}$with_gxx_include_path" >&6; }
fi
GXX_INCLUDE_PATH="$with_gxx_include_path"
if test "$WITH_MINGWIN" = "yes"; then
- echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5
-echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5
+echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
#include <stddef.h>
#include <bits/c++config.h>
@@ -9296,11 +10178,11 @@ _ACEOF
fi
if test -z "$_mingw_lib_include_path"; then
_mingw_lib_include_path="NO_LIB_INCLUDE"
- echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
-echo "${ECHO_T}no mingwin runtime includes" >&6
+ { echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
+echo "${ECHO_T}no mingwin runtime includes" >&6; }
else
- echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
-echo "${ECHO_T}$_mingw_lib_include_path" >&6
+ { echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
+echo "${ECHO_T}$_mingw_lib_include_path" >&6; }
fi
MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
@@ -9308,49 +10190,49 @@ fi
if test "$_os" = "SunOS"; then
if test "$CC" = "cc"; then
- echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
-echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
+echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6; }
if test "$CXX" != "CC"; then
{ echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5
echo "$as_me: WARNING: SunStudio C++ was not found" >&2;}
echo "SunStudio C++ was not found" >> warn
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
if test "$_os" = "Darwin"; then
if test "$CC" = "cc"; then
- echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5
-echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5
+echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6; }
if test "$CXX" != "c++"; then
{ echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
echo "Macosx C++ was not found" >> warn
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
if test "$CC" = "cc"; then
- echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5
-echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5
+echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6; }
if test "$CXX" != "CC"; then
{ echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
echo "SGI MIPSpro C++ was not found" >> warn
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
fi
if test "$_os" = "OSF1"; then
- echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
-echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
+echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6; }
_compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
_compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
if test "$_compaqcxx_major" != "V6"; then
@@ -9358,16 +10240,16 @@ echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
fi
fi
if test "$_os" = "SunOS"; then
_temp=`showrev -p | $AWK -F" " '{ print $2 }'`
if test "$_os_release" = "7"; then
- echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5
-echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5
+echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6; }
_patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -9381,15 +10263,15 @@ echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6
fi
done
if test "$_patch" = "found"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;}
echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
fi
- echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
-echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
+echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6; }
_patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -9403,8 +10285,8 @@ echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
fi
done
if test "$_patch" = "found"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;}
@@ -9412,8 +10294,8 @@ echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 10
fi
else
if test "$_os_release" = "6"; then
- echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5
-echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5
+echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6; }
_patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -9427,15 +10309,15 @@ echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6
fi
done
if test "$_patch" = "found"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;}
echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
fi
- echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
-echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
+echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6; }
_patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -9449,8 +10331,8 @@ echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
fi
done
if test "$_patch" = "found"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;}
@@ -9462,15 +10344,15 @@ fi
if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- echo "$as_me:$LINENO: checking for SGI STL" >&5
-echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for SGI STL" >&5
+echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6; }
if test -d /usr/include/CC ; then
- echo "$as_me:$LINENO: result: yes." >&5
-echo "${ECHO_T}yes." >&6
+ { echo "$as_me:$LINENO: result: yes." >&5
+echo "${ECHO_T}yes." >&6; }
else
- echo "$as_me:$LINENO: result: not found." >&5
-echo "${ECHO_T}not found." >&6
+ { echo "$as_me:$LINENO: result: not found." >&5
+echo "${ECHO_T}not found." >&6; }
fi
else
{ { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5
@@ -9479,49 +10361,51 @@ echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;}
fi
else
- echo "$as_me:$LINENO: checking what the default STL should be" >&5
-echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6
- DEFAULT_TO_STLPORT="yes"
+ { echo "$as_me:$LINENO: checking what the default STL should be" >&5
+echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6; }
+ DEFAULT_TO_STLPORT="no"
if test "$_os" = "Linux"; then
case "$build_cpu" in
- i?86|powerpc|sparc)
+ i?86)
DEFAULT_TO_STLPORT="yes"
;;
*)
DEFAULT_TO_STLPORT="no"
;;
esac
- elif test "$_os" = "Darwin"; then
- DEFAULT_TO_STLPORT="no"
- elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then
- DEFAULT_TO_STLPORT="no"
+ elif test "$_os" = "SunOS"; then
+ DEFAULT_TO_STLPORT="yes"
+ elif test "$_os" = "WINNT" -o "$_os" = "OS2"; then
+ DEFAULT_TO_STLPORT="yes"
+ elif test "$_os" = "FreeBSD"; then
+ DEFAULT_TO_STLPORT="yes"
fi
if test "$DEFAULT_TO_STLPORT" = "yes"; then
- echo "$as_me:$LINENO: result: stlport" >&5
-echo "${ECHO_T}stlport" >&6
+ { echo "$as_me:$LINENO: result: stlport" >&5
+echo "${ECHO_T}stlport" >&6; }
else
- echo "$as_me:$LINENO: result: gcc" >&5
-echo "${ECHO_T}gcc" >&6
+ { echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6; }
fi
if test "$WITH_STLPORT" = "auto"; then
WITH_STLPORT=$DEFAULT_TO_STLPORT
fi
- echo "$as_me:$LINENO: checking for STL providing headers" >&5
-echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for STL providing headers" >&5
+echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6; }
STLPORT4=""
USE_SYSTEM_STL=""
if test "$WITH_STLPORT" = "yes"; then
- echo "$as_me:$LINENO: result: using internal stlport." >&5
-echo "${ECHO_T}using internal stlport." >&6
+ { echo "$as_me:$LINENO: result: using internal stlport." >&5
+echo "${ECHO_T}using internal stlport." >&6; }
if test "$DEFAULT_TO_STLPORT" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;}
echo "using stlport. Warning, breaks your ABI compatability!" >>warn
fi
elif test "$WITH_STLPORT" = "no"; then
- echo "$as_me:$LINENO: result: using system STL" >&5
-echo "${ECHO_T}using system STL" >&6
+ { echo "$as_me:$LINENO: result: using system STL" >&5
+echo "${ECHO_T}using system STL" >&6; }
USE_SYSTEM_STL="YES"
if test "$DEFAULT_TO_STLPORT" != "no"; then
{ echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
@@ -9539,26 +10423,24 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$STLPORT4/stlport/hash_map
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ { echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6; }
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9567,11 +10449,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: STLport headers not found." >&2;}
{ (exit 1); exit 1; }; }
fi
+
rm -f conftest.err conftest.$ac_ext
else
if test -f "$STLPORT4/stlport/hash_map"; then
- echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
+ { echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6; }
else
{ { echo "$as_me:$LINENO: error: STLport headers not found." >&5
echo "$as_me: error: STLport headers not found." >&2;}
@@ -9579,15 +10462,15 @@ echo "$as_me: error: STLport headers not found." >&2;}
fi
fi
if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- echo "$as_me:$LINENO: checking for STLport libraries" >&5
-echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for STLport libraries" >&5
+echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6; }
if test "$_os" = "SunOS"; then
if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
elif test -f "$STLPORT4/lib/libstlport.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
STLPORT_VER=500
else
{ { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
@@ -9596,11 +10479,11 @@ echo "$as_me: error: STLport libraries not found" >&2;}
fi
elif test "$_os" = "Darwin"; then
if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
elif test -f "$STLPORT4/lib/libstlport.dylib"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
STLPORT_VER=500
else
{ { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
@@ -9609,15 +10492,15 @@ echo "$as_me: error: STLport libraries not found" >&2;}
fi
elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
else
if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
elif test -f "$STLPORT4/lib/libstlport.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
STLPORT_VER=500
else
{ { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
@@ -9627,11 +10510,11 @@ echo "$as_me: error: STLport libraries not found" >&2;}
fi
else
if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
elif test -f "$STLPORT4/lib/libstlport.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+ { echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6; }
STLPORT_VER=500
else
{ { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
@@ -9659,8 +10542,8 @@ fi
if test "$GCC" = "yes"; then
- echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5
+echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6; }
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -fvisibility=hidden"
cat >conftest.$ac_ext <<_ACEOF
@@ -9679,49 +10562,47 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
HAVE_GCC_VISIBILITY_FEATURE=TRUE
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS=$save_CFLAGS
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
if test "$USE_SYSTEM_STL" = "YES"; then
- echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
-echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6
- ac_ext=cc
+ { echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
+echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6; }
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -9747,48 +10628,44 @@ hash_map<int, int> t; return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_cxx_have_ext_hash_map=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_have_ext_hash_map=no
+ ac_cv_cxx_have_ext_hash_map=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
{ { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5
echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6
+ { echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6; }
fi
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
- echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5
-echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5
+echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9807,8 +10684,8 @@ else
fi
rm -f conftest*
- echo "$as_me:$LINENO: result: $stlvisok" >&5
-echo "${ECHO_T}$stlvisok" >&6
+ { echo "$as_me:$LINENO: result: $stlvisok" >&5
+echo "${ECHO_T}$stlvisok" >&6; }
if test "$stlvisok" = "no"; then
{ echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5
echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;}
@@ -9821,8 +10698,8 @@ echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling v
sharedlink_ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
- echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
-echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
+echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9841,39 +10718,36 @@ istringstream strm( "test" ); return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
$EGREP -q unresolvable conftest.err;
if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gccvisok=no
+ gccvisok=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $gccvisok" >&5
-echo "${ECHO_T}$gccvisok" >&6
+ { echo "$as_me:$LINENO: result: $gccvisok" >&5
+echo "${ECHO_T}$gccvisok" >&6; }
if test "$gccvisok" = "no"; then
{ echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5
echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;}
@@ -9885,8 +10759,8 @@ echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabli
fi
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
- echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
-echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
+echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6; }
cat >visibility.cxx <<_ACEOF
#pragma GCC visibility push(hidden)
struct __attribute__ ((visibility ("default"))) TestStruct {
@@ -9905,9 +10779,10 @@ _ACEOF
gccvisbroken=yes;
fi
fi
+ rm -f visibility.s
- echo "$as_me:$LINENO: result: $gccvisbroken" >&5
-echo "${ECHO_T}$gccvisbroken" >&6
+ { echo "$as_me:$LINENO: result: $gccvisbroken" >&5
+echo "${ECHO_T}$gccvisbroken" >&6; }
if test "$gccvisbroken" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5
echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;}
@@ -9926,11 +10801,11 @@ fi
-echo "$as_me:$LINENO: checking which memory allocator to use" >&5
-echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which memory allocator to use" >&5
+echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6; }
if test "$with_alloc" = "system"; then
- echo "$as_me:$LINENO: result: system" >&5
-echo "${ECHO_T}system" >&6
+ { echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6; }
ALLOC="SYS_ALLOC";
@@ -9939,9 +10814,9 @@ echo "${ECHO_T}system" >&6
for ac_func in malloc realloc calloc free
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9967,68 +10842,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -10039,16 +10906,16 @@ done
fi
if test "$with_alloc" = "tcmalloc"; then
- echo "$as_me:$LINENO: result: tcmalloc" >&5
-echo "${ECHO_T}tcmalloc" >&6
+ { echo "$as_me:$LINENO: result: tcmalloc" >&5
+echo "${ECHO_T}tcmalloc" >&6; }
if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
{ { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5
echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5
-echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5
+echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6; }
if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10061,56 +10928,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char malloc ();
int
main ()
{
-malloc ();
+return malloc ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_tcmalloc_malloc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_tcmalloc_malloc=no
+ ac_cv_lib_tcmalloc_malloc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6; }
if test $ac_cv_lib_tcmalloc_malloc = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTCMALLOC 1
@@ -10127,34 +10991,34 @@ fi
ALLOC="TCMALLOC";
fi
if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to add custom build version" >&5
-echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to add custom build version" >&5
+echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6; }
if test "z$with_build_version" != "z"; then
BUILD_VER_STRING=$with_build_version
- echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
-echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6
+ { echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
+echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6; }
else
BUILD_VER_STRING=
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to build with Java support" >&5
-echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build with Java support" >&5
+echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6; }
if test "$WITH_JAVA" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SOLAR_JAVA="TRUE"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SOLAR_JAVA=""
{ echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5
@@ -10171,7 +11035,7 @@ fi
if test "$_os" = "WINNT"; then
if test -z "$with_jdk_home"; then
- _jdk_home=`./oowintool --jdk-home`
+ _jdk_home=`./solenv/bin/oowintool --jdk-home`
if test -d "$_jdk_home"; then
with_jdk_home="$_jdk_home"
fi
@@ -10185,8 +11049,8 @@ if test "$SOLAR_JAVA" != ""; then
if test -z "$with_jdk_home"; then
# Extract the first word of "$WITH_JAVA", so it can be a program name with args.
set dummy $WITH_JAVA; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10201,27 +11065,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
-
if test -n "$JAVAINTERPRETER"; then
- echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
-echo "${ECHO_T}$JAVAINTERPRETER" >&6
+ { echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
+echo "${ECHO_T}$JAVAINTERPRETER" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
else
_java_path="$with_jdk_home/bin/$WITH_JAVA"
if test -x "$_java_path"; then
@@ -10243,8 +11108,8 @@ fi
if test "$SOLAR_JAVA" != ""; then
_gij_longver=0
- echo "$as_me:$LINENO: checking the installed JDK" >&5
-echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the installed JDK" >&5
+echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6; }
if test -n "$JAVAINTERPRETER"; then
if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
{ { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
@@ -10269,8 +11134,8 @@ echo "$as_me: error: No valid check available. Please check the block for your d
# JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
JDK=gcj
- echo "$as_me:$LINENO: result: checked (gcj)" >&5
-echo "${ECHO_T}checked (gcj)" >&6
+ { echo "$as_me:$LINENO: result: checked (gcj)" >&5
+echo "${ECHO_T}checked (gcj)" >&6; }
_gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
@@ -10301,27 +11166,29 @@ echo "$as_me: error: No valid check available. Please check the block for your d
# JAVA_HOME=$with_jdk_home
#
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
- { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
-echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
+ JDK=ibm
+
+ _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
+ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+
+ if test "$_jdk_ver" -lt 10600; then
+ { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5
+echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;}
{ (exit 1); exit 1; }; }
-# JDK=ibm
-#
-# dnl IBM JDK specific tests
-# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#
-# if test "$_jdk_ver" -lt 10301; then
-# AC_MSG_ERROR([IBM JDK is too old, you need at least 1.3.1])
-# fi
-#
-# AC_MSG_RESULT([checked (IBM JDK $_jdk)])
-#
-# if test "$with_jdk_home" = ""; then
-# AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
-#you must use the "--with-jdk-home" configure option explicitly])
-# fi
-#
-# JAVA_HOME=$with_jdk_home
+ fi
+
+ { echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5
+echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6; }
+
+ if test "$with_jdk_home" = ""; then
+ { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the \"--with-jdk-home\" configure option explicitly" >&5
+echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the \"--with-jdk-home\" configure option explicitly" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ JAVA_HOME=$with_jdk_home
else
JDK=sun
@@ -10334,8 +11201,8 @@ echo "$as_me: error: No valid check available. Please check the block for your d
echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
-echo "${ECHO_T}checked (JDK $_jdk)" >&6
+ { echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
+echo "${ECHO_T}checked (JDK $_jdk)" >&6; }
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
if test "$_os" = "WINNT"; then
JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"`
@@ -10367,8 +11234,8 @@ if test "$SOLAR_JAVA" != ""; then
if test -z "$with_jdk_home"; then
# Extract the first word of "$javacompiler", so it can be a program name with args.
set dummy $javacompiler; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_JAVACOMPILER+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10383,27 +11250,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
JAVACOMPILER=$ac_cv_path_JAVACOMPILER
-
if test -n "$JAVACOMPILER"; then
- echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
-echo "${ECHO_T}$JAVACOMPILER" >&6
+ { echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
+echo "${ECHO_T}$JAVACOMPILER" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
else
_javac_path="$with_jdk_home/bin/$javacompiler"
if test -x "$_javac_path"; then
@@ -10429,11 +11297,11 @@ echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
fi
if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
- echo "$as_me:$LINENO: checking re-checking JDK" >&5
-echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking re-checking JDK" >&5
+echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6; }
JDK=gcj
- echo "$as_me:$LINENO: result: checked (ecj)" >&5
-echo "${ECHO_T}checked (ecj)" >&6
+ { echo "$as_me:$LINENO: result: checked (ecj)" >&5
+echo "${ECHO_T}checked (ecj)" >&6; }
#TODO: what's to do here? some switch to do 1.5 compiling?
JAVAFLAGS="-source 1.5 -target 1.5"
_gij_longver="50000"
@@ -10452,8 +11320,8 @@ if test "$SOLAR_JAVA" != ""; then
if test -z "$with_jdk_home"; then
# Extract the first word of "javadoc", so it can be a program name with args.
set dummy javadoc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_JAVADOC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10468,27 +11336,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
JAVADOC=$ac_cv_path_JAVADOC
-
if test -n "$JAVADOC"; then
- echo "$as_me:$LINENO: result: $JAVADOC" >&5
-echo "${ECHO_T}$JAVADOC" >&6
+ { echo "$as_me:$LINENO: result: $JAVADOC" >&5
+echo "${ECHO_T}$JAVADOC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
else
_javadoc_path="$with_jdk_home/bin/javadoc"
if test "$_os" = "OS2"; then
@@ -10501,8 +11370,8 @@ fi
else
# Extract the first word of "javadoc", so it can be a program name with args.
set dummy javadoc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_JAVADOC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10517,27 +11386,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
JAVADOC=$ac_cv_path_JAVADOC
-
if test -n "$JAVADOC"; then
- echo "$as_me:$LINENO: result: $JAVADOC" >&5
-echo "${ECHO_T}$JAVADOC" >&6
+ { echo "$as_me:$LINENO: result: $JAVADOC" >&5
+echo "${ECHO_T}$JAVADOC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
fi
if test -z "$JAVADOC"; then
@@ -10575,8 +11445,8 @@ class findhome
}
}
_ACEOF
- echo "$as_me:$LINENO: checking if javac works" >&5
-echo $ECHO_N "checking if javac works... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if javac works" >&5
+echo $ECHO_N "checking if javac works... $ECHO_C" >&6; }
javac_cmd="$JAVACOMPILER findhome.java 1>&2"
{ (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
(eval $javac_cmd) 2>&5
@@ -10584,8 +11454,8 @@ echo $ECHO_N "checking if javac works... $ECHO_C" >&6
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
if test $? = 0 && test -f ./findhome.class ; then
- echo "$as_me:$LINENO: result: javac works" >&5
-echo "${ECHO_T}javac works" >&6
+ { echo "$as_me:$LINENO: result: javac works" >&5
+echo "${ECHO_T}javac works" >&6; }
else
echo "configure: javac test failed" >&5
cat findhome.java >&5
@@ -10594,12 +11464,12 @@ echo "$as_me: error: javac does not work - java projects will not build!" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking if gij knows its java.home" >&5
-echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if gij knows its java.home" >&5
+echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6; }
JAVA_HOME=`$JAVAINTERPRETER findhome`
if test $? = 0 && test "$JAVA_HOME" != "" ; then
- echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
-echo "${ECHO_T}$JAVA_HOME" >&6
+ { echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
+echo "${ECHO_T}$JAVA_HOME" >&6; }
else
echo "configure: java test failed" >&5
cat findhome.java >&5
@@ -10670,8 +11540,8 @@ fi
AWTLIB=
if test "$SOLAR_JAVA" != ""; then
- echo "$as_me:$LINENO: checking for jawt lib name" >&5
-echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for jawt lib name" >&5
+echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6; }
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
@@ -10679,17 +11549,17 @@ echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
if test "${ac_cv_header_jni_h+set}" = set; then
- echo "$as_me:$LINENO: checking for jni.h" >&5
-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jni_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking jni.h usability" >&5
-echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jni.h usability" >&5
+echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10700,41 +11570,37 @@ $ac_includes_default
#include <jni.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking jni.h presence" >&5
-echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jni.h presence" >&5
+echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10743,24 +11609,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <jni.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -10768,9 +11632,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -10794,25 +11659,18 @@ echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&
echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for jni.h" >&5
-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jni_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_jni_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }
fi
if test $ac_cv_header_jni_h = yes; then
@@ -10824,8 +11682,8 @@ echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj o
fi
- echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
-echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6; }
if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10838,56 +11696,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char JAWT_GetAWT ();
int
main ()
{
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_gcjawt_JAWT_GetAWT=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_gcjawt_JAWT_GetAWT=no
+ ac_cv_lib_gcjawt_JAWT_GetAWT=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; }
if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then
AWTLIB="-lgcjawt -lgcj"
fi
@@ -10908,17 +11763,17 @@ fi
export LD_LIBRARY_PATH
exec 6>/dev/null # no output
if test "${ac_cv_header_jni_h+set}" = set; then
- echo "$as_me:$LINENO: checking for jni.h" >&5
-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jni_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking jni.h usability" >&5
-echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jni.h usability" >&5
+echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10929,41 +11784,37 @@ $ac_includes_default
#include <jni.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking jni.h presence" >&5
-echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jni.h presence" >&5
+echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10972,24 +11823,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <jni.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -10997,9 +11846,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -11023,25 +11873,18 @@ echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&
echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for jni.h" >&5
-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for jni.h" >&5
+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jni_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_jni_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
-echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }
fi
if test $ac_cv_header_jni_h = yes; then
@@ -11053,8 +11896,8 @@ echo "$as_me: error: jni.h could not be found." >&2;}
fi
- echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
-echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6; }
if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11067,64 +11910,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char JAWT_GetAWT ();
int
main ()
{
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jawt_JAWT_GetAWT=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_jawt_JAWT_GetAWT=no
+ ac_cv_lib_jawt_JAWT_GetAWT=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6; }
if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then
AWTLIB="-ljawt"
fi
if test -z "$AWTLIB"; then
LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
- echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5
-echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5
+echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6; }
if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11137,56 +11977,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char JAWT_GetAWT ();
int
main ()
{
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_mawt_JAWT_GetAWT=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_mawt_JAWT_GetAWT=no
+ ac_cv_lib_mawt_JAWT_GetAWT=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
+echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6; }
if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then
AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
fi
@@ -11200,24 +12037,24 @@ fi
if test -z "$AWTLIB"; then
AWTLIB=-ljawt
fi
- echo "$as_me:$LINENO: result: $AWTLIB" >&5
-echo "${ECHO_T}$AWTLIB" >&6
+ { echo "$as_me:$LINENO: result: $AWTLIB" >&5
+echo "${ECHO_T}$AWTLIB" >&6; }
fi
if test "$SOLAR_JAVA" != ""; then
- echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5
-echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5
+echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6; }
if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
gcjaot="gcj"
else
gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
fi
- echo "$as_me:$LINENO: result: $gcjaot" >&5
-echo "${ECHO_T}$gcjaot" >&6
+ { echo "$as_me:$LINENO: result: $gcjaot" >&5
+echo "${ECHO_T}$gcjaot" >&6; }
if test -n "$with_jdk_home"; then
_javac_path="$with_jdk_home/bin/$gcjaot"
if test -x "$_javac_path"; then
@@ -11227,8 +12064,8 @@ echo "${ECHO_T}$gcjaot" >&6
if test -z "$JAVAAOTCOMPILER"; then
# Extract the first word of "$gcjaot", so it can be a program name with args.
set dummy $gcjaot; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11243,35 +12080,36 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
-
if test -n "$JAVAAOTCOMPILER"; then
- echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
-echo "${ECHO_T}$JAVAAOTCOMPILER" >&6
+ { echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
+echo "${ECHO_T}$JAVAAOTCOMPILER" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$JAVAAOTCOMPILER"; then
{ echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5
echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;}
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
@@ -11287,8 +12125,8 @@ fi
# Extract the first word of "dmake", so it can be a program name with args.
set dummy dmake; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_DMAKE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11303,34 +12141,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no"
;;
esac
fi
DMAKE=$ac_cv_path_DMAKE
-
if test -n "$DMAKE"; then
- echo "$as_me:$LINENO: result: $DMAKE" >&5
-echo "${ECHO_T}$DMAKE" >&6
+ { echo "$as_me:$LINENO: result: $DMAKE" >&5
+echo "${ECHO_T}$DMAKE" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test "$DMAKE" = "no"; then
BUILD_DMAKE=YES
echo "dmake will be built on ./bootstrap"
else
- echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5
-echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5
+echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6; }
# we need to find out whether that dmake we found is "our" dmake
# or the dmake from Sun's SunStudio Compiler which is something
# different
@@ -11339,46 +12178,46 @@ echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&
$DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
if test $? -eq 0; then
BUILD_DMAKE=NO
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- echo "$as_me:$LINENO: checking the dmake version" >&5
-echo $ECHO_N "checking the dmake version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ { echo "$as_me:$LINENO: checking the dmake version" >&5
+echo $ECHO_N "checking the dmake version... $ECHO_C" >&6; }
DMAKE_VERSION=`$DMAKE -V | $SED -n 's/.*Version \([0-9.]\+\).*/\1/p'`
if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
- echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-echo "${ECHO_T}OK, >= 4.11" >&6
+ { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
+echo "${ECHO_T}OK, >= 4.11" >&6; }
elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
- echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-echo "${ECHO_T}OK, >= 4.11" >&6
+ { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
+echo "${ECHO_T}OK, >= 4.11" >&6; }
else
- echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
-echo "${ECHO_T}too old. >= 4.11 is needed" >&6
+ { echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
+echo "${ECHO_T}too old. >= 4.11 is needed" >&6; }
echo "A newer dmake will be built on ./bootstrap"
BUILD_DMAKE=YES
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
echo "dmake will be built on ./bootstrap"
BUILD_DMAKE=YES
fi
fi
-echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
-echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
+echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if test "$_os" != "WINNT"; then
if test -n "$with_epm"; then
EPM=$with_epm
else
# Extract the first word of "epm", so it can be a program name with args.
set dummy epm; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_EPM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11393,28 +12232,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no"
;;
esac
fi
EPM=$ac_cv_path_EPM
-
if test -n "$EPM"; then
- echo "$as_me:$LINENO: result: $EPM" >&5
-echo "${ECHO_T}$EPM" >&6
+ { echo "$as_me:$LINENO: result: $EPM" >&5
+echo "${ECHO_T}$EPM" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$EPM" = "no" || test "$EPM" = "internal"; then
echo "EPM will be built."
@@ -11422,35 +12262,35 @@ fi
BUILD_TYPE="$BUILD_TYPE EPM"
else
# Gentoo has some epm which is something different...
- echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5
-echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5
+echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6; }
if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5
echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking epm version" >&5
-echo $ECHO_N "checking epm version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking epm version" >&5
+echo $ECHO_N "checking epm version... $ECHO_C" >&6; }
EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
- echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
-echo "${ECHO_T}OK, >= 3.7" >&6
+ { echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
+echo "${ECHO_T}OK, >= 3.7" >&6; }
BUILD_EPM=NO
if test "$_os" = "Darwin"; then
- echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5
-echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5
+echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6; }
_pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
{ { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
{ (exit 1); exit 1; }; }
elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
- echo "$as_me:$LINENO: result: $_pm, ok" >&5
-echo "${ECHO_T}$_pm, ok" >&6
+ { echo "$as_me:$LINENO: result: $_pm, ok" >&5
+echo "${ECHO_T}$_pm, ok" >&6; }
else # we never should get here, but go safe
{ { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
@@ -11458,8 +12298,8 @@ echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch y
fi
fi
else
- echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5
-echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
+ { echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5
+echo "${ECHO_T}too old. epm >= 3.7 is required." >&6; }
echo "EPM will be built."
BUILD_EPM=YES
BUILD_TYPE="$BUILD_TYPE EPM"
@@ -11468,8 +12308,8 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
fi
# test which package format to use
- echo "$as_me:$LINENO: checking which package format to use" >&5
-echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which package format to use" >&5
+echo $ECHO_N "checking which package format to use... $ECHO_C" >&6; }
# epm supports the following formats:
# aix - AIX software distribution
# bsd - FreeBSD, NetBSD, or OpenBSD software distribution
@@ -11559,11 +12399,11 @@ portable - Portable software distribution
done
PKGFORMAT="$with_package_format"
fi
- echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
-echo "${ECHO_T}$PKGFORMAT" >&6
+ { echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
+echo "${ECHO_T}$PKGFORMAT" >&6; }
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
- echo "$as_me:$LINENO: checking for rpm" >&5
-echo $ECHO_N "checking for rpm... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for rpm" >&5
+echo $ECHO_N "checking for rpm... $ECHO_C" >&6; }
for a in "$RPM" rpmbuild rpm; do
$a --usage >/dev/null 2> /dev/null
if test $? -eq 0; then
@@ -11583,15 +12423,15 @@ echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
else
RPM_PATH=`which $RPM`
- echo "$as_me:$LINENO: result: $RPM_PATH" >&5
-echo "${ECHO_T}$RPM_PATH" >&6
+ { echo "$as_me:$LINENO: result: $RPM_PATH" >&5
+echo "${ECHO_T}$RPM_PATH" >&6; }
fi
fi
if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
# Extract the first word of "dpkg", so it can be a program name with args.
set dummy dpkg; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_DPKG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11606,28 +12446,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no"
;;
esac
fi
DPKG=$ac_cv_path_DPKG
-
if test -n "$DPKG"; then
- echo "$as_me:$LINENO: result: $DPKG" >&5
-echo "${ECHO_T}$DPKG" >&6
+ { echo "$as_me:$LINENO: result: $DPKG" >&5
+echo "${ECHO_T}$DPKG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test "$DPKG" = "no"; then
{ { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5
echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;}
@@ -11636,15 +12477,15 @@ echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;}
fi
if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
if test "$_os" = "Darwin"; then
- echo "$as_me:$LINENO: checking for PackageMaker availability" >&5
-echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for PackageMaker availability" >&5
+echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6; }
if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
{ { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5
echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
else
{ { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5
@@ -11656,14 +12497,14 @@ echo "$as_me: error: PackageMaker needed to build OSX packages and you are not o
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
- echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5
-echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5
+echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6; }
if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
if echo "$PKGFORMAT" | grep -q rpm; then
_pt="rpm"
{ echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5
@@ -11690,8 +12531,8 @@ echo "$as_me: WARNING: if you want to make sure installation without --nodeps an
if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
# Extract the first word of "pkgmk", so it can be a program name with args.
set dummy pkgmk; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKGMK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11706,28 +12547,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no"
;;
esac
fi
PKGMK=$ac_cv_path_PKGMK
-
if test -n "$PKGMK"; then
- echo "$as_me:$LINENO: result: $PKGMK" >&5
-echo "${ECHO_T}$PKGMK" >&6
+ { echo "$as_me:$LINENO: result: $PKGMK" >&5
+echo "${ECHO_T}$PKGMK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test "$PKGMK" = "no"; then
{ { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5
echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
@@ -11740,16 +12582,16 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
EPM=NO
fi
# Extract the first word of "gperf", so it can be a program name with args.
set dummy gperf; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GPERF+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11764,64 +12606,65 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
GPERF=$ac_cv_path_GPERF
-
if test -n "$GPERF"; then
- echo "$as_me:$LINENO: result: $GPERF" >&5
-echo "${ECHO_T}$GPERF" >&6
+ { echo "$as_me:$LINENO: result: $GPERF" >&5
+echo "${ECHO_T}$GPERF" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$GPERF"; then
{ { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5
echo "$as_me: error: gperf not found but needed. Install it." >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: checking gperf version" >&5
-echo $ECHO_N "checking gperf version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking gperf version" >&5
+echo $ECHO_N "checking gperf version... $ECHO_C" >&6; }
if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
else
{ { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5
echo "$as_me: error: too old, you need at least 3.0.0" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: checking whether to build the ODK" >&5
-echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build the ODK" >&5
+echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6; }
if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if test "$WITH_JAVA" != "no"; then
- echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5
-echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6
- if ! test -f "../external/unowinreg/unowinreg.dll"; then
+ { echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5
+echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6; }
+ if ! test -f "./external/unowinreg/unowinreg.dll"; then
HAVE_UNOWINREG_DLL=no
else
HAVE_UNOWINREG_DLL=yes
fi
if test "$HAVE_UNOWINREG_DLL" = "yes"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
BUILD_UNOWINREG=NO
else
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: result: not found, will be built" >&5
-echo "${ECHO_T}not found, will be built" >&6
+ { echo "$as_me:$LINENO: result: not found, will be built" >&5
+echo "${ECHO_T}not found, will be built" >&6; }
else
{ echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5
echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
@@ -11846,8 +12689,8 @@ echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args.
set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_MINGWCXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11860,32 +12703,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
MINGWCXX=$ac_cv_prog_MINGWCXX
if test -n "$MINGWCXX"; then
- echo "$as_me:$LINENO: result: $MINGWCXX" >&5
-echo "${ECHO_T}$MINGWCXX" >&6
+ { echo "$as_me:$LINENO: result: $MINGWCXX" >&5
+echo "${ECHO_T}$MINGWCXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_MINGWCXX"; then
ac_ct_MINGWCXX=$MINGWCXX
# Extract the first word of "$WITH_MINGWIN", so it can be a program name with args.
set dummy $WITH_MINGWIN; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11898,27 +12743,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_MINGWCXX" && ac_cv_prog_ac_ct_MINGWCXX="false"
fi
fi
ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX
if test -n "$ac_ct_MINGWCXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
-echo "${ECHO_T}$ac_ct_MINGWCXX" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
+echo "${ECHO_T}$ac_ct_MINGWCXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- MINGWCXX=$ac_ct_MINGWCXX
+ if test "x$ac_ct_MINGWCXX" = x; then
+ MINGWCXX="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ MINGWCXX=$ac_ct_MINGWCXX
+ fi
else
MINGWCXX="$ac_cv_prog_MINGWCXX"
fi
@@ -11929,15 +12788,15 @@ fi
echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6; }
if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
{ { echo "$as_me:$LINENO: error: no" >&5
echo "$as_me: error: no" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
@@ -11945,8 +12804,8 @@ echo "${ECHO_T}yes" >&6
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11959,32 +12818,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
MINGWSTRIP=$ac_cv_prog_MINGWSTRIP
if test -n "$MINGWSTRIP"; then
- echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
-echo "${ECHO_T}$MINGWSTRIP" >&6
+ { echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
+echo "${ECHO_T}$MINGWSTRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_MINGWSTRIP"; then
ac_ct_MINGWSTRIP=$MINGWSTRIP
# Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11997,27 +12858,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_MINGWSTRIP" && ac_cv_prog_ac_ct_MINGWSTRIP="false"
fi
fi
ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP
if test -n "$ac_ct_MINGWSTRIP"; then
- echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
-echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
+echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- MINGWSTRIP=$ac_ct_MINGWSTRIP
+ if test "x$ac_ct_MINGWSTRIP" = x; then
+ MINGWSTRIP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ MINGWSTRIP=$ac_ct_MINGWSTRIP
+ fi
else
MINGWSTRIP="$ac_cv_prog_MINGWSTRIP"
fi
@@ -12028,7 +12903,7 @@ fi
echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;}
{ (exit 1); exit 1; }; }
fi
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -12047,8 +12922,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
save_LIBS=$LIBS
LIBS=""
-echo "$as_me:$LINENO: checking for main in -lkernel32" >&5
-echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -lkernel32" >&5
+echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6; }
if test "${ac_cv_lib_kernel32_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12065,46 +12940,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_kernel32_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_kernel32_main=no
+ ac_cv_lib_kernel32_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6; }
if test $ac_cv_lib_kernel32_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKERNEL32 1
@@ -12116,8 +12988,8 @@ fi
ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
-echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5
-echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5
+echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6; }
if test "${ac_cv_lib_advapi32_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12134,46 +13006,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_advapi32_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_advapi32_main=no
+ ac_cv_lib_advapi32_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6; }
if test $ac_cv_lib_advapi32_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBADVAPI32 1
@@ -12185,17 +13054,17 @@ fi
ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
if test "${ac_cv_header_windows_h+set}" = set; then
- echo "$as_me:$LINENO: checking for windows.h" >&5
-echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for windows.h" >&5
+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
if test "${ac_cv_header_windows_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking windows.h usability" >&5
-echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking windows.h usability" >&5
+echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12206,41 +13075,37 @@ $ac_includes_default
#include <windows.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking windows.h presence" >&5
-echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking windows.h presence" >&5
+echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12249,24 +13114,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <windows.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -12274,9 +13137,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -12300,25 +13164,18 @@ echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"
echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for windows.h" >&5
-echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for windows.h" >&5
+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
if test "${ac_cv_header_windows_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_windows_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6; }
fi
if test $ac_cv_header_windows_h = yes; then
@@ -12345,25 +13202,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
BUILD_TYPE="$BUILD_TYPE ODK"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
BUILD_UNOWINREG=NO
fi
-echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5
-echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5
+echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6; }
if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
BUILD_QADEVOOO="YES"
BUILD_TYPE="$BUILD_TYPE QADEVOOO"
else
BUILD_QADEVOOO="NO"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -12376,16 +13233,16 @@ echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs,
fi
fi
-echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
-echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
+echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6; }
if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
test "$with_system_stdlibs" != "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SYSTEM_STDLIBS=YES
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SYSTEM_STDLIBS=NO
fi
@@ -12393,25 +13250,25 @@ fi
if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
with_system_zlib=yes
fi
-echo "$as_me:$LINENO: checking which zlib to use" >&5
-echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which zlib to use" >&5
+echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6; }
if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
test "$with_system_zlib" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_ZLIB=YES
if test "${ac_cv_header_zlib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12422,41 +13279,37 @@ $ac_includes_default
#include <zlib.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12465,24 +13318,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <zlib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -12490,9 +13341,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12516,25 +13368,18 @@ echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >
echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_zlib_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
fi
if test $ac_cv_header_zlib_h = yes; then
@@ -12546,8 +13391,8 @@ echo "$as_me: error: zlib.h not found. install zlib" >&2;}
fi
- echo "$as_me:$LINENO: checking for deflate in -lz" >&5
-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for deflate in -lz" >&5
+echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }
if test "${ac_cv_lib_z_deflate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12560,56 +13405,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char deflate ();
int
main ()
{
-deflate ();
+return deflate ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_z_deflate=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_z_deflate=no
+ ac_cv_lib_z_deflate=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }
if test $ac_cv_lib_z_deflate = yes; then
ZLIB=-lz
else
@@ -12619,32 +13461,32 @@ echo "$as_me: error: zlib not found or functional" >&2;}
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_ZLIB=NO
BUILD_TYPE="$BUILD_TYPE ZLIB"
fi
-echo "$as_me:$LINENO: checking which jpeg to use" >&5
-echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which jpeg to use" >&5
+echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6; }
if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
test "$with_system_jpeg" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_JPEG=YES
if test "${ac_cv_header_jpeglib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jpeglib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
-echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
+echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12655,41 +13497,37 @@ $ac_includes_default
#include <jpeglib.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
-echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
+echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12698,24 +13536,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <jpeglib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -12723,9 +13559,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12749,25 +13586,18 @@ echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"
echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_jpeglib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_jpeglib_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
fi
if test $ac_cv_header_jpeglib_h = yes; then
@@ -12779,8 +13609,8 @@ echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;}
fi
- echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
+echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6; }
if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12793,90 +13623,87 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char jpeg_resync_to_restart ();
int
main ()
{
-jpeg_resync_to_restart ();
+return jpeg_resync_to_restart ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_jpeg_jpeg_resync_to_restart=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_jpeg_jpeg_resync_to_restart=no
+ ac_cv_lib_jpeg_jpeg_resync_to_restart=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; }
if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then
JPEG3RDLIB=-ljpeg
else
- echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
-echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
+echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_JPEG=NO
BUILD_TYPE="$BUILD_TYPE JPEG"
fi
-echo "$as_me:$LINENO: checking which expat to use" >&5
-echo $ECHO_N "checking which expat to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which expat to use" >&5
+echo $ECHO_N "checking which expat to use... $ECHO_C" >&6; }
if test -n "$with_system_expat" -o -n "$with_system_libs" && \
test "$with_system_expat" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_EXPAT=YES
if test "${ac_cv_header_expat_h+set}" = set; then
- echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
if test "${ac_cv_header_expat_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking expat.h usability" >&5
-echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12887,41 +13714,37 @@ $ac_includes_default
#include <expat.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking expat.h presence" >&5
-echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12930,24 +13753,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <expat.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -12955,9 +13776,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12981,25 +13803,18 @@ echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
if test "${ac_cv_header_expat_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_expat_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
fi
if test $ac_cv_header_expat_h = yes; then
@@ -13012,8 +13827,8 @@ fi
-echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13026,56 +13841,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XML_ParserCreate ();
int
main ()
{
-XML_ParserCreate ();
+return XML_ParserCreate ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_expat_XML_ParserCreate=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_expat_XML_ParserCreate=no
+ ac_cv_lib_expat_XML_ParserCreate=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBEXPAT 1
@@ -13084,24 +13896,24 @@ _ACEOF
LIBS="-lexpat $LIBS"
else
- echo "$as_me:$LINENO: result: expat library not found or functional." >&5
-echo "${ECHO_T}expat library not found or functional." >&6
+ { echo "$as_me:$LINENO: result: expat library not found or functional." >&5
+echo "${ECHO_T}expat library not found or functional." >&6; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_EXPAT=NO
BUILD_TYPE="$BUILD_TYPE EXPAT"
fi
-echo "$as_me:$LINENO: checking which libwpd to use" >&5
-echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which libwpd to use" >&5
+echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6; }
if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
test "$with_system_libwpd" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_LIBWPD=YES
succeeded=no
@@ -13109,8 +13921,8 @@ echo "${ECHO_T}external" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13125,28 +13937,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -13157,25 +13970,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
-echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
+echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libwpd-0.8 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
-echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
+echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6; }
LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "`
- echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
-echo "${ECHO_T}$LIBWPD_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
+echo "${ECHO_T}$LIBWPD_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
-echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
+echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6; }
LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "`
- echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
-echo "${ECHO_T}$LIBWPD_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
+echo "${ECHO_T}$LIBWPD_LIBS" >&6; }
else
LIBWPD_CFLAGS=""
LIBWPD_LIBS=""
@@ -13202,8 +14015,8 @@ echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjust
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_LIBWPD=NO
BUILD_TYPE="$BUILD_TYPE LIBWPD"
fi
@@ -13212,16 +14025,16 @@ fi
if test "$test_freetype" = "yes"; then
- echo "$as_me:$LINENO: checking whether freetype is available" >&5
-echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether freetype is available" >&5
+echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13236,28 +14049,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -13268,25 +14082,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
-echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
+echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
-echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
+echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; }
FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "`
- echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
-echo "${ECHO_T}$FREETYPE_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
+echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
-echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
+echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; }
FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "`
- echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
-echo "${ECHO_T}$FREETYPE_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
+echo "${ECHO_T}$FREETYPE_LIBS" >&6; }
else
FREETYPE_CFLAGS=""
FREETYPE_LIBS=""
@@ -13322,8 +14136,8 @@ if test "$test_freetype" = "yes"; then
save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
- echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
-echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
+echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6; }
if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13336,56 +14150,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char FT_GlyphSlot_Embolden ();
int
main ()
{
-FT_GlyphSlot_Embolden ();
+return FT_GlyphSlot_Embolden ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
+ ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
+echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; }
if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then
USE_FT_EMBOLDEN="YES"
else
@@ -13419,26 +14230,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
fi
fi
-echo "$as_me:$LINENO: checking which libxslt to use" >&5
-echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which libxslt to use" >&5
+echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6; }
if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
"$_os" = "Darwin" && \
test "$with_system_libxslt" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_LIBXSLT=YES
if test "$_os" = "Darwin"; then
- echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
+echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; }
LIBXSLT_CFLAGS=`xslt-config --cflags`
- echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
-echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6
- echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
-echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
+echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; }
+ { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
+echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; }
LIBXSLT_LIBS=`xslt-config --libs`
- echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-echo "${ECHO_T}$LIBXSLT_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
+echo "${ECHO_T}$LIBXSLT_LIBS" >&6; }
else
@@ -13448,8 +14259,8 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13464,28 +14275,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -13496,25 +14308,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libxslt" >&5
-echo $ECHO_N "checking for libxslt... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libxslt" >&5
+echo $ECHO_N "checking for libxslt... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libxslt" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
+echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; }
LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"`
- echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
-echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
+echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
-echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
+echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; }
LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"`
- echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-echo "${ECHO_T}$LIBXSLT_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
+echo "${ECHO_T}$LIBXSLT_LIBS" >&6; }
else
LIBXSLT_CFLAGS=""
LIBXSLT_LIBS=""
@@ -13545,8 +14357,8 @@ echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting
# Extract the first word of "xsltproc", so it can be a program name with args.
set dummy xsltproc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_XSLTPROC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13561,36 +14373,37 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
;;
esac
fi
XSLTPROC=$ac_cv_path_XSLTPROC
-
if test -n "$XSLTPROC"; then
- echo "$as_me:$LINENO: result: $XSLTPROC" >&5
-echo "${ECHO_T}$XSLTPROC" >&6
+ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5
+echo "${ECHO_T}$XSLTPROC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test "$XSLTPROC" = "no"; then
{ { echo "$as_me:$LINENO: error: xsltproc is required" >&5
echo "$as_me: error: xsltproc is required" >&2;}
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_LIBXSLT=NO
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
fi
@@ -13599,25 +14412,25 @@ fi
-echo "$as_me:$LINENO: checking which libxml to use" >&5
-echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which libxml to use" >&5
+echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6; }
if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
"$_os" = "Darwin" && \
test "$with_system_libxml" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_LIBXML=YES
if test "$_os" = "Darwin"; then
- echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
+echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; }
LIBXML_CFLAGS=`xml2-config --cflags`
- echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
-echo "${ECHO_T}$LIBXML_CFLAGS" >&6
- echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
-echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
+echo "${ECHO_T}$LIBXML_CFLAGS" >&6; }
+ { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
+echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; }
LIBXML_LIBS=`xml2-config --libs`
- echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-echo "${ECHO_T}$LIBXML_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
+echo "${ECHO_T}$LIBXML_LIBS" >&6; }
else
@@ -13627,8 +14440,8 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13643,28 +14456,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -13675,25 +14489,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5
-echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5
+echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
+echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; }
LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"`
- echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
-echo "${ECHO_T}$LIBXML_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
+echo "${ECHO_T}$LIBXML_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
-echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
+echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; }
LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"`
- echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-echo "${ECHO_T}$LIBXML_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
+echo "${ECHO_T}$LIBXML_LIBS" >&6; }
else
LIBXML_CFLAGS=""
LIBXML_LIBS=""
@@ -13723,8 +14537,8 @@ echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider
BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_LIBXML=NO
BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
fi
@@ -13735,21 +14549,21 @@ fi
if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
with_system_python=yes
fi
-echo "$as_me:$LINENO: checking which python to use" >&5
-echo $ECHO_N "checking which python to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which python to use" >&5
+echo $ECHO_N "checking which python to use... $ECHO_C" >&6; }
if test -n "$with_system_python" -o -n "$with_system_libs" && \
test "$with_system_python" != "no"; then
SYSTEM_PYTHON=YES
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
- echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
-echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
+echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6; }
prog="import sys, string
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
@@ -13762,8 +14576,8 @@ sys.exit(sys.hexversion < minverhex)"
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: too old" >&5
echo "$as_me: error: too old" >&2;}
@@ -13774,8 +14588,8 @@ fi
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
- echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5
-echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5
+echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6; }
if test "${am_cv_pathless_PYTHON+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13799,16 +14613,16 @@ fi
done
fi
-echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
+echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
if test "$am_cv_pathless_PYTHON" = none; then
PYTHON=:
else
# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
set dummy $am_cv_pathless_PYTHON; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PYTHON+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13823,27 +14637,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
PYTHON=$ac_cv_path_PYTHON
-
if test -n "$PYTHON"; then
- echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6
+ { echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
am_display_PYTHON=$am_cv_pathless_PYTHON
fi
@@ -13856,15 +14671,15 @@ echo "$as_me: error: no suitable Python interpreter found" >&2;}
else
- echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
if test "${am_cv_python_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
fi
-echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-echo "${ECHO_T}$am_cv_python_version" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+echo "${ECHO_T}$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
@@ -13875,30 +14690,30 @@ echo "${ECHO_T}$am_cv_python_version" >&6
- echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
if test "${am_cv_python_platform+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
fi
-echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-echo "${ECHO_T}$am_cv_python_platform" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+echo "${ECHO_T}$am_cv_python_platform" >&6; }
PYTHON_PLATFORM=$am_cv_python_platform
- echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
if test "${am_cv_python_pythondir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
fi
-echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-echo "${ECHO_T}$am_cv_python_pythondir" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
@@ -13906,16 +14721,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" >&6
pkgpythondir=\${pythondir}/$PACKAGE
- echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
if test "${am_cv_python_pyexecdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
fi
-echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
@@ -13941,17 +14756,17 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
if test "${ac_cv_header_Python_h+set}" = set; then
- echo "$as_me:$LINENO: checking for Python.h" >&5
-echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for Python.h" >&5
+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; }
if test "${ac_cv_header_Python_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-echo "${ECHO_T}$ac_cv_header_Python_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+echo "${ECHO_T}$ac_cv_header_Python_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking Python.h usability" >&5
-echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking Python.h usability" >&5
+echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13962,41 +14777,37 @@ $ac_includes_default
#include <Python.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking Python.h presence" >&5
-echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking Python.h presence" >&5
+echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -14005,24 +14816,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <Python.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -14030,9 +14839,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -14056,25 +14866,18 @@ echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for Python.h" >&5
-echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Python.h" >&5
+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; }
if test "${ac_cv_header_Python_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_Python_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-echo "${ECHO_T}$ac_cv_header_Python_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+echo "${ECHO_T}$ac_cv_header_Python_h" >&6; }
fi
if test $ac_cv_header_Python_h = yes; then
@@ -14090,8 +14893,8 @@ fi
else
SYSTEM_PYTHON=NO
BUILD_TYPE="$BUILD_TYPE PYTHON"
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
# Embedded python dies without Home set
if test "z$HOME" = "z"; then
export HOME="";
@@ -14100,8 +14903,8 @@ echo "${ECHO_T}internal" >&6
if test -z "$BZIP2"; then
# Extract the first word of "bzip2", so it can be a program name with args.
set dummy bzip2; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_BZIP2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14116,27 +14919,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
BZIP2=$ac_cv_path_BZIP2
-
if test -n "$BZIP2"; then
- echo "$as_me:$LINENO: result: $BZIP2" >&5
-echo "${ECHO_T}$BZIP2" >&6
+ { echo "$as_me:$LINENO: result: $BZIP2" >&5
+echo "${ECHO_T}$BZIP2" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$BZIP2"; then
{ { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5
echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;}
@@ -14150,15 +14954,15 @@ fi
HOME=`echo $HOME | sed 's:\\\\:/:g'`
-echo "$as_me:$LINENO: checking which db to use" >&5
-echo $ECHO_N "checking which db to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which db to use" >&5
+echo $ECHO_N "checking which db to use... $ECHO_C" >&6; }
if test -n "$with_system_db" -o -n "$with_system_libs" && \
test "$with_system_db" != "no"; then
SYSTEM_DB=YES
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
- echo "$as_me:$LINENO: checking for db.h" >&5
-echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
+ { echo "$as_me:$LINENO: checking for db.h" >&5
+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
if test "${ac_cv_header_db_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14174,45 +14978,41 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <db.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_db_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_db_h=no
+ ac_cv_header_db_h=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-echo "${ECHO_T}$ac_cv_header_db_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
if test $ac_cv_header_db_h = yes; then
DB_INCLUDES=/usr/include
else
CFLAGS=-I/usr/include/db4
- echo "$as_me:$LINENO: checking for db4/db.h" >&5
-echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for db4/db.h" >&5
+echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6; }
if test "${ac_cv_header_db4_db_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14227,38 +15027,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <db4/db.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_db4_db_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_db4_db_h=no
+ ac_cv_header_db4_db_h=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5
-echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6; }
if test $ac_cv_header_db4_db_h = yes; then
DB_INCLUDES=/usr/include/db4
else
@@ -14272,8 +15068,8 @@ fi
fi
- echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
-echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
+echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6; }
for v in 1 2 3 4 5 6; do
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -14298,13 +15094,22 @@ int main(int argc, char **argv) {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -14315,23 +15120,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
done
if test "$DB_VERSION_MINOR" -gt "1"; then
- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
DB_VERSION=4.$DB_VERSION_MINOR
else
- echo "$as_me:$LINENO: result: no. you need at least db 4.1" >&5
-echo "${ECHO_T}no. you need at least db 4.1" >&6
+ { echo "$as_me:$LINENO: result: no. you need at least db 4.1" >&5
+echo "${ECHO_T}no. you need at least db 4.1" >&6; }
fi
# does not work :/
#AC_CHECK_LIB(db, db_create, [],
# [AC_MSG_ERROR([db library not installed or functional])], [])
-echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -ldb" >&5
+echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; }
if test "${ac_cv_lib_db_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14348,46 +15155,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_db_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_db_main=no
+ ac_cv_lib_db_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5
-echo "${ECHO_T}$ac_cv_lib_db_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5
+echo "${ECHO_T}$ac_cv_lib_db_main" >&6; }
if test $ac_cv_lib_db_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDB 1
@@ -14404,8 +15208,8 @@ ac_cv_lib_db=ac_cv_lib_db_main
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_DB=NO
BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
fi
@@ -14414,16 +15218,16 @@ fi
-echo "$as_me:$LINENO: checking which lucene to use" >&5
-echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which lucene to use" >&5
+echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6; }
if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_LUCENE=YES
if test -z $LUCENE_CORE_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14437,14 +15241,14 @@ else
ac_cv_file__usr_share_java_lucene_core_2_3_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; }
if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then
LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14458,8 +15262,8 @@ else
ac_cv_file__usr_share_java_lucene_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6; }
if test $ac_cv_file__usr_share_java_lucene_jar = yes; then
LUCENE_CORE_JAR=/usr/share/java/lucene.jar
else
@@ -14475,9 +15279,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
-echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
+echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14490,8 +15294,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14503,8 +15308,8 @@ fi
fi
if test -z $LUCENE_ANALYZERS_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14518,14 +15323,14 @@ else
ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; }
if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then
LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14539,8 +15344,8 @@ else
ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; }
if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then
LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
else
@@ -14556,9 +15361,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
-echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
+echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14571,8 +15376,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14583,8 +15389,8 @@ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_LUCENE=NO
BUILD_TYPE="$BUILD_TYPE LUCENE"
fi
@@ -14592,20 +15398,20 @@ fi
-echo "$as_me:$LINENO: checking which hsqldb to use" >&5
-echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which hsqldb to use" >&5
+echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6; }
if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_HSQLDB=YES
if test -z $HSQLDB_JAR; then
HSQLDB_JAR=/usr/share/java/hsqldb.jar
fi
as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5
-echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5
+echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14618,8 +15424,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14628,8 +15435,8 @@ echo "$as_me: error: hsqldb.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5
-echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5
+echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6; }
export HSQLDB_JAR
if $PERL -e 'use Archive::Zip;
my $file = "$ENV{'HSQLDB_JAR'}";
@@ -14652,36 +15459,36 @@ echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6
} else {
exit 1;
}'; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5
echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;}
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_HSQLDB=NO
BUILD_TYPE="$BUILD_TYPE HSQLDB"
fi
-echo "$as_me:$LINENO: checking which beanshell to use" >&5
-echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which beanshell to use" >&5
+echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6; }
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_BSH=YES
if test -z $BSH_JAR; then
BSH_JAR=/usr/share/java/bsh.jar
fi
as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $BSH_JAR" >&5
-echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $BSH_JAR" >&5
+echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14694,8 +15501,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14705,8 +15513,8 @@ echo "$as_me: error: bsh.jar not found." >&2;}
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_BSH=NO
BUILD_TYPE="$BUILD_TYPE BSH"
fi
@@ -14714,16 +15522,16 @@ fi
-echo "$as_me:$LINENO: checking which saxon to use" >&5
-echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which saxon to use" >&5
+echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6; }
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_SAXON=YES
if test -z $SAXON_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14737,14 +15545,14 @@ else
ac_cv_file__usr_share_java_saxon9_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then
SAXON_JAR=/usr/share/java/saxon9.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14758,13 +15566,13 @@ else
ac_cv_file__usr_share_java_saxon_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6; }
if test $ac_cv_file__usr_share_java_saxon_jar = yes; then
SAXON_JAR=/usr/share/java/saxon.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14778,8 +15586,8 @@ else
ac_cv_file__usr_share_java_saxon9_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then
SAXON_JAR=/usr/share/java/saxon9.jar
else
@@ -14799,9 +15607,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5
-echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5
+echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14814,8 +15622,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14827,9 +15636,9 @@ fi
fi
if test -n "$SERIALIZER_JAR"; then
as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5
-echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5
+echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -14842,8 +15651,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -14855,8 +15665,8 @@ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_SAXON=NO
NEED_SAXON=TRUE
fi
@@ -14870,18 +15680,18 @@ fi
if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
with_system_curl=yes
fi
-echo "$as_me:$LINENO: checking which curl to use" >&5
-echo $ECHO_N "checking which curl to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which curl to use" >&5
+echo $ECHO_N "checking which curl to use... $ECHO_C" >&6; }
if test -n "$with_system_curl" -o -n "$with_system_libs" && \
test "$with_system_curl" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_CURL=YES
# Extract the first word of "curl-config", so it can be a program name with args.
set dummy curl-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_CURLCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14896,27 +15706,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
CURLCONFIG=$ac_cv_path_CURLCONFIG
-
if test -n "$CURLCONFIG"; then
- echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
-echo "${ECHO_T}$CURLCONFIG" >&6
+ { echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
+echo "${ECHO_T}$CURLCONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$CURLCONFIG"; then
{ { echo "$as_me:$LINENO: error: install curl to run this script" >&5
echo "$as_me: error: install curl to run this script" >&2;}
@@ -14924,8 +15735,8 @@ echo "$as_me: error: install curl to run this script" >&2;}
fi
# check curl version
- echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
-echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
+echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6; }
if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \
"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then
@@ -14933,14 +15744,14 @@ echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6
echo "$as_me: error: no, you need at least curl 7.9,8" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
CURL_LIBS=`$CURLCONFIG --libs`
CURL_CFLAGS=`$CURLCONFIG --cflags`
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_CURL=NO
BUILD_TYPE="$BUILD_TYPE CURL"
fi
@@ -14948,31 +15759,31 @@ fi
-echo "$as_me:$LINENO: checking which boost to use" >&5
-echo $ECHO_N "checking which boost to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which boost to use" >&5
+echo $ECHO_N "checking which boost to use... $ECHO_C" >&6; }
if test -n "$with_system_boost" -o -n "$with_system_headers" && \
test "$with_system_boost" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_BOOST=YES
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
- echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; }
if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
-echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -14983,41 +15794,37 @@ $ac_includes_default
#include <boost/shared_ptr.hpp>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
-echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15026,24 +15833,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <boost/shared_ptr.hpp>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -15051,9 +15856,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -15077,25 +15883,18 @@ echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be
echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; }
if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; }
fi
if test $ac_cv_header_boost_shared_ptr_hpp = yes; then
@@ -15108,17 +15907,17 @@ fi
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
- echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
-echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; }
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
-echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5
-echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5
+echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15129,41 +15928,37 @@ $ac_includes_default
#include <boost/spirit/core.hpp>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5
-echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5
+echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15172,24 +15967,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <boost/spirit/core.hpp>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -15197,9 +15990,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -15223,25 +16017,18 @@ echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot B
echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
-echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; }
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
-echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; }
fi
if test $ac_cv_header_boost_spirit_core_hpp = yes; then
@@ -15260,38 +16047,38 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
BUILD_TYPE="$BUILD_TYPE BOOST"
SYSTEM_BOOST=NO
fi
-echo "$as_me:$LINENO: checking which vigra to use" >&5
-echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which vigra to use" >&5
+echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6; }
if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
test "$with_system_vigra" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_VIGRA=YES
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
- echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
-echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5
-echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5
+echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15302,41 +16089,37 @@ $ac_includes_default
#include <vigra/copyimage.hxx>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5
-echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5
+echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15345,24 +16128,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <vigra/copyimage.hxx>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -15370,9 +16151,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -15396,25 +16178,18 @@ echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be
echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
-echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; }
fi
if test $ac_cv_header_vigra_copyimage_hxx = yes; then
@@ -15433,33 +16208,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
BUILD_TYPE="$BUILD_TYPE VIGRA"
SYSTEM_VIGRA=NO
fi
-echo "$as_me:$LINENO: checking which odbc headers to use" >&5
-echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which odbc headers to use" >&5
+echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6; }
if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
test "$with_system_odbc_headers" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_ODBC_HEADERS=YES
if test "${ac_cv_header_sqlext_h+set}" = set; then
- echo "$as_me:$LINENO: checking for sqlext.h" >&5
-echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for sqlext.h" >&5
+echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; }
if test "${ac_cv_header_sqlext_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
-echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking sqlext.h usability" >&5
-echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking sqlext.h usability" >&5
+echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15470,41 +16245,37 @@ $ac_includes_default
#include <sqlext.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking sqlext.h presence" >&5
-echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking sqlext.h presence" >&5
+echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15513,24 +16284,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sqlext.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -15538,9 +16307,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -15564,25 +16334,18 @@ echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for sqlext.h" >&5
-echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for sqlext.h" >&5
+echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; }
if test "${ac_cv_header_sqlext_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_sqlext_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
-echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; }
fi
if test $ac_cv_header_sqlext_h = yes; then
@@ -15595,90 +16358,91 @@ fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_ODBC_HEADERS=NO
BUILD_TYPE="$BUILD_TYPE UNIXODBC"
fi
-echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
-echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
+echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6; }
if test "$enable_mozilla" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_MOZILLA=NO
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_MOZILLA=YES
fi
-echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5
-echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5
+echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6; }
if test "$enable_mozilla" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
elif test "$with_system_mozilla" = "yes"; then
- echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
-echo "${ECHO_T}no, not possible with system-mozilla" >&6
+ { echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
+echo "${ECHO_T}no, not possible with system-mozilla" >&6; }
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to build XML Security support" >&5
-echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build XML Security support" >&5
+echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6; }
if test "$enable_mozilla" = "no"; then
- echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
-echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6
+ { echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
+echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6; }
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5
-echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5
+echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6; }
if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_LDAP=YES
else
- echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
-echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6
+ { echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
+echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6; }
WITH_LDAP=NO
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_LDAP=NO
fi
if test "$WITH_LDAP" = "YES"; then
- echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5
-echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5
+echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6; }
if test -n "$with_openldap" && test "$with_openldap" != "no"; then
- echo "$as_me:$LINENO: result: OpenLDAP" >&5
-echo "${ECHO_T}OpenLDAP" >&6
+ { echo "$as_me:$LINENO: result: OpenLDAP" >&5
+echo "${ECHO_T}OpenLDAP" >&6; }
WITH_OPENLDAP=YES
for ac_header in ldap.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15689,41 +16453,37 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15732,24 +16492,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -15757,9 +16515,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -15783,25 +16542,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -15818,8 +16571,8 @@ fi
done
-echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
-echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
+echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6; }
if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15832,56 +16585,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ldap_simple_bind_s ();
int
main ()
{
-ldap_simple_bind_s ();
+return ldap_simple_bind_s ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ldap_ldap_simple_bind_s=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ldap_ldap_simple_bind_s=no
+ ac_cv_lib_ldap_ldap_simple_bind_s=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
@@ -15898,8 +16648,8 @@ fi
# rumours say that OpenLDAP doesn't have that function. I looked and
# it has it. Test for it to be sure
-echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5
-echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5
+echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6; }
if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15912,56 +16662,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ldap_set_option ();
int
main ()
{
-ldap_set_option ();
+return ldap_set_option ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ldap_ldap_set_option=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ldap_ldap_set_option=no
+ ac_cv_lib_ldap_ldap_set_option=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5
+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6; }
if test $ac_cv_lib_ldap_ldap_set_option = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
@@ -15976,8 +16723,8 @@ echo "$as_me: error: openldap lib not found or functional" >&2;}
fi
else
- echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5
-echo "${ECHO_T}Netscape/Mozilla" >&6
+ { echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5
+echo "${ECHO_T}Netscape/Mozilla" >&6; }
# TODO. Actually do a sanity check and check for
# LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
WITH_OPENLDAP=NO
@@ -15986,14 +16733,14 @@ fi
-echo "$as_me:$LINENO: checking which mozilla to use" >&5
-echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which mozilla to use" >&5
+echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; }
if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_MOZILLA=YES
- echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
-echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
+echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6; }
if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
MOZ_FLAVOUR=libxul
elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
@@ -16008,8 +16755,8 @@ echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
MOZ_FLAVOUR=libxul
fi
tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
- echo "$as_me:$LINENO: result: $tmp" >&5
-echo "${ECHO_T}$tmp" >&6
+ { echo "$as_me:$LINENO: result: $tmp" >&5
+echo "${ECHO_T}$tmp" >&6; }
succeeded=no
@@ -16017,8 +16764,8 @@ echo "${ECHO_T}$tmp" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16033,28 +16780,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16065,25 +16813,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for nss" >&5
-echo $ECHO_N "checking for nss... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for nss" >&5
+echo $ECHO_N "checking for nss... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "nss" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; }
MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
- echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; }
MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
- echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; }
else
MOZ_NSS_CFLAGS=""
MOZ_NSS_LIBS=""
@@ -16114,8 +16862,8 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16130,28 +16878,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16162,25 +16911,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; }
MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "`
- echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; }
MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "`
- echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; }
else
MOZ_NSS_CFLAGS=""
MOZ_NSS_LIBS=""
@@ -16218,8 +16967,8 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16234,28 +16983,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16266,25 +17016,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for nspr " >&5
-echo $ECHO_N "checking for nspr ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for nspr " >&5
+echo $ECHO_N "checking for nspr ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "nspr " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; }
MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "`
- echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; }
MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "`
- echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; }
else
MOZ_NSPR_CFLAGS=""
MOZ_NSPR_LIBS=""
@@ -16319,8 +17069,8 @@ echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting th
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16335,28 +17085,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16367,25 +17118,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
+echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; }
MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "`
- echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
+echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
+echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; }
MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "`
- echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
+echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; }
else
MOZ_NSPR_CFLAGS=""
MOZ_NSPR_LIBS=""
@@ -16420,8 +17171,8 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16436,28 +17187,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16468,25 +17220,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libxul " >&5
-echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libxul " >&5
+echo $ECHO_N "checking for libxul ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libxul " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; }
MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; }
MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; }
else
MOZILLAXPCOM_CFLAGS=""
MOZILLAXPCOM_LIBS=""
@@ -16527,8 +17279,8 @@ echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16543,28 +17295,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16575,25 +17328,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
+echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; }
MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom "`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
+echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; }
MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom "`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
+echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; }
else
MOZILLAXPCOM_CFLAGS=""
MOZILLAXPCOM_LIBS=""
@@ -16629,8 +17382,8 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-xpcom ) not met; conside
CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
-echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
+echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6; }
if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16643,56 +17396,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char PK11_GetCertFromPrivateKey ();
int
main ()
{
-PK11_GetCertFromPrivateKey ();
+return PK11_GetCertFromPrivateKey ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
+ ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
-echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
+echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; }
if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSS3 1
@@ -16716,11 +17466,11 @@ fi
MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
- echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5
-echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5
+echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6; }
if test -d "$MOZ_INC/ldap"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
MOZ_LDAP_CFLAGS="-I$MOZ_INC"
else
{ { echo "$as_me:$LINENO: error: no.
@@ -16740,48 +17490,46 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
fi
elif test "$enable_mozilla" = "no"; then
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
WITH_MOZILLA=NO
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_MOZILLA=NO
BUILD_TYPE="$BUILD_TYPE MOZ"
if test -z "$with_mozilla_version"; then
MOZILLA_VERSION=
else
- echo "$as_me:$LINENO: checking which mozilla version to build" >&5
-echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which mozilla version to build" >&5
+echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6; }
MOZILLA_VERSION=$with_mozilla_version
enable_build_mozilla=1
- echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
-echo "${ECHO_T}$MOZILLA_VERSION" >&6
+ { echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
+echo "${ECHO_T}$MOZILLA_VERSION" >&6; }
fi
-echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
-echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
+echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6; }
if test -z "$with_mozilla_toolkit"; then
if test "$_os" != "WINNT"; then
MOZILLA_TOOLKIT=gtk2
- echo "$as_me:$LINENO: result: gtk2" >&5
-echo "${ECHO_T}gtk2" >&6
+ { echo "$as_me:$LINENO: result: gtk2" >&5
+echo "${ECHO_T}gtk2" >&6; }
fi
else
MOZILLA_TOOLKIT=$with_mozilla_toolkit
enable_build_mozilla=1
- echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
-echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6
-fi
-if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
- #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
- #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
- { { echo "$as_me:$LINENO: error: Only gtk2 toolkit supported on Mac, sorry." >&5
-echo "$as_me: error: Only gtk2 toolkit supported on Mac, sorry." >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
+echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6; }
fi
+#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
+# #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
+# #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
+# AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
+#fi
@@ -16792,16 +17540,16 @@ else
enable_build_mozilla=
fi
-echo "$as_me:$LINENO: checking whether to build Mozilla" >&5
-echo $ECHO_N "checking whether to build Mozilla... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build Mozilla" >&5
+echo $ECHO_N "checking whether to build Mozilla... $ECHO_C" >&6; }
if test -n "$enable_build_mozilla"; then
BUILD_MOZAB="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
BUILD_MOZAB=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "$BUILD_MOZAB" = "TRUE"; then
@@ -16814,15 +17562,15 @@ if test "$BUILD_MOZAB" = "TRUE"; then
MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
fi
for e in gz bz2; do
- echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
-echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6
- if test ! -e "../moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
+echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6; }
+ if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
HAVE_MOZILLA_TARBALL=n
else
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
HAVE_MOZILLA_TARBALL=y
fi
done
@@ -16838,11 +17586,11 @@ http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/
{ (exit 1); exit 1; }; }
fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5
-echo $ECHO_N "checking for glib and libIDL binaries... $ECHO_C" >&6
- if test ! -e "../moz/download/vc71-glib-1.2.10-bin.zip" \
- -o ! -e "../moz/download/vc71-libIDL-0.6.8-bin.zip" \
- -o ! -e "../moz/download/wintools.zip" ; then
+ { echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5
+echo $ECHO_N "checking for glib and libIDL binaries... $ECHO_C" >&6; }
+ if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
+ -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
+ -o ! -e "./moz/download/wintools.zip" ; then
{ { echo "$as_me:$LINENO: error: One or more of the following archives is missing in moz/download/
vc71-glib-1.2.10-bin.zip
vc71-libIDL-0.6.8-bin.zip
@@ -16857,12 +17605,12 @@ echo "$as_me: error: One or more of the following archives is missing in moz/dow
(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
elif test "$_os" = "Darwin"; then
- # only gtk2 supported - see above
- { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
+ if test "$MOZILLA_TOOLKIT" = "gtk2"; then
+ { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
echo "$as_me: checking whether mozilla can be built..." >&6;}
succeeded=no
@@ -16870,8 +17618,8 @@ echo "$as_me: checking whether mozilla can be built..." >&6;}
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16886,28 +17634,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -16918,25 +17667,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
-echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5
-echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5
+echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6; }
MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
- echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
-echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
+echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5
-echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5
+echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6; }
MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
- echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
-echo "${ECHO_T}$MOZGTK2_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
+echo "${ECHO_T}$MOZGTK2_LIBS" >&6; }
else
MOZGTK2_CFLAGS=""
MOZGTK2_LIBS=""
@@ -16963,6 +17712,110 @@ echo "$as_me: error: Prerequisites to build mozilla not met. Either use the prec
{ (exit 1); exit 1; }; }
fi
+ else
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ { echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5
+echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; }
+ MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"`
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; }
+
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; }
+ MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"`
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; }
+ else
+ MOZLIBREQ_CFLAGS=""
+ MOZLIBREQ_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL >= 0.6.3 libIDL <= 0.6.8"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ MOZIDL="TRUE"
+ else
+ MOZIDL=""
+ fi
+
+ if test -z "$MOZIDL"; then
+ { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
+echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
else
# Generic Unix/Linux section
if test "$MOZILLA_TOOLKIT" = "gtk2"; then
@@ -16972,8 +17825,8 @@ echo "$as_me: error: Prerequisites to build mozilla not met. Either use the prec
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16988,28 +17841,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -17020,25 +17874,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
-echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
+echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gtk+-2.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; }
MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; }
MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; }
else
MOZLIBREQ_CFLAGS=""
MOZLIBREQ_LIBS=""
@@ -17073,8 +17927,8 @@ echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17089,28 +17943,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -17121,25 +17976,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5
-echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5
+echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; }
MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; }
MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; }
else
MOZLIBREQ_CFLAGS=""
MOZLIBREQ_LIBS=""
@@ -17175,8 +18030,8 @@ echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla.
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17191,28 +18046,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -17223,25 +18079,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5
-echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5
+echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; }
MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; }
MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; }
else
MOZLIBREQ_CFLAGS=""
MOZLIBREQ_LIBS=""
@@ -17276,8 +18132,8 @@ echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17292,28 +18148,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -17324,25 +18181,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
-echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
+echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
+echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; }
MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
+echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
+echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; }
MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"`
- echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
+echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; }
else
MOZLIBREQ_CFLAGS=""
MOZLIBREQ_LIBS=""
@@ -17387,25 +18244,25 @@ fi
-echo "$as_me:$LINENO: checking which sane header to use" >&5
-echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which sane header to use" >&5
+echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6; }
if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
test "$with_system_sane_header" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_SANE_HEADER=YES
if test "${ac_cv_header_sane_sane_h+set}" = set; then
- echo "$as_me:$LINENO: checking for sane/sane.h" >&5
-echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; }
if test "${ac_cv_header_sane_sane_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
-echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
-echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
+echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17416,41 +18273,37 @@ $ac_includes_default
#include <sane/sane.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
-echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
+echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17459,24 +18312,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sane/sane.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -17484,9 +18335,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -17510,25 +18362,18 @@ echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled
echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for sane/sane.h" >&5
-echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; }
if test "${ac_cv_header_sane_sane_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_sane_sane_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
-echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; }
fi
if test $ac_cv_header_sane_sane_h = yes; then
@@ -17541,28 +18386,28 @@ fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_SANE_HEADER=NO
BUILD_TYPE="$BUILD_TYPE SANE"
fi
-echo "$as_me:$LINENO: checking which icu to use" >&5
-echo $ECHO_N "checking which icu to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which icu to use" >&5
+echo $ECHO_N "checking which icu to use... $ECHO_C" >&6; }
if test -n "$with_system_icu" -o -n "$with_system_libs" && \
test "$with_system_icu" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_ICU=YES
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5
-echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5
+echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17571,26 +18416,24 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
unicode/rbbi.h
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ { echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6; }
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17599,11 +18442,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: icu headers not found." >&2;}
{ (exit 1); exit 1; }; }
fi
+
rm -f conftest.err conftest.$ac_ext
# Extract the first word of "genbrk", so it can be a program name with args.
set dummy genbrk; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17619,27 +18463,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
-
if test -n "$SYSTEM_GENBRK"; then
- echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
-echo "${ECHO_T}$SYSTEM_GENBRK" >&6
+ { echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
+echo "${ECHO_T}$SYSTEM_GENBRK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$SYSTEM_GENBRK"; then
{ { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5
echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;}
@@ -17647,8 +18492,8 @@ echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu developme
fi
# Extract the first word of "genccode", so it can be a program name with args.
set dummy genccode; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17664,27 +18509,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
-
if test -n "$SYSTEM_GENCCODE"; then
- echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
-echo "${ECHO_T}$SYSTEM_GENCCODE" >&6
+ { echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
+echo "${ECHO_T}$SYSTEM_GENCCODE" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$SYSTEM_GENCCODE"; then
{ { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5
echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;}
@@ -17692,8 +18538,8 @@ echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu develop
fi
# Extract the first word of "gencmn", so it can be a program name with args.
set dummy gencmn; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -17709,34 +18555,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
-
if test -n "$SYSTEM_GENCMN"; then
- echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
-echo "${ECHO_T}$SYSTEM_GENCMN" >&6
+ { echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
+echo "${ECHO_T}$SYSTEM_GENCMN" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$SYSTEM_GENCMN"; then
{ { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5
echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking ICU version" >&5
-echo $ECHO_N "checking ICU version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking ICU version" >&5
+echo $ECHO_N "checking ICU version... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -17764,18 +18611,27 @@ int main(int argc, char **argv) {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -17786,8 +18642,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: not suitable, only >= 3.6 supported currently" >&2;}
{ (exit 1); exit 1; }; }
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -17795,8 +18653,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_ICU=NO
BUILD_TYPE="$BUILD_TYPE ICU"
fi
@@ -17807,11 +18665,11 @@ fi
if test "$_os" = "Darwin" -a "x$with_x" != "xyes" -a "x$x_includes" = "xNONE" -a "x$x_libraries" = "xNONE"; then
- echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5
-echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5
+echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6; }
if test -d "/System/Library/Frameworks/AppKit.framework/"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
x_includes="no_x_includes"
x_libraries="no_x_libraries"
enable_gtk=no
@@ -17819,8 +18677,8 @@ echo "${ECHO_T}yes" >&6
ENABLE_CUPS=""
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
@@ -17831,44 +18689,49 @@ elif test "$_os" = "OS2" ; then
echo "Do Nothing for _os = OS2. Don't check for X11."
:
elif test "$_os" != "WINNT" ; then
- echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-# Check whether --with-x or --without-x was given.
+# Check whether --with-x was given.
if test "${with_x+set}" = set; then
- withval="$with_x"
+ withval=$with_x;
+fi
-fi;
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
# The user explicitly disabled X.
have_x=disabled
else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- # Both variables are already set.
- have_x=yes
- else
- if test "${ac_cv_have_x+set}" = set; then
+ case $x_includes,$x_libraries in #(
+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+ { (exit 1); exit 1; }; };; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat >Imakefile <<'_ACEOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+incroot:
+ @echo incroot='${INCROOT}'
+usrlibdir:
+ @echo usrlibdir='${USRLIBDIR}'
+libdir:
+ @echo libdir='${LIBDIR}'
+_ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
@@ -17876,7 +18739,7 @@ _ACEOF
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
- /usr/include) ;;
+ /usr/include) ac_x_includes= ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
@@ -17885,7 +18748,7 @@ _ACEOF
esac
fi
cd ..
- rm -fr conftest.dir
+ rm -f -r conftest.dir
fi
# Standard set of common directories for X headers.
@@ -17926,7 +18789,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -17934,26 +18797,24 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# We can compile using X headers with no special include directory.
ac_x_includes=
else
@@ -17961,12 +18822,13 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
done
fi
+
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
@@ -17975,44 +18837,40 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
@@ -18020,49 +18878,54 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-LIBS=$ac_save_LIBS
+ LIBS=$ac_save_LIBS
for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
-else
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
+ ac_cv_have_x="have_x=no";; #(
+ *)
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
+esac
fi
-
- fi
+;; #(
+ *) have_x=yes;;
+ esac
eval "$ac_cv_have_x"
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+ { echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6; }
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
# Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
fi
if test "$no_x" = yes; then
@@ -18083,12 +18946,12 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
- case `(uname -sr) 2>/dev/null` in
- "SunOS 5"*)
- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -18104,43 +18967,32 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_R_nospace=yes
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_R_nospace=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_nospace = yes; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- X_LIBS="$X_LIBS -R$x_libraries"
- else
LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -18156,47 +19008,42 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_R_space=yes
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_R_space=no
+ { echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6; }
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_space = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
- fi
- fi
- LIBS=$ac_xsave_LIBS
- esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
fi
# Check for system-dependent libraries X programs must link with.
@@ -18217,50 +19064,46 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XOpenDisplay ();
int
main ()
{
-XOpenDisplay ();
+return XOpenDisplay ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
:
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18273,63 +19116,60 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dnet_ntoa ();
int
main ()
{
-dnet_ntoa ();
+return dnet_ntoa ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18342,63 +19182,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dnet_ntoa ();
int
main ()
{
-dnet_ntoa ();
+return dnet_ntoa ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
fi
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
@@ -18410,8 +19248,8 @@ rm -f conftest.err conftest.$ac_objext \
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
if test "${ac_cv_func_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18438,72 +19276,63 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef gethostbyname
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char gethostbyname ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != gethostbyname;
+return gethostbyname ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_gethostbyname=no
+ ac_cv_func_gethostbyname=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
if test $ac_cv_func_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18516,63 +19345,60 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char gethostbyname ();
int
main ()
{
-gethostbyname ();
+return gethostbyname ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_gethostbyname=no
+ ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
if test $ac_cv_lib_nsl_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18585,56 +19411,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char gethostbyname ();
int
main ()
{
-gethostbyname ();
+return gethostbyname ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -18649,8 +19472,8 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18677,72 +19500,63 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef connect
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char connect ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_connect) || defined (__stub___connect)
+#if defined __stub_connect || defined __stub___connect
choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != connect;
+return connect ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
+ ac_cv_func_connect=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
if test $ac_cv_func_connect = no; then
- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18755,56 +19569,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char connect ();
int
main ()
{
-connect ();
+return connect ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
@@ -18812,8 +19623,8 @@ fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18840,72 +19651,63 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef remove
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char remove ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_remove) || defined (__stub___remove)
+#if defined __stub_remove || defined __stub___remove
choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != remove;
+return remove ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
+ ac_cv_func_remove=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
if test $ac_cv_func_remove = no; then
- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18918,56 +19720,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char remove ();
int
main ()
{
-remove ();
+return remove ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
@@ -18975,8 +19774,8 @@ fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19003,72 +19802,63 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef shmat
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char shmat ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_shmat) || defined (__stub___shmat)
+#if defined __stub_shmat || defined __stub___shmat
choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != shmat;
+return shmat ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
+ ac_cv_func_shmat=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
if test $ac_cv_func_shmat = no; then
- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19081,56 +19871,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char shmat ();
int
main ()
{
-shmat ();
+return shmat ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -19147,8 +19934,8 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19161,56 +19948,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char IceConnectionNumber ();
int
main ()
{
-IceConnectionNumber ();
+return IceConnectionNumber ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -19221,19 +20005,19 @@ fi
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- echo "$as_me:$LINENO: checking whether to use Xaw" >&5
-echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use Xaw" >&5
+echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6; }
if test "$enable_Xaw" = "no"; then
DISABLE_XAW=TRUE
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
for ac_header in X11/Composite.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -19247,38 +20031,35 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -19293,24 +20074,25 @@ fi
done
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
for ac_header in X11/Xaw/Label.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19321,41 +20103,37 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19364,24 +20142,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -19389,9 +20165,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -19415,25 +20192,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -19449,6 +20220,75 @@ fi
done
+
+{ echo "$as_me:$LINENO: checking for main in -lXaw" >&5
+echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xaw_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXaw $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_Xaw_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xaw_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5
+echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6; }
+if test $ac_cv_lib_Xaw_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXAW 1
+_ACEOF
+
+ LIBS="-lXaw $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5
+echo "$as_me: error: Xaw library not found or functional" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
fi
if test "x$x_includes" = "x"; then
@@ -19469,8 +20309,8 @@ echo "$as_me: error: No X includes found" >&2;}
fi
CFLAGS=$X_CFLAGS
LDFLAGS="$X_LDFLAGS $X_LIBS"
- echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
+echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19483,56 +20323,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XOpenDisplay ();
int
main ()
{
-XOpenDisplay ();
+return XOpenDisplay ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_X11_XOpenDisplay=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_X11_XOpenDisplay=no
+ ac_cv_lib_X11_XOpenDisplay=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; }
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
x_libs="-lX11 $X_EXTRA_LIBS"
else
@@ -19541,8 +20378,8 @@ echo "$as_me: error: X Development libraries not found" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5
-echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5
+echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6; }
if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19555,56 +20392,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XauDisposeAuth ();
int
main ()
{
-XauDisposeAuth ();
+return XauDisposeAuth ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_Xau_XauDisposeAuth=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xau_XauDisposeAuth=no
+ ac_cv_lib_Xau_XauDisposeAuth=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
-echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
+echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6; }
if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then
XAU_LIBS="-lXau"
fi
@@ -19626,7 +20460,10 @@ else
fi
if test "$x_libraries" = "default_x_libraries"; then
- XLIB="/usr/lib"
+ XLIB=`$PKG_CONFIG --variable=libdir x11`
+ if test "x$XLIB" = x; then
+ XLIB="/usr/lib"
+ fi
else
XLIB="$x_libraries"
fi
@@ -19636,17 +20473,17 @@ fi
if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
- echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
-echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; }
if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
-echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5
-echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5
+echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19657,41 +20494,37 @@ $ac_includes_default
#include <fontconfig/fontconfig.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5
-echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5
+echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19700,24 +20533,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <fontconfig/fontconfig.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -19725,9 +20556,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -19751,25 +20583,18 @@ echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot
echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
-echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; }
if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
-echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; }
fi
if test $ac_cv_header_fontconfig_fontconfig_h = yes; then
@@ -19781,8 +20606,8 @@ echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-
fi
- echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5
-echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5
+echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -19806,18 +20631,27 @@ int main(int argc, char **argv) {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -19828,41 +20662,43 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
{ (exit 1); exit 1; }; }
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
-echo "$as_me:$LINENO: checking whether to link to Xrender" >&5
-echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to link to Xrender" >&5
+echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6; }
if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
XRENDER_LINK=YES
with_system_xrender_headers=yes
else
- echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+ { echo "$as_me:$LINENO: result: no, dynamically open it" >&5
+echo "${ECHO_T}no, dynamically open it" >&6; }
XRENDER_LINK=NO
fi
-echo "$as_me:$LINENO: checking which Xrender headers to use" >&5
-echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which Xrender headers to use" >&5
+echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6; }
if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
test "$with_system_xrender_headers" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_XRENDER_HEADERS=YES
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
- echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
-echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19873,41 +20709,37 @@ $ac_includes_default
#include <X11/extensions/Xrender.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
-echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19916,24 +20748,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/extensions/Xrender.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -19941,9 +20771,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -19967,25 +20798,18 @@ echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Canno
echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
@@ -19998,15 +20822,15 @@ fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_XRENDER_HEADERS=NO
BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
fi
if test "$XRENDER_LINK" = "YES"; then
-echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5
-echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5
+echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6; }
if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20019,56 +20843,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XRenderQueryVersion ();
int
main ()
{
-XRenderQueryVersion ();
+return XRenderQueryVersion ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_Xrender_XRenderQueryVersion=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xrender_XRenderQueryVersion=no
+ ac_cv_lib_Xrender_XRenderQueryVersion=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
+echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; }
if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXRENDER 1
@@ -20086,13 +20907,13 @@ fi
-echo "$as_me:$LINENO: checking whether to enable RandR support" >&5
-echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable RandR support" >&5
+echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6; }
if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
XRANDR_DLOPEN="TRUE"
- echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
-echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6
+ { echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
+echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6; }
else
XRANDR_DLOPEN="FALSE"
@@ -20101,8 +20922,8 @@ echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20117,28 +20938,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -20149,25 +20971,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
-echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
+echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
-echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
+echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6; }
XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"`
- echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
-echo "${ECHO_T}$XRANDR_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
+echo "${ECHO_T}$XRANDR_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
-echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
+echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6; }
XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"`
- echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
-echo "${ECHO_T}$XRANDR_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
+echo "${ECHO_T}$XRANDR_LIBS" >&6; }
else
XRANDR_CFLAGS=""
XRANDR_LIBS=""
@@ -20193,17 +21015,17 @@ echo "${ECHO_T}$XRANDR_LIBS" >&6
if test "$ENABLE_RANDR" != "TRUE"; then
if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5
-echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20214,41 +21036,37 @@ $ac_includes_default
#include <X11/extensions/Xrandr.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5
-echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20257,24 +21075,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/extensions/Xrandr.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -20282,9 +21098,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -20308,25 +21125,18 @@ echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot
echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
fi
if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
@@ -20340,8 +21150,8 @@ fi
XRANDR_CFLAGS=" "
-echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
-echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
+echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6; }
if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20354,56 +21164,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XRRQueryExtension ();
int
main ()
{
-XRRQueryExtension ();
+return XRRQueryExtension ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_Xrandr_XRRQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xrandr_XRRQueryExtension=no
+ ac_cv_lib_Xrandr_XRRQueryExtension=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXRANDR 1
@@ -20419,44 +21226,44 @@ fi
XRANDR_LIBS="-lXrandr "
ENABLE_RANDR="TRUE"
- echo "$as_me:$LINENO: result: enabling RandR support" >&5
-echo "${ECHO_T}enabling RandR support" >&6
+ { echo "$as_me:$LINENO: result: enabling RandR support" >&5
+echo "${ECHO_T}enabling RandR support" >&6; }
fi
fi
else
ENABLE_RANDR=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to use neon" >&5
-echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to use neon" >&5
+echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6; }
if test "$enable_neon" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
DISABLE_NEON=TRUE
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-echo "$as_me:$LINENO: checking which neon to use" >&5
-echo $ECHO_N "checking which neon to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+{ echo "$as_me:$LINENO: checking which neon to use" >&5
+echo $ECHO_N "checking which neon to use... $ECHO_C" >&6; }
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
test "$with_system_neon" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20471,28 +21278,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -20503,25 +21311,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
-echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
+echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "neon >= 0.24.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
-echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
+echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6; }
NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"`
- echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
-echo "${ECHO_T}$NEON_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
+echo "${ECHO_T}$NEON_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking NEON_LIBS" >&5
-echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking NEON_LIBS" >&5
+echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6; }
NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"`
- echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
-echo "${ECHO_T}$NEON_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
+echo "${ECHO_T}$NEON_LIBS" >&6; }
else
NEON_CFLAGS=""
NEON_LIBS=""
@@ -20551,8 +21359,8 @@ echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_NEON=NO
NEON_LIBS=-lneon
NEON_CFLAGS=
@@ -20561,12 +21369,12 @@ fi
if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
with_system_openssl=yes
fi
-echo "$as_me:$LINENO: checking which libssl to use" >&5
-echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which libssl to use" >&5
+echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6; }
if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
test "$with_system_openssl" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
if test "$_os" = "Darwin"; then
@@ -20579,8 +21387,8 @@ echo "${ECHO_T}external" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20595,28 +21403,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -20627,25 +21436,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for openssl " >&5
-echo $ECHO_N "checking for openssl ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for openssl " >&5
+echo $ECHO_N "checking for openssl ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "openssl " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
-echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
+echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6; }
OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
- echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
-echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
+echo "${ECHO_T}$OPENSSL_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
-echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
+echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6; }
OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
- echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
-echo "${ECHO_T}$OPENSSL_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
+echo "${ECHO_T}$OPENSSL_LIBS" >&6; }
else
OPENSSL_CFLAGS=""
OPENSSL_LIBS=""
@@ -20674,8 +21483,8 @@ echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting
fi
SYSTEM_OPENSSL=YES
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_OPENSSL=NO
BUILD_TYPE="$BUILD_TYPE OPENSSL"
fi
@@ -20689,31 +21498,31 @@ fi
fi
-echo "$as_me:$LINENO: checking whether to enable agg" >&5
-echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable agg" >&5
+echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6; }
if test "$with_agg" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ENABLE_AGG=YES
- echo "$as_me:$LINENO: checking which AGG to use" >&5
-echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which AGG to use" >&5
+echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6; }
if test -n "$with_system_agg" -o -n "$with_system_libs" && \
test "$with_system_agg" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20728,28 +21537,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -20760,25 +21570,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
-echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
+echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "libagg >= 2.3" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
-echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
+echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6; }
AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"`
- echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
-echo "${ECHO_T}$AGG_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
+echo "${ECHO_T}$AGG_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking AGG_LIBS" >&5
-echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking AGG_LIBS" >&5
+echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6; }
AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"`
- echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
-echo "${ECHO_T}$AGG_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
+echo "${ECHO_T}$AGG_LIBS" >&6; }
else
AGG_CFLAGS=""
AGG_LIBS=""
@@ -20804,8 +21614,8 @@ echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adju
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking agg version" >&5
-echo $ECHO_N "checking agg version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking agg version" >&5
+echo $ECHO_N "checking agg version... $ECHO_C" >&6; }
# workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway
# (/usr/include gets stripped from pkg-config output)
if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then
@@ -20817,12 +21627,12 @@ echo $ECHO_N "checking agg version... $ECHO_C" >&6
$PKG_CONFIG --modversion libagg | grep -q 2.4; then
# 2.4's libagg.pc.in still contains 2.3 :/
if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
- echo "$as_me:$LINENO: result: 2.4" >&5
-echo "${ECHO_T}2.4" >&6
+ { echo "$as_me:$LINENO: result: 2.4" >&5
+echo "${ECHO_T}2.4" >&6; }
AGG_VERSION=2400
else
- echo "$as_me:$LINENO: result: 2.3" >&5
-echo "${ECHO_T}2.3" >&6
+ { echo "$as_me:$LINENO: result: 2.3" >&5
+echo "${ECHO_T}2.3" >&6; }
AGG_VERSION=2300
fi
SYSTEM_AGG=YES
@@ -20832,8 +21642,8 @@ echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;}
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_AGG=NO
AGG_VERSION=2300
BUILD_TYPE="$BUILD_TYPE AGG"
@@ -20842,12 +21652,12 @@ echo "${ECHO_T}internal" >&6
fi
-echo "$as_me:$LINENO: checking which redland library to use" >&5
-echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which redland library to use" >&5
+echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6; }
if test -n "$with_system_redland" && \
test "$with_system_redland" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_REDLAND=YES
succeeded=no
@@ -20855,8 +21665,8 @@ echo "${ECHO_T}external" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20871,28 +21681,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -20903,25 +21714,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for redland" >&5
-echo $ECHO_N "checking for redland... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for redland" >&5
+echo $ECHO_N "checking for redland... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "redland" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
-echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
+echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6; }
REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"`
- echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
-echo "${ECHO_T}$REDLAND_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
+echo "${ECHO_T}$REDLAND_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
-echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
+echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6; }
REDLAND_LIBS=`$PKG_CONFIG --libs "redland"`
- echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
-echo "${ECHO_T}$REDLAND_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
+echo "${ECHO_T}$REDLAND_LIBS" >&6; }
else
REDLAND_CFLAGS=""
REDLAND_LIBS=""
@@ -20948,22 +21759,22 @@ echo "$as_me: error: Library requirements (redland) not met; consider adjusting
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
BUILD_TYPE="$BUILD_TYPE REDLAND"
SYSTEM_REDLAND=NO
fi
-echo "$as_me:$LINENO: checking which libhunspell to use" >&5
-echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which libhunspell to use" >&5
+echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6; }
if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
test "$with_system_hunspell" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_HUNSPELL=YES
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -20975,8 +21786,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20991,28 +21802,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -21023,25 +21835,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for hunspell" >&5
-echo $ECHO_N "checking for hunspell... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hunspell" >&5
+echo $ECHO_N "checking for hunspell... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "hunspell" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
-echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
+echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6; }
HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
- echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
-echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
+echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
-echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
+echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6; }
HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
- echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
-echo "${ECHO_T}$HUNSPELL_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
+echo "${ECHO_T}$HUNSPELL_LIBS" >&6; }
else
HUNSPELL_CFLAGS=""
HUNSPELL_LIBS=""
@@ -21067,17 +21879,17 @@ echo "${ECHO_T}$HUNSPELL_LIBS" >&6
if test "$HUNSPELL_PC" != "TRUE"; then
if test "${ac_cv_header_hunspell_hxx+set}" = set; then
- echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
-echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5
-echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5
+echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21088,41 +21900,37 @@ $ac_includes_default
#include <hunspell.hxx>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5
-echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5
+echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21131,24 +21939,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <hunspell.hxx>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -21156,9 +21962,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -21182,25 +21989,18 @@ echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compile
echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
-echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_hunspell_hxx=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; }
fi
if test $ac_cv_header_hunspell_hxx = yes; then
@@ -21208,17 +22008,17 @@ if test $ac_cv_header_hunspell_hxx = yes; then
else
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
- echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
-echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
-echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
+echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21229,41 +22029,37 @@ $ac_includes_default
#include <hunspell/hunspell.hxx>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
-echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
+echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21272,24 +22068,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <hunspell/hunspell.hxx>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -21297,9 +22091,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -21323,25 +22118,18 @@ echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot B
echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
-echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; }
fi
if test $ac_cv_header_hunspell_hunspell_hxx = yes; then
@@ -21358,8 +22146,8 @@ fi
-echo "$as_me:$LINENO: checking for main in -lhunspell" >&5
-echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -lhunspell" >&5
+echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6; }
if test "${ac_cv_lib_hunspell_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21376,46 +22164,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_hunspell_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_hunspell_main=no
+ ac_cv_lib_hunspell_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5
-echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5
+echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6; }
if test $ac_cv_lib_hunspell_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBHUNSPELL 1
@@ -21438,8 +22223,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_HUNSPELL=NO
BUILD_TYPE="$BUILD_TYPE HUNSPELL"
fi
@@ -21447,25 +22232,25 @@ fi
-echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
-echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
+echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6; }
if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
test "$with_system_altlinuxhyph" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_HYPH=YES
if test "${ac_cv_header_hyphen_h+set}" = set; then
- echo "$as_me:$LINENO: checking for hyphen.h" >&5
-echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hyphen.h" >&5
+echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; }
if test "${ac_cv_header_hyphen_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
-echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking hyphen.h usability" >&5
-echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hyphen.h usability" >&5
+echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21476,41 +22261,37 @@ $ac_includes_default
#include <hyphen.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking hyphen.h presence" >&5
-echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking hyphen.h presence" >&5
+echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21519,24 +22300,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <hyphen.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -21544,9 +22323,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -21570,25 +22350,18 @@ echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for hyphen.h" >&5
-echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for hyphen.h" >&5
+echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; }
if test "${ac_cv_header_hyphen_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_hyphen_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
-echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; }
fi
if test $ac_cv_header_hyphen_h = yes; then
@@ -21600,8 +22373,8 @@ echo "$as_me: error: altlinuxhyph headers not found." >&2;}
fi
- echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5
-echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5
+echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6; }
if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21624,33 +22397,28 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_member_struct__HyphenDict_cset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -21669,40 +22437,37 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_member_struct__HyphenDict_cset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_member_struct__HyphenDict_cset=no
+ ac_cv_member_struct__HyphenDict_cset=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5
-echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5
+echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6; }
if test $ac_cv_member_struct__HyphenDict_cset = yes; then
:
else
@@ -21711,8 +22476,8 @@ echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
-echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6; }
if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21725,56 +22490,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char hnj_hyphen_hyphenate2 ();
int
main ()
{
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
+ ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
-echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; }
if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then
HYPHEN_LIB=-lhyphen
else
@@ -21784,8 +22546,8 @@ echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
fi
if test -z "$HYPHEN_LIB"; then
- echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
-echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6; }
if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21798,56 +22560,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char hnj_hyphen_hyphenate2 ();
int
main ()
{
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
+ ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
-echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; }
if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then
HYPHEN_LIB=-lhyph
else
@@ -21858,8 +22617,8 @@ fi
fi
if test -z "$HYPHEN_LIB"; then
- echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
-echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
+echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6; }
if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21872,56 +22631,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char hnj_hyphen_hyphenate2 ();
int
main ()
{
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
+ ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
-echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
+echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; }
if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then
HYPHEN_LIB=-lhnj
else
@@ -21932,31 +22688,31 @@ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_HYPH=NO
fi
-echo "$as_me:$LINENO: checking which mythes to use" >&5
-echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which mythes to use" >&5
+echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6; }
if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_MYTHES=YES
if test "${ac_cv_header_mythes_hxx+set}" = set; then
- echo "$as_me:$LINENO: checking for mythes.hxx" >&5
-echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_mythes_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking mythes.hxx usability" >&5
-echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking mythes.hxx usability" >&5
+echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21967,41 +22723,37 @@ $ac_includes_default
#include <mythes.hxx>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking mythes.hxx presence" >&5
-echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking mythes.hxx presence" >&5
+echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22010,24 +22762,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <mythes.hxx>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22035,9 +22785,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -22061,25 +22812,18 @@ echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\
echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for mythes.hxx" >&5
-echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; }
if test "${ac_cv_header_mythes_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_mythes_hxx=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
-echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; }
fi
if test $ac_cv_header_mythes_hxx = yes; then
@@ -22092,8 +22836,8 @@ fi
-echo "$as_me:$LINENO: checking for main in -lmythes" >&5
-echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -lmythes" >&5
+echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6; }
if test "${ac_cv_lib_mythes_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22110,46 +22854,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_mythes_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_mythes_main=no
+ ac_cv_lib_mythes_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
-echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6; }
if test $ac_cv_lib_mythes_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMYTHES 1
@@ -22164,31 +22905,31 @@ echo "$as_me: error: mythes library not found." >&2;}
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_MYTHES=NO
fi
-echo "$as_me:$LINENO: checking which lpsolve to use" >&5
-echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which lpsolve to use" >&5
+echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6; }
if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
test "$with_system_lpsolve" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_LPSOLVE=YES
if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
-echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
-echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5
-echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5
+echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22199,41 +22940,37 @@ $ac_includes_default
#include <lpsolve/lp_lib.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5
-echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5
+echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22242,24 +22979,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <lpsolve/lp_lib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22267,9 +23002,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -22293,25 +23029,18 @@ echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Com
echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
-echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
-echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; }
fi
if test $ac_cv_header_lpsolve_lp_lib_h = yes; then
@@ -22324,8 +23053,8 @@ fi
-echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5
-echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5
+echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6; }
if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22338,56 +23067,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char make_lp ();
int
main ()
{
-make_lp ();
+return make_lp ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_lpsolve55_make_lp=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_lpsolve55_make_lp=no
+ ac_cv_lib_lpsolve55_make_lp=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5
-echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5
+echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6; }
if test $ac_cv_lib_lpsolve55_make_lp = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLPSOLVE55 1
@@ -22402,19 +23128,19 @@ echo "$as_me: error: lpsolve library not found or too old." >&2;}
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_LPSOLVE=NO
BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi
if test "$_os" = "Linux"; then
- echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5
-echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5
+echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6; }
exec 6>/dev/null # no output
- echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
-echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
+echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6; }
if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22427,64 +23153,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char gnu_get_libc_version ();
int
main ()
{
-gnu_get_libc_version ();
+return gnu_get_libc_version ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_c_gnu_get_libc_version=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_gnu_get_libc_version=no
+ ac_cv_lib_c_gnu_get_libc_version=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
-echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
+echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6; }
if test $ac_cv_lib_c_gnu_get_libc_version = yes; then
HAVE_LIBC=yes; export HAVE_LIBC
fi
exec 6>&1 # output on again
if test "$HAVE_LIBC"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, upgrade libc" >&5
echo "$as_me: error: no, upgrade libc" >&2;}
@@ -22493,11 +23216,11 @@ echo "$as_me: error: no, upgrade libc" >&2;}
fi
if test \( "$_os" = "WINNT" \) ; then
- echo "$as_me:$LINENO: checking for PSDK files" >&5
-echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for PSDK files" >&5
+echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6; }
if test -z "$with_psdk_home"; then
# This first line will detect a February 2003 Microsoft Platform SDK
- PSDK_HOME=`./oowintool --psdk-home`
+ PSDK_HOME=`./solenv/bin/oowintool --psdk-home`
# But there might be also an April 2005 PSDK, unfortunately MS changed
# the registry entry. (we prefer the old version!?)
if test -z "$PSDK_HOME"; then
@@ -22557,27 +23280,27 @@ are installed or use --with-psdk-home ." >&2;}
echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: result: SDK files found ...)" >&5
-echo "${ECHO_T}SDK files found ...)" >&6
+ { echo "$as_me:$LINENO: result: SDK files found ...)" >&5
+echo "${ECHO_T}SDK files found ...)" >&6; }
if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6
+ { echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6; }
WINDOWS_VISTA_PSDK=TRUE
elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6
+ { echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6; }
WINDOWS_VISTA_PSDK=TRUE
else
- echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6
+ { echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
+echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; }
fi
fi
if test \( "$_os" = "WINNT" \) ; then
- echo "$as_me:$LINENO: checking for DirectX SDK files" >&5
-echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for DirectX SDK files" >&5
+echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6; }
if test -z "$with_directx_home"; then
if test -n "$DXSDK_DIR"; then
DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
@@ -22609,8 +23332,8 @@ echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6
fi
if test -n "$ENABLE_DIRECTX"; then
if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5
echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;}
@@ -22618,8 +23341,8 @@ echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home
fi
else
DIRECTXSDK_HOME=""
- echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6
+ { echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6; }
fi
fi
@@ -22627,12 +23350,12 @@ fi
NSIS_PATH=""
if test "$_os" = "WINNT" ; then
- echo "$as_me:$LINENO: checking for NSIS" >&5
-echo $ECHO_N "checking for NSIS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for NSIS" >&5
+echo $ECHO_N "checking for NSIS... $ECHO_C" >&6; }
# Extract the first word of "nsis.exe", so it can be a program name with args.
set dummy nsis.exe; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_NSIS_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22647,27 +23370,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
NSIS_PATH=$ac_cv_path_NSIS_PATH
-
if test -n "$NSIS_PATH"; then
- echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
-echo "${ECHO_T}$NSIS_PATH" >&6
+ { echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
+echo "${ECHO_T}$NSIS_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -n "$NSIS_PATH"; then
NSIS_PATH=`dirname "$NSIS_PATH"`
fi
@@ -22677,7 +23401,7 @@ fi
if test -e "$with_nsis_path/nsis.exe"; then
NSIS_PATH="$with_nsis_path"
fi
- nsistest=`./oowintool --nsis-dir`;
+ nsistest=`./solenv/bin/oowintool --nsis-dir`;
if test -x "$nsistest/nsis.exe"; then
NSIS_PATH="$nsistest"
fi
@@ -22688,16 +23412,16 @@ echo "$as_me: WARNING: NSIS not found, no self contained installer will be build
else
NSIS_PATH=`cygpath -d "$NSIS_PATH"`
NSIS_PATH=`cygpath -u "$NSIS_PATH"`
- echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
-echo "${ECHO_T}found ($NSIS_PATH)" >&6
+ { echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
+echo "${ECHO_T}found ($NSIS_PATH)" >&6; }
fi
fi
# Extract the first word of "bison", so it can be a program name with args.
set dummy bison; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_BISON+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22712,34 +23436,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
BISON=$ac_cv_path_BISON
-
if test -n "$BISON"; then
- echo "$as_me:$LINENO: result: $BISON" >&5
-echo "${ECHO_T}$BISON" >&6
+ { echo "$as_me:$LINENO: result: $BISON" >&5
+echo "${ECHO_T}$BISON" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$BISON"; then
{ { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5
echo "$as_me: error: no bison found in \$PATH, install bison" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: checking the bison version" >&5
-echo $ECHO_N "checking the bison version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking the bison version" >&5
+echo $ECHO_N "checking the bison version... $ECHO_C" >&6; }
_bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
# Accept newer than 1.875 or older(equal) than 1.75
@@ -22749,8 +23474,8 @@ echo $ECHO_N "checking the bison version... $ECHO_C" >&6
echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
else
- echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
-echo "${ECHO_T}checked ($BISON $_bison_version)" >&6
+ { echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
+echo "${ECHO_T}checked ($BISON $_bison_version)" >&6; }
fi
else
{ { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5
@@ -22760,8 +23485,8 @@ echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and old
fi
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_FLEX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22776,27 +23501,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
FLEX=$ac_cv_path_FLEX
-
if test -n "$FLEX"; then
- echo "$as_me:$LINENO: result: $FLEX" >&5
-echo "${ECHO_T}$FLEX" >&6
+ { echo "$as_me:$LINENO: result: $FLEX" >&5
+echo "${ECHO_T}$FLEX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$FLEX"; then
{ { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5
echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
@@ -22804,8 +23530,8 @@ echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
fi
# Extract the first word of "patch", so it can be a program name with args.
set dummy patch; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PATCH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22820,27 +23546,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
PATCH=$ac_cv_path_PATCH
-
if test -n "$PATCH"; then
- echo "$as_me:$LINENO: result: $PATCH" >&5
-echo "${ECHO_T}$PATCH" >&6
+ { echo "$as_me:$LINENO: result: $PATCH" >&5
+echo "${ECHO_T}$PATCH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$PATCH"; then
{ { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;}
@@ -22860,11 +23587,11 @@ echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
fi
fi
- echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
-echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
+echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6; }
if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;}
@@ -22877,8 +23604,8 @@ echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-pa
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GNUCP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22893,27 +23620,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
GNUCP=$ac_cv_path_GNUCP
-
if test -n "$GNUCP"; then
- echo "$as_me:$LINENO: result: $GNUCP" >&5
-echo "${ECHO_T}$GNUCP" >&6
+ { echo "$as_me:$LINENO: result: $GNUCP" >&5
+echo "${ECHO_T}$GNUCP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$GNUCP" && break
done
@@ -22932,20 +23660,20 @@ echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
fi
fi
- echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
-echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
+echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6; }
if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
if test "$_os" = "Darwin"; then
GNUCP=''
- echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
-echo "${ECHO_T}no gnucp found - using the system's cp command" >&6
+ { echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
+echo "${ECHO_T}no gnucp found - using the system's cp command" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5
echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;}
@@ -22962,8 +23690,8 @@ if test "$_os" = "WINNT"; then
CYGWIN_PATH=""
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22978,27 +23706,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
-
if test -n "$CYGWIN_PATH"; then
- echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
-echo "${ECHO_T}$CYGWIN_PATH" >&6
+ { echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
+echo "${ECHO_T}$CYGWIN_PATH" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
CYGWIN_PATH=`dirname "$CYGWIN_PATH"`
fi
if test -z "$CYGWIN_PATH"; then
@@ -23006,17 +23735,17 @@ if test -z "$CYGWIN_PATH"; then
fi
-if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
- echo "$as_me:$LINENO: checking ml.exe assembler path" >&5
-echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6
+if test "$_os" = "WINNT"; then
+ { echo "$as_me:$LINENO: checking ml.exe assembler path" >&5
+echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6; }
if test -n "$with_asm_home"; then
with_asm_home=`cygpath -u "$with_asm_home"`
fi
if test ! -x "$with_asm_home/ml.exe"; then
# Extract the first word of "ml.exe", so it can be a program name with args.
set dummy ml.exe; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ML_EXE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23031,32 +23760,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ML_EXE=$ac_cv_path_ML_EXE
-
if test -n "$ML_EXE"; then
- echo "$as_me:$LINENO: result: $ML_EXE" >&5
-echo "${ECHO_T}$ML_EXE" >&6
+ { echo "$as_me:$LINENO: result: $ML_EXE" >&5
+echo "${ECHO_T}$ML_EXE" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$ML_EXE"; then
if test -x "$with_cl_home/bin/ml.exe"; then
with_asm_home=$with_cl_home/bin
- echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
-echo "${ECHO_T}found ($with_asm_home)" >&6
+ { echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
+echo "${ECHO_T}found ($with_asm_home)" >&6; }
else
{ { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5
echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
@@ -23071,8 +23801,8 @@ else
fi
ASM_HOME="$with_asm_home"
if test -n "$ASM_HOME"; then
- echo "$as_me:$LINENO: result: $ASM_HOME" >&5
-echo "${ECHO_T}$ASM_HOME" >&6
+ { echo "$as_me:$LINENO: result: $ASM_HOME" >&5
+echo "${ECHO_T}$ASM_HOME" >&6; }
fi
@@ -23089,8 +23819,8 @@ if test -n "$with_zip_home" ; then
else
# Extract the first word of "zip", so it can be a program name with args.
set dummy zip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23105,31 +23835,32 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ZIP=$ac_cv_path_ZIP
-
if test -n "$ZIP"; then
- echo "$as_me:$LINENO: result: $ZIP" >&5
-echo "${ECHO_T}$ZIP" >&6
+ { echo "$as_me:$LINENO: result: $ZIP" >&5
+echo "${ECHO_T}$ZIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "unzip", so it can be a program name with args.
set dummy unzip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_UNZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23144,27 +23875,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
UNZIP=$ac_cv_path_UNZIP
-
if test -n "$UNZIP"; then
- echo "$as_me:$LINENO: result: $UNZIP" >&5
-echo "${ECHO_T}$UNZIP" >&6
+ { echo "$as_me:$LINENO: result: $UNZIP" >&5
+echo "${ECHO_T}$UNZIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
ZIP_HOME=`dirname "$ZIP"`
fi
if test -z "$ZIP" -o -z "$UNZIP"; then
@@ -23193,11 +23925,11 @@ fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking for unicows.dll" >&5
-echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6
- if test -x ../external/unicows/unicows.dll; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: checking for unicows.dll" >&5
+echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6; }
+ if test -x ./external/unicows/unicows.dll; then
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
Get it from the Microsoft site and put it into external/unicows.
@@ -23214,11 +23946,11 @@ may have to search Microsoft's website.) Last time it was seen at:
fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
-echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6
- if test -x ../external/dbghelp/dbghelp.dll; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
+echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6; }
+ if test -x ./external/dbghelp/dbghelp.dll; then
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/.
Get it from the Microsoft site and put it into external/dbghelp.
@@ -23235,21 +23967,21 @@ may have to search Microsoft's website.) Last time it was seen at:
fi
if test "$_os" = "WINNT"; then
- if ./oowintool --msvc-copy-dlls ../external/msvcp ; then
+ if ./solenv/bin/oowintool --msvc-copy-dlls ./external/msvcp ; then
:
else
- { { echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5
-echo "$as_me: error: oowintool failed to copy CRT" >&2;}
+ { { echo "$as_me:$LINENO: error: solenv/bin/oowintool failed to copy CRT" >&5
+echo "$as_me: error: solenv/bin/oowintool failed to copy CRT" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
if test "$_os" = "WINNT"; then
- echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
-echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6
- if test -x ../external/gdiplus/gdiplus.dll; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
+echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6; }
+ if test -x ./external/gdiplus/gdiplus.dll; then
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
{ { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/.
Get it from the Microsoft site and put it into external/gdiplus.
@@ -23264,22 +23996,22 @@ You may have to search Microsoft's website. Last time it was seen at:
fi
if test "$_os" = "WINNT"; then
- ./oowintool --msvc-copy-instmsi ../external/msi
+ ./solenv/bin/oowintool --msvc-copy-instmsi ./external/msi
fi
if test "$_os" = "WINNT"; then
if test "$COMEX" -ge "10"; then
- echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5
-echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6
- if test -x ../external/msi/instmsia.exe -a -x ../external/msi/instmsiw.exe; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ { echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5
+echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6; }
+ if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
+ { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
else
MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
- cp "$MSIAPATH" ../external/msi/ && chmod +x ../external/msi/instmsia.exe && MSIACOPY="OK"
- cp "$MSIWPATH" ../external/msi/ && chmod +x ../external/msi/instmsiw.exe && MSIWCOPY="OK"
+ cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
+ cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
fi
if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
{ { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
@@ -23294,38 +24026,38 @@ directory similar to:
As the automatic detection fails please copy the files to external/msi/." >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: found and copied" >&5
-echo "${ECHO_T}found and copied" >&6
+ { echo "$as_me:$LINENO: result: found and copied" >&5
+echo "${ECHO_T}found and copied" >&6; }
fi
fi
fi
fi
-echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
-echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
+echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6; }
WITH_GPC=NO
if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
WITH_GPC=YES
- echo "$as_me:$LINENO: result: GPC" >&5
-echo "${ECHO_T}GPC" >&6
+ { echo "$as_me:$LINENO: result: GPC" >&5
+echo "${ECHO_T}GPC" >&6; }
- echo "$as_me:$LINENO: checking for GPC files" >&5
-echo $ECHO_N "checking for GPC files... $ECHO_C" >&6
- if test -f ../external/gpc/gpc.h; then
+ { echo "$as_me:$LINENO: checking for GPC files" >&5
+echo $ECHO_N "checking for GPC files... $ECHO_C" >&6; }
+ if test -f ./external/gpc/gpc.h; then
HAVE_GPC_H="yes"
else
HAVE_GPC_H="no"
fi
- if test -f ../external/gpc/gpc.c; then
+ if test -f ./external/gpc/gpc.c; then
HAVE_GPC_C="yes"
else
HAVE_GPC_C="no"
fi
if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
- echo "$as_me:$LINENO: result: GPC files found" >&5
-echo "${ECHO_T}GPC files found" >&6
+ { echo "$as_me:$LINENO: result: GPC files found" >&5
+echo "${ECHO_T}GPC files found" >&6; }
else
{ { echo "$as_me:$LINENO: error: GPC files not found
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
@@ -23336,13 +24068,13 @@ or use basegfx' implementation using --without-gpc" >&2;}
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
fi
-echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
-echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
+echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6; }
ENABLE_GTK=""
if test "x$enable_gtk" = "xyes"; then
ENABLE_GTK="TRUE"
@@ -23358,29 +24090,29 @@ fi
if test -z "$R"; then
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
else
- echo "$as_me:$LINENO: result: $R" >&5
-echo "${ECHO_T}$R" >&6
+ { echo "$as_me:$LINENO: result: $R" >&5
+echo "${ECHO_T}$R" >&6; }
fi
ENABLE_GCONF=""
-echo "$as_me:$LINENO: checking whether to enable GConf support" >&5
-echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable GConf support" >&5
+echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
ENABLE_GCONF="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23395,28 +24127,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23427,25 +24160,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
+echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gconf-2.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
+echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; }
GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
- echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-echo "${ECHO_T}$GCONF_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
+echo "${ECHO_T}$GCONF_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
+echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; }
GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
- echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-echo "${ECHO_T}$GCONF_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
+echo "${ECHO_T}$GCONF_LIBS" >&6; }
else
GCONF_CFLAGS=""
GCONF_LIBS=""
@@ -23472,27 +24205,27 @@ echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusti
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
ENABLE_GNOMEVFS=""
-echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5
-echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5
+echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
ENABLE_GNOMEVFS="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23507,28 +24240,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23539,25 +24273,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
-echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
+echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
-echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
+echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6; }
GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "`
- echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
-echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
+echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
-echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
+echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6; }
GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "`
- echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
-echo "${ECHO_T}$GNOMEVFS_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
+echo "${ECHO_T}$GNOMEVFS_LIBS" >&6; }
else
GNOMEVFS_CFLAGS=""
GNOMEVFS_LIBS=""
@@ -23590,8 +24324,8 @@ echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; con
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23606,28 +24340,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23638,25 +24373,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
+echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gconf-2.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
+echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; }
GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
- echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-echo "${ECHO_T}$GCONF_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
+echo "${ECHO_T}$GCONF_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
+echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; }
GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
- echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-echo "${ECHO_T}$GCONF_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
+echo "${ECHO_T}$GCONF_LIBS" >&6; }
else
GCONF_CFLAGS=""
GCONF_LIBS=""
@@ -23684,8 +24419,8 @@ echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusti
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -23703,8 +24438,8 @@ if test "$test_gtk" = "yes"; then
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23719,28 +24454,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23751,25 +24487,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
-echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
-echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
+echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; }
GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
- echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
-echo "${ECHO_T}$GTK_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
+echo "${ECHO_T}$GTK_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GTK_LIBS" >&5
-echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GTK_LIBS" >&5
+echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; }
GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
- echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
-echo "${ECHO_T}$GTK_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
+echo "${ECHO_T}$GTK_LIBS" >&6; }
else
GTK_CFLAGS=""
GTK_LIBS=""
@@ -23802,20 +24538,20 @@ echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable
BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
fi
- echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5
-echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5
+echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
ENABLE_DBUS="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23830,28 +24566,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23862,25 +24599,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5
-echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5
+echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
-echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
+echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; }
DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "`
- echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
-echo "${ECHO_T}$DBUS_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
+echo "${ECHO_T}$DBUS_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
-echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
+echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; }
DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "`
- echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
-echo "${ECHO_T}$DBUS_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
+echo "${ECHO_T}$DBUS_LIBS" >&6; }
else
DBUS_CFLAGS=""
DBUS_LIBS=""
@@ -23907,12 +24644,12 @@ echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consid
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- echo "$as_me:$LINENO: checking whether to enable GIO support" >&5
-echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to enable GIO support" >&5
+echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6; }
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
{ { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5
@@ -23920,16 +24657,16 @@ echo "$as_me: error: please use --enable-gio only together with --disable-gnome-
{ (exit 1); exit 1; }; }
fi
ENABLE_GIO="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23944,28 +24681,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -23976,25 +24714,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gio-2.0 " >&5
-echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gio-2.0 " >&5
+echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gio-2.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
-echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
+echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6; }
GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "`
- echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
-echo "${ECHO_T}$GIO_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
+echo "${ECHO_T}$GIO_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GIO_LIBS" >&5
-echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GIO_LIBS" >&5
+echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6; }
GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "`
- echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
-echo "${ECHO_T}$GIO_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
+echo "${ECHO_T}$GIO_LIBS" >&6; }
else
GIO_CFLAGS=""
GIO_LIBS=""
@@ -24021,8 +24759,8 @@ echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
@@ -24041,18 +24779,18 @@ SYSTEM_CAIRO=""
if test "$test_cairo" = "yes"; then
- echo "$as_me:$LINENO: checking whether to use cairo" >&5
-echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use cairo" >&5
+echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6; }
if test "x$enable_cairo" != "xno" ; then
ENABLE_CAIRO="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- echo "$as_me:$LINENO: checking which cairo to use" >&5
-echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ { echo "$as_me:$LINENO: checking which cairo to use" >&5
+echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6; }
if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
test "$with_system_cairo" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_CAIRO=YES
@@ -24061,8 +24799,8 @@ echo "${ECHO_T}external" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24077,28 +24815,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -24109,25 +24848,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5
-echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5
+echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
-echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
+echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6; }
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "`
- echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
-echo "${ECHO_T}$CAIRO_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
+echo "${ECHO_T}$CAIRO_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
-echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
+echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6; }
CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "`
- echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
-echo "${ECHO_T}$CAIRO_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
+echo "${ECHO_T}$CAIRO_LIBS" >&6; }
else
CAIRO_CFLAGS=""
CAIRO_LIBS=""
@@ -24159,8 +24898,8 @@ echo "$as_me: error: Cairo library requires fontconfig." >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$with_system_xrender_headers" = "yes"; then
- echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5
-echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5
+echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -24187,18 +24926,27 @@ int main(int argc, char **argv) {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -24209,20 +24957,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: no, X headers too old." >&2;}
{ (exit 1); exit 1; }; }
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
else
BUILD_TYPE="$BUILD_TYPE CAIRO"
if test "$build_cpu" != "x86_64"; then
BUILD_PIXMAN=YES
fi
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
@@ -24233,25 +24983,25 @@ fi
-echo "$as_me:$LINENO: checking whether to build the OGLTrans extension" >&5
-echo $ECHO_N "checking whether to build the OGLTrans extension... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build the OGLTrans extension" >&5
+echo $ECHO_N "checking whether to build the OGLTrans extension... $ECHO_C" >&6; }
ENABLE_OPENGL=
if test "x$enable_opengl" != "xno" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if test "${ac_cv_header_GL_gl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_GL_gl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
-echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
+echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24262,41 +25012,37 @@ $ac_includes_default
#include <GL/gl.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
-echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
+echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24305,24 +25051,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <GL/gl.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -24330,9 +25074,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -24356,25 +25101,18 @@ echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_GL_gl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_GL_gl_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
fi
if test $ac_cv_header_GL_gl_h = yes; then
@@ -24387,8 +25125,8 @@ fi
-echo "$as_me:$LINENO: checking for main in -lGL" >&5
-echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -lGL" >&5
+echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6; }
if test "${ac_cv_lib_GL_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24405,46 +25143,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_GL_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_GL_main=no
+ ac_cv_lib_GL_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
+echo "${ECHO_T}$ac_cv_lib_GL_main" >&6; }
if test $ac_cv_lib_GL_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGL 1
@@ -24459,8 +25194,8 @@ echo "$as_me: error: libGL not installed or functional" >&2;}
fi
-echo "$as_me:$LINENO: checking for main in -lGLU" >&5
-echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for main in -lGLU" >&5
+echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6; }
if test "${ac_cv_lib_GLU_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24477,46 +25212,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_GLU_main=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_GLU_main=no
+ ac_cv_lib_GLU_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
+echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6; }
if test $ac_cv_lib_GLU_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGLU 1
@@ -24532,55 +25264,51 @@ fi
ENABLE_OPENGL=TRUE
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5
-echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5
+echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6; }
if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ENABLE_MINIMIZER=YES
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
ENABLE_MINIMIZER=NO
fi
-echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5
-echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6
-if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5
+echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6; }
+if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ENABLE_PRESENTER_SCREEN=YES
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
ENABLE_PRESENTER_SCREEN=NO
fi
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES"; then
- BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
-echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5
-echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5
+echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6; }
if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ENABLE_PDFIMPORT=YES
- echo "$as_me:$LINENO: checking which pdf backend to use" >&5
-echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which pdf backend to use" >&5
+echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6; }
if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
- test "$with_system_poppler" != "no"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ test "$with_system_poppler" != "no"; then
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_POPPLER=YES
succeeded=no
@@ -24588,8 +25316,8 @@ echo "${ECHO_T}external" >&6
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24604,28 +25332,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -24636,25 +25365,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5
-echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5
+echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
-echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
+echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6; }
POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "`
- echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
-echo "${ECHO_T}$POPPLER_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
+echo "${ECHO_T}$POPPLER_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
-echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
+echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6; }
POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "`
- echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
-echo "${ECHO_T}$POPPLER_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
+echo "${ECHO_T}$POPPLER_LIBS" >&6; }
else
POPPLER_CFLAGS=""
POPPLER_LIBS=""
@@ -24681,41 +25410,74 @@ echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_POPPLER=NO
BUILD_TYPE="$BUILD_TYPE XPDF"
+ { echo "$as_me:$LINENO: checking for xpdf module" >&5
+echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6; }
+ if test -d ./xpdf; then
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
-
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ENABLE_PDFIMPORT=NO
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ENABLE_PDFIMPORT=NO
fi
-echo "$as_me:$LINENO: checking whether to build the MediaWiki Editor extension" >&5
-echo $ECHO_N "checking whether to build the MediaWiki Editor extension... $ECHO_C" >&6
-if test -n "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+ { echo "$as_me:$LINENO: checking for sdext module" >&5
+echo $ECHO_N "checking for sdext module... $ECHO_C" >&6; }
+ if test -d ./sdext; then
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ BUILD_TYPE="$BUILD_TYPE SDEXT"
+fi
+
+{ echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5
+echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6; }
+if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ { echo "$as_me:$LINENO: checking for swext module" >&5
+echo $ECHO_N "checking for swext module... $ECHO_C" >&6; }
+ if test -d ./swext; then
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
ENABLE_MEDIAWIKI=YES
- echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
-echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
+echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; }
if test "$with_system_apache_commons" == "yes"; then
SYSTEM_APACHE_COMMONS=YES
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
if test -z "$COMMONS_CODEC_JAR"; then
COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
fi
as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -24728,8 +25490,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -24742,9 +25505,9 @@ fi
COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
fi
as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -24757,8 +25520,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -24771,9 +25535,9 @@ fi
COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
fi
as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -24786,8 +25550,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -24798,8 +25563,8 @@ fi
if test -z $COMMONS_LOGGING_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24813,14 +25578,14 @@ else
ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; }
if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then
COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24834,8 +25599,8 @@ else
ac_cv_file__usr_share_java_commons_logging_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6; }
if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then
COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
else
@@ -24851,9 +25616,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -24866,8 +25631,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -24878,15 +25644,15 @@ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_APACHE_COMMONS=NO
BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
fi
BUILD_TYPE="$BUILD_TYPE SWEXT"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
ENABLE_MEDIAWIKI=NO
fi
@@ -24897,19 +25663,19 @@ fi
if test "$ENABLE_MEDIAWIKI" == "YES"; then
- echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
-echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
+echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; }
if test -n "$with_system_servlet_api"; then
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
SYSTEM_SERVLETAPI=YES
if test -z "$SERVLETAPI_JAR"; then
SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
fi
as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5
-echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5
+echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -24922,8 +25688,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -24933,8 +25700,8 @@ echo "$as_me: error: servlet-api.jar not found." >&2;}
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
SYSTEM_SERVLETAPI=NO
BUILD_TYPE="$BUILD_TYPE TOMCAT"
fi
@@ -24942,21 +25709,21 @@ fi
-echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5
-echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6
-if test -n "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- ENABLE_REPORTDESIGN=YES
- echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
-echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5
+echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6; }
+if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ ENABLE_REPORTBUILDER=YES
+ { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
+echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; }
if test "$with_system_jfreereport" == "yes"; then
SYSTEM_JFREEREPORT=YES
- echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+ { echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6; }
if test -z $JCOMMON_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-1.0.10.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/jcommon-1.0.10.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-1.0.10.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/jcommon-1.0.10.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_jcommon_1_0_10_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24970,14 +25737,14 @@ else
ac_cv_file__usr_share_java_jcommon_1_0_10_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&6; }
if test $ac_cv_file__usr_share_java_jcommon_1_0_10_jar = yes; then
JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/jcommon.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/jcommon.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/jcommon.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_jcommon_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -24991,8 +25758,8 @@ else
ac_cv_file__usr_share_java_jcommon_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_jar" >&6; }
if test $ac_cv_file__usr_share_java_jcommon_jar = yes; then
JCOMMON_JAR=/usr/share/java/jcommon.jar
else
@@ -25008,9 +25775,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$JCOMMON_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $JCOMMON_JAR" >&5
-echo $ECHO_N "checking for $JCOMMON_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $JCOMMON_JAR" >&5
+echo $ECHO_N "checking for $JCOMMON_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25023,8 +25790,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25039,9 +25807,9 @@ fi
SAC_JAR=/usr/share/java/sac.jar
fi
as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $SAC_JAR" >&5
-echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $SAC_JAR" >&5
+echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25054,8 +25822,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25066,8 +25835,8 @@ fi
if test -z $LIBXML_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/libxml-0.9.9.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libxml-0.9.9.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libxml-0.9.9.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libxml-0.9.9.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libxml_0_9_9_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25081,14 +25850,14 @@ else
ac_cv_file__usr_share_java_libxml_0_9_9_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&6; }
if test $ac_cv_file__usr_share_java_libxml_0_9_9_jar = yes; then
LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25102,8 +25871,8 @@ else
ac_cv_file__usr_share_java_libxml_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6; }
if test $ac_cv_file__usr_share_java_libxml_jar = yes; then
LIBXML_JAR=/usr/share/java/libxml.jar
else
@@ -25119,9 +25888,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5
-echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5
+echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25134,8 +25903,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25147,8 +25917,8 @@ fi
fi
if test -z $FLUTE_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3-jfree-20061107.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/flute-1.3-jfree-20061107.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3-jfree-20061107.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flute-1.3-jfree-20061107.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25162,14 +25932,14 @@ else
ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&6; }
if test $ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar = yes; then
FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25183,8 +25953,8 @@ else
ac_cv_file__usr_share_java_flute_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6; }
if test $ac_cv_file__usr_share_java_flute_jar = yes; then
FLUTE_JAR=/usr/share/java/flute.jar
else
@@ -25200,9 +25970,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5
-echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5
+echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25215,8 +25985,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25228,8 +25999,8 @@ fi
fi
if test -z $JFREEREPORT_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25243,14 +26014,14 @@ else
ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&6; }
if test $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar = yes; then
JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25264,8 +26035,8 @@ else
ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&6; }
if test $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar = yes; then
JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine.jar
else
@@ -25281,9 +26052,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5
-echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5
+echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25296,8 +26067,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25309,8 +26081,8 @@ fi
fi
if test -z $LIBLAYOUT_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.8.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.8.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.8.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.8.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_liblayout_0_2_8_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25324,14 +26096,14 @@ else
ac_cv_file__usr_share_java_liblayout_0_2_8_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&6; }
if test $ac_cv_file__usr_share_java_liblayout_0_2_8_jar = yes; then
LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25345,8 +26117,8 @@ else
ac_cv_file__usr_share_java_liblayout_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6; }
if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then
LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
else
@@ -25362,9 +26134,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5
-echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5
+echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25377,8 +26149,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25390,8 +26163,8 @@ fi
fi
if test -z $LIBLOADER_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/libloader-0.3.6.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libloader-0.3.6.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libloader-0.3.6.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libloader-0.3.6.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libloader_0_3_6_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25405,14 +26178,14 @@ else
ac_cv_file__usr_share_java_libloader_0_3_6_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&6; }
if test $ac_cv_file__usr_share_java_libloader_0_3_6_jar = yes; then
LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25426,8 +26199,8 @@ else
ac_cv_file__usr_share_java_libloader_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6; }
if test $ac_cv_file__usr_share_java_libloader_jar = yes; then
LIBLOADER_JAR=/usr/share/java/libloader.jar
else
@@ -25443,9 +26216,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5
-echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5
+echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25458,8 +26231,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25471,8 +26245,8 @@ fi
fi
if test -z $LIBFORMULA_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.1.14.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libformula-0.1.14.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.1.14.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libformula-0.1.14.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libformula_0_1_14_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25486,14 +26260,14 @@ else
ac_cv_file__usr_share_java_libformula_0_1_14_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&6; }
if test $ac_cv_file__usr_share_java_libformula_0_1_14_jar = yes; then
LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25507,8 +26281,8 @@ else
ac_cv_file__usr_share_java_libformula_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6; }
if test $ac_cv_file__usr_share_java_libformula_jar = yes; then
LIBFORMULA_JAR=/usr/share/java/libformula.jar
else
@@ -25524,9 +26298,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5
-echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5
+echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25539,8 +26313,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25552,8 +26327,8 @@ fi
fi
if test -z $LIBREPOSITORY_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/librepository-0.1.4.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/librepository-0.1.4.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/librepository-0.1.4.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/librepository-0.1.4.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_librepository_0_1_4_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25567,14 +26342,14 @@ else
ac_cv_file__usr_share_java_librepository_0_1_4_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&6; }
if test $ac_cv_file__usr_share_java_librepository_0_1_4_jar = yes; then
LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25588,8 +26363,8 @@ else
ac_cv_file__usr_share_java_librepository_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6; }
if test $ac_cv_file__usr_share_java_librepository_jar = yes; then
LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
else
@@ -25605,9 +26380,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5
-echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5
+echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25620,8 +26395,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25633,8 +26409,8 @@ fi
fi
if test -z $LIBFONTS_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-0.3.3.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libfonts-0.3.3.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-0.3.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libfonts-0.3.3.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libfonts_0_3_3_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25648,14 +26424,14 @@ else
ac_cv_file__usr_share_java_libfonts_0_3_3_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&6; }
if test $ac_cv_file__usr_share_java_libfonts_0_3_3_jar = yes; then
LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25669,8 +26445,8 @@ else
ac_cv_file__usr_share_java_libfonts_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6; }
if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then
LIBFONTS_JAR=/usr/share/java/libfonts.jar
else
@@ -25686,9 +26462,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5
-echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5
+echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25701,8 +26477,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25714,8 +26491,8 @@ fi
fi
if test -z $JCOMMON_SERIALIZER_JAR; then
- echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer-0.2.0.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/jcommon-serializer-0.2.0.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer-0.2.0.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/jcommon-serializer-0.2.0.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25729,14 +26506,14 @@ else
ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&6; }
if test $ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar = yes; then
JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar
else
- echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/jcommon-serializer.jar... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/jcommon-serializer.jar... $ECHO_C" >&6; }
if test "${ac_cv_file__usr_share_java_jcommon_serializer_jar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25750,8 +26527,8 @@ else
ac_cv_file__usr_share_java_jcommon_serializer_jar=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_jar" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_jar" >&6; }
if test $ac_cv_file__usr_share_java_jcommon_serializer_jar = yes; then
JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer.jar
else
@@ -25767,9 +26544,9 @@ fi
else
as_ac_File=`echo "ac_cv_file_$JCOMMON_SERIALIZER_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $JCOMMON_SERIALIZER_JAR" >&5
-echo $ECHO_N "checking for $JCOMMON_SERIALIZER_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $JCOMMON_SERIALIZER_JAR" >&5
+echo $ECHO_N "checking for $JCOMMON_SERIALIZER_JAR... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
@@ -25782,8 +26559,9 @@ else
eval "$as_ac_File=no"
fi
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
@@ -25795,16 +26573,26 @@ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+ { echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6; }
+ { echo "$as_me:$LINENO: checking for jfreereport module" >&5
+echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6; }
+ if test -d ./jfreereport; then
+ { echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
SYSTEM_JFREEREPORT=NO
BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
fi
BUILD_TYPE="$BUILD_TYPE REPORTDESIGN"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ENABLE_REPORTDESIGN=NO
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ENABLE_REPORTBUILDER=NO
SYSTEM_JFREEREPORT=NO
fi
@@ -25862,8 +26650,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
kde_test_include="ksharedptr.h"
kde_test_library="libkdeui.so"
- echo "$as_me:$LINENO: checking for Qt headers" >&5
-echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for Qt headers" >&5
+echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; }
qt_incdir="no"
for kde_check in $qt_incdirs ; do
if test -r "$kde_check/$qt_test_include" ; then
@@ -25871,8 +26659,8 @@ echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
break
fi
done
- echo "$as_me:$LINENO: result: $qt_incdir" >&5
-echo "${ECHO_T}$qt_incdir" >&6
+ { echo "$as_me:$LINENO: result: $qt_incdir" >&5
+echo "${ECHO_T}$qt_incdir" >&6; }
if test "x$qt_incdir" = "xno" ; then
{ { echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of
your Qt installation by exporting QTDIR before running \"configure\"." >&5
@@ -25881,8 +26669,8 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for Qt libraries" >&5
-echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for Qt libraries" >&5
+echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; }
qt_libdir="no"
for qt_check in $qt_libdirs ; do
if test -r "$qt_check/$qt_test_library" ; then
@@ -25890,8 +26678,8 @@ echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6
break
fi
done
- echo "$as_me:$LINENO: result: $qt_libdir" >&5
-echo "${ECHO_T}$qt_libdir" >&6
+ { echo "$as_me:$LINENO: result: $qt_libdir" >&5
+echo "${ECHO_T}$qt_libdir" >&6; }
if test "x$qt_libdir" = "xno" ; then
{ { echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of
your Qt installation by exporting QTDIR before running \"configure\"." >&5
@@ -25902,8 +26690,8 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
# Extract the first word of "moc", so it can be a program name with args.
set dummy moc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MOC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25919,28 +26707,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no"
;;
esac
fi
MOC=$ac_cv_path_MOC
-
if test -n "$MOC"; then
- echo "$as_me:$LINENO: result: $MOC" >&5
-echo "${ECHO_T}$MOC" >&6
+ { echo "$as_me:$LINENO: result: $MOC" >&5
+echo "${ECHO_T}$MOC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test "$MOC" = "no" ; then
{ { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5
@@ -25949,8 +26738,8 @@ the root of your Qt installation by exporting QTDIR before running \"configure\"
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for KDE headers" >&5
-echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for KDE headers" >&5
+echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6; }
kde_incdir="no"
for kde_check in $kde_incdirs ; do
if test -r "$kde_check/$kde_test_include" ; then
@@ -25958,8 +26747,8 @@ echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6
break
fi
done
- echo "$as_me:$LINENO: result: $kde_incdir" >&5
-echo "${ECHO_T}$kde_incdir" >&6
+ { echo "$as_me:$LINENO: result: $kde_incdir" >&5
+echo "${ECHO_T}$kde_incdir" >&6; }
if test "x$kde_incdir" = "xno" ; then
{ { echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of
your KDE installation by exporting KDEDIR before running \"configure\"." >&5
@@ -25968,8 +26757,8 @@ your KDE installation by exporting KDEDIR before running \"configure\"." >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for KDE libraries" >&5
-echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for KDE libraries" >&5
+echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6; }
kde_libdir="no"
for kde_check in $kde_libdirs ; do
if test -r "$kde_check/$kde_test_library" ; then
@@ -25977,8 +26766,8 @@ echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6
break
fi
done
- echo "$as_me:$LINENO: result: $kde_libdir" >&5
-echo "${ECHO_T}$kde_libdir" >&6
+ { echo "$as_me:$LINENO: result: $kde_libdir" >&5
+echo "${ECHO_T}$kde_libdir" >&6; }
if test "x$kde_libdir" = "xno" ; then
{ { echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of
your KDE installation by exporting KDEDIR before running \"configure\"." >&5
@@ -25994,32 +26783,32 @@ fi
-echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5
-echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5
+echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6; }
ENABLE_LOCKDOWN=""
if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
ENABLE_LOCKDOWN=YES
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5
-echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5
+echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6; }
if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -26034,28 +26823,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" = "no" ; then
@@ -26066,25 +26856,25 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gobject-2.0" >&5
-echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for gobject-2.0" >&5
+echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "gobject-2.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
succeeded=yes
- echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
-echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
+echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6; }
GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"`
- echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
-echo "${ECHO_T}$GOBJECT_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
+echo "${ECHO_T}$GOBJECT_CFLAGS" >&6; }
- echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
-echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
+echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6; }
GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"`
- echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
-echo "${ECHO_T}$GOBJECT_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
+echo "${ECHO_T}$GOBJECT_LIBS" >&6; }
else
GOBJECT_CFLAGS=""
GOBJECT_LIBS=""
@@ -26113,19 +26903,19 @@ echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjust
ENABLE_EVOAB2="TRUE"
else
ENABLE_EVOAB2=""
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5
-echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5
+echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6; }
if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- ac_ext=cc
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -26133,8 +26923,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
- echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5
-echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5
+echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -26158,18 +26948,27 @@ int main(int argc, char **argv) {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -26180,8 +26979,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;}
{ (exit 1); exit 1; }; }
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
CXXFLAGS=$save_CXXFLAGS
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -26191,54 +26992,54 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ENABLE_KAB=TRUE
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
ENABLE_KAB=
fi
-echo "$as_me:$LINENO: checking whether to include FontOOo" >&5
-echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include FontOOo" >&5
+echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6; }
if test -n "$enable_fontooo"; then
if test "$enable_fontooo" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_FONTOOO=NO
SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_FONTOOO=YES
BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_FONTOOO=NO
SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
fi
if test "$WITH_FONTOOO" = "YES"; then
- echo "$as_me:$LINENO: checking whether to use system libmspack" >&5
-echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether to use system libmspack" >&5
+echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6; }
if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
test "$with_system_mspack" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SYSTEM_MSPACK=YES
if test "${ac_cv_header_mspack_h+set}" = set; then
- echo "$as_me:$LINENO: checking for mspack.h" >&5
-echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; }
if test "${ac_cv_header_mspack_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking mspack.h usability" >&5
-echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking mspack.h usability" >&5
+echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -26249,41 +27050,37 @@ $ac_includes_default
#include <mspack.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking mspack.h presence" >&5
-echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking mspack.h presence" >&5
+echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -26292,24 +27089,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <mspack.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -26317,9 +27112,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -26343,25 +27139,18 @@ echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\""
echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for mspack.h" >&5
-echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; }
if test "${ac_cv_header_mspack_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_mspack_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; }
fi
if test $ac_cv_header_mspack_h = yes; then
@@ -26374,8 +27163,8 @@ fi
-echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5
-echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5
+echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6; }
if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -26388,56 +27177,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char mspack_create_cab_decompressor ();
int
main ()
{
-mspack_create_cab_decompressor ();
+return mspack_create_cab_decompressor ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_mspack_mspack_create_cab_decompressor=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_mspack_mspack_create_cab_decompressor=no
+ ac_cv_lib_mspack_mspack_create_cab_decompressor=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
-echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
+echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; }
if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMSPACK 1
@@ -26452,82 +27238,82 @@ echo "$as_me: error: libmspack not installed or functional" >&2;}
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SYSTEM_MSPACK=NO
fi
fi
-echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
-echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
+echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6; }
if test -n "$enable_mathmldtd"; then
if test "$enable_mathmldtd" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
fi
-echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5
-echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5
+echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6; }
if test "$with_fonts" != "no" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_FONTS=YES
BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_FONTS=NO
SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
fi
-echo "$as_me:$LINENO: checking whether to include PPDs" >&5
-echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include PPDs" >&5
+echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6; }
if test "$with_ppds" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITHOUT_PPDS=YES
SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
fi
-echo "$as_me:$LINENO: checking whether to include AFMs" >&5
-echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include AFMs" >&5
+echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6; }
if test "$with_afms" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITHOUT_AFMS=YES
SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
fi
-echo "$as_me:$LINENO: checking whether to include writer2latex" >&5
-echo $ECHO_N "checking whether to include writer2latex... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to include writer2latex" >&5
+echo $ECHO_N "checking whether to include writer2latex... $ECHO_C" >&6; }
if test "$with_writer2latex" != "no" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
WITH_WRITER2LATEX=YES
BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
WITH_WRITER2LATEX=NO
SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
fi
@@ -26535,13 +27321,13 @@ fi
-echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
-echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
+echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6; }
if test "$_os" = "Darwin"; then
USE_XINERAMA=YES
XINERAMA_LINK=dynamic
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
# we have both versions, let the user decide but use the dynamic one
@@ -26571,20 +27357,20 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
XINERAMA_LINK=none
fi
if test "$USE_XINERAMA" = "YES"; then
- echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5
-echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6
+ { echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5
+echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6; }
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
- echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5
-echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5
+echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -26595,41 +27381,37 @@ $ac_includes_default
#include <X11/extensions/Xinerama.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5
-echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5
+echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -26638,24 +27420,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/extensions/Xinerama.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -26663,9 +27443,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -26689,25 +27470,18 @@ echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cann
echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+
;;
esac
-echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; }
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
fi
if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
@@ -26727,8 +27501,8 @@ fi
XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
fi
-echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
-echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
+echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6; }
if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -26741,56 +27515,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char XineramaIsActive ();
int
main ()
{
-XineramaIsActive ();
+return XineramaIsActive ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_Xinerama_XineramaIsActive=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xinerama_XineramaIsActive=no
+ ac_cv_lib_Xinerama_XineramaIsActive=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6; }
if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXINERAMA 1
@@ -26805,12 +27576,12 @@ echo "$as_me: error: Xinerama not functional?" >&2;}
fi
else
- echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
-echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6
+ { echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
+echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6; }
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -26824,8 +27595,8 @@ if test -z "$with_ant_home"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ANT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -26840,27 +27611,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ANT=$ac_cv_path_ANT
-
if test -n "$ANT"; then
- echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6
+ { echo "$as_me:$LINENO: result: $ANT" >&5
+echo "${ECHO_T}$ANT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ANT" && break
done
@@ -26872,8 +27644,8 @@ else
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ANT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -26889,27 +27661,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ANT=$ac_cv_path_ANT
-
if test -n "$ANT"; then
- echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6
+ { echo "$as_me:$LINENO: result: $ANT" >&5
+echo "${ECHO_T}$ANT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ANT" && break
done
@@ -26945,8 +27718,8 @@ else
fi
ant_minminor1=`echo $ant_minver | cut -d"." -f2`
- echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
-echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
+echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6; }
ant_version=`$ANT -version | $AWK '{ print $4; }'`
ant_version_major=`echo $ant_version | cut -d. -f1`
ant_version_minor=`echo $ant_version | cut -d. -f2`
@@ -26954,18 +27727,18 @@ echo "configure: ant_version $ant_version " >&5
echo "configure: ant_version_major $ant_version_major " >&5
echo "configure: ant_version_minor $ant_version_minor " >&5
if test "$ant_version_major" -ge "2"; then
- echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
+ { echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6; }
elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
- echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
+ { echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking if $ANT works" >&5
-echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if $ANT works" >&5
+echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6; }
cat > conftest.java << EOF
public class conftest {
int testmethod(int a, int b) {
@@ -26995,8 +27768,8 @@ EOF
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
if test $? = 0 && test -f ./conftest.class ; then
- echo "$as_me:$LINENO: result: Ant works" >&5
-echo "${ECHO_T}Ant works" >&6
+ { echo "$as_me:$LINENO: result: Ant works" >&5
+echo "${ECHO_T}Ant works" >&6; }
if test -z "$WITH_ANT_HOME"; then
ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
if test -z "$ANT_HOME"; then
@@ -27023,8 +27796,8 @@ fi
if test "$ANT_HOME" != "NO_ANT_HOME"; then
- echo "$as_me:$LINENO: checking Ant lib directory" >&5
-echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking Ant lib directory" >&5
+echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6; }
if test -f $ANT_HOME/lib/ant.jar; then
ANT_LIB="$ANT_HOME/lib"
else
@@ -27048,15 +27821,15 @@ echo "$as_me: error: Ant libraries not found!" >&2;}
fi
fi
fi
- echo "$as_me:$LINENO: result: Ant lib directory found." >&5
-echo "${ECHO_T}Ant lib directory found." >&6
+ { echo "$as_me:$LINENO: result: Ant lib directory found." >&5
+echo "${ECHO_T}Ant lib directory found." >&6; }
fi
fi
if test "$ENABLE_MEDIAWIKI" = "YES"; then
-echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5
-echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5
+echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6; }
rm -rf confdir
mkdir confdir
cat > conftest.java << EOF
@@ -27094,8 +27867,8 @@ EOF
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
if test $? = 0 && test -f ./conftest.class ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -rf confdir
else
echo "configure: Ant test failed" >&5
@@ -27109,50 +27882,50 @@ echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
fi
rm -f conftest* core core.* *.core
-echo "$as_me:$LINENO: checking which languages to be built" >&5
-echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which languages to be built" >&5
+echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6; }
WITH_LANG="$with_lang"
if test -z "$WITH_LANG"; then
- echo "$as_me:$LINENO: result: en-US" >&5
-echo "${ECHO_T}en-US" >&6
+ { echo "$as_me:$LINENO: result: en-US" >&5
+echo "${ECHO_T}en-US" >&6; }
else
- echo "$as_me:$LINENO: result: $WITH_LANG" >&5
-echo "${ECHO_T}$WITH_LANG" >&6
+ { echo "$as_me:$LINENO: result: $WITH_LANG" >&5
+echo "${ECHO_T}$WITH_LANG" >&6; }
fi
-echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5
-echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5
+echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6; }
WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
else
- echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
-echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6
+ { echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
+echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6; }
fi
-echo "$as_me:$LINENO: checking which dictionaries to include" >&5
-echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which dictionaries to include" >&5
+echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6; }
if test -z "$with_dict"; then
WITH_DICT=,ALL,
- echo "$as_me:$LINENO: result: ALL" >&5
-echo "${ECHO_T}ALL" >&6
+ { echo "$as_me:$LINENO: result: ALL" >&5
+echo "${ECHO_T}ALL" >&6; }
else
WITH_DICT=","$with_dict","
- echo "$as_me:$LINENO: result: $with_dict" >&5
-echo "${ECHO_T}$with_dict" >&6
+ { echo "$as_me:$LINENO: result: $with_dict" >&5
+echo "${ECHO_T}$with_dict" >&6; }
fi
-echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5
-echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5
+echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6; }
INTRO_BITMAPS=
if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
INTRO_BITMAPS=
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
else
for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
case "$bitmap" in
@@ -27164,18 +27937,18 @@ echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
fi
done
- echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
-echo "${ECHO_T}$INTRO_BITMAPS" >&6
+ { echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
+echo "${ECHO_T}$INTRO_BITMAPS" >&6; }
fi
-echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5
-echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5
+echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6; }
ABOUT_BITMAPS=
if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
ABOUT_BITMAPS=
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
else
for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
case "$bitmap" in
@@ -27187,82 +27960,82 @@ echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
fi
done
- echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
-echo "${ECHO_T}$ABOUT_BITMAPS" >&6
+ { echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
+echo "${ECHO_T}$ABOUT_BITMAPS" >&6; }
fi
OOO_VENDOR=
-echo "$as_me:$LINENO: checking for vendor" >&5
-echo $ECHO_N "checking for vendor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for vendor" >&5
+echo $ECHO_N "checking for vendor... $ECHO_C" >&6; }
if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
- echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+ { echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6; }
else
OOO_VENDOR="$with_vendor"
- echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
-echo "${ECHO_T}$OOO_VENDOR" >&6
+ { echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
+echo "${ECHO_T}$OOO_VENDOR" >&6; }
fi
UNIXWRAPPERNAME=
-echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5
-echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5
+echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6; }
if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then
- echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+ { echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6; }
else
UNIXWRAPPERNAME="$with_unix_wrapper"
- echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
-echo "${ECHO_T}$UNIXWRAPPERNAME" >&6
+ { echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
+echo "${ECHO_T}$UNIXWRAPPERNAME" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5
-echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5
+echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6; }
if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
ENABLE_STATIC_GTK="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_STATIC_GTK="FALSE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5
-echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5
+echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6; }
if test -n "$enable_layout" && test "$enable_layout" != "no"; then
ENABLE_LAYOUT="TRUE"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
ENABLE_LAYOUT="FALSE"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
# ===================================================================
# De- or increase default verbosity of build process
# ===================================================================
-echo "$as_me:$LINENO: checking build verbosity" >&5
-echo $ECHO_N "checking build verbosity... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build verbosity" >&5
+echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; }
if test -n "$enable_verbose"; then
if test "$enable_verbose" == "yes"; then
VERBOSE="TRUE"
- echo "$as_me:$LINENO: result: high" >&5
-echo "${ECHO_T}high" >&6
+ { echo "$as_me:$LINENO: result: high" >&5
+echo "${ECHO_T}high" >&6; }
fi
if test "$enable_verbose" == "no"; then
VERBOSE="FALSE"
- echo "$as_me:$LINENO: result: low" >&5
-echo "${ECHO_T}low" >&6
+ { echo "$as_me:$LINENO: result: low" >&5
+echo "${ECHO_T}low" >&6; }
fi
else
- echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+ { echo "$as_me:$LINENO: result: not set" >&5
+echo "${ECHO_T}not set" >&6; }
fi
@@ -27279,25 +28052,26 @@ echo "$as_me: error: No compiler found." >&2;}
fi
-echo "$as_me:$LINENO: checking solver path" >&5
-echo $ECHO_N "checking solver path... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking solver path" >&5
+echo $ECHO_N "checking solver path... $ECHO_C" >&6; }
if test -z "$with_local_solver"; then
LOCAL_SOLVER="DEFAULT"
- echo "$as_me:$LINENO: result: default" >&5
-echo "${ECHO_T}default" >&6
+ { echo "$as_me:$LINENO: result: default" >&5
+echo "${ECHO_T}default" >&6; }
else
LOCAL_SOLVER=$with_local_solver
- echo "$as_me:$LINENO: result: $with_local_solver" >&5
-echo "${ECHO_T}$with_local_solver" >&6
+ { echo "$as_me:$LINENO: result: $with_local_solver" >&5
+echo "${ECHO_T}$with_local_solver" >&6; }
fi
# make sure config.guess is +x; we execute config.guess, so it has to be so;
-chmod +x $_solenv/bin/config.guess
+chmod +x ./config.guess
+
+ac_config_files="$ac_config_files set_soenv Makefile"
- ac_config_files="$ac_config_files set_soenv"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -27316,39 +28090,58 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+
(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- echo "not updating unwritable cache $cache_file"
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -27357,63 +28150,48 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
#
# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section. Otherwise,
+# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
+ac_script='
t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
t quote
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
t quote
-d
-: quote
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output. A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+b any
+:quote
+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+ g
+ s/^\n//
+ s/\n/ /g
+ p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
ac_libobjs=
ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -27444,17 +28222,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -27464,8 +28270,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -27479,18 +28320,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -27498,159 +28340,120 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -27659,7 +28462,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -27668,31 +28492,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -27700,30 +28507,18 @@ generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
@@ -27731,7 +28526,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -27742,18 +28537,20 @@ Configuration files:
$config_files
Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -27764,60 +28561,42 @@ while test $# != 0
do
case $1 in
--*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
+ --he | --h | --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+ -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -27833,28 +28612,43 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ echo "$ac_log"
+} >&5
-
-
-
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "set_soenv" ) CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
+ case $ac_config_target in
+ "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -27864,613 +28658,804 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
} ||
{
echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
#
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
#
# No need to generate the scripts if there are no CONFIG_FILES.
# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@AWK@,$AWK,;t t
-s,@SED@,$SED,;t t
-s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t
-s,@UPD@,$UPD,;t t
-s,@SOURCEVERSION@,$SOURCEVERSION,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@OSVERSION@,$OSVERSION,;t t
-s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
-s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
-s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
-s,@VC_STANDARD@,$VC_STANDARD,;t t
-s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t
-s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
-s,@PRODUCT@,$PRODUCT,;t t
-s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t
-s,@PROEXT@,$PROEXT,;t t
-s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t
-s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t
-s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t
-s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t
-s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t
-s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t
-s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t
-s,@DISABLE_ATL@,$DISABLE_ATL,;t t
-s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t
-s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t
-s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t
-s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t
-s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t
-s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t
-s,@USE_SHELL@,$USE_SHELL,;t t
-s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
-s,@SHELLPATH@,$SHELLPATH,;t t
-s,@GCC_HOME@,$GCC_HOME,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@COMPATH@,$COMPATH,;t t
-s,@GCCVER@,$GCCVER,;t t
-s,@ENABLE_PCH@,$ENABLE_PCH,;t t
-s,@GNUMAKE@,$GNUMAKE,;t t
-s,@_cc@,$_cc,;t t
-s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t
-s,@PERL@,$PERL,;t t
-s,@MSPDB_PATH@,$MSPDB_PATH,;t t
-s,@COMEX@,$COMEX,;t t
-s,@USE_MINGW@,$USE_MINGW,;t t
-s,@MIDL_PATH@,$MIDL_PATH,;t t
-s,@CSC_PATH@,$CSC_PATH,;t t
-s,@FRAME_HOME@,$FRAME_HOME,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t
-s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t
-s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t
-s,@ENABLE_VBA@,$ENABLE_VBA,;t t
-s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t
-s,@PAM@,$PAM,;t t
-s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t
-s,@PAM_LINK@,$PAM_LINK,;t t
-s,@CRYPT_LINK@,$CRYPT_LINK,;t t
-s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t
-s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t
-s,@STLPORT4@,$STLPORT4,;t t
-s,@STLPORT_VER@,$STLPORT_VER,;t t
-s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
-s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t
-s,@ALLOC@,$ALLOC,;t t
-s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t
-s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
-s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t
-s,@JAVACOMPILER@,$JAVACOMPILER,;t t
-s,@JAVACISGCJ@,$JAVACISGCJ,;t t
-s,@JAVADOC@,$JAVADOC,;t t
-s,@AWTLIB@,$AWTLIB,;t t
-s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t
-s,@JAVA_HOME@,$JAVA_HOME,;t t
-s,@JDK@,$JDK,;t t
-s,@JAVAFLAGS@,$JAVAFLAGS,;t t
-s,@DMAKE@,$DMAKE,;t t
-s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t
-s,@EPM@,$EPM,;t t
-s,@DPKG@,$DPKG,;t t
-s,@PKGMK@,$PKGMK,;t t
-s,@BUILD_EPM@,$BUILD_EPM,;t t
-s,@PKGFORMAT@,$PKGFORMAT,;t t
-s,@RPM@,$RPM,;t t
-s,@GPERF@,$GPERF,;t t
-s,@MINGWCXX@,$MINGWCXX,;t t
-s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t
-s,@MINGWSTRIP@,$MINGWSTRIP,;t t
-s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t
-s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t
-s,@BUILD_QADEVOOO@,$BUILD_QADEVOOO,;t t
-s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t
-s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t
-s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t
-s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
-s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
-s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t
-s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
-s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
-s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t
-s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s,@XSLTPROC@,$XSLTPROC,;t t
-s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t
-s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t
-s,@PYTHON@,$PYTHON,;t t
-s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
-s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t
-s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t
-s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t
-s,@pythondir@,$pythondir,;t t
-s,@pkgpythondir@,$pkgpythondir,;t t
-s,@pyexecdir@,$pyexecdir,;t t
-s,@pkgpyexecdir@,$pkgpyexecdir,;t t
-s,@BZIP2@,$BZIP2,;t t
-s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t
-s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t
-s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t
-s,@HOME@,$HOME,;t t
-s,@SYSTEM_DB@,$SYSTEM_DB,;t t
-s,@DB_VERSION@,$DB_VERSION,;t t
-s,@DB_INCLUDES@,$DB_INCLUDES,;t t
-s,@DB_JAR@,$DB_JAR,;t t
-s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t
-s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t
-s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t
-s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t
-s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t
-s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t
-s,@BSH_JAR@,$BSH_JAR,;t t
-s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t
-s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t
-s,@SAXON_JAR@,$SAXON_JAR,;t t
-s,@CURLCONFIG@,$CURLCONFIG,;t t
-s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t
-s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t
-s,@CURL_LIBS@,$CURL_LIBS,;t t
-s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t
-s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t
-s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t
-s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t
-s,@WITH_LDAP@,$WITH_LDAP,;t t
-s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t
-s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t
-s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t
-s,@NSS_LIB@,$NSS_LIB,;t t
-s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t
-s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t
-s,@NSPR_LIB@,$NSPR_LIB,;t t
-s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t
-s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t
-s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t
-s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t
-s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t
-s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t
-s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t
-s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t
-s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t
-s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t
-s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t
-s,@MOZ_INC@,$MOZ_INC,;t t
-s,@MOZ_LIB@,$MOZ_LIB,;t t
-s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t
-s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t
-s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t
-s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t
-s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t
-s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t
-s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t
-s,@X_CFLAGS@,$X_CFLAGS,;t t
-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
-s,@X_LIBS@,$X_LIBS,;t t
-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@XINC@,$XINC,;t t
-s,@XLIB@,$XLIB,;t t
-s,@DISABLE_XAW@,$DISABLE_XAW,;t t
-s,@XAU_LIBS@,$XAU_LIBS,;t t
-s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t
-s,@XRENDER_LINK@,$XRENDER_LINK,;t t
-s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t
-s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t
-s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t
-s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t
-s,@DISABLE_NEON@,$DISABLE_NEON,;t t
-s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t
-s,@NEON_LIBS@,$NEON_LIBS,;t t
-s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t
-s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t
-s,@NEON_VERSION@,$NEON_VERSION,;t t
-s,@ENABLE_AGG@,$ENABLE_AGG,;t t
-s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t
-s,@AGG_LIBS@,$AGG_LIBS,;t t
-s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t
-s,@AGG_VERSION@,$AGG_VERSION,;t t
-s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t
-s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t
-s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t
-s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t
-s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t
-s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
-s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
-s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t
-s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
-s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t
-s,@PSDK_HOME@,$PSDK_HOME,;t t
-s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t
-s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t
-s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t
-s,@NSIS_PATH@,$NSIS_PATH,;t t
-s,@BISON@,$BISON,;t t
-s,@FLEX@,$FLEX,;t t
-s,@PATCH@,$PATCH,;t t
-s,@GNUCP@,$GNUCP,;t t
-s,@GNUPATCH@,$GNUPATCH,;t t
-s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t
-s,@ML_EXE@,$ML_EXE,;t t
-s,@ASM_HOME@,$ASM_HOME,;t t
-s,@ZIP@,$ZIP,;t t
-s,@UNZIP@,$UNZIP,;t t
-s,@ZIP_HOME@,$ZIP_HOME,;t t
-s,@WITH_GPC@,$WITH_GPC,;t t
-s,@ENABLE_GTK@,$ENABLE_GTK,;t t
-s,@ENABLE_KDE@,$ENABLE_KDE,;t t
-s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t
-s,@GCONF_LIBS@,$GCONF_LIBS,;t t
-s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t
-s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t
-s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t
-s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t
-s,@DBUS_LIBS@,$DBUS_LIBS,;t t
-s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t
-s,@GIO_LIBS@,$GIO_LIBS,;t t
-s,@ENABLE_GIO@,$ENABLE_GIO,;t t
-s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t
-s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t
-s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
-s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
-s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t
-s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t
-s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t
-s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t
-s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t
-s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t
-s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t
-s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t
-s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t
-s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t
-s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t
-s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t
-s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t
-s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t
-s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t
-s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t
-s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t
-s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t
-s,@ENABLE_REPORTDESIGN@,$ENABLE_REPORTDESIGN,;t t
-s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t
-s,@JCOMMON_JAR@,$JCOMMON_JAR,;t t
-s,@SAC_JAR@,$SAC_JAR,;t t
-s,@LIBXML_JAR@,$LIBXML_JAR,;t t
-s,@FLUTE_JAR@,$FLUTE_JAR,;t t
-s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t
-s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t
-s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t
-s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t
-s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t
-s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t
-s,@JCOMMON_SERIALIZER_JAR@,$JCOMMON_SERIALIZER_JAR,;t t
-s,@MOC@,$MOC,;t t
-s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t
-s,@KDE_LIBS@,$KDE_LIBS,;t t
-s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t
-s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t
-s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t
-s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t
-s,@ENABLE_KAB@,$ENABLE_KAB,;t t
-s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t
-s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t
-s,@WITH_FONTS@,$WITH_FONTS,;t t
-s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t
-s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t
-s,@WITH_WRITER2LATEX@,$WITH_WRITER2LATEX,;t t
-s,@SCPDEFS@,$SCPDEFS,;t t
-s,@USE_XINERAMA@,$USE_XINERAMA,;t t
-s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t
-s,@ANT@,$ANT,;t t
-s,@ANT_HOME@,$ANT_HOME,;t t
-s,@ANT_LIB@,$ANT_LIB,;t t
-s,@WITH_LANG@,$WITH_LANG,;t t
-s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t
-s,@WITH_DICT@,$WITH_DICT,;t t
-s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t
-s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t
-s,@OOO_VENDOR@,$OOO_VENDOR,;t t
-s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t
-s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
-s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t
-s,@VERBOSE@,$VERBOSE,;t t
-s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t
-s,@BUILD_TYPE@,$BUILD_TYPE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+AWK!$AWK$ac_delim
+SED!$SED$ac_delim
+LOCAL_SOLENV!$LOCAL_SOLENV$ac_delim
+_solenv!$_solenv$ac_delim
+UPD!$UPD$ac_delim
+SOURCEVERSION!$SOURCEVERSION$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+OSVERSION!$OSVERSION$ac_delim
+PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
+PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
+ENABLE_CRASHDUMP!$ENABLE_CRASHDUMP$ac_delim
+VC_STANDARD!$VC_STANDARD$ac_delim
+ENABLE_WERROR!$ENABLE_WERROR$ac_delim
+ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim
+PRODUCT!$PRODUCT$ac_delim
+PROFULLSWITCH!$PROFULLSWITCH$ac_delim
+PROEXT!$PROEXT$ac_delim
+ENABLE_SYMBOLS!$ENABLE_SYMBOLS$ac_delim
+DISABLE_STRIP!$DISABLE_STRIP$ac_delim
+ENABLE_CUPS!$ENABLE_CUPS$ac_delim
+ENABLE_FONTCONFIG!$ENABLE_FONTCONFIG$ac_delim
+WITH_BINFILTER!$WITH_BINFILTER$ac_delim
+ENABLE_DIRECTX!$ENABLE_DIRECTX$ac_delim
+DISABLE_ACTIVEX!$DISABLE_ACTIVEX$ac_delim
+DISABLE_ATL!$DISABLE_ATL$ac_delim
+ENABLE_RPATH!$ENABLE_RPATH$ac_delim
+WITH_MYSPELL_DICTS!$WITH_MYSPELL_DICTS$ac_delim
+SYSTEM_DICTS!$SYSTEM_DICTS$ac_delim
+DICT_SYSTEM_DIR!$DICT_SYSTEM_DIR$ac_delim
+HYPH_SYSTEM_DIR!$HYPH_SYSTEM_DIR$ac_delim
+THES_SYSTEM_DIR!$THES_SYSTEM_DIR$ac_delim
+USE_SHELL!$USE_SHELL$ac_delim
+WITH_MINGWIN!$WITH_MINGWIN$ac_delim
+SHELLPATH!$SHELLPATH$ac_delim
+GCC_HOME!$GCC_HOME$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+COMPATH!$COMPATH$ac_delim
+GCCVER!$GCCVER$ac_delim
+ENABLE_PCH!$ENABLE_PCH$ac_delim
+GNUMAKE!$GNUMAKE$ac_delim
+_cc!$_cc$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+HAVE_LD_HASH_STYLE!$HAVE_LD_HASH_STYLE$ac_delim
+PERL!$PERL$ac_delim
+MSPDB_PATH!$MSPDB_PATH$ac_delim
+COMEX!$COMEX$ac_delim
+USE_MINGW!$USE_MINGW$ac_delim
+MIDL_PATH!$MIDL_PATH$ac_delim
+CSC_PATH!$CSC_PATH$ac_delim
+FRAME_HOME!$FRAME_HOME$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+SIZEOF_LONG!$SIZEOF_LONG$ac_delim
+WORDS_BIGENDIAN!$WORDS_BIGENDIAN$ac_delim
+LFS_CFLAGS!$LFS_CFLAGS$ac_delim
+ENABLE_VBA!$ENABLE_VBA$ac_delim
+VBA_EXTENSION!$VBA_EXTENSION$ac_delim
+PAM!$PAM$ac_delim
+NEW_SHADOW_API!$NEW_SHADOW_API$ac_delim
+PAM_LINK!$PAM_LINK$ac_delim
+CRYPT_LINK!$CRYPT_LINK$ac_delim
+GXX_INCLUDE_PATH!$GXX_INCLUDE_PATH$ac_delim
+MINGW_LIB_INCLUDE_PATH!$MINGW_LIB_INCLUDE_PATH$ac_delim
+STLPORT4!$STLPORT4$ac_delim
+STLPORT_VER!$STLPORT_VER$ac_delim
+USE_SYSTEM_STL!$USE_SYSTEM_STL$ac_delim
+HAVE_GCC_VISIBILITY_FEATURE!$HAVE_GCC_VISIBILITY_FEATURE$ac_delim
+ALLOC!$ALLOC$ac_delim
+BUILD_VER_STRING!$BUILD_VER_STRING$ac_delim
+SOLAR_JAVA!$SOLAR_JAVA$ac_delim
+JAVAINTERPRETER!$JAVAINTERPRETER$ac_delim
+JAVACOMPILER!$JAVACOMPILER$ac_delim
+JAVACISGCJ!$JAVACISGCJ$ac_delim
+JAVADOC!$JAVADOC$ac_delim
+AWTLIB!$AWTLIB$ac_delim
+JAVAAOTCOMPILER!$JAVAAOTCOMPILER$ac_delim
+JAVA_HOME!$JAVA_HOME$ac_delim
+JDK!$JDK$ac_delim
+JAVAFLAGS!$JAVAFLAGS$ac_delim
+DMAKE!$DMAKE$ac_delim
+BUILD_DMAKE!$BUILD_DMAKE$ac_delim
+EPM!$EPM$ac_delim
+DPKG!$DPKG$ac_delim
+PKGMK!$PKGMK$ac_delim
+BUILD_EPM!$BUILD_EPM$ac_delim
+PKGFORMAT!$PKGFORMAT$ac_delim
+RPM!$RPM$ac_delim
+GPERF!$GPERF$ac_delim
+MINGWCXX!$MINGWCXX$ac_delim
+MINGWSTRIP!$MINGWSTRIP$ac_delim
+BUILD_UNOWINREG!$BUILD_UNOWINREG$ac_delim
+BUILD_QADEVOOO!$BUILD_QADEVOOO$ac_delim
+SYSTEM_STDLIBS!$SYSTEM_STDLIBS$ac_delim
+SYSTEM_ZLIB!$SYSTEM_ZLIB$ac_delim
+SYSTEM_JPEG!$SYSTEM_JPEG$ac_delim
+SYSTEM_EXPAT!$SYSTEM_EXPAT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+LIBWPD_CFLAGS!$LIBWPD_CFLAGS$ac_delim
+LIBWPD_LIBS!$LIBWPD_LIBS$ac_delim
+SYSTEM_LIBWPD!$SYSTEM_LIBWPD$ac_delim
+FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
+FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
+USE_FT_EMBOLDEN!$USE_FT_EMBOLDEN$ac_delim
+LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
+LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
+XSLTPROC!$XSLTPROC$ac_delim
+SYSTEM_LIBXSLT!$SYSTEM_LIBXSLT$ac_delim
+LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
+LIBXML_LIBS!$LIBXML_LIBS$ac_delim
+SYSTEM_LIBXML!$SYSTEM_LIBXML$ac_delim
+PYTHON!$PYTHON$ac_delim
+PYTHON_VERSION!$PYTHON_VERSION$ac_delim
+PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
+PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
+PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
+pythondir!$pythondir$ac_delim
+pkgpythondir!$pkgpythondir$ac_delim
+pyexecdir!$pyexecdir$ac_delim
+pkgpyexecdir!$pkgpyexecdir$ac_delim
+BZIP2!$BZIP2$ac_delim
+SYSTEM_PYTHON!$SYSTEM_PYTHON$ac_delim
+PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
+PYTHON_LIBS!$PYTHON_LIBS$ac_delim
+HOME!$HOME$ac_delim
+SYSTEM_DB!$SYSTEM_DB$ac_delim
+DB_VERSION!$DB_VERSION$ac_delim
+DB_INCLUDES!$DB_INCLUDES$ac_delim
+DB_JAR!$DB_JAR$ac_delim
+SYSTEM_LUCENE!$SYSTEM_LUCENE$ac_delim
+LUCENE_CORE_JAR!$LUCENE_CORE_JAR$ac_delim
+LUCENE_ANALYZERS_JAR!$LUCENE_ANALYZERS_JAR$ac_delim
+SYSTEM_HSQLDB!$SYSTEM_HSQLDB$ac_delim
+HSQLDB_JAR!$HSQLDB_JAR$ac_delim
+SYSTEM_BSH!$SYSTEM_BSH$ac_delim
+BSH_JAR!$BSH_JAR$ac_delim
+SERIALIZER_JAR!$SERIALIZER_JAR$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+SYSTEM_SAXON!$SYSTEM_SAXON$ac_delim
+SAXON_JAR!$SAXON_JAR$ac_delim
+CURLCONFIG!$CURLCONFIG$ac_delim
+SYSTEM_CURL!$SYSTEM_CURL$ac_delim
+CURL_CFLAGS!$CURL_CFLAGS$ac_delim
+CURL_LIBS!$CURL_LIBS$ac_delim
+SYSTEM_BOOST!$SYSTEM_BOOST$ac_delim
+SYSTEM_VIGRA!$SYSTEM_VIGRA$ac_delim
+SYSTEM_ODBC_HEADERS!$SYSTEM_ODBC_HEADERS$ac_delim
+WITH_MOZILLA!$WITH_MOZILLA$ac_delim
+WITH_LDAP!$WITH_LDAP$ac_delim
+WITH_OPENLDAP!$WITH_OPENLDAP$ac_delim
+MOZ_NSS_CFLAGS!$MOZ_NSS_CFLAGS$ac_delim
+MOZ_NSS_LIBS!$MOZ_NSS_LIBS$ac_delim
+NSS_LIB!$NSS_LIB$ac_delim
+MOZ_NSPR_CFLAGS!$MOZ_NSPR_CFLAGS$ac_delim
+MOZ_NSPR_LIBS!$MOZ_NSPR_LIBS$ac_delim
+NSPR_LIB!$NSPR_LIB$ac_delim
+MOZILLAXPCOM_CFLAGS!$MOZILLAXPCOM_CFLAGS$ac_delim
+MOZILLAXPCOM_LIBS!$MOZILLAXPCOM_LIBS$ac_delim
+MOZILLA_VERSION!$MOZILLA_VERSION$ac_delim
+MOZILLA_TOOLKIT!$MOZILLA_TOOLKIT$ac_delim
+MOZGTK2_CFLAGS!$MOZGTK2_CFLAGS$ac_delim
+MOZGTK2_LIBS!$MOZGTK2_LIBS$ac_delim
+MOZLIBREQ_CFLAGS!$MOZLIBREQ_CFLAGS$ac_delim
+MOZLIBREQ_LIBS!$MOZLIBREQ_LIBS$ac_delim
+BUILD_MOZAB!$BUILD_MOZAB$ac_delim
+SYSTEM_MOZILLA!$SYSTEM_MOZILLA$ac_delim
+MOZ_FLAVOUR!$MOZ_FLAVOUR$ac_delim
+MOZ_INC!$MOZ_INC$ac_delim
+MOZ_LIB!$MOZ_LIB$ac_delim
+MOZ_LIB_XPCOM!$MOZ_LIB_XPCOM$ac_delim
+MOZ_LDAP_CFLAGS!$MOZ_LDAP_CFLAGS$ac_delim
+SYSTEM_SANE_HEADER!$SYSTEM_SANE_HEADER$ac_delim
+SYSTEM_GENBRK!$SYSTEM_GENBRK$ac_delim
+SYSTEM_GENCCODE!$SYSTEM_GENCCODE$ac_delim
+SYSTEM_GENCMN!$SYSTEM_GENCMN$ac_delim
+SYSTEM_ICU!$SYSTEM_ICU$ac_delim
+XMKMF!$XMKMF$ac_delim
+X_CFLAGS!$X_CFLAGS$ac_delim
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+X_LIBS!$X_LIBS$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+XINC!$XINC$ac_delim
+XLIB!$XLIB$ac_delim
+DISABLE_XAW!$DISABLE_XAW$ac_delim
+XAU_LIBS!$XAU_LIBS$ac_delim
+SYSTEM_XRENDER_HEADERS!$SYSTEM_XRENDER_HEADERS$ac_delim
+XRENDER_LINK!$XRENDER_LINK$ac_delim
+XRANDR_CFLAGS!$XRANDR_CFLAGS$ac_delim
+XRANDR_LIBS!$XRANDR_LIBS$ac_delim
+XRANDR_DLOPEN!$XRANDR_DLOPEN$ac_delim
+ENABLE_RANDR!$ENABLE_RANDR$ac_delim
+DISABLE_NEON!$DISABLE_NEON$ac_delim
+NEON_CFLAGS!$NEON_CFLAGS$ac_delim
+NEON_LIBS!$NEON_LIBS$ac_delim
+OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim
+OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
+SYSTEM_OPENSSL!$SYSTEM_OPENSSL$ac_delim
+SYSTEM_NEON!$SYSTEM_NEON$ac_delim
+NEON_VERSION!$NEON_VERSION$ac_delim
+ENABLE_AGG!$ENABLE_AGG$ac_delim
+AGG_CFLAGS!$AGG_CFLAGS$ac_delim
+AGG_LIBS!$AGG_LIBS$ac_delim
+SYSTEM_AGG!$SYSTEM_AGG$ac_delim
+AGG_VERSION!$AGG_VERSION$ac_delim
+REDLAND_CFLAGS!$REDLAND_CFLAGS$ac_delim
+REDLAND_LIBS!$REDLAND_LIBS$ac_delim
+SYSTEM_REDLAND!$SYSTEM_REDLAND$ac_delim
+HUNSPELL_CFLAGS!$HUNSPELL_CFLAGS$ac_delim
+HUNSPELL_LIBS!$HUNSPELL_LIBS$ac_delim
+SYSTEM_HUNSPELL!$SYSTEM_HUNSPELL$ac_delim
+SYSTEM_HYPH!$SYSTEM_HYPH$ac_delim
+HYPHEN_LIB!$HYPHEN_LIB$ac_delim
+SYSTEM_MYTHES!$SYSTEM_MYTHES$ac_delim
+SYSTEM_LPSOLVE!$SYSTEM_LPSOLVE$ac_delim
+PSDK_HOME!$PSDK_HOME$ac_delim
+WINDOWS_VISTA_PSDK!$WINDOWS_VISTA_PSDK$ac_delim
+DIRECTXSDK_HOME!$DIRECTXSDK_HOME$ac_delim
+DIRECTXSDK_LIB!$DIRECTXSDK_LIB$ac_delim
+NSIS_PATH!$NSIS_PATH$ac_delim
+BISON!$BISON$ac_delim
+FLEX!$FLEX$ac_delim
+PATCH!$PATCH$ac_delim
+GNUCP!$GNUCP$ac_delim
+GNUPATCH!$GNUPATCH$ac_delim
+CYGWIN_PATH!$CYGWIN_PATH$ac_delim
+ML_EXE!$ML_EXE$ac_delim
+ASM_HOME!$ASM_HOME$ac_delim
+ZIP!$ZIP$ac_delim
+UNZIP!$UNZIP$ac_delim
+ZIP_HOME!$ZIP_HOME$ac_delim
+WITH_GPC!$WITH_GPC$ac_delim
+ENABLE_GTK!$ENABLE_GTK$ac_delim
+ENABLE_KDE!$ENABLE_KDE$ac_delim
+GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim
+GCONF_LIBS!$GCONF_LIBS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+ENABLE_GCONF!$ENABLE_GCONF$ac_delim
+GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
+GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
+ENABLE_GNOMEVFS!$ENABLE_GNOMEVFS$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
+DBUS_LIBS!$DBUS_LIBS$ac_delim
+GIO_CFLAGS!$GIO_CFLAGS$ac_delim
+GIO_LIBS!$GIO_LIBS$ac_delim
+ENABLE_GIO!$ENABLE_GIO$ac_delim
+ENABLE_DBUS!$ENABLE_DBUS$ac_delim
+ENABLE_SYSTRAY_GTK!$ENABLE_SYSTRAY_GTK$ac_delim
+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
+CAIRO_LIBS!$CAIRO_LIBS$ac_delim
+ENABLE_CAIRO!$ENABLE_CAIRO$ac_delim
+BUILD_PIXMAN!$BUILD_PIXMAN$ac_delim
+SYSTEM_CAIRO!$SYSTEM_CAIRO$ac_delim
+ENABLE_OPENGL!$ENABLE_OPENGL$ac_delim
+ENABLE_MINIMIZER!$ENABLE_MINIMIZER$ac_delim
+ENABLE_PRESENTER_SCREEN!$ENABLE_PRESENTER_SCREEN$ac_delim
+POPPLER_CFLAGS!$POPPLER_CFLAGS$ac_delim
+POPPLER_LIBS!$POPPLER_LIBS$ac_delim
+ENABLE_PDFIMPORT!$ENABLE_PDFIMPORT$ac_delim
+SYSTEM_POPPLER!$SYSTEM_POPPLER$ac_delim
+ENABLE_MEDIAWIKI!$ENABLE_MEDIAWIKI$ac_delim
+SYSTEM_APACHE_COMMONS!$SYSTEM_APACHE_COMMONS$ac_delim
+COMMONS_CODEC_JAR!$COMMONS_CODEC_JAR$ac_delim
+COMMONS_LANG_JAR!$COMMONS_LANG_JAR$ac_delim
+COMMONS_HTTPCLIENT_JAR!$COMMONS_HTTPCLIENT_JAR$ac_delim
+COMMONS_LOGGING_JAR!$COMMONS_LOGGING_JAR$ac_delim
+SYSTEM_SERVLETAPI!$SYSTEM_SERVLETAPI$ac_delim
+SERVLETAPI_JAR!$SERVLETAPI_JAR$ac_delim
+ENABLE_REPORTBUILDER!$ENABLE_REPORTBUILDER$ac_delim
+SYSTEM_JFREEREPORT!$SYSTEM_JFREEREPORT$ac_delim
+JCOMMON_JAR!$JCOMMON_JAR$ac_delim
+SAC_JAR!$SAC_JAR$ac_delim
+LIBXML_JAR!$LIBXML_JAR$ac_delim
+FLUTE_JAR!$FLUTE_JAR$ac_delim
+JFREEREPORT_JAR!$JFREEREPORT_JAR$ac_delim
+LIBLAYOUT_JAR!$LIBLAYOUT_JAR$ac_delim
+LIBLOADER_JAR!$LIBLOADER_JAR$ac_delim
+LIBFORMULA_JAR!$LIBFORMULA_JAR$ac_delim
+LIBREPOSITORY_JAR!$LIBREPOSITORY_JAR$ac_delim
+LIBFONTS_JAR!$LIBFONTS_JAR$ac_delim
+JCOMMON_SERIALIZER_JAR!$JCOMMON_SERIALIZER_JAR$ac_delim
+MOC!$MOC$ac_delim
+KDE_CFLAGS!$KDE_CFLAGS$ac_delim
+KDE_LIBS!$KDE_LIBS$ac_delim
+ENABLE_LOCKDOWN!$ENABLE_LOCKDOWN$ac_delim
+GOBJECT_CFLAGS!$GOBJECT_CFLAGS$ac_delim
+GOBJECT_LIBS!$GOBJECT_LIBS$ac_delim
+ENABLE_EVOAB2!$ENABLE_EVOAB2$ac_delim
+ENABLE_KAB!$ENABLE_KAB$ac_delim
+WITH_FONTOOO!$WITH_FONTOOO$ac_delim
+SYSTEM_MSPACK!$SYSTEM_MSPACK$ac_delim
+WITH_FONTS!$WITH_FONTS$ac_delim
+WITHOUT_PPDS!$WITHOUT_PPDS$ac_delim
+WITHOUT_AFMS!$WITHOUT_AFMS$ac_delim
+WITH_WRITER2LATEX!$WITH_WRITER2LATEX$ac_delim
+SCPDEFS!$SCPDEFS$ac_delim
+USE_XINERAMA!$USE_XINERAMA$ac_delim
+XINERAMA_LINK!$XINERAMA_LINK$ac_delim
+ANT!$ANT$ac_delim
+ANT_HOME!$ANT_HOME$ac_delim
+ANT_LIB!$ANT_LIB$ac_delim
+WITH_LANG!$WITH_LANG$ac_delim
+WITH_POOR_HELP_LOCALIZATIONS!$WITH_POOR_HELP_LOCALIZATIONS$ac_delim
+WITH_DICT!$WITH_DICT$ac_delim
+INTRO_BITMAPS!$INTRO_BITMAPS$ac_delim
+ABOUT_BITMAPS!$ABOUT_BITMAPS$ac_delim
+OOO_VENDOR!$OOO_VENDOR$ac_delim
+UNIXWRAPPERNAME!$UNIXWRAPPERNAME$ac_delim
+ENABLE_STATIC_GTK!$ENABLE_STATIC_GTK$ac_delim
+ENABLE_LAYOUT!$ENABLE_LAYOUT$ac_delim
+VERBOSE!$VERBOSE$ac_delim
+LOCAL_SOLVER!$LOCAL_SOLVER$ac_delim
+BUILD_TYPE!$BUILD_TYPE$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in :F $CONFIG_FILES
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ fi
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
@@ -28478,28 +29463,39 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
+ ;;
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+
+ esac
+
+done # for ac_tag
+
{ (exit 0); exit 0; }
_ACEOF
diff --git a/configure.cmd b/configure.cmd
new file mode 100755
index 000000000000..389efd2f37ff
--- /dev/null
+++ b/configure.cmd
@@ -0,0 +1,7 @@
+@echo off
+setlocal
+SET ANT_HOME=C:\PROGRAMMI\jsdk142\apache-ant-1.7.0
+SET JAVA_HOME=C:\PROGRAMMI\jsdk142
+SET PATH=%JAVA_HOME%\bin;%PATH%;%ANT_HOME%\bin;
+sh -c "configure --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts" | tee configure.log
+endlocal
diff --git a/config_office/configure.in b/configure.in
index 2f67a5357e94..ee4929fbe23a 100644
--- a/config_office/configure.in
+++ b/configure.in
@@ -28,7 +28,7 @@ AC_ARG_WITH(gnu-cp,
AC_ARG_WITH(gpc,
[ --without-gpc Use the internal polygon clipping code instead of
the external GPC polygon clipping library.
-],,if test ! -e ../external/gpc/gpc.c && test ! -e ../external/gpc/gpc.h; then without_gpc=yes; fi)
+],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi)
AC_ARG_ENABLE(ldap,
[ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
or OpenLDAP LDAP SDK
@@ -90,6 +90,12 @@ AC_ARG_ENABLE(epm,
epm, however epm is useless for large scale
package building.
],,enable_epm="yes")
+AC_ARG_WITH(epm,
+[ --with-epm Decides which epm to use. Default is to use
+ the one from the system if one is built. When
+ either this is not there or you say =internal
+ epm will be built.
+],,)
AC_ARG_WITH(package-format,
[ --with-package-format specify package format(s) for OOo installsets.
Default is "normal" one of the OS/Distribution.
@@ -253,7 +259,7 @@ AC_ARG_ENABLE(kdeab,
],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
AC_ARG_ENABLE(binfilter,
[ --disable-binfilter Disable legacy binary file formats filters
-],,if ! test -d ../binfilter; then enable_binfilter=no; fi)
+],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
AC_ARG_ENABLE(rpath,
[ --disable-rpath Disable the use of relative paths in shared libraries
],,)
@@ -379,14 +385,14 @@ AC_ARG_WITH(beanshell-jar,
AC_ARG_ENABLE(minimizer,
[ --enable-minimizer enables the build of the Presentation Minimizer extension
],,)
-AC_ARG_ENABLE(presenter-screen,
-[ --enable-presenter-screen enables the build of the Presenter Screen extension
+AC_ARG_ENABLE(presenter-console,
+[ --enable-presenter-console enables the build of the Presenter Console extension
],,)
AC_ARG_ENABLE(pdfimport,
-[ --disable-pdfimport disables the build of the PDF Import extension and xpdf
+[ --enable-pdfimport enables the build of the PDF Import extension and xpdf
],,)
-AC_ARG_ENABLE(mediawiki,
-[ --disable-mediawiki disables the build of the MediaWiki Editor extension
+AC_ARG_ENABLE(wiki-publisher,
+[ --enable-wiki-publisher enables the build of the Wiki Publisher extension
],,)
AC_ARG_WITH(commons-codec-jar,
[ --with-commons-codec-jar=JARFILE Specify path to jarfile manually ],
@@ -411,12 +417,9 @@ AC_ARG_WITH(servlet-api-jar,
AC_ARG_ENABLE(ogltrans,
[ --enable-ogltrans enables the build of the OGLTrans extension
],,)
-AC_ARG_ENABLE(reportdesign,
-[ --disable-reportdesign disables the build of the Report Builder extension
+AC_ARG_ENABLE(report-builder,
+[ --enable-report-builder disables the build of the Report Builder extension
],,)
-AC_ARG_ENABLE(minimizer,
-[ --disable-minimizer disables the build of the Presentation Minimizer extension
-],,enable_minimizer=yes)
AC_ARG_WITH(system-jfreereport,
[ --with-system-jfreereport Use JFreeReport already on system
],,)
@@ -448,6 +451,10 @@ AC_ARG_WITH(libloader-jar,
[ --with-libloader-jar=JARFILE Specify path to jarfile manually ],
[ LIBLOADER_JAR="$withval"
])
+AC_ARG_WITH(libloader-jar,
+[ --with-libloader-jar=JARFILE Specify path to jarfile manually ],
+[ LIBLOADER_JAR="$withval"
+])
AC_ARG_WITH(libformula-jar,
[ --with-libformula-jar=JARFILE Specify path to jarfile manually ],
[ LIBFORMULA_JAR="$withval"
@@ -456,7 +463,7 @@ AC_ARG_WITH(librepository-jar,
[ --with-librepository-jar=JARFILE Specify path to jarfile manually ],
[ LIBREPOSITORY_JAR="$withval"
])
-AC_ARG_WITH(libfonts-java-jar,
+AC_ARG_WITH(libfonts-jar,
[ --with-libfonts-jar=JARFILE Specify path to jarfile manually ],
[ LIBFONTS_JAR="$withval"
])
@@ -641,13 +648,13 @@ AC_ARG_WITH(directx-home,
Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
],,)
AC_ARG_WITH(local-solenv,
-[ --with-local-solenv If you have solenv in a location other than ../solenv,
+[ --with-local-solenv If you have solenv in a location other than ./solenv,
please supply the path here.
Usage: --with-local-solenv=<absolute path to solenv>
],,)
AC_ARG_WITH(local-solver,
-[ --with-local-solver if you have solver in a location other than ../solver,
+[ --with-local-solver if you have solver in a location other than ./solver,
please supply the path here.
Usage: --with-local-solver=<absolute path to solver>
@@ -827,16 +834,17 @@ fi
AC_SUBST(LOCAL_SOLENV)
if test "$LOCAL_SOLENV" = "DEFAULT"; then
- _solenv="../solenv"
+ _solenv="./solenv"
else
_solenv="$LOCAL_SOLENV"
fi
+AC_SUBST(_solenv)
if test -e $_solenv/inc/minor.mk; then
- # Get UPD number from ../solenv/inc/minor.mk
- UPD="`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ # Get UPD number from ./solenv/inc/minor.mk
+ UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
AC_SUBST(UPD)
- SOURCEVERSION="`grep SOURCEVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
AC_SUBST(SOURCEVERSION)
else
AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
@@ -845,7 +853,6 @@ fi
dnl ===================================================================
dnl Checks for the operating system and processor.
dnl ===================================================================
-AC_CONFIG_AUX_DIRS([$_solenv/bin])
AC_CANONICAL_SYSTEM
if test "$build" != "$host" -o "$build" != "$target" \
-o "$host" != "$target"; then
@@ -1288,6 +1295,13 @@ dnl The following sets the with_use_shell variable.
dnl ===================================================================
AC_MSG_CHECKING([which shell to use])
if test $_os = "WINNT"; then
+ dnl Sanity check! expand.exe in cygwin could cause build error.
+ dnl ===================================================================
+ if test -x "/usr/bin/expand.exe" ; then
+ AC_MSG_ERROR([cygwin has expand.exe!
+The expand.exe in cygwin could cause build error. Please remove or rename it.])
+ fi
+ dnl ===================================================================
if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
AC_MSG_ERROR([only "tcsh","bash" or "4nt" are supported options])
fi
@@ -1480,28 +1494,25 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
fi
done
AC_MSG_RESULT($GNUMAKE)
+if test -z "$GNUMAKE"; then
+ AC_MSG_ERROR([not found. install GNU make.])
+fi
AC_MSG_CHECKING([the GNU make version])
-dnl Change empty GNUMAKE from warning to error, pending testing.
-if test -z "$GNUMAKE"; then
- AC_MSG_WARN([not found build may fail])
- echo "GNU make not found build may fail" >> warn
+_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+if test "$_make_longver" -ge "037901" ; then
+ AC_MSG_RESULT([$GNUMAKE $_make_version])
else
- _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
- _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
- if test "$_make_longver" -ge "037901" ; then
- AC_MSG_RESULT([$GNUMAKE $_make_version])
- else
- if test "$_os" = "Darwin"; then
- if test "$_make_longver" -ge "037900" ; then
- AC_MSG_RESULT([$GNUMAKE $_make_version])
- else
- AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.0+)])
- fi
+ if test "$_os" = "Darwin"; then
+ if test "$_make_longver" -ge "037900" ; then
+ AC_MSG_RESULT([$GNUMAKE $_make_version])
else
- AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
+ AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.0+)])
fi
- fi
+ else
+ AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
+ fi
fi
AC_SUBST(GNUMAKE)
@@ -1647,7 +1658,7 @@ if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for friendly registry keys])
# VS.Net 2003, VS.Net 2005
if test -z "$with_cl_home"; then
- vctest=`./oowintool --msvc-productdir`;
+ vctest=`./solenv/bin/oowintool --msvc-productdir`;
if test -x "$vctest/bin/cl.exe"; then
with_cl_home=$vctest;
fi
@@ -1773,13 +1784,13 @@ if test "$COMEX" -ge "10"; then
MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
fi
if test -z "$MIDL_PATH" ; then
- vstest=`./oowintool --msvs-productdir`;
+ vstest=`./solenv/bin/oowintool --msvs-productdir`;
if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
MIDL_PATH="$vstest/Common7/Tools/Bin"
fi
fi
if test -z "$MIDL_PATH" ; then
- psdktest=`./oowintool --psdk-home`
+ psdktest=`./solenv/bin/oowintool --psdk-home`
if test -x "$psdktest/Bin/midl.exe" ; then
MIDL_PATH="$psdktest/Bin"
fi
@@ -1802,7 +1813,7 @@ if test "$COMEX" -ge "10"; then
if test -x "$with_csc_path/csc.exe"; then
CSC_PATH="$with_csc_path"
else
- csctest=`./oowintool --csc-compilerdir`;
+ csctest=`./solenv/bin/oowintool --csc-compilerdir`;
if test -x "$csctest/csc.exe"; then
CSC_PATH="$csctest"
fi
@@ -1827,11 +1838,11 @@ if test "$COMEX" -ge "10"; then
FRAME_HOME="$with_cl_home/../SDK/v1.1"
fi
if test -z "$FRAME_HOME" ; then
- frametest=`./oowintool --dotnetsdk-dir`
+ frametest=`./solenv/bin/oowintool --dotnetsdk-dir`
if test -f "$frametest/lib/mscoree.lib"; then
FRAME_HOME="$frametest"
else
- frametest=`./oowintool --psdk-home`
+ frametest=`./solenv/bin/oowintool --psdk-home`
if test -f "$frametest/lib/mscoree.lib"; then
FRAME_HOME="$frametest"
fi
@@ -2292,25 +2303,29 @@ dnl ===================================================================
dnl Checks for what the default STL should be
dnl ===================================================================
AC_MSG_CHECKING([what the default STL should be])
- DEFAULT_TO_STLPORT="yes"
+ DEFAULT_TO_STLPORT="no"
if test "$_os" = "Linux"; then
case "$build_cpu" in
- i?86|powerpc|sparc)
+ i?86)
DEFAULT_TO_STLPORT="yes"
;;
*)
DEFAULT_TO_STLPORT="no"
;;
esac
- elif test "$_os" = "Darwin"; then
- DEFAULT_TO_STLPORT="no"
+ elif test "$_os" = "SunOS"; then
+ DEFAULT_TO_STLPORT="yes"
elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then
DEFAULT_TO_STLPORT="no"
+ elif test "$_os" = "WINNT" -o "$_os" = "OS2"; then
+ DEFAULT_TO_STLPORT="yes"
+ elif test "$_os" = "FreeBSD"; then
+ DEFAULT_TO_STLPORT="yes"
fi
if test "$DEFAULT_TO_STLPORT" = "yes"; then
AC_MSG_RESULT([stlport])
else
- AC_MSG_RESULT([gcc])
+ AC_MSG_RESULT([system])
fi
if test "$WITH_STLPORT" = "auto"; then
WITH_STLPORT=$DEFAULT_TO_STLPORT
@@ -2494,6 +2509,7 @@ _ACEOF
gccvisbroken=yes;
fi
fi
+ rm -f visibility.s
AC_MSG_RESULT([$gccvisbroken])
if test "$gccvisbroken" = "yes"; then
@@ -2569,7 +2585,7 @@ fi
if test "$_os" = "WINNT"; then
if test -z "$with_jdk_home"; then
- _jdk_home=`./oowintool --jdk-home`
+ _jdk_home=`./solenv/bin/oowintool --jdk-home`
if test -d "$_jdk_home"; then
with_jdk_home="$_jdk_home"
fi
@@ -2661,25 +2677,24 @@ if test "$SOLAR_JAVA" != ""; then
# JAVA_HOME=$with_jdk_home
#
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
- AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-# JDK=ibm
-#
-# dnl IBM JDK specific tests
-# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#
-# if test "$_jdk_ver" -lt 10301; then
-# AC_MSG_ERROR([IBM JDK is too old, you need at least 1.3.1])
-# fi
-#
-# AC_MSG_RESULT([checked (IBM JDK $_jdk)])
-#
-# if test "$with_jdk_home" = ""; then
-# AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
-#you must use the "--with-jdk-home" configure option explicitly])
-# fi
-#
-# JAVA_HOME=$with_jdk_home
+ JDK=ibm
+
+ dnl IBM JDK specific tests
+ _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+
+ if test "$_jdk_ver" -lt 10600; then
+ AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6])
+ fi
+
+ AC_MSG_RESULT([checked (IBM JDK $_jdk)])
+
+ if test "$with_jdk_home" = ""; then
+ AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the "--with-jdk-home" configure option explicitly])
+ fi
+
+ JAVA_HOME=$with_jdk_home
else
JDK=sun
@@ -3264,7 +3279,7 @@ if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
AC_MSG_RESULT([yes])
if test "$WITH_JAVA" != "no"; then
AC_MSG_CHECKING([for external/unowinreg/unowinreg.dll])
- if ! test -f "../external/unowinreg/unowinreg.dll"; then
+ if ! test -f "./external/unowinreg/unowinreg.dll"; then
HAVE_UNOWINREG_DLL=no
else
HAVE_UNOWINREG_DLL=yes
@@ -4091,11 +4106,11 @@ else
enable_build_mozilla=1
AC_MSG_RESULT([$MOZILLA_TOOLKIT])
fi
-if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
- #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
- #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
- AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
-fi
+#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
+# #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
+# #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
+# AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
+#fi
AC_SUBST(MOZILLA_TOOLKIT)
@@ -4126,7 +4141,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
fi
for e in gz bz2; do
AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e])
- if test ! -e "../moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
+ if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
AC_MSG_RESULT([not found])
HAVE_MOZILLA_TARBALL=n
else
@@ -4142,9 +4157,9 @@ http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/
fi
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for glib and libIDL binaries])
- if test ! -e "../moz/download/vc71-glib-1.2.10-bin.zip" \
- -o ! -e "../moz/download/vc71-libIDL-0.6.8-bin.zip" \
- -o ! -e "../moz/download/wintools.zip" ; then
+ if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
+ -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
+ -o ! -e "./moz/download/wintools.zip" ; then
AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
vc71-glib-1.2.10-bin.zip
vc71-libIDL-0.6.8-bin.zip
@@ -4155,9 +4170,15 @@ AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
AC_MSG_RESULT([ok])
fi
elif test "$_os" = "Darwin"; then
- # only gtk2 supported - see above
- AC_MSG_NOTICE([checking whether mozilla can be built...])
- PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
+ if test "$MOZILLA_TOOLKIT" = "gtk2"; then
+ AC_MSG_NOTICE([checking whether mozilla can be built...])
+ PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
+ else
+ PKG_CHECK_MODULES(MOZLIBREQ, libIDL >= 0.6.3 libIDL <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
+ if test -z "$MOZIDL"; then
+ AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.])
+ fi
+ fi
else
# Generic Unix/Linux section
if test "$MOZILLA_TOOLKIT" = "gtk2"; then
@@ -4312,6 +4333,8 @@ elif test "$_os" != "WINNT" ; then
else
AC_MSG_RESULT([yes])
AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+ AC_CHECK_LIB(Xaw, main, [],
+ [AC_MSG_ERROR(Xaw library not found or functional)], [])
fi
dnl ===================================================================
@@ -4350,7 +4373,10 @@ else
fi
AC_SUBST(XINC)
if test "$x_libraries" = "default_x_libraries"; then
- XLIB="/usr/lib"
+ XLIB=`$PKG_CONFIG --variable=libdir x11`
+ if test "x$XLIB" = x; then
+ XLIB="/usr/lib"
+ fi
else
XLIB="$x_libraries"
fi
@@ -4692,7 +4718,7 @@ if test \( "$_os" = "WINNT" \) ; then
AC_MSG_CHECKING([for PSDK files])
if test -z "$with_psdk_home"; then
# This first line will detect a February 2003 Microsoft Platform SDK
- PSDK_HOME=`./oowintool --psdk-home`
+ PSDK_HOME=`./solenv/bin/oowintool --psdk-home`
# But there might be also an April 2005 PSDK, unfortunately MS changed
# the registry entry. (we prefer the old version!?)
if test -z "$PSDK_HOME"; then
@@ -4820,7 +4846,7 @@ if test "$_os" = "WINNT" ; then
if test -e "$with_nsis_path/nsis.exe"; then
NSIS_PATH="$with_nsis_path"
fi
- nsistest=`./oowintool --nsis-dir`;
+ nsistest=`./solenv/bin/oowintool --nsis-dir`;
if test -x "$nsistest/nsis.exe"; then
NSIS_PATH="$nsistest"
fi
@@ -5016,7 +5042,7 @@ dnl Windows builds need unicows.dll in external/unicows/
dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for unicows.dll])
- if test -x ../external/unicows/unicows.dll; then
+ if test -x ./external/unicows/unicows.dll; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
@@ -5032,7 +5058,7 @@ dnl Windows builds need dbghelp.dll in external/dbghelp/
dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for dbghelp.dll])
- if test -x ../external/dbghelp/dbghelp.dll; then
+ if test -x ./external/dbghelp/dbghelp.dll; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/.
@@ -5044,13 +5070,13 @@ may have to search Microsoft's website.) Last time it was seen at:
fi
dnl ===================================================================
-dnl Windows builds - use oowintool to copy CRT dlls and manifest
+dnl Windows builds - use solenv/bin/oowintool to copy CRT dlls and manifest
dnl ===================================================================
if test "$_os" = "WINNT"; then
- if ./oowintool --msvc-copy-dlls ../external/msvcp ; then
+ if ./solenv/bin/oowintool --msvc-copy-dlls ./external/msvcp ; then
:
else
- AC_MSG_ERROR([oowintool failed to copy CRT])
+ AC_MSG_ERROR([solenv/bin/oowintool failed to copy CRT])
fi
fi
@@ -5059,7 +5085,7 @@ dnl Windows builds need gdiplus.dll in external/gdiplus/
dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for gdiplus.dll])
- if test -x ../external/gdiplus/gdiplus.dll; then
+ if test -x ./external/gdiplus/gdiplus.dll; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/.
@@ -5073,7 +5099,7 @@ dnl ===================================================================
dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
dnl ===================================================================
if test "$_os" = "WINNT"; then
- ./oowintool --msvc-copy-instmsi ../external/msi
+ ./solenv/bin/oowintool --msvc-copy-instmsi ./external/msi
fi
dnl ===================================================================
@@ -5082,14 +5108,14 @@ dnl ===================================================================
if test "$_os" = "WINNT"; then
if test "$COMEX" -ge "10"; then
AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
- if test -x ../external/msi/instmsia.exe -a -x ../external/msi/instmsiw.exe; then
+ if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
AC_MSG_RESULT([found])
else
MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
- cp "$MSIAPATH" ../external/msi/ && chmod +x ../external/msi/instmsia.exe && MSIACOPY="OK"
- cp "$MSIWPATH" ../external/msi/ && chmod +x ../external/msi/instmsiw.exe && MSIWCOPY="OK"
+ cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
+ cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
fi
if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
AC_MSG_ERROR([instmsia.exe and/or instmsiw.exe are/is missing in the default location.
@@ -5115,12 +5141,12 @@ if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
AC_MSG_RESULT([GPC])
AC_MSG_CHECKING([for GPC files])
- if test -f ../external/gpc/gpc.h; then
+ if test -f ./external/gpc/gpc.h; then
HAVE_GPC_H="yes"
else
HAVE_GPC_H="no"
fi
- if test -f ../external/gpc/gpc.c; then
+ if test -f ./external/gpc/gpc.c; then
HAVE_GPC_C="yes"
else
HAVE_GPC_C="no"
@@ -5334,7 +5360,7 @@ fi
AC_SUBST(ENABLE_MINIMIZER)
AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
+if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_SCREEN=YES
else
@@ -5343,10 +5369,6 @@ else
fi
AC_SUBST(ENABLE_PRESENTER_SCREEN)
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES"; then
- BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
AC_MSG_CHECKING([whether to build the PDF Import extension])
if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
AC_MSG_RESULT([yes])
@@ -5357,7 +5379,7 @@ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
dnl ===================================================================
AC_MSG_CHECKING([which pdf backend to use])
if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
- test "$with_system_poppler" != "no"; then
+ test "$with_system_poppler" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
@@ -5365,20 +5387,41 @@ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO
BUILD_TYPE="$BUILD_TYPE XPDF"
+ AC_MSG_CHECKING([for xpdf module])
+ if test -d ./xpdf; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+ fi
fi
-
else
- AC_MSG_RESULT([no])
- ENABLE_PDFIMPORT=NO
+ AC_MSG_RESULT([no])
+ ENABLE_PDFIMPORT=NO
fi
AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS)
-AC_MSG_CHECKING([whether to build the MediaWiki Editor extension])
-if test -n "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
+if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+ AC_MSG_CHECKING([for sdext module])
+ if test -d ./sdext; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+ fi
+ BUILD_TYPE="$BUILD_TYPE SDEXT"
+fi
+
+AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
+if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then
AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([for swext module])
+ if test -d ./swext; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+ fi
ENABLE_MEDIAWIKI=YES
AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" == "yes"; then
@@ -5451,9 +5494,9 @@ AC_SUBST(SYSTEM_SERVLETAPI)
AC_SUBST(SERVLETAPI_JAR)
AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
+if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
AC_MSG_RESULT([yes])
- ENABLE_REPORTDESIGN=YES
+ ENABLE_REPORTBUILDER=YES
AC_MSG_CHECKING([which jfreereport libs to use])
if test "$with_system_jfreereport" == "yes"; then
SYSTEM_JFREEREPORT=YES
@@ -5616,16 +5659,22 @@ if test -n "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WI
else
AC_MSG_RESULT([internal])
+ AC_MSG_CHECKING([for jfreereport module])
+ if test -d ./jfreereport; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+ fi
SYSTEM_JFREEREPORT=NO
BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
fi
BUILD_TYPE="$BUILD_TYPE REPORTDESIGN"
else
AC_MSG_RESULT([no])
- ENABLE_REPORTDESIGN=NO
+ ENABLE_REPORTBUILDER=NO
SYSTEM_JFREEREPORT=NO
fi
-AC_SUBST(ENABLE_REPORTDESIGN)
+AC_SUBST(ENABLE_REPORTBUILDER)
AC_SUBST(SYSTEM_JFREEREPORT)
AC_SUBST(JCOMMON_JAR)
AC_SUBST(SAC_JAR)
@@ -6322,9 +6371,9 @@ AC_SUBST(LOCAL_SOLVER)
AC_SUBST(BUILD_TYPE)
# make sure config.guess is +x; we execute config.guess, so it has to be so;
-chmod +x $_solenv/bin/config.guess
+chmod +x ./config.guess
-AC_OUTPUT([set_soenv])
+AC_OUTPUT([set_soenv Makefile])
dnl Executing the set_soenv script to setup the environment variables.
chmod a+x set_soenv
diff --git a/guw/guw.cc b/guw/guw.cc
new file mode 100644
index 000000000000..808dc9e52e21
--- /dev/null
+++ b/guw/guw.cc
@@ -0,0 +1,2067 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: guw.cc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// guw - A wrapper program to execute windows programs with parameters that
+// contain cygwin (POSIX) style pathnames.
+
+// Todo: Add a -? switch to guw to issue a help page.
+
+#include <string>
+#include <list>
+#include <vector>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <cstddef>
+#include <cerrno>
+
+#include <sys/cygwin.h>
+#include <windows.h>
+#include <regex.h>
+
+
+using std::string;
+using std::list;
+using std::vector;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::size_t;
+
+void init_ignorepara(string command);
+bool is_ignorepara(const string &para);
+int winFormat(string &para);
+void do_atcommand(string &para);
+void myCygpath(string &path, int shortname = 1 );
+void replace_cyg_env( void );
+void Fatal( const string text );
+
+int match2s(const string argument, const char *pattern, string &sub1, string &sub2);
+void rep_subn_cyg(string &argument);
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl);
+void rep_char( string &argument, const char from, const char to);
+
+bool debug = false;
+bool debug_light = false;
+
+// The commands are treated case insensitive, the parameters
+// are case sensitive.
+const string ignorepara[] = { "echo /TEST",
+ "cl -clr: -Z",
+ "climaker StarOffice/OpenOffice",
+ "csc -target:",
+ "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
+ " -DBUILD_ID -DSC_INFO_OSVERSION",
+ "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
+ " -DPACKAGE -DU_MAKE",
+ "lib /OUT: -out: -def: -machine:",
+ "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
+ " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
+ " /STACK: /SUBSYSTEM: -NODEFAULTLIB:"
+ " -def: delayload: -implib: -map: -out:",
+ "rc -D",
+ "regcomp -env: vnd.sun.star.expand:"
+ " vnd.openoffice.pymodule: file:",
+ "regmerge /UCR",
+ "rsc -DOOO_" };
+
+vector<string> ignorepara_vec;
+
+// environment variables that are "winformatted" when -env is given
+const string transformvars[] = { "SOLAR_VERSION",
+ "SOLARVERSION",
+ "SOLARVER",
+ "SRC_ROOT",
+ "LOCALINI",
+ "GLOBALINI",
+ "SOLARENV",
+ "STAR_INSTPATH",
+ "STAR_SOLARPATH",
+ "STAR_PACKMISC",
+ "STAR_SOLARENVPATH",
+ "STAR_INITROOT",
+ "STAR_STANDLST",
+ "CLASSPATH",
+ "JAVA_HOME" };
+
+
+int main(int argc, char **argv) {
+
+ // initialize arglist with arguments
+ list<string> arglist(argv, argv + argc);
+
+ // Drop the first (filename) argument
+ arglist.pop_front();
+
+ // iterarot over cmdline elements
+ list<string>::iterator ele = arglist.begin();
+
+ // Allowed switch values
+ bool conv_cyg_arg = false;
+
+ // Look for switches to guw
+ // Supported: -env
+ // -dbg
+ // -ldbg
+ while ( !arglist.empty()
+ && ele!=arglist.end()
+ && (ele->find("-", 0) == 0) ) {
+ if (ele->find("-env", 0) == 0) {
+ if ( conv_cyg_arg )
+ Fatal("-env used twice!");
+
+ conv_cyg_arg = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-dbg", 0) == 0) {
+
+ debug = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-ldbg", 0) == 0) {
+
+ debug_light = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else {
+ // Ignore this switch
+ ++ele;
+ }
+ }
+
+ // The next entry must be the program
+ string command;
+ if ( !arglist.empty() ) {
+ command.assign(*arglist.begin());
+ arglist.pop_front();
+ }
+ else
+ Fatal("guw needs at least one parameter.");
+
+ if ( debug )
+ cerr << "Command: " << command << "\n" << endl;
+ // Initialize parameter exception list (for this command)
+ init_ignorepara(command);
+
+
+ // Do something if -env was found
+ if ( conv_cyg_arg )
+ replace_cyg_env();
+
+
+ // loop and and DOSify the parameters
+ if ( debug )
+ cerr << "Transform the parameter\n" << endl;
+
+ ele=arglist.begin();
+ while ( ele != arglist.end() ) {
+
+ if ((*ele)[0] == '@')
+ do_atcommand(*ele);
+ else if (!is_ignorepara(*ele)) {
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process parameter: " << *ele << endl;
+ }
+ winFormat(*ele);
+ if ( debug )
+ cerr << "Transformed to: " << *ele << "\n" << endl;
+ }
+
+ ++ele;
+ }
+
+ // create the argv[] for execvp(argv[0], argv);
+ ele=arglist.begin();
+
+ // const char *nargv[arglist.size()+2]; // or ..
+ char *nargv[arglist.size()+2];
+
+ // nargv[0] = command.c_str(); // or ..
+ nargv[0] = new char[command.length()+1];
+ // strcpy(nargv[0], command.c_str());
+ command.copy(nargv[0], command.length());
+ nargv[0][command.length()] = 0;
+
+ if ( debug )
+ cerr << "----------------\n" << endl;
+ if ( debug || debug_light )
+ cerr << "Execute: " << nargv[0];
+
+ int count = 1, sLen;
+ while ( ele != arglist.end() ) {
+ // nargv[count] = ele->c_str(); // or ..
+ sLen = ele->length();
+ nargv[count] = new char[sLen+1];
+ // strcpy(nargv[count], ele->c_str());
+ ele->copy(nargv[count], sLen);
+ nargv[count][sLen] = 0;
+
+ if ( debug || debug_light )
+ cerr << " " << nargv[count];
+
+ ++count;
+ ++ele;
+ }
+ // last nargv[] must be NULL
+ nargv[count] = NULL;
+ if ( debug || debug_light )
+ cerr << endl;
+
+ // Unfortunately the prototype of execvp does not like const char*,
+ // actually not const char* nargv[] coming from .c_str(). So either
+ // we copy everything into newly allocated variables or we force it
+ // with a cast. const_cast<char * const *>()
+ // execvp(nargv[0], const_cast<char * const *>(nargv) );
+ if ( execvp(nargv[0], nargv ) < 0 ) {
+ perror("Execvp error. Aborting.");
+ exit(1);
+ }
+
+ // Omit the deleting of the dynamically allocated nargv[] elements
+ // here as this part will never be reached.
+
+ return 0;
+}
+
+// Initialize exception list from global var ignorepara[]
+void init_ignorepara(string fullcommand) {
+ const size_t kplen = sizeof(ignorepara)/sizeof(string *);
+ string shortcommand, cmd, para, sub2;
+
+ // First lowercase everything
+ for(size_t i=0;i<fullcommand.length();i++)
+ fullcommand[i] = tolower(fullcommand[i]);
+
+ // Remove a potential .exe
+ size_t slen = fullcommand.length();
+
+ // for slen == 3 this would yield string::npos otherwise
+ if ( slen > 4 && fullcommand.rfind(".exe") == slen - 4 )
+ fullcommand.erase(slen-4);
+
+ // get the program name - Only one subexpression
+ if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
+ shortcommand, sub2)) {
+ Fatal("No basename found in: " + fullcommand);
+ }
+
+ for (size_t i=0; i != kplen; ++i) {
+ std::istringstream line(ignorepara[i]);
+ line >> cmd;
+ if (shortcommand == cmd)
+ while (line >> para) {
+ ignorepara_vec.push_back(para);
+ }
+ }
+ return ;
+}
+
+// Check if command/parameter is in exception list.
+bool is_ignorepara(const string &para) {
+
+ for( vector<string>::iterator it = ignorepara_vec.begin();
+ it != ignorepara_vec.end(); it++ ) {
+ if ( para.find(*it) != string::npos ) {
+ if ( debug )
+ cerr << "Found execption para: " << para << endl;
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+// Reformat para to DOSish format
+int winFormat(string &para) {
+ string su1, su2;
+
+ // Instead of ([/[:alnum:]_~. +-]+) use ((/?[[:alnum:]_~. +-]+)+)
+
+ // find [-][-]X<something>=<path>, sometimes with quotes or "/" at the end
+ if (match2s(para, "^(-?-?[[:alpha:]][[:alnum:]_.-]*=)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - ([-][-]<something>=<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_.]*:)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<NO-path>, and prevents translating of these.
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_]*:)(.*)$",
+ su1, su2)) {
+
+ // myCygpath(su2);
+ // para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<NO-path>)\n"
+ << " " << para << endl;
+
+ }
+ // See iz35982 for the reason for the special treatment of this switch.
+ // This regex evaluates <something>:///<path>, sometimes with
+ // quotes or "/" at the end
+ else if (match2s(para, "^([[:alpha:]][[:alnum:]_]*:)[\'\"]?///((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + "///" + su2);
+ // Replace \ to /
+ rep_char( para, '\\', '/');
+
+ if ( debug )
+ cerr << " WinFormat - (<something>:///<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<absolute path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-X<absolute path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -FX<path> (MSVC switches for output naming), sometimes with quotes
+ // or "/" at the end
+ else if (match2s(para, "^(-F[ARdemopr])[\'\"]?(/[/[:alnum:]_~. +-]+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (compiler naming (-FX<absolute path>) path)\n"
+ << " " << para << endl;
+
+ }
+ else{
+ // No parameter found, assume a path
+
+ // replace the colon in drives with 0x1F"
+ // (Unused ascii US - unit separator)
+ rep_subn( para, "(^|[;,])[[:alpha:]](:)", 2, 0x1F);
+
+ // Replace remaining : to ;
+ rep_char( para, ':', ';');
+
+ // Replace back US to ':';
+ rep_char( para, 0x1F, ':');
+
+ /* Search for posix path ;entry; (The regex accepts valid paths with at
+ * least one /) and replace with DOS path, accept quotes.
+ * since iz28717 we also accept ',' as path seperator. */
+ rep_subn_cyg(para);
+
+ if ( debug )
+ cerr << " WinFormat - full path\n"
+ << " " << para << endl;
+
+ }
+
+ // Sanity check for -X<abspath>
+ if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not converted -X/... type switch in :" + para);
+ }
+ // Sanity check for [-]X<something>(:|=)<abspath> case
+ if (match2s(para, "^(-?[[:alpha:]][[:alnum:]_.]+[=:])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not processed [-]X<something>(=|:)/... in :" + para);
+ }
+
+
+ return 1;
+}
+
+// Reformat para to DOSish format
+void do_atcommand(string &para) {
+ string at, filename, token;
+
+ // Workaround, iz28717, keep number of @'s.
+ match2s(para, "^(@+)(.*)",at ,filename);
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process @-file" << endl;
+ cerr << " :" << at << ": before filename :" << filename << ":" << endl;
+ }
+
+ // Read at file into memory
+ std::ifstream atin(filename.c_str());
+ list<string> newtoken;
+ while (atin >> token) {
+ // Read / transform tokens
+ if ( debug )
+ cerr << "@ token :" << token << ":" << endl;
+ if (!is_ignorepara(token))
+ winFormat(token);
+
+ newtoken.push_back(token);
+ }
+ atin.close();
+
+ // Write token tokens bak to file
+ if ( debug || debug_light )
+ cerr << "New @-file parameter:" << endl;
+
+ // for debugging ..
+ // filename += ".bak";
+
+ std::ofstream atout(filename.c_str());
+ list<string>::iterator tok = newtoken.begin();
+ while ( tok != newtoken.end() ) {
+ if ( debug || debug_light )
+ cerr << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+
+ atout << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+ ++tok;
+ }
+ // We want a dos file
+ atout << '\r' << endl;
+ atout.close();
+
+ // Transform the filename
+ winFormat(filename);
+ para = at + filename;
+ if ( debug || debug_light ) {
+ cerr << "\nNew @-file name: " << para << "\n" << endl;
+ }
+}
+
+void myCygpath(string &path, int shortname /* =1 */ )
+{
+ static char convpath[MAX_PATH];
+ static char buf[MAX_PATH];
+ int err;
+
+ // Only use cygwin_conv_to_win32_path() on absolute paths as it errors
+ // out if its path doen't exist. Unfortunatelt there are a lot of not
+ // existing relative pathes used as parameters during an OOo build.
+ if( path.find("/", 0) == 0) {
+ err = cygwin_conv_to_win32_path( path.c_str(), convpath );
+ }
+ else {
+ rep_char( path, '/', '\\');
+ // see below, we copy convpath back to path, that's stupid
+ path.copy( convpath, path.length());
+ convpath[path.length()] = 0;
+ err = 0;
+ }
+
+ if (err)
+ Fatal("converting: " + path + " - " + strerror(errno) );
+
+ // Only convert to short dos names when space is present
+ if (shortname && (path.find(" ", 0) != string::npos) ) {
+ DWORD len = GetShortPathName (convpath, buf, MAX_PATH);
+ if (!len) {
+ Fatal("cannot create short name of " + string(convpath) );
+ }
+
+ path.assign(buf);
+ }
+ else
+ path.assign(convpath);
+
+}
+
+void replace_cyg_env( void ) {
+ // Transform certain environment variables
+ if ( debug )
+ cerr << "Transforming some environment variables" << endl;
+
+ const size_t nvars = sizeof(transformvars)/sizeof(string *);
+
+ char *currvar;
+ string newvar;
+
+ for (size_t i=0; i != nvars; ++i) {
+ if ( currvar = getenv(transformvars[i].c_str() ) ) {
+ // Only transform existent vars
+ if ( debug )
+ cerr << "Transform variable: " << transformvars[i] << "="
+ << currvar << endl;
+ newvar.assign(currvar);
+ winFormat(newvar);
+ if( setenv(transformvars[i].c_str(), newvar.c_str(), 1) )
+ Fatal("setenv failed on " + transformvars[i] + "=" + newvar +
+ " with error: " + strerror(errno));
+ if ( debug )
+ cerr << "To: " << transformvars[i] << "="
+ << newvar << "\n" << endl;
+ }
+ }
+}
+
+
+void Fatal( const string text ) {
+ // End with error
+ cerr << "Error: " << text << endl;
+ exit(1);
+}
+
+
+int
+match2s(const string argument, const char *pattern, string &sub1, string &sub2)
+{
+ int status;
+ regex_t re;
+
+ const int maxsub = 3; // Only 3 needed, 4 is for debug
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec(&re, argument.c_str(), maxsub, match, 0);
+ regfree(&re);
+
+ if (status == REG_NOMATCH) {
+ return(0); /* no match */
+ } else if (status == 0) {
+ string tstr(argument.c_str() + match[0].rm_so,
+ match[0].rm_eo - match[0].rm_so);
+ // cout << "Match: " << tstr << endl;
+
+ sub1.assign(argument.c_str() + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
+ // cout << "Match1: " << sub1 << endl;
+
+ sub2.assign(argument.c_str() + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
+ // cout << "Match2: " << sub2 << endl;
+
+ return(1); /* match found */
+ } else {
+ Fatal("regexec had a problem.");
+ }
+
+ // Not reached.
+ return(1);
+}
+
+
+// Replace path entry with myCygpath() version
+void rep_subn_cyg(string &argument)
+{
+ // accept ["']<entry>["']:["']<entry>["']:... to make the
+ // $(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)"
+ // work in ?tg_app.mk.
+ // FIXME: Better would be to use a DOSified $(APP1ICON) there and remove
+ // the special " treatment here.
+ const char *pattern = "(^|[;,])[\'\"]?([[:alnum:]_~. +-]*(/[[:alnum:]_~. +-]+)+/?)[\'\"]?([;,]|$)";
+ const int subexp = 2;
+
+ int status, pos=0;
+ regex_t re;
+
+ string repstr;
+ string::size_type oLen, nLen;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ oLen = match[subexp].rm_eo - match[subexp].rm_so;
+ repstr.assign(argument.c_str() + pos + match[subexp].rm_so, oLen);
+
+ // Do not replace with shortpaths
+ myCygpath(repstr, 0);
+ nLen = repstr.length();
+
+ // replace
+ argument.replace( pos + match[subexp].rm_so, oLen, repstr );
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+
+ pos += match[0].rm_eo + nLen - oLen ;
+
+ // Either the last match did end in ';' or we are at the end of para.
+ // REG_NOTBOL is not used because we skip over the ';' by using pos.
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all occurences of subexpression number "subexp" with "repl"
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
+{
+ int status, pos=0;
+ regex_t re;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ argument[pos + match[subexp].rm_so] = repl;
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+ pos += match[0].rm_eo;
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, REG_NOTBOL);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all char1 with char2
+void rep_char( string &argument, const char from, const char to)
+{
+ string::size_type loc = 0;
+
+ while ( (loc = argument.find( from, loc )) != string::npos ) {
+ argument[loc] = to;
+ }
+}
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: guw.cc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// guw - A wrapper program to execute windows programs with parameters that
+// contain cygwin (POSIX) style pathnames.
+
+// Todo: Add a -? switch to guw to issue a help page.
+
+#include <string>
+#include <list>
+#include <vector>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <cstddef>
+#include <cerrno>
+
+#include <sys/cygwin.h>
+#include <windows.h>
+#include <regex.h>
+
+
+using std::string;
+using std::list;
+using std::vector;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::size_t;
+
+void init_ignorepara(string command);
+bool is_ignorepara(const string &para);
+int winFormat(string &para);
+void do_atcommand(string &para);
+void myCygpath(string &path, int shortname = 1 );
+void replace_cyg_env( void );
+void Fatal( const string text );
+
+int match2s(const string argument, const char *pattern, string &sub1, string &sub2);
+void rep_subn_cyg(string &argument);
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl);
+void rep_char( string &argument, const char from, const char to);
+
+bool debug = false;
+bool debug_light = false;
+
+// The commands are treated case insensitive, the parameters
+// are case sensitive.
+const string ignorepara[] = { "echo /TEST",
+ "cl -clr: -Z",
+ "climaker StarOffice/OpenOffice",
+ "csc -target:",
+ "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
+ " -DBUILD_ID -DSC_INFO_OSVERSION",
+ "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
+ " -DPACKAGE -DU_MAKE",
+ "lib /OUT: -out: -def: -machine:",
+ "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
+ " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
+ " /STACK: /SUBSYSTEM: -NODEFAULTLIB:"
+ " -def: delayload: -implib: -map: -out:",
+ "rc -D",
+ "regcomp -env: vnd.sun.star.expand:"
+ " vnd.openoffice.pymodule: file:",
+ "regmerge /UCR",
+ "rsc -DOOO_" };
+
+vector<string> ignorepara_vec;
+
+// environment variables that are "winformatted" when -env is given
+const string transformvars[] = { "SOLAR_VERSION",
+ "SOLARVERSION",
+ "SOLARVER",
+ "SRC_ROOT",
+ "LOCALINI",
+ "GLOBALINI",
+ "SOLARENV",
+ "STAR_INSTPATH",
+ "STAR_SOLARPATH",
+ "STAR_PACKMISC",
+ "STAR_SOLARENVPATH",
+ "STAR_INITROOT",
+ "STAR_STANDLST",
+ "CLASSPATH",
+ "JAVA_HOME" };
+
+
+int main(int argc, char **argv) {
+
+ // initialize arglist with arguments
+ list<string> arglist(argv, argv + argc);
+
+ // Drop the first (filename) argument
+ arglist.pop_front();
+
+ // iterarot over cmdline elements
+ list<string>::iterator ele = arglist.begin();
+
+ // Allowed switch values
+ bool conv_cyg_arg = false;
+
+ // Look for switches to guw
+ // Supported: -env
+ // -dbg
+ // -ldbg
+ while ( !arglist.empty()
+ && ele!=arglist.end()
+ && (ele->find("-", 0) == 0) ) {
+ if (ele->find("-env", 0) == 0) {
+ if ( conv_cyg_arg )
+ Fatal("-env used twice!");
+
+ conv_cyg_arg = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-dbg", 0) == 0) {
+
+ debug = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-ldbg", 0) == 0) {
+
+ debug_light = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else {
+ // Ignore this switch
+ ++ele;
+ }
+ }
+
+ // The next entry must be the program
+ string command;
+ if ( !arglist.empty() ) {
+ command.assign(*arglist.begin());
+ arglist.pop_front();
+ }
+ else
+ Fatal("guw needs at least one parameter.");
+
+ if ( debug )
+ cerr << "Command: " << command << "\n" << endl;
+ // Initialize parameter exception list (for this command)
+ init_ignorepara(command);
+
+
+ // Do something if -env was found
+ if ( conv_cyg_arg )
+ replace_cyg_env();
+
+
+ // loop and and DOSify the parameters
+ if ( debug )
+ cerr << "Transform the parameter\n" << endl;
+
+ ele=arglist.begin();
+ while ( ele != arglist.end() ) {
+
+ if ((*ele)[0] == '@')
+ do_atcommand(*ele);
+ else if (!is_ignorepara(*ele)) {
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process parameter: " << *ele << endl;
+ }
+ winFormat(*ele);
+ if ( debug )
+ cerr << "Transformed to: " << *ele << "\n" << endl;
+ }
+
+ ++ele;
+ }
+
+ // create the argv[] for execvp(argv[0], argv);
+ ele=arglist.begin();
+
+ // const char *nargv[arglist.size()+2]; // or ..
+ char *nargv[arglist.size()+2];
+
+ // nargv[0] = command.c_str(); // or ..
+ nargv[0] = new char[command.length()+1];
+ // strcpy(nargv[0], command.c_str());
+ command.copy(nargv[0], command.length());
+ nargv[0][command.length()] = 0;
+
+ if ( debug )
+ cerr << "----------------\n" << endl;
+ if ( debug || debug_light )
+ cerr << "Execute: " << nargv[0];
+
+ int count = 1, sLen;
+ while ( ele != arglist.end() ) {
+ // nargv[count] = ele->c_str(); // or ..
+ sLen = ele->length();
+ nargv[count] = new char[sLen+1];
+ // strcpy(nargv[count], ele->c_str());
+ ele->copy(nargv[count], sLen);
+ nargv[count][sLen] = 0;
+
+ if ( debug || debug_light )
+ cerr << " " << nargv[count];
+
+ ++count;
+ ++ele;
+ }
+ // last nargv[] must be NULL
+ nargv[count] = NULL;
+ if ( debug || debug_light )
+ cerr << endl;
+
+ // Unfortunately the prototype of execvp does not like const char*,
+ // actually not const char* nargv[] coming from .c_str(). So either
+ // we copy everything into newly allocated variables or we force it
+ // with a cast. const_cast<char * const *>()
+ // execvp(nargv[0], const_cast<char * const *>(nargv) );
+ if ( execvp(nargv[0], nargv ) < 0 ) {
+ perror("Execvp error. Aborting.");
+ exit(1);
+ }
+
+ // Omit the deleting of the dynamically allocated nargv[] elements
+ // here as this part will never be reached.
+
+ return 0;
+}
+
+// Initialize exception list from global var ignorepara[]
+void init_ignorepara(string fullcommand) {
+ const size_t kplen = sizeof(ignorepara)/sizeof(string *);
+ string shortcommand, cmd, para, sub2;
+
+ // First lowercase everything
+ for(size_t i=0;i<fullcommand.length();i++)
+ fullcommand[i] = tolower(fullcommand[i]);
+
+ // Remove a potential .exe
+ size_t slen = fullcommand.length();
+
+ // for slen == 3 this would yield string::npos otherwise
+ if ( slen > 4 && fullcommand.rfind(".exe") == slen - 4 )
+ fullcommand.erase(slen-4);
+
+ // get the program name - Only one subexpression
+ if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
+ shortcommand, sub2)) {
+ Fatal("No basename found in: " + fullcommand);
+ }
+
+ for (size_t i=0; i != kplen; ++i) {
+ std::istringstream line(ignorepara[i]);
+ line >> cmd;
+ if (shortcommand == cmd)
+ while (line >> para) {
+ ignorepara_vec.push_back(para);
+ }
+ }
+ return ;
+}
+
+// Check if command/parameter is in exception list.
+bool is_ignorepara(const string &para) {
+
+ for( vector<string>::iterator it = ignorepara_vec.begin();
+ it != ignorepara_vec.end(); it++ ) {
+ if ( para.find(*it) != string::npos ) {
+ if ( debug )
+ cerr << "Found execption para: " << para << endl;
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+// Reformat para to DOSish format
+int winFormat(string &para) {
+ string su1, su2;
+
+ // Instead of ([/[:alnum:]_~. +-]+) use ((/?[[:alnum:]_~. +-]+)+)
+
+ // find [-][-]X<something>=<path>, sometimes with quotes or "/" at the end
+ if (match2s(para, "^(-?-?[[:alpha:]][[:alnum:]_.-]*=)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - ([-][-]<something>=<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_.]*:)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<NO-path>, and prevents translating of these.
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_]*:)(.*)$",
+ su1, su2)) {
+
+ // myCygpath(su2);
+ // para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<NO-path>)\n"
+ << " " << para << endl;
+
+ }
+ // See iz35982 for the reason for the special treatment of this switch.
+ // This regex evaluates <something>:///<path>, sometimes with
+ // quotes or "/" at the end
+ else if (match2s(para, "^([[:alpha:]][[:alnum:]_]*:)[\'\"]?///((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + "///" + su2);
+ // Replace \ to /
+ rep_char( para, '\\', '/');
+
+ if ( debug )
+ cerr << " WinFormat - (<something>:///<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<absolute path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-X<absolute path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -FX<path> (MSVC switches for output naming), sometimes with quotes
+ // or "/" at the end
+ else if (match2s(para, "^(-F[ARdemopr])[\'\"]?(/[/[:alnum:]_~. +-]+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (compiler naming (-FX<absolute path>) path)\n"
+ << " " << para << endl;
+
+ }
+ else{
+ // No parameter found, assume a path
+
+ // replace the colon in drives with 0x1F"
+ // (Unused ascii US - unit separator)
+ rep_subn( para, "(^|[;,])[[:alpha:]](:)", 2, 0x1F);
+
+ // Replace remaining : to ;
+ rep_char( para, ':', ';');
+
+ // Replace back US to ':';
+ rep_char( para, 0x1F, ':');
+
+ /* Search for posix path ;entry; (The regex accepts valid paths with at
+ * least one /) and replace with DOS path, accept quotes.
+ * since iz28717 we also accept ',' as path seperator. */
+ rep_subn_cyg(para);
+
+ if ( debug )
+ cerr << " WinFormat - full path\n"
+ << " " << para << endl;
+
+ }
+
+ // Sanity check for -X<abspath>
+ if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not converted -X/... type switch in :" + para);
+ }
+ // Sanity check for [-]X<something>(:|=)<abspath> case
+ if (match2s(para, "^(-?[[:alpha:]][[:alnum:]_.]+[=:])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not processed [-]X<something>(=|:)/... in :" + para);
+ }
+
+
+ return 1;
+}
+
+// Reformat para to DOSish format
+void do_atcommand(string &para) {
+ string at, filename, token;
+
+ // Workaround, iz28717, keep number of @'s.
+ match2s(para, "^(@+)(.*)",at ,filename);
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process @-file" << endl;
+ cerr << " :" << at << ": before filename :" << filename << ":" << endl;
+ }
+
+ // Read at file into memory
+ std::ifstream atin(filename.c_str());
+ list<string> newtoken;
+ while (atin >> token) {
+ // Read / transform tokens
+ if ( debug )
+ cerr << "@ token :" << token << ":" << endl;
+ if (!is_ignorepara(token))
+ winFormat(token);
+
+ newtoken.push_back(token);
+ }
+ atin.close();
+
+ // Write token tokens bak to file
+ if ( debug || debug_light )
+ cerr << "New @-file parameter:" << endl;
+
+ // for debugging ..
+ // filename += ".bak";
+
+ std::ofstream atout(filename.c_str());
+ list<string>::iterator tok = newtoken.begin();
+ while ( tok != newtoken.end() ) {
+ if ( debug || debug_light )
+ cerr << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+
+ atout << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+ ++tok;
+ }
+ // We want a dos file
+ atout << '\r' << endl;
+ atout.close();
+
+ // Transform the filename
+ winFormat(filename);
+ para = at + filename;
+ if ( debug || debug_light ) {
+ cerr << "\nNew @-file name: " << para << "\n" << endl;
+ }
+}
+
+void myCygpath(string &path, int shortname /* =1 */ )
+{
+ static char convpath[MAX_PATH];
+ static char buf[MAX_PATH];
+ int err;
+
+ // Only use cygwin_conv_to_win32_path() on absolute paths as it errors
+ // out if its path doen't exist. Unfortunatelt there are a lot of not
+ // existing relative pathes used as parameters during an OOo build.
+ if( path.find("/", 0) == 0) {
+ err = cygwin_conv_to_win32_path( path.c_str(), convpath );
+ }
+ else {
+ rep_char( path, '/', '\\');
+ // see below, we copy convpath back to path, that's stupid
+ path.copy( convpath, path.length());
+ convpath[path.length()] = 0;
+ err = 0;
+ }
+
+ if (err)
+ Fatal("converting: " + path + " - " + strerror(errno) );
+
+ // Only convert to short dos names when space is present
+ if (shortname && (path.find(" ", 0) != string::npos) ) {
+ DWORD len = GetShortPathName (convpath, buf, MAX_PATH);
+ if (!len) {
+ Fatal("cannot create short name of " + string(convpath) );
+ }
+
+ path.assign(buf);
+ }
+ else
+ path.assign(convpath);
+
+}
+
+void replace_cyg_env( void ) {
+ // Transform certain environment variables
+ if ( debug )
+ cerr << "Transforming some environment variables" << endl;
+
+ const size_t nvars = sizeof(transformvars)/sizeof(string *);
+
+ char *currvar;
+ string newvar;
+
+ for (size_t i=0; i != nvars; ++i) {
+ if ( currvar = getenv(transformvars[i].c_str() ) ) {
+ // Only transform existent vars
+ if ( debug )
+ cerr << "Transform variable: " << transformvars[i] << "="
+ << currvar << endl;
+ newvar.assign(currvar);
+ winFormat(newvar);
+ if( setenv(transformvars[i].c_str(), newvar.c_str(), 1) )
+ Fatal("setenv failed on " + transformvars[i] + "=" + newvar +
+ " with error: " + strerror(errno));
+ if ( debug )
+ cerr << "To: " << transformvars[i] << "="
+ << newvar << "\n" << endl;
+ }
+ }
+}
+
+
+void Fatal( const string text ) {
+ // End with error
+ cerr << "Error: " << text << endl;
+ exit(1);
+}
+
+
+int
+match2s(const string argument, const char *pattern, string &sub1, string &sub2)
+{
+ int status;
+ regex_t re;
+
+ const int maxsub = 3; // Only 3 needed, 4 is for debug
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec(&re, argument.c_str(), maxsub, match, 0);
+ regfree(&re);
+
+ if (status == REG_NOMATCH) {
+ return(0); /* no match */
+ } else if (status == 0) {
+ string tstr(argument.c_str() + match[0].rm_so,
+ match[0].rm_eo - match[0].rm_so);
+ // cout << "Match: " << tstr << endl;
+
+ sub1.assign(argument.c_str() + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
+ // cout << "Match1: " << sub1 << endl;
+
+ sub2.assign(argument.c_str() + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
+ // cout << "Match2: " << sub2 << endl;
+
+ return(1); /* match found */
+ } else {
+ Fatal("regexec had a problem.");
+ }
+
+ // Not reached.
+ return(1);
+}
+
+
+// Replace path entry with myCygpath() version
+void rep_subn_cyg(string &argument)
+{
+ // accept ["']<entry>["']:["']<entry>["']:... to make the
+ // $(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)"
+ // work in ?tg_app.mk.
+ // FIXME: Better would be to use a DOSified $(APP1ICON) there and remove
+ // the special " treatment here.
+ const char *pattern = "(^|[;,])[\'\"]?([[:alnum:]_~. +-]*(/[[:alnum:]_~. +-]+)+/?)[\'\"]?([;,]|$)";
+ const int subexp = 2;
+
+ int status, pos=0;
+ regex_t re;
+
+ string repstr;
+ string::size_type oLen, nLen;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ oLen = match[subexp].rm_eo - match[subexp].rm_so;
+ repstr.assign(argument.c_str() + pos + match[subexp].rm_so, oLen);
+
+ // Do not replace with shortpaths
+ myCygpath(repstr, 0);
+ nLen = repstr.length();
+
+ // replace
+ argument.replace( pos + match[subexp].rm_so, oLen, repstr );
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+
+ pos += match[0].rm_eo + nLen - oLen ;
+
+ // Either the last match did end in ';' or we are at the end of para.
+ // REG_NOTBOL is not used because we skip over the ';' by using pos.
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all occurences of subexpression number "subexp" with "repl"
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
+{
+ int status, pos=0;
+ regex_t re;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ argument[pos + match[subexp].rm_so] = repl;
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+ pos += match[0].rm_eo;
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, REG_NOTBOL);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all char1 with char2
+void rep_char( string &argument, const char from, const char to)
+{
+ string::size_type loc = 0;
+
+ while ( (loc = argument.find( from, loc )) != string::npos ) {
+ argument[loc] = to;
+ }
+}
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: guw.cc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// guw - A wrapper program to execute windows programs with parameters that
+// contain cygwin (POSIX) style pathnames.
+
+// Todo: Add a -? switch to guw to issue a help page.
+
+#include <string>
+#include <list>
+#include <vector>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <cstddef>
+#include <cerrno>
+
+#include <sys/cygwin.h>
+#include <windows.h>
+#include <regex.h>
+
+
+using std::string;
+using std::list;
+using std::vector;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::size_t;
+
+void init_ignorepara(string command);
+bool is_ignorepara(const string &para);
+int winFormat(string &para);
+void do_atcommand(string &para);
+void myCygpath(string &path, int shortname = 1 );
+void replace_cyg_env( void );
+void Fatal( const string text );
+
+int match2s(const string argument, const char *pattern, string &sub1, string &sub2);
+void rep_subn_cyg(string &argument);
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl);
+void rep_char( string &argument, const char from, const char to);
+
+bool debug = false;
+bool debug_light = false;
+
+// The commands are treated case insensitive, the parameters
+// are case sensitive.
+const string ignorepara[] = { "echo /TEST",
+ "cl -clr: -Z",
+ "climaker StarOffice/OpenOffice",
+ "csc -target:",
+ "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
+ " -DBUILD_ID -DSC_INFO_OSVERSION",
+ "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
+ " -DPACKAGE -DU_MAKE",
+ "lib /OUT: -out: -def: -machine:",
+ "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
+ " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
+ " /STACK: /SUBSYSTEM: -NODEFAULTLIB:"
+ " -def: delayload: -implib: -map: -out:",
+ "rc -D",
+ "regcomp -env: vnd.sun.star.expand:"
+ " vnd.openoffice.pymodule: file:",
+ "regmerge /UCR",
+ "rsc -DOOO_" };
+
+vector<string> ignorepara_vec;
+
+// environment variables that are "winformatted" when -env is given
+const string transformvars[] = { "SOLAR_VERSION",
+ "SOLARVERSION",
+ "SOLARVER",
+ "SRC_ROOT",
+ "LOCALINI",
+ "GLOBALINI",
+ "SOLARENV",
+ "STAR_INSTPATH",
+ "STAR_SOLARPATH",
+ "STAR_PACKMISC",
+ "STAR_SOLARENVPATH",
+ "STAR_INITROOT",
+ "STAR_STANDLST",
+ "CLASSPATH",
+ "JAVA_HOME" };
+
+
+int main(int argc, char **argv) {
+
+ // initialize arglist with arguments
+ list<string> arglist(argv, argv + argc);
+
+ // Drop the first (filename) argument
+ arglist.pop_front();
+
+ // iterarot over cmdline elements
+ list<string>::iterator ele = arglist.begin();
+
+ // Allowed switch values
+ bool conv_cyg_arg = false;
+
+ // Look for switches to guw
+ // Supported: -env
+ // -dbg
+ // -ldbg
+ while ( !arglist.empty()
+ && ele!=arglist.end()
+ && (ele->find("-", 0) == 0) ) {
+ if (ele->find("-env", 0) == 0) {
+ if ( conv_cyg_arg )
+ Fatal("-env used twice!");
+
+ conv_cyg_arg = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-dbg", 0) == 0) {
+
+ debug = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else if (ele->find("-ldbg", 0) == 0) {
+
+ debug_light = true;
+ ele = arglist.erase(ele);
+ continue;
+ }
+ else {
+ // Ignore this switch
+ ++ele;
+ }
+ }
+
+ // The next entry must be the program
+ string command;
+ if ( !arglist.empty() ) {
+ command.assign(*arglist.begin());
+ arglist.pop_front();
+ }
+ else
+ Fatal("guw needs at least one parameter.");
+
+ if ( debug )
+ cerr << "Command: " << command << "\n" << endl;
+ // Initialize parameter exception list (for this command)
+ init_ignorepara(command);
+
+
+ // Do something if -env was found
+ if ( conv_cyg_arg )
+ replace_cyg_env();
+
+
+ // loop and and DOSify the parameters
+ if ( debug )
+ cerr << "Transform the parameter\n" << endl;
+
+ ele=arglist.begin();
+ while ( ele != arglist.end() ) {
+
+ if ((*ele)[0] == '@')
+ do_atcommand(*ele);
+ else if (!is_ignorepara(*ele)) {
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process parameter: " << *ele << endl;
+ }
+ winFormat(*ele);
+ if ( debug )
+ cerr << "Transformed to: " << *ele << "\n" << endl;
+ }
+
+ ++ele;
+ }
+
+ // create the argv[] for execvp(argv[0], argv);
+ ele=arglist.begin();
+
+ // const char *nargv[arglist.size()+2]; // or ..
+ char *nargv[arglist.size()+2];
+
+ // nargv[0] = command.c_str(); // or ..
+ nargv[0] = new char[command.length()+1];
+ // strcpy(nargv[0], command.c_str());
+ command.copy(nargv[0], command.length());
+ nargv[0][command.length()] = 0;
+
+ if ( debug )
+ cerr << "----------------\n" << endl;
+ if ( debug || debug_light )
+ cerr << "Execute: " << nargv[0];
+
+ int count = 1, sLen;
+ while ( ele != arglist.end() ) {
+ // nargv[count] = ele->c_str(); // or ..
+ sLen = ele->length();
+ nargv[count] = new char[sLen+1];
+ // strcpy(nargv[count], ele->c_str());
+ ele->copy(nargv[count], sLen);
+ nargv[count][sLen] = 0;
+
+ if ( debug || debug_light )
+ cerr << " " << nargv[count];
+
+ ++count;
+ ++ele;
+ }
+ // last nargv[] must be NULL
+ nargv[count] = NULL;
+ if ( debug || debug_light )
+ cerr << endl;
+
+ // Unfortunately the prototype of execvp does not like const char*,
+ // actually not const char* nargv[] coming from .c_str(). So either
+ // we copy everything into newly allocated variables or we force it
+ // with a cast. const_cast<char * const *>()
+ // execvp(nargv[0], const_cast<char * const *>(nargv) );
+ if ( execvp(nargv[0], nargv ) < 0 ) {
+ perror("Execvp error. Aborting.");
+ exit(1);
+ }
+
+ // Omit the deleting of the dynamically allocated nargv[] elements
+ // here as this part will never be reached.
+
+ return 0;
+}
+
+// Initialize exception list from global var ignorepara[]
+void init_ignorepara(string fullcommand) {
+ const size_t kplen = sizeof(ignorepara)/sizeof(string *);
+ string shortcommand, cmd, para, sub2;
+
+ // First lowercase everything
+ for(size_t i=0;i<fullcommand.length();i++)
+ fullcommand[i] = tolower(fullcommand[i]);
+
+ // Remove a potential .exe
+ size_t slen = fullcommand.length();
+
+ // for slen == 3 this would yield string::npos otherwise
+ if ( slen > 4 && fullcommand.rfind(".exe") == slen - 4 )
+ fullcommand.erase(slen-4);
+
+ // get the program name - Only one subexpression
+ if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
+ shortcommand, sub2)) {
+ Fatal("No basename found in: " + fullcommand);
+ }
+
+ for (size_t i=0; i != kplen; ++i) {
+ std::istringstream line(ignorepara[i]);
+ line >> cmd;
+ if (shortcommand == cmd)
+ while (line >> para) {
+ ignorepara_vec.push_back(para);
+ }
+ }
+ return ;
+}
+
+// Check if command/parameter is in exception list.
+bool is_ignorepara(const string &para) {
+
+ for( vector<string>::iterator it = ignorepara_vec.begin();
+ it != ignorepara_vec.end(); it++ ) {
+ if ( para.find(*it) != string::npos ) {
+ if ( debug )
+ cerr << "Found execption para: " << para << endl;
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+// Reformat para to DOSish format
+int winFormat(string &para) {
+ string su1, su2;
+
+ // Instead of ([/[:alnum:]_~. +-]+) use ((/?[[:alnum:]_~. +-]+)+)
+
+ // find [-][-]X<something>=<path>, sometimes with quotes or "/" at the end
+ if (match2s(para, "^(-?-?[[:alpha:]][[:alnum:]_.-]*=)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - ([-][-]<something>=<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_.]*:)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<something>:<NO-path>, and prevents translating of these.
+ else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_]*:)(.*)$",
+ su1, su2)) {
+
+ // myCygpath(su2);
+ // para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-<something>:<NO-path>)\n"
+ << " " << para << endl;
+
+ }
+ // See iz35982 for the reason for the special treatment of this switch.
+ // This regex evaluates <something>:///<path>, sometimes with
+ // quotes or "/" at the end
+ else if (match2s(para, "^([[:alpha:]][[:alnum:]_]*:)[\'\"]?///((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + "///" + su2);
+ // Replace \ to /
+ rep_char( para, '\\', '/');
+
+ if ( debug )
+ cerr << " WinFormat - (<something>:///<path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -X<absolute path>, sometimes with quotes or "/" at the end
+ else if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (-X<absolute path>)\n"
+ << " " << para << endl;
+
+ }
+ // find -FX<path> (MSVC switches for output naming), sometimes with quotes
+ // or "/" at the end
+ else if (match2s(para, "^(-F[ARdemopr])[\'\"]?(/[/[:alnum:]_~. +-]+)[\'\"]?$",
+ su1, su2)) {
+
+ myCygpath(su2);
+ para.assign(su1 + su2);
+ if ( debug )
+ cerr << " WinFormat - (compiler naming (-FX<absolute path>) path)\n"
+ << " " << para << endl;
+
+ }
+ else{
+ // No parameter found, assume a path
+
+ // replace the colon in drives with 0x1F"
+ // (Unused ascii US - unit separator)
+ rep_subn( para, "(^|[;,])[[:alpha:]](:)", 2, 0x1F);
+
+ // Replace remaining : to ;
+ rep_char( para, ':', ';');
+
+ // Replace back US to ':';
+ rep_char( para, 0x1F, ':');
+
+ /* Search for posix path ;entry; (The regex accepts valid paths with at
+ * least one /) and replace with DOS path, accept quotes.
+ * since iz28717 we also accept ',' as path seperator. */
+ rep_subn_cyg(para);
+
+ if ( debug )
+ cerr << " WinFormat - full path\n"
+ << " " << para << endl;
+
+ }
+
+ // Sanity check for -X<abspath>
+ if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not converted -X/... type switch in :" + para);
+ }
+ // Sanity check for [-]X<something>(:|=)<abspath> case
+ if (match2s(para, "^(-?[[:alpha:]][[:alnum:]_.]+[=:])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
+ su1, su2)) {
+ Fatal("Not processed [-]X<something>(=|:)/... in :" + para);
+ }
+
+
+ return 1;
+}
+
+// Reformat para to DOSish format
+void do_atcommand(string &para) {
+ string at, filename, token;
+
+ // Workaround, iz28717, keep number of @'s.
+ match2s(para, "^(@+)(.*)",at ,filename);
+ if ( debug ) {
+ cerr << "----------------" << endl;
+ cerr << "Process @-file" << endl;
+ cerr << " :" << at << ": before filename :" << filename << ":" << endl;
+ }
+
+ // Read at file into memory
+ std::ifstream atin(filename.c_str());
+ list<string> newtoken;
+ while (atin >> token) {
+ // Read / transform tokens
+ if ( debug )
+ cerr << "@ token :" << token << ":" << endl;
+ if (!is_ignorepara(token))
+ winFormat(token);
+
+ newtoken.push_back(token);
+ }
+ atin.close();
+
+ // Write token tokens bak to file
+ if ( debug || debug_light )
+ cerr << "New @-file parameter:" << endl;
+
+ // for debugging ..
+ // filename += ".bak";
+
+ std::ofstream atout(filename.c_str());
+ list<string>::iterator tok = newtoken.begin();
+ while ( tok != newtoken.end() ) {
+ if ( debug || debug_light )
+ cerr << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+
+ atout << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
+ ++tok;
+ }
+ // We want a dos file
+ atout << '\r' << endl;
+ atout.close();
+
+ // Transform the filename
+ winFormat(filename);
+ para = at + filename;
+ if ( debug || debug_light ) {
+ cerr << "\nNew @-file name: " << para << "\n" << endl;
+ }
+}
+
+void myCygpath(string &path, int shortname /* =1 */ )
+{
+ static char convpath[MAX_PATH];
+ static char buf[MAX_PATH];
+ int err;
+
+ // Only use cygwin_conv_to_win32_path() on absolute paths as it errors
+ // out if its path doen't exist. Unfortunatelt there are a lot of not
+ // existing relative pathes used as parameters during an OOo build.
+ if( path.find("/", 0) == 0) {
+ err = cygwin_conv_to_win32_path( path.c_str(), convpath );
+ }
+ else {
+ rep_char( path, '/', '\\');
+ // see below, we copy convpath back to path, that's stupid
+ path.copy( convpath, path.length());
+ convpath[path.length()] = 0;
+ err = 0;
+ }
+
+ if (err)
+ Fatal("converting: " + path + " - " + strerror(errno) );
+
+ // Only convert to short dos names when space is present
+ if (shortname && (path.find(" ", 0) != string::npos) ) {
+ DWORD len = GetShortPathName (convpath, buf, MAX_PATH);
+ if (!len) {
+ Fatal("cannot create short name of " + string(convpath) );
+ }
+
+ path.assign(buf);
+ }
+ else
+ path.assign(convpath);
+
+}
+
+void replace_cyg_env( void ) {
+ // Transform certain environment variables
+ if ( debug )
+ cerr << "Transforming some environment variables" << endl;
+
+ const size_t nvars = sizeof(transformvars)/sizeof(string *);
+
+ char *currvar;
+ string newvar;
+
+ for (size_t i=0; i != nvars; ++i) {
+ if ( currvar = getenv(transformvars[i].c_str() ) ) {
+ // Only transform existent vars
+ if ( debug )
+ cerr << "Transform variable: " << transformvars[i] << "="
+ << currvar << endl;
+ newvar.assign(currvar);
+ winFormat(newvar);
+ if( setenv(transformvars[i].c_str(), newvar.c_str(), 1) )
+ Fatal("setenv failed on " + transformvars[i] + "=" + newvar +
+ " with error: " + strerror(errno));
+ if ( debug )
+ cerr << "To: " << transformvars[i] << "="
+ << newvar << "\n" << endl;
+ }
+ }
+}
+
+
+void Fatal( const string text ) {
+ // End with error
+ cerr << "Error: " << text << endl;
+ exit(1);
+}
+
+
+int
+match2s(const string argument, const char *pattern, string &sub1, string &sub2)
+{
+ int status;
+ regex_t re;
+
+ const int maxsub = 3; // Only 3 needed, 4 is for debug
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec(&re, argument.c_str(), maxsub, match, 0);
+ regfree(&re);
+
+ if (status == REG_NOMATCH) {
+ return(0); /* no match */
+ } else if (status == 0) {
+ string tstr(argument.c_str() + match[0].rm_so,
+ match[0].rm_eo - match[0].rm_so);
+ // cout << "Match: " << tstr << endl;
+
+ sub1.assign(argument.c_str() + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
+ // cout << "Match1: " << sub1 << endl;
+
+ sub2.assign(argument.c_str() + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
+ // cout << "Match2: " << sub2 << endl;
+
+ return(1); /* match found */
+ } else {
+ Fatal("regexec had a problem.");
+ }
+
+ // Not reached.
+ return(1);
+}
+
+
+// Replace path entry with myCygpath() version
+void rep_subn_cyg(string &argument)
+{
+ // accept ["']<entry>["']:["']<entry>["']:... to make the
+ // $(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)"
+ // work in ?tg_app.mk.
+ // FIXME: Better would be to use a DOSified $(APP1ICON) there and remove
+ // the special " treatment here.
+ const char *pattern = "(^|[;,])[\'\"]?([[:alnum:]_~. +-]*(/[[:alnum:]_~. +-]+)+/?)[\'\"]?([;,]|$)";
+ const int subexp = 2;
+
+ int status, pos=0;
+ regex_t re;
+
+ string repstr;
+ string::size_type oLen, nLen;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ oLen = match[subexp].rm_eo - match[subexp].rm_so;
+ repstr.assign(argument.c_str() + pos + match[subexp].rm_so, oLen);
+
+ // Do not replace with shortpaths
+ myCygpath(repstr, 0);
+ nLen = repstr.length();
+
+ // replace
+ argument.replace( pos + match[subexp].rm_so, oLen, repstr );
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+
+ pos += match[0].rm_eo + nLen - oLen ;
+
+ // Either the last match did end in ';' or we are at the end of para.
+ // REG_NOTBOL is not used because we skip over the ';' by using pos.
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all occurences of subexpression number "subexp" with "repl"
+void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
+{
+ int status, pos=0;
+ regex_t re;
+
+ const int maxsub = subexp+1; // One more than the maximal subexpression
+ regmatch_t match[maxsub];
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ Fatal("regcomp had a problem."); /* report error */
+ }
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
+ while (status == 0) { /* While matches found. */
+ // Classical assert()
+ if (match[subexp].rm_eo == -1) {
+ Fatal("Nonexisting subexpression specified!");
+ }
+
+ argument[pos + match[subexp].rm_so] = repl;
+
+ /* Substring found between match[0].rm_so and match[0].rm_eo. */
+ /* This call to regexec() finds the next match. */
+ pos += match[0].rm_eo;
+ status = regexec (&re, argument.c_str() + pos, maxsub, match, REG_NOTBOL);
+ }
+
+ if (status != REG_NOMATCH) {
+ Fatal("regexec had a problem.");
+ }
+
+ regfree(&re);
+}
+
+// Replace all char1 with char2
+void rep_char( string &argument, const char from, const char to)
+{
+ string::size_type loc = 0;
+
+ while ( (loc = argument.find( from, loc )) != string::npos ) {
+ argument[loc] = to;
+ }
+}
diff --git a/guw/makefile b/guw/makefile
new file mode 100644
index 000000000000..c8f24e6ddbb2
--- /dev/null
+++ b/guw/makefile
@@ -0,0 +1,12 @@
+sources = guw.cc
+
+guw : $(sources)
+ g++ -Wall -o guw $(sources)
+sources = guw.cc
+
+guw : $(sources)
+ g++ -Wall -o guw $(sources)
+sources = guw.cc
+
+guw : $(sources)
+ g++ -Wall -o guw $(sources)
diff --git a/solenv/bin/install-sh b/install-sh
index 36f96f3e033c..36f96f3e033c 100644
--- a/solenv/bin/install-sh
+++ b/install-sh
diff --git a/config_office/makefile.rc b/makefile.rc
index c74b3bf904b4..46206795dd5b 100644
--- a/config_office/makefile.rc
+++ b/makefile.rc
@@ -60,8 +60,8 @@ bootstrap .PHONY :
distclean .PHONY: clean
- -rm config_office/config.cache
- -rm config_office/config.log
+ -rm config.cache
+ -rm config.log
.IF "$(BUILD_DMAKE)"!="NO"
-$(GNUMAKE) -C dmake distclean
.ENDIF
@@ -79,7 +79,7 @@ clean .PHONY:
# configure target
#
-configure .PHONY SETDIR=config_office :
+configure .PHONY SETDIR=. :
@configure
diff --git a/config_office/oowintool b/oowintool
index 0b4be43f9a7e..0b4be43f9a7e 100755
--- a/config_office/oowintool
+++ b/oowintool
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 26976a133341..3edccbfc7be9 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -62,7 +62,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-#ifdef ENABLE_REPORTDESIGN
+#ifdef ENABLE_REPORTBUILDER
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
STD_RES_FILE( gid_File_Res_Rpt, rpt)
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index 286af2bbde8e..53d1f0a89666 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -41,8 +41,8 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
-.IF "$(ENABLE_REPORTDESIGN)" == "YES"
-SCPDEFS += -DENABLE_REPORTDESIGN
+.IF "$(ENABLE_REPORTBUILDER)" == "YES"
+SCPDEFS += -DENABLE_REPORTBUILDER
.ENDIF
SCP_PRODUCT_TYPE=osl
diff --git a/config_office/set_soenv.in b/set_soenv.in
index ec83aec2c7c1..1f7c516ee000 100644
--- a/config_office/set_soenv.in
+++ b/set_soenv.in
@@ -105,12 +105,7 @@ my ( $dmake, $build, $build_client, $nmake, $mkout, $deliver, $zipdep );
#
# $platform is needed for PathFormat()
#
-if ('@LOCAL_SOLENV@' eq "DEFAULT")
-{ $platform = `../solenv/bin/config.guess`;
-}
-else
-{ $platform = `@LOCAL_SOLENV@/bin/config.guess`;
-}
+$platform = `./config.guess`;
chomp( $platform );
$UPD = '@UPD@'; # the project's UPD
@@ -399,6 +394,7 @@ elsif ( $platform =~ m/linux/ )
else {
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ # has both server and client
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
@@ -420,6 +416,7 @@ elsif ( $platform =~ m/linux/ )
$OUTPATH = "unxlngx6";
# Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ # has both server and client
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
@@ -444,7 +441,7 @@ elsif ( $platform =~ m/linux/ )
$CPUNAME = "SPARC";
$OUTPATH = "unxlngs";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
}
@@ -473,18 +470,18 @@ elsif ( $platform =~ m/linux/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
- { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
- $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
- }
- else {
- # OpenJDK (aka JDK=sun)
- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."client";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."native_threads";
- $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."xawt";
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
}
+ # OpenJDK
+ elsif ($JDK =~ m/sun/) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+ }
}
$CPU = "P";
@@ -507,7 +504,7 @@ elsif ( $platform =~ m/linux/ )
$OUTPATH = "unxlngs390";
}
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
$CPU = "3";
@@ -531,7 +528,7 @@ elsif ( $platform =~ m/linux/ )
$CPUNAME = "ALPHA_";
$OUTPATH = "unxlnga";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
}
elsif ($platform =~ m/^arm.*?l-/)
@@ -541,8 +538,9 @@ elsif ( $platform =~ m/linux/ )
$CPUNAME = "ARM";
$OUTPATH = "unxlngr";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."xawt";
$EPM_FLAGS = "-a arm";
}
elsif ($platform =~ m/^mips/)
@@ -1728,7 +1726,7 @@ ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
-ToFile( "ENABLE_REPORTDESIGN","@ENABLE_REPORTDESIGN@","e" );
+ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "JCOMMON_JAR", "@JCOMMON_JAR@", "e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 06:51:11 +0000