[mapguide-commits] r9318 - in trunk/MgDev: . BuildTools BuildTools/WebTools BuildTools/WebTools/IMake Common Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfModel Common/MdfParser Common/PlatformBase Common/Renderers Common/Security Common/Stylization Desktop Desktop/MgDesktop Desktop/MgDesktop/Services/Feature Desktop/UnitTest Oem Oem/DWFTK Oem/DWFTK/develop Oem/DWFTK/develop/global Oem/DWFTK/develop/global/src Oem/DWFTK/develop/global/src/dwf Oem/DWFTK/develop/global/src/dwf/XAML Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops Oem/DWFTK/develop/global/src/dwfcore Oem/DWFTK/develop/global/src/dwfcore/ansi Oem/LinuxApt Oem/SWIGEx Oem/dbxml Oem/dbxml/dbxml Oem/dbxml/dbxml/dist Oem/dbxml/dbxml/dist/aclocal Oem/dbxml/xerces-c-src/src/xercesc/util Oem/dbxml/xqilla Oem/geos Oem/geos/tools Server Server/src Server/src/Common Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Core Server/src/Gws Server/src/Gws/GwsCommon Server/s rc/Gws/GwsQueryEngine Server/src/Gws/GwsResource Server/src/Services Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Server/src/UnitTesting UnitTest UnitTest/WebTier UnitTest/WebTier/MapAgent UnitTest/WebTier/MapAgent/MapAgentForms Web Web/src Web/src/ApacheAgent Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/HttpHandler Web/src/JavaApi Web/src/JavaApiEx Web/src/PhpApi Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jan 24 04:38:13 PST 2018
Author: jng
Date: 2018-01-24 04:38:11 -0800 (Wed, 24 Jan 2018)
New Revision: 9318
Added:
trunk/MgDev/BuildTools/CMakeLists.txt
trunk/MgDev/BuildTools/WebTools/CMakeLists.txt
trunk/MgDev/BuildTools/WebTools/IMake/CMakeLists.txt
trunk/MgDev/CMakeLists.txt
trunk/MgDev/CMake_README.txt
trunk/MgDev/Common/CMakeLists.txt
trunk/MgDev/Common/Foundation/CMakeLists.txt
trunk/MgDev/Common/Geometry/CMakeLists.txt
trunk/MgDev/Common/Geometry/GeosInclude.h
trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
trunk/MgDev/Common/MdfModel/CMakeLists.txt
trunk/MgDev/Common/MdfParser/CMakeLists.txt
trunk/MgDev/Common/PlatformBase/CMakeLists.txt
trunk/MgDev/Common/Renderers/CMakeLists.txt
trunk/MgDev/Common/Security/CMakeLists.txt
trunk/MgDev/Common/Stylization/CMakeLists.txt
trunk/MgDev/Desktop/CMakeLists.txt
trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt
trunk/MgDev/Desktop/UnitTest/CMakeLists.txt
trunk/MgDev/Oem/CMakeLists.txt
trunk/MgDev/Oem/CsMapLibrary/
trunk/MgDev/Oem/DWFTK/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/config.h.in
trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/config.h.in
trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
trunk/MgDev/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2
trunk/MgDev/Oem/SWIGEx/CMakeLists.txt
trunk/MgDev/Oem/geos/tools/geos_svn_revision_cmake.h.in
trunk/MgDev/Oem/tclap-1.2.2/
trunk/MgDev/Server/CMakeLists.txt
trunk/MgDev/Server/src/CMakeLists.txt
trunk/MgDev/Server/src/Common/Base/CMakeLists.txt
trunk/MgDev/Server/src/Common/CMakeLists.txt
trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt
trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt
trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt
trunk/MgDev/Server/src/Core/CMakeLists.txt
trunk/MgDev/Server/src/Gws/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt
trunk/MgDev/Server/src/Services/CMakeLists.txt
trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt
trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt
trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt
trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt
trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt
trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt
trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt
trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt
trunk/MgDev/Server/src/Services/Site/CMakeLists.txt
trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt
trunk/MgDev/Server/src/UnitTesting/CMakeLists.txt
trunk/MgDev/UnitTest/CMakeLists.txt
trunk/MgDev/UnitTest/WebTier/CMakeLists.txt
trunk/MgDev/UnitTest/WebTier/MapAgent/CMakeLists.txt
trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/CMakeLists.txt
trunk/MgDev/Web/CMakeLists.txt
trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt
trunk/MgDev/Web/src/CMakeLists.txt
trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
trunk/MgDev/Web/src/JavaApi/CMakeLists.txt
trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt
trunk/MgDev/Web/src/PhpApi/CMakeLists.txt
trunk/MgDev/Web/src/WebApp/CMakeLists.txt
trunk/MgDev/Web/src/WebSupport/CMakeLists.txt
trunk/MgDev/cmake/
trunk/MgDev/cmake_bootstrap.sh
trunk/MgDev/cmake_build.sh
Removed:
trunk/MgDev/BuildTools/WebTools/IMake/Win32/
trunk/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2
trunk/MgDev/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
Modified:
trunk/MgDev/
trunk/MgDev/BuildTools/WebTools/IMake/
trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
trunk/MgDev/BuildTools/WebTools/IMake/IMake.sln
trunk/MgDev/BuildTools/WebTools/IMake/IMake.vcxproj
trunk/MgDev/BuildTools/WebTools/IMake/Makefile
trunk/MgDev/BuildTools/WebTools/IMake/SimpleXmlParser.cpp
trunk/MgDev/Common/Geometry/Geometry.vcxproj
trunk/MgDev/Common/Geometry/Geometry.vcxproj.filters
trunk/MgDev/Common/Geometry/GeometrySimplifier.cpp
trunk/MgDev/Common/Geometry/GeosUtil.cpp
trunk/MgDev/Desktop/
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
trunk/MgDev/Desktop/UnitTest/TestFeatureService.cpp
trunk/MgDev/Desktop/UnitTest/TestResourceService.cpp
trunk/MgDev/License.html
trunk/MgDev/License.txt
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c
trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp
trunk/MgDev/Oem/LinuxApt/build_apt.sh
trunk/MgDev/Oem/dbxml/buildall.sh
trunk/MgDev/Oem/dbxml/dbxml/configure
trunk/MgDev/Oem/dbxml/dbxml/dist/aclocal/options.ac
trunk/MgDev/Oem/dbxml/dbxml/dist/s_paths
trunk/MgDev/Oem/dbxml/xerces-c-src/src/xercesc/util/XMLString.hpp
trunk/MgDev/Oem/dbxml/xqilla/configure
trunk/MgDev/Oem/dbxml/xqilla/configure.in
trunk/MgDev/Oem/geos/geos_svn_revision.h
trunk/MgDev/Server/src/Common/Cache/FeatureClassCacheItem.h
trunk/MgDev/Server/src/Common/Cache/Makefile.am
trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
trunk/MgDev/Web/src/HttpHandler/JsonDoc.h
trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj
trunk/MgDev/Web/src/JavaApi/Makefile.am
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
trunk/MgDev/Web/src/JavaApiEx/Makefile.am
trunk/MgDev/Web/src/PhpApi/Makefile.am
trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
trunk/MgDev/Web/src/WebTier.sln
Log:
Merge in cmake_v2 sandbox. This completes the implementation of MapGuide RFC 164
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmake_v2:9259-9317
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
Copied: trunk/MgDev/BuildTools/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/BuildTools/CMakeLists.txt)
===================================================================
--- trunk/MgDev/BuildTools/CMakeLists.txt (rev 0)
+++ trunk/MgDev/BuildTools/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(WebTools)
\ No newline at end of file
Copied: trunk/MgDev/BuildTools/WebTools/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/BuildTools/WebTools/CMakeLists.txt)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/CMakeLists.txt (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(IMake)
\ No newline at end of file
Property changes on: trunk/MgDev/BuildTools/WebTools/IMake
___________________________________________________________________
Added: svn:ignore
+ Debug
Linux
Release
Win32
Win64
Copied: trunk/MgDev/BuildTools/WebTools/IMake/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/BuildTools/WebTools/IMake/CMakeLists.txt)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/CMakeLists.txt (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/IMake/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,13 @@
+project(imake)
+include_directories(${ACE_INCLUDE_DIR}
+ ${TCLAP_INCLUDE_DIR}
+)
+
+set(IMake_SRCS
+ IMake.cpp
+ SimpleXmlParser.cpp
+ stdafx.cpp
+)
+
+add_executable(IMake ${IMake_SRCS})
+target_link_libraries(IMake ${ACE_LIBRARY})
\ No newline at end of file
Modified: trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -3,6 +3,7 @@
#include "stdafx.h"
#include "SimpleXmlParser.h"
+#include <tclap/CmdLine.h>
enum Language
{
@@ -12,7 +13,7 @@
java
};
-static char version[] = "1.2.4";
+static char version[] = "1.3.0";
static char EXTERNAL_API_DOCUMENTATION[] = "(NOTE: This API is not officially supported and may be subject to removal in a future release without warning. Use with caution.)";
static string module;
@@ -34,6 +35,7 @@
static char charbuf[2];
static bool translateMode;
static Language language;
+static bool verbose;
#ifdef _WIN32
#define FILESEP '\\'
@@ -43,13 +45,13 @@
void error(string msg)
{
- fprintf(stderr, "\nError: %s", msg.c_str());
+ fprintf(stderr, "Error: %s\n", msg.c_str());
exit(1);
}
void warning(string msg)
{
- fprintf(stderr, "\nWarning: %s", msg.c_str());
+ fprintf(stderr, "Warning: %s\n", msg.c_str());
}
string parseModule(XNode* elt)
@@ -185,8 +187,20 @@
return text;
}
-void parseParameterFile(char* xmlDef)
+void findAndReplaceInString(string& subject,
+ const string& search,
+ const string& replace)
{
+ size_t pos = 0;
+ while((pos = subject.find(search, pos)) != string::npos)
+ {
+ subject.replace(pos, search.length(), replace);
+ pos += replace.length();
+ }
+}
+
+void parseParameterFile(char* xmlDef, const string& relRoot)
+{
XNode xml;
if(xml.Load(xmlDef) == NULL)
error("XML parsing error");
@@ -232,6 +246,18 @@
else if(node->name == "SwigInline" || (node->name == "Inline" && translateMode))
{
swigInline = parseSwigInline(node);
+
+ if (!relRoot.empty())
+ {
+ //Rewrite any relative %include statements in the inline section so they're relative to the
+ //custom root
+ string replace = "%include \"";
+ replace += relRoot;
+ replace += "/../";
+ findAndReplaceInString(swigInline,
+ "%include \"../",
+ replace);
+ }
}
else if(node->name == "Typedefs")
{
@@ -601,7 +627,7 @@
}
//If it contains "Mg", assume it's a MapGuide class name and link-ify it
//TODO: Resolve :: to member links. Right now it just linkifies the Mg class name
- int idx = elems[i].find("Mg");
+ size_t idx = elems[i].find("Mg");
if (idx != std::string::npos) {
std::string prefix;
std::string mgClassName;
@@ -662,7 +688,7 @@
}
//If it contains "Mg", assume it's a MapGuide class name and link-ify it
//TODO: Resolve :: to member links. Right now it just linkifies the Mg class name
- int idx = elems[i].find("Mg");
+ size_t idx = elems[i].find("Mg");
if (idx != std::string::npos) {
std::string prefix;
std::string mgClassName;
@@ -1325,17 +1351,17 @@
{
// if there is a doc comment as part of this line, check if it
// contains the macro V(...) which indicates a string value to be assigned before the ;
- int posComment = token.find_first_of("///");
- if(posComment != string::npos)
+ size_t posComment = token.find_first_of("///");
+ if (posComment != string::npos)
{
- if(strstr(token.c_str(), "value("))
+ if (strstr(token.c_str(), "value("))
{
string comment = token.substr(posComment+3);
- int posBeginValue = comment.find("value(");
- int posEndValue = comment.find(")", posBeginValue + 1);
- if(posEndValue != string::npos)
+ size_t posBeginValue = comment.find("value(");
+ size_t posEndValue = comment.find(")", posBeginValue + 1);
+ if (posEndValue != string::npos)
{
- int strLen = posEndValue - posBeginValue - 6;
+ size_t strLen = posEndValue - posBeginValue - 6;
string expr = comment.substr(posBeginValue + 6, strLen);
comment = comment.substr(0, posBeginValue) + comment.substr(posEndValue + 1);
@@ -1478,16 +1504,27 @@
}
}
-void processHeaderFile(string header)
+void processHeaderFile(string header, const string& relRoot)
{
vector<string> tokens;
- tokenize(header, tokens);
+ string theHeader;
+ if (relRoot.empty())
+ {
+ theHeader = header;
+ }
+ else
+ {
+ theHeader = relRoot;
+ theHeader += "/";
+ theHeader += header;
+ }
+ tokenize(theHeader, tokens);
if(!translateMode)
{
//short banner about this file
- fprintf(outfile, "\n// Definitions from file %s\n//\n", header.c_str());
+ fprintf(outfile, "\n// Definitions from file %s\n//\n", theHeader.c_str());
}
//ignore every token outside of a class definition
@@ -1522,7 +1559,10 @@
//in translation mode, filters out clases which don't belong to the class list
bool ignore = translateMode && classes.find(className) == classes.end();
- //printf("Processing header: %s\n", className.c_str());
+ if (verbose)
+ {
+ printf("Processing header: %s\n", className.c_str());
+ }
if(!ignore)
{
if(translateMode)
@@ -1647,7 +1687,7 @@
}
}
-void createSWGInterfaceFile()
+void createSWGInterfaceFile(const string& outDir, const string& relRoot)
{
printf("\n\nGenerating interface file %s...\n", target.c_str());
@@ -1665,10 +1705,22 @@
if(!translateMode || language != java)
{
- outfile = fopen(target.c_str(), "w");
+ string swigTarget = target;
+ string swigDocTarget = docTarget;
+ if (!outDir.empty())
+ {
+ swigTarget = outDir;
+ swigTarget += "/";
+ swigTarget += target;
+
+ swigDocTarget = outDir;
+ swigDocTarget += "/";
+ swigDocTarget += docTarget;
+ }
+ outfile = fopen(swigTarget.c_str(), "w");
if(outfile == NULL)
error(string("Cannot create target file ") + target);
- docOutFile = fopen(docTarget.c_str(), "w");
+ docOutFile = fopen(swigDocTarget.c_str(), "w");
if(docOutFile == NULL)
error(string("Cannot create doctarget file ") + docTarget);
}
@@ -1707,7 +1759,7 @@
//process the headers
for(vector<string>::const_iterator it = headers.begin(); it != headers.end(); it++)
- processHeaderFile(*it);
+ processHeaderFile(*it, relRoot);
if(!translateMode || language != java)
{
@@ -1718,7 +1770,7 @@
}
}
-void createNativeFile()
+void createNativeFile(const string& outDir, const string& relRoot)
{
if(target.length() == 0)
error("Target section is missing");
@@ -1760,7 +1812,7 @@
//process the headers
for(vector<string>::const_iterator it = headers.begin(); it != headers.end(); it++)
- processHeaderFile(*it);
+ processHeaderFile(*it, relRoot);
if(language == php)
fprintf(outfile, "?>");
@@ -1779,7 +1831,7 @@
fclose(docOutFile);
}
-void createInterfaceFile(char* paramFile)
+void createInterfaceFile(const char* paramFile, const string& outDir, const string& relRoot)
{
FILE* file = fopen(paramFile, "r");
if(file == NULL)
@@ -1796,64 +1848,162 @@
char* end = strchr(data, 255);
*end = '\0';
- parseParameterFile(data);
+ parseParameterFile(data, relRoot);
if(!translateMode)
- createSWGInterfaceFile();
+ createSWGInterfaceFile(outDir, relRoot);
else
- createNativeFile();
+ createNativeFile(outDir, relRoot);
}
-void usage()
+void usage(TCLAP::CmdLineInterface& cmd)
{
- printf("\nUsage:");
- printf("\nIMake parameterFile lang [generation_path_or_folder]");
- printf("\n parameterFile: XML description of generation parameters\n");
- printf("\n lang: Target language (PHP, C# or Java).\n");
- printf("\n generation_path_or_folder: Do not generate SWIG. Generate constant definitions.");
- printf("\n For PHP and C#, pathname of the constant file.");
- printf("\n For Java, folder where the constant files are created");
+ TCLAP::CmdLineOutput* cmdOutput = cmd.getOutput();
+ cmdOutput->usage(cmd);
exit(1);
}
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
{
printf("\nIMake - SWIG Interface generator");
- printf("\nVersion %s", version);
+ printf("\nVersion %s\n\n", version);
- if(argc < 3)
- usage();
+ try
+ {
+ string msg = "IMake - SWIG Interface generator";
+ TCLAP::CmdLine cmd(msg, ' ', version);
- if (argc > 4)
- usage();
+ TCLAP::ValueArg<std::string> argInputFile("p", "param-file", "The path to the input parameter file", true, "Constants.xml", "string");
+ TCLAP::ValueArg<std::string> argLanguage("l", "language", "The language to generate for", true, "PHP|C#|Java", "string");
+ TCLAP::ValueArg<std::string> argOutput("o", "output", "The file or directory where generated files are output to", false, ".", "string");
+ TCLAP::ValueArg<std::string> argRelRoot("r", "rel-root", "Defines where headers will be resolved relative to", false, ".", "string");
- translateMode = false;
- language = unknown;
+ cmd.add(argInputFile);
+ cmd.add(argLanguage);
+ cmd.add(argOutput);
+ cmd.add(argRelRoot);
- if(!strcmp(argv[2], "PHP"))
- language = php;
- else if(!strcmp(argv[2], "C#"))
- {
- language = csharp;
- rootObjectMethods["Equals"] = 1;
- rootObjectMethods["GetHashCode"] = 1;
- rootObjectMethods["GetType"] = 1;
- rootObjectMethods["ReferenceEquals"] = 1;
- rootObjectMethods["ToString"] = 1;
+ TCLAP::SwitchArg argTranslateMode("t", "translate-mode", "Enable translate (generate constants) mode", cmd, false);
+
+ cmd.parse(argc, argv);
+
+ string pFile;
+ string relRoot;
+ string outDir;
+ translateMode = false;
+ verbose = true;
+ language = unknown;
+
+ if (argTranslateMode.getValue())
+ {
+ translateMode = true;
+ }
+ pFile = argInputFile.getValue();
+ string sLang = argLanguage.getValue();
+ if (sLang == "PHP")
+ {
+ language = php;
+ }
+ else if (sLang == "C#")
+ {
+ language = csharp;
+ rootObjectMethods["Equals"] = 1;
+ rootObjectMethods["GetHashCode"] = 1;
+ rootObjectMethods["GetType"] = 1;
+ rootObjectMethods["ReferenceEquals"] = 1;
+ rootObjectMethods["ToString"] = 1;
+ }
+ else if (sLang == "Java")
+ {
+ language = java;
+ }
+ outDir = argOutput.getValue();
+ relRoot = argRelRoot.getValue();
+
+ //Basic validation
+ if (language == unknown)
+ {
+ printf("ERROR: Invalid language or no language specified\n");
+ usage(cmd);
+ }
+ else
+ {
+ switch (language)
+ {
+ case csharp:
+ printf("INFO: Language mode: C#\n");
+ break;
+ case php:
+ printf("INFO: Language mode: PHP\n");
+ break;
+ case java:
+ printf("INFO: Language mode: Java\n");
+ break;
+ }
+ }
+
+ if (verbose)
+ {
+ printf("INFO: Verbose mode is ON\n");
+ }
+ else
+ {
+ printf("INFO: Verbose mode is OFF\n");
+ }
+
+ if (pFile.empty())
+ {
+ printf("ERROR: No parameter file specified\n");
+ usage(cmd);
+ }
+ else
+ {
+ printf("INFO: Parameter file: %s\n", pFile.c_str());
+ }
+
+ if (translateMode)
+ {
+ printf("INFO: Translate (generate constants) mode is ON\n");
+ }
+ else
+ {
+ printf("INFO: Translate (generate constants) mode is OFF. IMake will be generating the SWIG input file\n");
+ }
+
+ if (!outDir.empty())
+ {
+ printf("INFO: Auto-generated files will be output to: %s\n", outDir.c_str());
+ }
+ else
+ {
+ printf("INFO: Auto-generated files will be output to this directory\n");
+ }
+
+ if (!relRoot.empty())
+ {
+ printf("INFO: Headers will be resolved relative to: %s\n", relRoot.c_str());
+ }
+ else
+ {
+ printf("INFO: Headers will be resolved relative to this directory\n");
+ }
+
+ if (translateMode)
+ {
+ if (!outDir.empty())
+ target += outDir;
+ else
+ target += ".";
+ if (verbose)
+ printf("INFO: Target is set to: %s\n", target.c_str());
+ }
+
+ createInterfaceFile(pFile.c_str(), outDir, relRoot);
}
- else if(!strcmp(argv[2], "Java"))
- language = java;
- else
- usage();
-
- if(argc == 4)
+ catch (TCLAP::ArgException &e) // catch any exceptions
{
- translateMode = true;
- target = argv[3];
+ std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl;
}
-
- createInterfaceFile(argv[1]);
-
return 0;
}
Modified: trunk/MgDev/BuildTools/WebTools/IMake/IMake.sln
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/IMake.sln 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/BuildTools/WebTools/IMake/IMake.sln 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1,19 +1,30 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IMake", "IMake.vcxproj", "{B601F04C-0D42-4AFC-A092-B31185E2EA8C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {242C90DE-3281-4AF2-94D4-DB81FA5B69C1}
+ EndGlobalSection
EndGlobal
Modified: trunk/MgDev/BuildTools/WebTools/IMake/IMake.vcxproj
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/IMake.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/BuildTools/WebTools/IMake/IMake.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -9,20 +9,39 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B601F04C-0D42-4AFC-A092-B31185E2EA8C}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
- <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -34,6 +53,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
@@ -48,19 +73,33 @@
<IntDir>Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>Win64\</OutDir>
+ <IntDir>Debug\</IntDir>
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>Win64\</OutDir>
+ <IntDir>Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)IMake.exe</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)IMake.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -69,16 +108,46 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)IMake.exe</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)IMake.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)IMake.exe</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -88,12 +157,37 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)IMake.exe</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="IMake.cpp" />
<ClCompile Include="SimpleXmlParser.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: trunk/MgDev/BuildTools/WebTools/IMake/Makefile
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/Makefile 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/BuildTools/WebTools/IMake/Makefile 2018-01-24 12:38:11 UTC (rev 9318)
@@ -16,7 +16,7 @@
CXXFLAGS = -pipe -UZTS -Wall -W -O2 -g -pipe -fno-use-cxa-atexit -fexceptions -DNDEBUG
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I$(QTDIR)/mkspecs/default -I.
+INCPATH = -I$(QTDIR)/mkspecs/default -I. -I../../../Oem/tclap-1.2.2/include
LINK = g++
LFLAGS =
LIBS = $(SUBLIBS)
@@ -116,10 +116,12 @@
Linux/obj/debug/IMake.o: IMake.cpp stdafx.h \
SimpleXmlParser.h
+ test -d Linux/obj/debug || mkdir -p Linux/obj/debug
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Linux/obj/debug/IMake.o IMake.cpp
Linux/obj/debug/SimpleXmlParser.o: SimpleXmlParser.cpp stdafx.h \
SimpleXmlParser.h
+ test -d Linux/obj/debug || mkdir -p Linux/obj/debug
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Linux/obj/debug/SimpleXmlParser.o SimpleXmlParser.cpp
####### Install
Modified: trunk/MgDev/BuildTools/WebTools/IMake/SimpleXmlParser.cpp
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/SimpleXmlParser.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/BuildTools/WebTools/IMake/SimpleXmlParser.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -180,7 +180,7 @@
const char* _tcseistr( const char* psz, const char* str, int escape )
{
- int len = strlen( str );
+ size_t len = strlen( str );
return _tcsenistr( psz, str, len, escape );
}
Copied: trunk/MgDev/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/CMakeLists.txt)
===================================================================
--- trunk/MgDev/CMakeLists.txt (rev 0)
+++ trunk/MgDev/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,191 @@
+project(mapguide)
+
+# CMake base requires and policy tweaks
+cmake_minimum_required( VERSION 2.6.2 FATAL_ERROR )
+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
+cmake_policy( SET CMP0005 OLD )
+
+# Look first in internal modules
+set(CMAKE_MODULE_PATH
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
+)
+
+# Set configuration if not defined
+if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+endif (NOT CMAKE_BUILD_TYPE)
+
+message(STATUS "CMake Build Type is: ${CMAKE_BUILD_TYPE}")
+
+# Determine bitness
+if ((NOT MG_CPU EQUAL 32) AND (NOT MG_CPU EQUAL 64))
+ message(STATUS "MG_CPU not defined, determining what we're building for based on system bitness")
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(MG_CPU 64)
+ else(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(MG_CPU 32)
+ endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ message (STATUS "MG_CPU is ${MG_CPU}")
+endif ((NOT MG_CPU EQUAL 32) AND (NOT MG_CPU EQUAL 64))
+
+# Make CPack available to easy generate binary packages
+include(CPack)
+
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCXXSourceCompiles)
+include(CheckLibraryExists)
+include(ExternalProject)
+
+set(MG_VERSION_MAJOR 3)
+set(MG_VERSION_MINOR 3)
+set(MG_VERSION_RELEASE 0)
+if (NOT MG_VERSION_REV)
+ set(MG_VERSION_REV 0)
+endif (NOT MG_VERSION_REV)
+set(MG_VERSION "${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.${MG_VERSION_RELEASE}")
+set(MG_VERSION_FULL "${MG_VERSION}.${MG_VERSION_REV}")
+
+set(MG_HTTPD_PORT 8008)
+set(MG_TOMCAT_PORT 8009)
+
+set(CSMAP_NO_GRID 1)
+
+set(MG_OEM_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Oem")
+set(MG_OEM_ROOT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/Oem")
+
+set(MG_OEM_CSMAP_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/CsMap/Include")
+set(MG_OEM_AGG_DIR "${MG_OEM_ROOT_DIR}/agg-2.4")
+set(MG_OEM_AGG_INCLUDE_DIR "${MG_OEM_AGG_DIR}/include")
+set(MG_OEM_AGG_FREETYPE_DIR "${MG_OEM_AGG_DIR}/font_freetype")
+set(MG_OEM_AGG_SOURCE_DIR "${MG_OEM_AGG_DIR}/src")
+set(MG_OEM_HTTPD_SOURCE_DIR, "${MG_OEM_ROOT_DIR}/LinuxApt/httpd-2.4.18")
+
+set(MG_OEM_DWF_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/DWFTK/develop/global/src")
+set(MG_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Common")
+set(MG_SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Common")
+set(MG_SERVER_SERVICES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Services")
+set(MG_SERVER_GWS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Gws")
+
+set(MG_AUTO_GENERATED_HEADER_DIR "${CMAKE_CURRENT_BINARY_DIR}/IncludeAutogenerated")
+set(MG_UNIT_TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/UnitTest/TestData")
+
+set(MG_COMPONENT_COMMON "common")
+set(MG_COMPONENT_SERVER "server")
+set(MG_COMPONENT_WEB "web")
+
+# Override install directory to match what the automake build does (/usr/local, rather than /usr/local/lib)
+set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-${MG_VERSION}")
+set(MG_INSTALL_WEB_PREFIX "${MG_INSTALL_PREFIX}/webserverextensions")
+set(MG_WWWROOT "${MG_INSTALL_WEB_PREFIX}/www")
+set(MG_INSTALL_SERVER_PREFIX "${MG_INSTALL_PREFIX}/server")
+set(MG_SERVER_BIN_DIR "${MG_INSTALL_SERVER_PREFIX}/bin")
+set(MG_INSTALL_COORDSYS_PREFIX "${MG_INSTALL_PREFIX}/share/gis/coordsys")
+set(CMAKE_INSTALL_PREFIX "${MG_INSTALL_PREFIX}")
+
+set(MG_VERSION_SUFFIX "-${MG_VERSION}")
+
+macro(set_install_subdir relbase)
+ # Global definitions ( used by all sources )
+ # Check if is a 64 bits install and use user defined LIB_SUFFIX
+ if(UNIX)
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+ if(MG_CPU EQUAL 64)
+ set(LIB_SUFFIX "64")
+ endif(MG_CPU EQUAL 64)
+ set(LIB_INSTALL_DIR "${relbase}lib${LIB_SUFFIX}")
+ set(BIN_INSTALL_DIR "${relbase}bin")
+ endif(UNIX)
+endmacro(set_install_subdir)
+
+macro(make_install workdir)
+ if (UNIX)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${workdir} make install)")
+ endif (UNIX)
+endmacro(make_install workdir)
+
+macro(install_empty_directory dirname root)
+ install(CODE "file(MAKE_DIRECTORY ${root}/${dirname})")
+endmacro(install_empty_directory dirname root)
+
+if(UNIX)
+ add_definitions(-DFULLPROTO -fPIC -DPIC)
+endif(UNIX)
+
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ add_definitions(-DLINUX -DLINUX_IA32 -pthread -Wno-write-strings)
+endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+if (CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-D__USE_GNU -Wno-deprecated)
+ if(MG_CPU EQUAL 64)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+ else(MG_CPU EQUAL 64)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+ endif(MG_CPU EQUAL 64)
+ if (CMAKE_BUILD_TYPE MATCHES Debug)
+ add_definitions(-DDEBUG -D_DEBUG)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
+ message(STATUS "Adding standard compiler flags for debug")
+ endif (CMAKE_BUILD_TYPE MATCHES DEBUG)
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
+find_package(Sanitizers)
+find_package(GEOS REQUIRED)
+find_package(ACE REQUIRED)
+if (NOT INTERNAL_XERCES)
+ find_package(XercesC REQUIRED)
+else (NOT INTERNAL_XERCES)
+ message(STATUS "Using internal xerces-c")
+endif (NOT INTERNAL_XERCES)
+find_package(GD REQUIRED)
+find_package(Freetype REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(PNG REQUIRED)
+find_package(FDO REQUIRED)
+find_package(CppUnit REQUIRED)
+find_package(TCLAP REQUIRED)
+find_package(LinuxApt REQUIRED)
+find_package(DbXmlInternal REQUIRED)
+if (INTERNAL_XERCES)
+ # This will be the same
+ set(XERCESC_INCLUDE_DIR "${DBXML_INCLUDE_DIR}")
+endif (INTERNAL_XERCES)
+find_package(Ant REQUIRED)
+
+# Set internal tool paths
+set(IMAKE_TOOL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/WebTools/IMake/IMake)
+set(SWIG_TOOL ${MG_OEM_ROOT_BUILD_DIR}/SWIGEx/swig)
+set(SWIG_LIB_PATH ${MG_OEM_ROOT_BUILD_DIR}/SWIGEx/Lib)
+
+# Set common commands.
+set(MOVE_COMMAND "mv")
+
+if (WITH_JAVA)
+ find_package(Java REQUIRED)
+ find_package(JNI REQUIRED)
+else (WITH_JAVA)
+ message(STATUS "Skipping optional Java support")
+endif (WITH_JAVA)
+
+# Some helper macros
+macro(install_symlink target linkname component)
+ # The link target doesn't have to exist at this point in time, the symlink will be valid at install time
+ execute_process(COMMAND ln -sf ${target} ${CMAKE_CURRENT_BINARY_DIR}/${linkname})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${linkname} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${component})
+endmacro(install_symlink)
+
+add_subdirectory(BuildTools)
+add_subdirectory(Oem)
+add_subdirectory(Common)
+add_subdirectory(Server)
+add_subdirectory(Web)
+add_subdirectory(UnitTest)
+if (WITH_DESKTOP)
+ add_subdirectory(Desktop)
+else (WITH_DESKTOP)
+ message(STATUS "Skipping optional mg-desktop support")
+endif (WITH_DESKTOP)
Copied: trunk/MgDev/CMake_README.txt (from rev 9317, sandbox/jng/cmake_v2/CMake_README.txt)
===================================================================
--- trunk/MgDev/CMake_README.txt (rev 0)
+++ trunk/MgDev/CMake_README.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,107 @@
+CMake build for MapGuide
+========================
+
+This document contains instructions on how to use CMake to build MapGuide on Linux.
+
+This is an experimental alternative build system to autotools for building MapGuide on Linux.
+
+Requirements
+============
+
+You have FDO already built and installed at /usr/local/fdo-x.y.z (where x.y.z is the current version of FDO)
+ - You should build FDO with CMake too
+
+These instructions assume an Ubuntu 14.04 LTS environment.
+
+Install the following packages:
+
+build-essential libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk
+ant libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev
+python-dev libpq-dev libcppunit-dev libxalan-c-dev libxerces-c-dev libboost-date-time-dev
+libboost-thread-dev libboost-system-dev libboost-chrono-dev libboost-program-options-dev libgdal-dev
+libjsoncpp-dev libgd-dev libace-dev libjsoncpp-dev cmake
+
+If you wish to build with ninja instead of make, install the following:
+
+ninja-build
+
+TODO: Specify dep list for CentOS
+
+Usage
+=====
+
+1. Create a directory where internal thirdparty components will be built in
+
+ mkdir -p ~/mapguide_oem_build
+
+2. Build the internal thirdparty components specifying the directory where thirdparty components will be built in
+
+ sudo ./cmake_bootstrap.sh --oem_working_dir ~/mapguide_oem_build
+
+ This will copy the DBXML, httpd, PHP and the Tomcat connector sources to your specified directory and build it from there.
+ Once completed, an env_vars.sh script will be written to this directory that the following step will use.
+
+ This will generally require elevation (with sudo) as the default install prefix is /usr/local/mapguideopensource-x.y.z where
+ x.y.z is the current version of MapGuide.
+
+3. Start the main CMake build
+
+ ./cmake_build.sh --oem_working_dir ~/mapguide_oem_build --cmake_build_dir ~/mapguide_build_area
+
+ This will set up the CMake build using the generated env_vars.sh script and set up a CMake build tree in the directory specified
+ by --cmake_build_dir
+
+4. Install the MapGuide binaries. This will generally require elevation (with sudo) as well.
+
+ cd ~/mapguide_build_area
+ sudo make install
+
+5. Start the MapGuide Server (replace x.y.z with the current version of MapGuide)
+
+ cd /usr/local/mapguideopensource-x.y.z/server/bin
+ ./mgserver.sh
+
+6. Start the Apache Web Server (replace x.y.z with the current version of MapGuide)
+
+ cd /usr/local/mapguideopensource-x.y.z/webserverextensions/apache2/bin
+ ./apachectl start
+
+Manual CMake Build
+==================
+
+cmake_build.sh is a wrapper around calling CMake with a standard set of options. If you want to invoke CMake manually, do the following
+after running cmake_bootstrap.sh.
+
+ mkdir -p ~/mapguide_build_area
+ cd ~/mapguide_build_area
+ source ~/mapguide_oem_build/env_vars.sh
+ cmake <YOUR SOURCE DIRECTORY> -DMG_OEM_WORK_DIR=~/mapguide_oem_build -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG <other options...>
+
+The CMake build supports the following options. Prefix with "-D" in your cmake command to enable such options:
+
+ - CMAKE_BUILD_TYPE=(Debug|Release)
+ Build the source in Debug or Release configuration
+
+ - WITH_JAVA=(TRUE|FALSE)
+ Enable Java support. This will build the Java API wrappers and enable Tomcat install/integration.
+ If not set, these parts are skipped.
+
+ - WITH_DESKTOP=(TRUE|FALSE)
+ Enable building mg-desktop.
+
+ - SANITIZE_ADDRESS=(ON|OFF)
+ Build the source with AddressSanitizer (ASAN) support.
+ This allows one to catch a certain class of errors during execution that previously would require an external tool like valgrind.
+ You should also be building your source in Debug configuration if you enable this option.
+
+Help/Support
+============
+
+File a ticket on https://trac.osgeo.org/mapguide or send an email to the mapguide-users mailing list.
+
+TODO
+====
+
+ - Integrate with system-provided httpd/php if available and in supported version range.
+ - Support full internal Oem build (currently only covers components we know not to be provided by Ubuntu)
+ - Windows support and vcpkg integration
\ No newline at end of file
Copied: trunk/MgDev/Common/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,31 @@
+# NOTE: Not applied for server tier projects except for mgserver main executable
+if( CMAKE_COMPILER_IS_GNUCXX )
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+endif( CMAKE_COMPILER_IS_GNUCXX )
+
+add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
+
+set(MG_COMPONENT ${MG_COMPONENT_COMMON})
+set_install_subdir("")
+
+add_subdirectory(Foundation)
+add_subdirectory(Geometry)
+add_subdirectory(MapGuideCommon)
+add_subdirectory(MdfModel)
+add_subdirectory(MdfParser)
+add_subdirectory(PlatformBase)
+add_subdirectory(Renderers)
+add_subdirectory(Security)
+add_subdirectory(Stylization)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Schema DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT_SERVER})
+
+if (INTERNAL_XERCES)
+ file(GLOB XERCES_LIBS "${MG_OEM_WORK_DIR}/dbxml/install/lib/libxerces-c*.so")
+ install(FILES ${XERCES_LIBS} DESTINATION ${LIB_INSTALL_DIR})
+endif (INTERNAL_XERCES)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwfcore/libdwfcore-1.7.0.so DESTINATION ${LIB_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../Oem/DWFTK/develop/global/src/dwf/libdwftk-7.7.0.so DESTINATION ${LIB_INSTALL_DIR})
+
+configure_file(${CMAKE_MODULE_PATH}/../configs/ProductVersion.h.in ${MG_AUTO_GENERATED_HEADER_DIR}/ProductVersion.h)
\ No newline at end of file
Copied: trunk/MgDev/Common/Foundation/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/Foundation/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/Foundation/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/Foundation/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,25 @@
+project(foundation)
+
+include_directories(${ACE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/Data
+ ${CMAKE_CURRENT_SOURCE_DIR}/Exception
+ ${CMAKE_CURRENT_SOURCE_DIR}/System
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Security
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel)
+
+set (MgFoundation_SRCS
+ FoundationBuild.cpp
+)
+
+add_library(MgFoundation${MG_VERSION_SUFFIX} SHARED ${MgFoundation_SRCS})
+
+target_link_libraries(MgFoundation${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ ${XERCESC_LIBRARIES}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+)
+
+install( TARGETS MgFoundation${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgFoundation${MG_VERSION_SUFFIX}.so libMgFoundation.so ${MG_COMPONENT} )
Copied: trunk/MgDev/Common/Geometry/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/Geometry/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/Geometry/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/Geometry/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,77 @@
+project(geometry)
+
+include_directories(${ACE_INCLUDE_DIR}
+ ${GEOS_INCLUDE_DIR}
+ ${MG_OEM_CSMAP_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../CoordinateSystem
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Security
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfPaser
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Foundation
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Geometry)
+
+set (MgGeometry_SRCS
+ GeometryBuild.cpp
+ ../CoordinateSystem/ArbitraryCoordsys.cpp
+ ../CoordinateSystem/CoordSysDictionaryBase.cpp
+ ../CoordinateSystem/CoordSys.cpp
+ ../CoordinateSystem/CoordSysCatalog.cpp
+ ../CoordinateSystem/CoordSysCategory.cpp
+ ../CoordinateSystem/CoordSysCategoryDictionary.cpp
+ ../CoordinateSystem/CoordSysDatum.cpp
+ ../CoordinateSystem/CoordSysDatumDictionary.cpp
+ ../CoordinateSystem/CoordSysDictionary.cpp
+ ../CoordinateSystem/CoordSysEllipsoid.cpp
+ ../CoordinateSystem/CoordSysEllipsoidDictionary.cpp
+ ../CoordinateSystem/CoordSysEnum.cpp
+ ../CoordinateSystem/CoordSysEnumCategory.cpp
+ ../CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
+ ../CoordinateSystem/CoordSysEnumDatum.cpp
+ ../CoordinateSystem/CoordSysEnumEllipsoid.cpp
+ ../CoordinateSystem/CoordSysFormatConverter.cpp
+ ../CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
+ ../CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
+ ../CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
+ ../CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp
+ ../CoordinateSystem/CoordSysGeodeticPath.cpp
+ ../CoordinateSystem/CoordSysGeodeticPathDictionary.cpp
+ ../CoordinateSystem/CoordSysGeodeticPathElement.cpp
+ ../CoordinateSystem/CoordSysGeodeticTransformation.cpp
+ ../CoordinateSystem/CoordSysGeodeticTransformDef.cpp
+ ../CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp
+ ../CoordinateSystem/CoordSysGeodeticTransformDefParams.cpp
+ ../CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
+ ../CoordinateSystem/CoordSysMeasure.cpp
+ ../CoordinateSystem/CoordSysTransform.cpp
+ ../CoordinateSystem/CoordSysDictionaryUtility.cpp
+ ../CoordinateSystem/CoordSysEnumInteger32.cpp
+ ../CoordinateSystem/CoordSysMathComparator.cpp
+ ../CoordinateSystem/CoordSysProjectionInformation.cpp
+ ../CoordinateSystem/CoordSysUnitInformation.cpp
+ ../CoordinateSystem/CoordSysUtil.cpp
+ ../CoordinateSystem/MentorDictionary.cpp
+ ../CoordinateSystem/MentorUtil.cpp
+ ../CoordinateSystem/CoordSysWktFailureCache.cpp
+ ../CoordinateSystem/CoordSysGridGeneric.cpp
+ ../CoordinateSystem/CoordSysGrids.cpp
+ ../CoordinateSystem/CoordSysMgrsZone.cpp
+ ../CoordinateSystem/CoordSysMgrs.cpp
+ ../CoordinateSystem/CoordSysMgrsMajorRegion.cpp
+ ../CoordinateSystem/CoordSysOneGrid.cpp
+ ../CoordinateSystem/namestruct.cpp
+ ../CoordinateSystem/CriticalSection.cpp
+ ../CoordinateSystem/SmartCriticalClass.cpp
+)
+
+add_library(MgGeometry${MG_VERSION_SUFFIX} SHARED ${MgGeometry_SRCS})
+
+target_link_libraries(MgGeometry${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ CsMap
+ ${ACE_LIBRARY}
+ ${GEOS_LIBRARY}
+ pthread
+)
+
+install( TARGETS MgGeometry${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGeometry${MG_VERSION_SUFFIX}.so libMgGeometry.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -906,6 +906,7 @@
<ClInclude Include="Exception\InvalidCoordinateSystemUnitsException.h" />
<ClInclude Include="GeometrySimplifier.h" />
<ClInclude Include="GeometrySimplificationAlgorithmType.h" />
+ <ClInclude Include="GeosInclude.h" />
<ClInclude Include="Parse\Array.h" />
<ClInclude Include="Parse\ArrayHelper.h" />
<ClInclude Include="Parse\LexAwkt.h" />
Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj.filters
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj.filters 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj.filters 2018-01-24 12:38:11 UTC (rev 9318)
@@ -975,6 +975,7 @@
<ClInclude Include="GeometrySimplifier.h" />
<ClInclude Include="GeometrySimplificationAlgorithmType.h" />
<ClInclude Include="PreparedGeometry.h" />
+ <ClInclude Include="GeosInclude.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Geometry.rc" />
Modified: trunk/MgDev/Common/Geometry/GeometrySimplifier.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeometrySimplifier.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Common/Geometry/GeometrySimplifier.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include "geos.h"
+#include "GeosInclude.h"
#include "geos/simplify/DouglasPeuckerSimplifier.h"
#include "geos/simplify/TopologyPreservingSimplifier.h"
Copied: trunk/MgDev/Common/Geometry/GeosInclude.h (from rev 9317, sandbox/jng/cmake_v2/Common/Geometry/GeosInclude.h)
===================================================================
--- trunk/MgDev/Common/Geometry/GeosInclude.h (rev 0)
+++ trunk/MgDev/Common/Geometry/GeosInclude.h 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,27 @@
+//
+// Copyright (C) 2004-2017 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library 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 for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#ifndef _GEOMETRY_GEOS_INCLUDE_H
+#define _GEOMETRY_GEOS_INCLUDE_H
+
+#include <geos/version.h>
+#include <geos/geom.h>
+#include <geos/util.h>
+#include <geos/io.h>
+#include <geos/unload.h>
+
+#endif
\ No newline at end of file
Modified: trunk/MgDev/Common/Geometry/GeosUtil.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeosUtil.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Common/Geometry/GeosUtil.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -18,7 +18,7 @@
// disable C4244 of io.h about int64 assigned to unsigned long
#pragma warning(push)
#pragma warning(disable: 4244)
-#include "geos.h"
+#include "GeosInclude.h"
#pragma warning(pop)
#include "GeometryCommon.h"
Copied: trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,34 @@
+project(mapguidecommon)
+
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../PlatformBase
+ ${CMAKE_CURRENT_SOURCE_DIR}/../CoordinateSystem
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Security
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfParser
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Foundation
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Geometry
+)
+
+set (MgMapGuideCommon_SRCS
+ MapGuideCommonBuild.cpp
+)
+
+add_library(MgMapGuideCommon${MG_VERSION_SUFFIX} SHARED ${MgMapGuideCommon_SRCS})
+
+target_link_libraries(MgMapGuideCommon${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgSecurity${MG_VERSION_SUFFIX}
+)
+
+install(TARGETS MgMapGuideCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT})
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Common/MdfModel/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/MdfModel/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/MdfModel/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/MdfModel/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,123 @@
+project(mdfmodel)
+
+set (MgMdfModel_SRCS
+ Common/Color.cpp
+ Common/Extent3D.cpp
+ Common/Point3D.cpp
+ Common/Size2D.cpp
+ Common/StringObject.cpp
+ Common/Vector3D.cpp
+ PrintLayout/DataConfiguration.cpp
+ PrintLayout/MapView.cpp
+ PrintLayout/MapViewportDefinition.cpp
+ PrintLayout/PrintLayoutDefinition.cpp
+ PrintLayout/PrintLayoutElement.cpp
+ PrintLayout/PrintLayoutElementDefinition.cpp
+ PrintLayout/PrintLayoutElementStyle.cpp
+ PrintLayout/PropertyMapping.cpp
+ PrintLayout/StylizationConfiguration.cpp
+ PrintLayout/Thickness.cpp
+ AreaRule.cpp
+ AreaSymbolization2D.cpp
+ AreaTypeStyle.cpp
+ AreaUsage.cpp
+ AttributeRelate.cpp
+ BaseMapLayer.cpp
+ BaseMapLayerGroup.cpp
+ BlockSymbol.cpp
+ Box2D.cpp
+ CalculatedProperty.cpp
+ ChannelBand.cpp
+ CompositeRule.cpp
+ CompositeSymbolization.cpp
+ CompositeTypeStyle.cpp
+ CompoundSymbolDefinition.cpp
+ ConvertUTF.c
+ DisplayScale.cpp
+ DrawingLayerDefinition.cpp
+ ElevationSettings.cpp
+ Extension.cpp
+ FeatureSource.cpp
+ FeatureTypeStyle.cpp
+ Fill.cpp
+ FontSymbol.cpp
+ GraphicElement.cpp
+ GridColor.cpp
+ GridColorRule.cpp
+ GridColorStyle.cpp
+ GridLayerDefinition.cpp
+ GridScaleRange.cpp
+ GridSurfaceStyle.cpp
+ HillShade.cpp
+ Image.cpp
+ ImageSymbol.cpp
+ Label.cpp
+ LayerDefinition.cpp
+ LengthConverter.cpp
+ LineRule.cpp
+ LineSymbolization2D.cpp
+ LineTypeStyle.cpp
+ LineUsage.cpp
+ MapDefinition.cpp
+ MapLayer.cpp
+ MapLayerGroup.cpp
+ MapLayerGroupCommon.cpp
+ MarkSymbol.cpp
+ MdfModel.cpp
+ MdfRootObject.cpp
+ NameStringPair.cpp
+ Override.cpp
+ Parameter.cpp
+ Path.cpp
+ PointRule.cpp
+ PointSymbolization2D.cpp
+ PointTypeStyle.cpp
+ PointUsage.cpp
+ ProfileRenderLabelsResult.cpp
+ ProfileRenderLayerResult.cpp
+ ProfileRenderLayersResult.cpp
+ ProfileRenderLayersResultBase.cpp
+ ProfileRenderMapResult.cpp
+ ProfileRenderSelectionResult.cpp
+ ProfileRenderWatermarkResult.cpp
+ ProfileRenderWatermarksResult.cpp
+ ProfileResult.cpp
+ RelateProperty.cpp
+ ResizeBox.cpp
+ Rule.cpp
+ ScaleRange.cpp
+ SimpleSymbol.cpp
+ SimpleSymbolDefinition.cpp
+ Stroke.cpp
+ SupplementalSpatialContextInfo.cpp
+ Symbol.cpp
+ SymbolDefinition.cpp
+ SymbolInstance.cpp
+ Symbolization.cpp
+ Text.cpp
+ TextFrame.cpp
+ TextSymbol.cpp
+ ThemeLabel.cpp
+ TileSetDefinition.cpp
+ TileSetSource.cpp
+ TileStoreParameters.cpp
+ TileWatermarkPosition.cpp
+ UnicodeString.cpp
+ URLData.cpp
+ VectorLayerDefinition.cpp
+ VectorScaleRange.cpp
+ Version.cpp
+ W2DSymbol.cpp
+ WatermarkAppearance.cpp
+ WatermarkDefinition.cpp
+ WatermarkInstance.cpp
+ WatermarkPosition.cpp
+ WatermarkXOffset.cpp
+ WatermarkYOffset.cpp
+ XYWatermarkPosition.cpp
+)
+
+add_library(MgMdfModel${MG_VERSION_SUFFIX} SHARED ${MgMdfModel_SRCS})
+
+install( TARGETS MgMdfModel${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfModel${MG_VERSION_SUFFIX}.so libMgMdfModel.so ${MG_COMPONENT} )
\ No newline at end of file
Copied: trunk/MgDev/Common/MdfParser/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/MdfParser/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/MdfParser/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/MdfParser/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,129 @@
+project(mdfparser)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel)
+
+set (MgMdfParser_SRCS
+ Common/IOColor.cpp
+ Common/IOExtent3D.cpp
+ Common/IOPoint3D.cpp
+ Common/IOSize2D.cpp
+ Common/IOStringObjectCollection.cpp
+ Common/IOVector3D.cpp
+ PrintLayout/IODataConfiguration.cpp
+ PrintLayout/IOMapView.cpp
+ PrintLayout/IOMapViewportDefinition.cpp
+ PrintLayout/IOPrintLayoutDefinition.cpp
+ PrintLayout/IOPrintLayoutElementCollection.cpp
+ PrintLayout/IOPrintLayoutElementDefinition.cpp
+ PrintLayout/IOPrintLayoutElementStyle.cpp
+ PrintLayout/IOPropertyMappingCollection.cpp
+ PrintLayout/IOStylizationConfiguration.cpp
+ PrintLayout/IOThickness.cpp
+ FSDSAX2Parser.cpp
+ IOAreaRule.cpp
+ IOAreaSymbolization2D.cpp
+ IOAreaTypeStyle.cpp
+ IOAreaUsage.cpp
+ IOAttributeRelate.cpp
+ IOBaseMapDefinition.cpp
+ IOBaseMapLayer.cpp
+ IOBaseMapLayerGroup.cpp
+ IOBlockSymbol.cpp
+ IOCalculatedProperty.cpp
+ IOChannelBand.cpp
+ IOCompositeRule.cpp
+ IOCompositeSymbolization.cpp
+ IOCompositeTypeStyle.cpp
+ IOCompoundSymbolDefinition.cpp
+ IODrawingLayerDefinition.cpp
+ IOElevationSettings.cpp
+ IOExtension.cpp
+ IOExtra.cpp
+ IOFeatureSource.cpp
+ IOFill.cpp
+ IOFontSymbol.cpp
+ IOGraphicElement.cpp
+ IOGraphicElementCollection.cpp
+ IOGridColor.cpp
+ IOGridColorBands.cpp
+ IOGridColorRule.cpp
+ IOGridColorStyle.cpp
+ IOGridLayerDefinition.cpp
+ IOGridScaleRange.cpp
+ IOGridSurfaceStyle.cpp
+ IOHillShade.cpp
+ IOImage.cpp
+ IOImageSymbol.cpp
+ IOLabel.cpp
+ IOLineRule.cpp
+ IOLineSymbolization2D.cpp
+ IOLineTypeStyle.cpp
+ IOLineUsage.cpp
+ IOMapDefinition.cpp
+ IOMapLayer.cpp
+ IOMapLayerCommon.cpp
+ IOMapLayerGroup.cpp
+ IOMapLayerGroupCommon.cpp
+ IOMarkSymbol.cpp
+ IONameStringPair.cpp
+ IOOverride.cpp
+ IOOverrideCollection.cpp
+ IOParameter.cpp
+ IOParameterCollection.cpp
+ IOPath.cpp
+ IOPointRule.cpp
+ IOPointSymbolization2D.cpp
+ IOPointTypeStyle.cpp
+ IOPointUsage.cpp
+ IOProfileRenderLabelsResult.cpp
+ IOProfileRenderLayerResult.cpp
+ IOProfileRenderLayersResult.cpp
+ IOProfileRenderMapResult.cpp
+ IOProfileRenderSelectionResult.cpp
+ IOProfileRenderWatermarkResult.cpp
+ IOProfileRenderWatermarksResult.cpp
+ IOProfileResult.cpp
+ IORelateProperty.cpp
+ IOResizeBox.cpp
+ IOResourceRef.cpp
+ IOScaleRange.cpp
+ IOSimpleSymbol.cpp
+ IOSimpleSymbolDefinition.cpp
+ IOStroke.cpp
+ IOSupplementalSpatialContextInfo.cpp
+ IOSymbol.cpp
+ IOSymbolInstance.cpp
+ IOText.cpp
+ IOTextFrame.cpp
+ IOThemeLabel.cpp
+ IOTileSetDefinition.cpp
+ IOTileSetSource.cpp
+ IOTileStoreParameters.cpp
+ IOTileWatermarkPosition.cpp
+ IOUnknown.cpp
+ IOURLData.cpp
+ IOUtil.cpp
+ IOVectorLayerDefinition.cpp
+ IOVectorScaleRange.cpp
+ IOW2DSymbol.cpp
+ IOWatermarkAppearance.cpp
+ IOWatermarkDefinition.cpp
+ IOWatermarkInstance.cpp
+ IOWatermarkOffsetUnit.cpp
+ IOWatermarkXOffset.cpp
+ IOWatermarkYOffset.cpp
+ IOXYWatermarkPosition.cpp
+ MdfParser.cpp
+ SAX2ElementHandler.cpp
+ SAX2Parser.cpp
+)
+
+add_library(MgMdfParser${MG_VERSION_SUFFIX} SHARED ${MgMdfParser_SRCS})
+
+target_link_libraries(MgMdfParser${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+ MgMdfModel${MG_VERSION_SUFFIX}
+)
+
+install( TARGETS MgMdfParser${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfParser${MG_VERSION_SUFFIX}.so libMgMdfParser.so ${MG_COMPONENT} )
\ No newline at end of file
Copied: trunk/MgDev/Common/PlatformBase/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/PlatformBase/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/PlatformBase/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/PlatformBase/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,29 @@
+project(platformbase)
+
+include_directories(${ACE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../CoordinateSystem
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Security
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfParser
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Foundation
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Geometry
+)
+
+set (MgPlatformBase_SRCS
+ PlatformBaseBuild.cpp
+)
+
+add_library(MgPlatformBase${MG_VERSION_SUFFIX} SHARED ${MgPlatformBase_SRCS})
+
+target_link_libraries(MgPlatformBase${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgSecurity${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+)
+
+install( TARGETS MgPlatformBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgPlatformBase${MG_VERSION_SUFFIX}.so libMgPlatformBase.so ${MG_COMPONENT} )
\ No newline at end of file
Copied: trunk/MgDev/Common/Renderers/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/Renderers/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/Renderers/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,71 @@
+project(renderers)
+
+include_directories(${GD_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ ${PNG_INCLUDE_DIRS}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${MG_OEM_DWF_INCLUDE_DIR}
+ ${MG_OEM_DWF_INCLUDE_DIR}/dwf
+ ${MG_OEM_AGG_INCLUDE_DIR}
+ ${MG_OEM_AGG_FREETYPE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Stylization
+)
+
+set (MgRenderers_SRCS
+ AGGRenderer.cpp
+ AGGImageIO.cpp
+ AGGW2DRewriter.cpp
+ AGGFillPatterns.cpp
+ ../../Oem/agg-2.4/font_freetype/agg_font_freetype.cpp
+ CriticalSection.cpp
+ DWFRenderer.cpp
+ EPlotRenderer.cpp
+ FontManager.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_curves.cpp
+ ${MG_OEM_AGG_DIR}/font_freetype/agg_font_freetype.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_line_aa_basics.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_line_profile_aa.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_sqrt_tables.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_trans_affine.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_vcgen_contour.cpp
+ ${MG_OEM_AGG_SOURCE_DIR}/agg_vcgen_stroke.cpp
+ GDFillPatterns.cpp
+ GDRenderer.cpp
+ GDUtils.cpp
+ GDW2DRewriter.cpp
+ KmlContent.cpp
+ KmlLineStyle.cpp
+ KmlPolyStyle.cpp
+ KmlIconStyle.cpp
+ KmlRenderer.cpp
+ MapQuantization.cpp
+ ObservationMesh.cpp
+ RenderUtil.cpp
+ RS_ByteData.cpp
+ SymbolTrans.cpp
+ UTFGridRenderer.cpp
+ UTFGridContent.cpp
+ W2DRewriter.cpp
+ complex_polygon_gd.cpp
+)
+
+add_definitions(-DDWFTK_BUILD_EXPAT)
+
+add_library(MgRenderers${MG_VERSION_SUFFIX} SHARED ${MgRenderers_SRCS})
+
+target_link_libraries(MgRenderers${MG_VERSION_SUFFIX}
+ ${GD_LIBRARY}
+ ${FREETYPE_LIBRARY}
+ ${JPEG_LIBRARY}
+ ${PNG_LIBRARY}
+ ${AGG_LIBRARY}
+ dwfcore-1.7.0
+ dwftk-7.7.0
+ MgStylization${MG_VERSION_SUFFIX}
+)
+
+install( TARGETS MgRenderers${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgRenderers${MG_VERSION_SUFFIX}.so libMgRenderers.so ${MG_COMPONENT} )
\ No newline at end of file
Copied: trunk/MgDev/Common/Security/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/Security/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/Security/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/Security/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,5 @@
+set (MgSecurity_SRCS
+ SecurityBuild.cpp
+)
+
+add_library(MgSecurity${MG_VERSION_SUFFIX} STATIC ${MgSecurity_SRCS})
\ No newline at end of file
Copied: trunk/MgDev/Common/Stylization/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Common/Stylization/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Common/Stylization/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,110 @@
+project(stylization)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Foundation
+)
+
+set (MgStylization_SRCS
+ atom_element_abandonment.cpp
+ atom_element_environment.cpp
+ atom_element_location.cpp
+ atom_element_structure.cpp
+ atom_element_style.cpp
+ atom_element_textrun.cpp
+ atom_element_transform.cpp
+ atom_element_universe.cpp
+ atom_impl.cpp
+ Band.cpp
+ BandData.cpp
+ BIDIConverter.cpp
+ Color.cpp
+ DefaultStylizer.cpp
+ ExpressionFunctionArgb.cpp
+ ExpressionFunctionDecap.cpp
+ ExpressionFunctionFeatureClass.cpp
+ ExpressionFunctionFeatureId.cpp
+ ExpressionFunctionFeatureSource.cpp
+ ExpressionFunctionHtmlColor.cpp
+ ExpressionFunctionIf.cpp
+ ExpressionFunctionLayerDefinition.cpp
+ ExpressionFunctionLayerId.cpp
+ ExpressionFunctionLookup.cpp
+ ExpressionFunctionMapCenterX.cpp
+ ExpressionFunctionMapCenterY.cpp
+ ExpressionFunctionMapName.cpp
+ ExpressionFunctionMapScale.cpp
+ ExpressionFunctionRange.cpp
+ ExpressionFunctionSession.cpp
+ ExpressionFunctionUrlEncode.cpp
+ ExpressionHelper.cpp
+ GeometryAdapter.cpp
+ GeometryAlgorithms.cpp
+ GridApplyStatusReporter.cpp
+ GridChannelBand.cpp
+ GridColorBandHandler.cpp
+ GridColorBandsHandler.cpp
+ GridColorHandler.cpp
+ GridColorNullHandler.cpp
+ GridColorThemeHandler.cpp
+ GridData.cpp
+ GridStyleColorHandler.cpp
+ GridStyleSurfaceColorHandler.cpp
+ GridStyleSurfaceHandler.cpp
+ GridStylizer.cpp
+ GridStylizerReactor.cpp
+ GridTheme.cpp
+ GridThemeParser.cpp
+ KeyEncode.cpp
+ LabelRenderer.cpp
+ LabelRendererBase.cpp
+ LabelRendererLocal.cpp
+ LineBuffer.cpp
+ LineStyleDef.cpp
+ Matrix3D.cpp
+ mtext_parser.cpp
+ Point2D.cpp
+ Point3D.cpp
+ PointAdapter.cpp
+ PolygonAdapter.cpp
+ PolygonUtils.cpp
+ PolylineAdapter.cpp
+ RasterAdapter.cpp
+ RichTextEngine.cpp
+ RS_FontEngine.cpp
+ RS_TextMetrics.cpp
+ SE_AreaPositioning.cpp
+ SE_Bounds.cpp
+ SE_BufferPool.cpp
+ SE_ExpressionBase.cpp
+ SE_LineBuffer.cpp
+ SE_LineRenderer.cpp
+ SE_Matrix.cpp
+ SE_PositioningAlgorithms.cpp
+ SE_Renderer.cpp
+ SE_StyleVisitor.cpp
+ SE_SymbolDefProxies.cpp
+ SE_SymbolManager.cpp
+ SimpleOverpost.cpp
+ StylizationEngine.cpp
+ StylizationUtil.cpp
+ Stylizer.cpp
+ ThemeParameters.cpp
+ Vector2D.cpp
+ Vector3D.cpp
+ TransformMesh.cpp
+)
+
+add_library(MgStylization${MG_VERSION_SUFFIX} SHARED ${MgStylization_SRCS})
+
+target_link_libraries(MgStylization${MG_VERSION_SUFFIX}
+ ${FDO_EXPRESSIONENGINE_LIBRARY}
+ ${FDO_LIBRARY}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+)
+
+install( TARGETS MgStylization${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgStylization${MG_VERSION_SUFFIX}.so libMgStylization.so ${MG_COMPONENT} )
\ No newline at end of file
Property changes on: trunk/MgDev/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/cmake_v2/Desktop:9259-9317
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
Copied: trunk/MgDev/Desktop/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Desktop/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Desktop/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Desktop/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,12 @@
+add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
+
+# NOTE: Not applied for server tier projects except for mgserver main executable
+if( CMAKE_COMPILER_IS_GNUCXX )
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+endif( CMAKE_COMPILER_IS_GNUCXX )
+
+set(MG_COMPONENT "portable")
+set_install_subdir("portable/")
+
+add_subdirectory(MgDesktop)
+add_subdirectory(UnitTest)
\ No newline at end of file
Copied: trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Desktop/MgDesktop/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,54 @@
+project(mgdesktop)
+
+#NOTE: DWF headers *must* go before MdfModel headers because we want Version.h from
+#MdfModel first and not DWF Toolkit
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/CoordinateSystem
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/Renderers
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_OEM_DWF_INCLUDE_DIR}
+ ${MG_OEM_DWF_INCLUDE_DIR}/dwf
+ ${MG_SERVER_GWS_DIR}/Include
+ ${MG_SERVER_GWS_DIR}/GwsCommon/inc
+ ${MG_SERVER_GWS_DIR}/GwsQueryEngine/inc
+)
+
+set (MgDesktop_SRCS
+ MgDesktopBuild.cpp
+)
+
+add_definitions(-DDWFCORE_STATIC -DDWFTK_STATIC -DDWFTK_USE_DWFCORE_ZLIB -DDWFTK_BUILD_EXPAT -DWHIP_STATIC_LIB)
+
+add_library(MgDesktop${MG_VERSION_SUFFIX} SHARED ${MgDesktop_SRCS})
+install(TARGETS MgDesktop${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgDesktop${MG_VERSION_SUFFIX}.so libMgDesktop.so ${MG_COMPONENT})
+
+target_link_libraries(MgDesktop${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ ${XERCESC_LIBRARIES}
+ ${FDO_LIBRARY}
+ ${FDO_EXPRESSIONENGINE_LIBRARY}
+ dwfcore
+ dwftk
+ dwfwhiptk
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgSecurity${MG_VERSION_SUFFIX}
+ MgRenderers${MG_VERSION_SUFFIX}
+ MgStylization${MG_VERSION_SUFFIX}
+ MgGwsCommon${MG_VERSION_SUFFIX}
+ MgGwsQueryEngine${MG_VERSION_SUFFIX}
+ pthread
+)
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h 2018-01-24 12:38:11 UTC (rev 9318)
@@ -5,7 +5,6 @@
class MgResourceIdentifier;
class MgdFdoConnectionPool;
-template class Ptr<MgResourceIdentifier>;
/// \cond INTERNAL
class MgdFeatureConnection : public MgGuardDisposable
{
Copied: trunk/MgDev/Desktop/UnitTest/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Desktop/UnitTest/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Desktop/UnitTest/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Desktop/UnitTest/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,48 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MgDesktop
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MgDesktop/Services
+ ${CPPUNIT_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/CoordinateSystem
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/Stylization
+)
+
+set (MgDesktopUnitTest_SRCS
+ main.cpp
+ TestFeatureService.cpp
+ #TestKmlService.cpp
+ TestLogManager.cpp
+ TestLogManagerThread.cpp
+ TestMappingService.cpp
+ #TestPerformance.cpp
+ TestProfilingService.cpp
+ TestRenderingService.cpp
+ TestResourceService.cpp
+ TestTileService.cpp
+)
+
+add_executable(MgDesktopUnitTest ${MgDesktopUnitTest_SRCS})
+add_sanitizers(MgDesktopUnitTest)
+set_target_properties( MgDesktopUnitTest
+ PROPERTIES OUTPUT_NAME "UnitTest" )
+
+target_link_libraries(MgDesktopUnitTest
+ ${ACE_LIBRARY}
+ ${FDO_LIBRARY}
+ ${XERCESC_LIBRARIES}
+ ${CPPUNIT_LIBRARIES}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgSecurity${MG_VERSION_SUFFIX}
+ MgDesktop${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Modified: trunk/MgDev/Desktop/UnitTest/TestFeatureService.cpp
===================================================================
--- trunk/MgDev/Desktop/UnitTest/TestFeatureService.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Desktop/UnitTest/TestFeatureService.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -21,6 +21,7 @@
#include "TestFeatureService.h"
#include "CppUnitExtensions.h"
#include "Fdo.h"
+#include <ctime>
//Uncommenting this will make the join benchmarks 10-15x slower (because we're writing each feature out!)
//
@@ -3162,7 +3163,7 @@
#else
const int iterations = 1000;
#endif
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
for(int i=0;i<iterations;i++)
{
int nFeatures = 0;
@@ -3176,8 +3177,8 @@
reader->Close();
CPPUNIT_ASSERT(nFeatures == 17565);
}
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (Average of %d runs): = %6.4f (s)\n"), iterations, ((GetTickCount()-lStart)/1000.0)/(double)iterations ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (Average of %d runs): = %6.4f (s)\n"), iterations, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC)/(double)iterations ));
ACE_DEBUG((LM_INFO, ACE_TEXT("TestCase_BenchmarkSelectFeatures - END\n")));
}
catch(MgException* e)
@@ -3624,18 +3625,18 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSdfJoin() - Inner Join \n")));
- long lStart = GetTickCount();
-
+
+ clock_t clock_start = clock();
reader = featSvc->SelectFeatures(fsId, L"ParcelsInner", NULL);
while(reader->ReadNext())
{
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSdfJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuter", NULL);
@@ -3644,10 +3645,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSdfJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOne", NULL);
@@ -3656,10 +3657,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSdfJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOne", NULL);
@@ -3668,8 +3669,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -3724,7 +3725,7 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInner", NULL);
@@ -3733,10 +3734,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuter", NULL);
@@ -3745,10 +3746,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOne", NULL);
@@ -3757,10 +3758,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOne", NULL);
@@ -3769,8 +3770,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -3819,7 +3820,7 @@
aggOpts->AddComputedProperty(L"TotalCount", L"Count(SdfId)");
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteAggregateJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
int iterations = 0;
@@ -3832,10 +3833,10 @@
}
reader->Close();
CPPUNIT_ASSERT(iterations == 1);
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteAggregateJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
iterations = 0L;
reader = featSvc->SelectAggregate(fsId, L"ParcelsLeftOuter", aggOpts);
@@ -3847,10 +3848,10 @@
}
reader->Close();
CPPUNIT_ASSERT(iterations == 1L);
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteAggregateJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
iterations = 0L;
reader = featSvc->SelectAggregate(fsId, L"ParcelsInnerOneToOne", aggOpts);
@@ -3862,10 +3863,10 @@
}
reader->Close();
CPPUNIT_ASSERT(iterations == 1L);
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkSqliteAggregateJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
iterations = 0L;
reader = featSvc->SelectAggregate(fsId, L"ParcelsLeftOuterOneToOne", aggOpts);
@@ -3877,8 +3878,8 @@
}
reader->Close();
CPPUNIT_ASSERT(iterations == 1L);
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -3924,7 +3925,7 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkMergeSortJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerSortMerge", NULL);
@@ -3945,10 +3946,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkMergeSortJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterSortMerge", NULL);
@@ -3965,10 +3966,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkMergeSortJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOneSortMerge", NULL);
@@ -3985,10 +3986,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkMergeSortJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOneSortMerge", NULL);
@@ -4005,8 +4006,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -4052,7 +4053,7 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkBatchSortedBlockJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerBatchSortedBlock", NULL);
@@ -4073,10 +4074,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkBatchSortedBlockJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterBatchSortedBlock", NULL);
@@ -4093,10 +4094,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkBatchSortedBlockJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOneBatchSortedBlock", NULL);
@@ -4113,10 +4114,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkBatchSortedBlockJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOneBatchSortedBlock", NULL);
@@ -4133,8 +4134,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -4180,7 +4181,7 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsSortedBlockJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerNestedLoopSortedBlock", NULL);
@@ -4201,10 +4202,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsSortedBlockJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterNestedLoopSortedBlock", NULL);
@@ -4221,10 +4222,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsSortedBlockJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOneNestedLoopSortedBlock", NULL);
@@ -4241,10 +4242,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsSortedBlockJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOneNestedLoopSortedBlock", NULL);
@@ -4261,8 +4262,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
@@ -4539,7 +4540,7 @@
// ----- Start the tests ------- //
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsJoin() - Inner Join \n")));
- long lStart = GetTickCount();
+ clock_t clock_start = clock();
long total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerNestedLoops", NULL);
@@ -4561,10 +4562,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsJoin() - Left Outer Join \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterNestedLoops", NULL);
@@ -4581,10 +4582,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsJoin() - Inner Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsInnerOneToOneNestedLoops", NULL);
@@ -4601,10 +4602,10 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestFeatureService::TestCase_BenchmarkNestedLoopsJoin() - Left Outer Join (Forced 1:1) \n")));
- lStart = GetTickCount();
+ clock_start = clock();
total = 0L;
reader = featSvc->SelectFeatures(fsId, L"ParcelsLeftOuterOneToOneNestedLoops", NULL);
@@ -4621,8 +4622,8 @@
total++;
}
reader->Close();
-
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((GetTickCount()-lStart)/1000.0) ));
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time (%d results): = %6.4f (s)\n"), total, ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
}
catch(MgException* e)
{
Modified: trunk/MgDev/Desktop/UnitTest/TestResourceService.cpp
===================================================================
--- trunk/MgDev/Desktop/UnitTest/TestResourceService.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Desktop/UnitTest/TestResourceService.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -16,10 +16,11 @@
//
#include "MgDesktop.h"
-#include "Services\Resource\ResourceContentCache.h"
+#include "Services/Resource/ResourceContentCache.h"
#include "Fdo.h"
#include "TestResourceService.h"
#include "CppUnitExtensions.h"
+#include <ctime>
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestResourceService, "TestResourceService");
@@ -1122,78 +1123,82 @@
void TestResourceService::TestCase_BenchmarkGetResourceContents()
{
- try
- {
- Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
+ try
+ {
+ Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
Ptr<MgResourceService> pService = dynamic_cast<MgResourceService*>(fact->CreateService(MgServiceType::ResourceService));
if (pService == 0)
{
throw new MgServiceNotAvailableException(L"TestResourceService.TestCase_BenchmarkGetResourceContents", __LINE__, __WFILE__, NULL, L"", NULL);
}
- Ptr<MgStringCollection> resources = new MgStringCollection();
+ Ptr<MgStringCollection> resources = new MgStringCollection();
- Ptr<MgByteSource> source = new MgByteSource(resourceContentFileName2);
- Ptr<MgByteReader> reader = source->GetReader();
- // Prepare the resources
- for (INT32 i = 0; i < 150; i++)
- {
- STRING numStr;
- MgUtil::Int32ToString(i, numStr);
- STRING resIdStr = L"Library://BatchTests/Layer";
- resIdStr += numStr;
- resIdStr += L".LayerDefinition";
+ Ptr<MgByteSource> source = new MgByteSource(resourceContentFileName2);
+ Ptr<MgByteReader> reader = source->GetReader();
+ // Prepare the resources
+ for (INT32 i = 0; i < 150; i++)
+ {
+ STRING numStr;
+ MgUtil::Int32ToString(i, numStr);
+ STRING resIdStr = L"Library://BatchTests/Layer";
+ resIdStr += numStr;
+ resIdStr += L".LayerDefinition";
- Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resIdStr);
- pService->SetResource(resId, reader, NULL);
- resources->Add(resId->ToString());
- reader->Rewind();
- }
+ Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resIdStr);
+ pService->SetResource(resId, reader, NULL);
+ resources->Add(resId->ToString());
+ reader->Rewind();
+ }
- //Evict all cached copies to avoid distortion of results due to caching
- MgdResourceContentCache* cache = MgdResourceContentCache::GetInstance();
- cache->Clear();
+ //Evict all cached copies to avoid distortion of results due to caching
+ MgdResourceContentCache* cache = MgdResourceContentCache::GetInstance();
+ cache->Clear();
- long lStart = GetTickCount();
- ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Individual GetResourceContent calls (cold) \n")));
- for (INT32 i = 0; i < resources->GetCount(); i++)
- {
- Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resources->GetItem(i));
- Ptr<MgByteReader> content = pService->GetResourceContent(resId);
- }
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((GetTickCount()-lStart)/1000.0) ));
- ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
+ clock_t clock_start = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Individual GetResourceContent calls (cold) \n")));
+ for (INT32 i = 0; i < resources->GetCount(); i++)
+ {
+ Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resources->GetItem(i));
+ Ptr<MgByteReader> content = pService->GetResourceContent(resId);
+ }
+ clock_t clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
- lStart = GetTickCount();
- ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Individual GetResourceContent calls (cached contents) \n")));
- for (INT32 i = 0; i < resources->GetCount(); i++)
- {
- Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resources->GetItem(i));
- Ptr<MgByteReader> content = pService->GetResourceContent(resId);
- }
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((GetTickCount()-lStart)/1000.0) ));
- ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
+ clock_start = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Individual GetResourceContent calls (cached contents) \n")));
+ for (INT32 i = 0; i < resources->GetCount(); i++)
+ {
+ Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(resources->GetItem(i));
+ Ptr<MgByteReader> content = pService->GetResourceContent(resId);
+ }
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
//Evict all cached copies to avoid distortion of results due to caching
cache->Clear();
- lStart = GetTickCount();
- Ptr<MgStringCollection> contents;
- ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Multi-threaded GetResourceContents call (cold) \n")));
- contents = pService->GetResourceContents(resources, NULL);
- CPPUNIT_ASSERT(NULL != contents.p);
- CPPUNIT_ASSERT(contents->GetCount() == resources->GetCount());
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((GetTickCount()-lStart)/1000.0) ));
- ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
+ clock_start = clock();
+ Ptr<MgStringCollection> contents;
+ ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Multi-threaded GetResourceContents call (cold) \n")));
+ contents = pService->GetResourceContents(resources, NULL);
+ CPPUNIT_ASSERT(NULL != contents.p);
+ CPPUNIT_ASSERT(contents->GetCount() == resources->GetCount());
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
- lStart = GetTickCount();
- ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Multi-threaded GetResourceContents call (cached contents) \n")));
- contents = pService->GetResourceContents(resources, NULL);
- CPPUNIT_ASSERT(NULL != contents.p);
- CPPUNIT_ASSERT(contents->GetCount() == resources->GetCount());
- ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((GetTickCount()-lStart)/1000.0) ));
- ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
- }
+ clock_start = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Multi-threaded GetResourceContents call (cached contents) \n")));
+ contents = pService->GetResourceContents(resources, NULL);
+ CPPUNIT_ASSERT(NULL != contents.p);
+ CPPUNIT_ASSERT(contents->GetCount() == resources->GetCount());
+ clock_end = clock();
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((double)(clock_end - clock_start) / CLOCKS_PER_SEC) ));
+ ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
+ }
catch(MgException* e)
{
STRING message = e->GetDetails(TEST_LOCALE);
Modified: trunk/MgDev/License.html
===================================================================
--- trunk/MgDev/License.html 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/License.html 2018-01-24 12:38:11 UTC (rev 9318)
@@ -90,39 +90,39 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>MapGuide Open Source
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>MapGuide Open Source
is free software; you can redistribute it<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and/or modify it
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>and/or modify it
under the terms of version 2.1 of the GNU Lesser<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>General Public License
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>General Public License
(LGPL) as published by the Free Software<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Foundation.<span
-style='mso-spacerun:yes'> </span>It is distributed in the hope that it will be
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Foundation.<span
+style='mso-spacerun:yes'>� </span>It is distributed in the hope that it will be
useful,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>but WITHOUT ANY
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>but WITHOUT ANY
WARRANTY; without even the implied warranty of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>MERCHANTABILITY or
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The full text of the
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>The full text of the
LGPL can be found at the bottom of this file.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Autodesk
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>"Autodesk
MapGuide" is a registered trademark of Autodesk, Inc.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and nothing herein
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>and nothing herein
shall grant any license or permission to use <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>such trademark.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>such trademark.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -153,198 +153,198 @@
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Simplified Wrapper and Interface Generator<span
-style='mso-spacerun:yes'> </span>(SWIG)<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>(SWIG)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>SWIG is distributed
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>SWIG is distributed
under the following terms:<o:p></o:p></p>
<p class=MsoNormal><span
-style='mso-spacerun:yes'> </span>=================================================<o:p></o:p></p>
+style='mso-spacerun:yes'>�</span>=================================================<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>I. <o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>I. <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>This software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>This software
includes contributions that are Copyright (c) 1998-2002<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><st1:place w:st="on"><st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><st1:place w:st="on"><st1:PlaceType
w:st="on">University</st1:PlaceType> of <st1:PlaceName w:st="on">Chicago</st1:PlaceName></st1:place>.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>modification, are
permitted provided that the following conditions are<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Redistributions of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Redistributions of
source code must retain the above copyright notice,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>this list of
-conditions and the following disclaimer.<span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>this list of
+conditions and the following disclaimer.<span style='mso-spacerun:yes'>�
</span>Redistributions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>in binary form must
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>in binary form must
reproduce the above copyright notice, this list of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>conditions and the
following disclaimer in the documentation and/or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>other materials
-provided with the distribution.<span style='mso-spacerun:yes'> </span>Neither
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>other materials
+provided with the distribution.<span style='mso-spacerun:yes'>� </span>Neither
the name of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the <st1:place w:st="on"><st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>the <st1:place w:st="on"><st1:PlaceType
w:st="on">University</st1:PlaceType> of <st1:PlaceName w:st="on">Chicago</st1:PlaceName></st1:place>
nor the names of its contributors may be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>used to endorse or
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>used to endorse or
promote products derived from this software without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>specific prior
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>specific prior
written permission.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THIS SOFTWARE IS
PROVIDED BY THE <st1:place w:st="on"><st1:PlaceType w:st="on">UNIVERSITY</st1:PlaceType>
OF <st1:PlaceName w:st="on">CHICAGO</st1:PlaceName></st1:place> AND
CONTRIBUTORS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"AS IS" AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>"AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>LIMITED TO, THE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>PARTICULAR PURPOSE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>CHICAGO OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>CHICAGO OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>SPECIAL, EXEMPLARY,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>TO, PROCUREMENT OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>PROFITS; OR BUSINESS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>LIABILITY, WHETHER IN
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>NEGLIGENCE OR OTHERWISE)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>SOFTWARE, EVEN IF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>II.<span
-style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>II.<span
+style='mso-spacerun:yes'>� </span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Copyright (c)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Copyright (c)
1995-1998<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The <st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>The <st1:PlaceType
w:st="on">University</st1:PlaceType> of <st1:PlaceName w:st="on">Utah</st1:PlaceName>
and the Regents of the <st1:place w:st="on"><st1:PlaceType w:st="on">University</st1:PlaceType>
of <st1:PlaceName w:st="on">California</st1:PlaceName></st1:place><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>All Rights Reserved<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>All Rights Reserved<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Permission is hereby
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Permission is hereby
granted, without written agreement and without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>license or royalty
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>license or royalty
fees, to use, copy, modify, and distribute this<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>software and its
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>software and its
documentation for any purpose, provided that <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(1) The above
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>(1) The above
copyright notice and the following two paragraphs<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>appear in all copies
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>appear in all copies
of the source code and (2) redistributions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>including binaries
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>including binaries
reproduces these notices in the supporting<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>documentation.<span
-style='mso-spacerun:yes'> </span>Substantial modifications to this software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>documentation.<span
+style='mso-spacerun:yes'>�� </span>Substantial modifications to this software
may be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>copyrighted by their
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>copyrighted by their
authors and need not follow the licensing terms<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>described here,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>described here,
provided that the new terms are clearly indicated in<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>all files where they
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>all files where they
apply.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>IN NO EVENT SHALL THE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>IN NO EVENT SHALL THE
AUTHOR, THE <st1:place w:st="on"><st1:PlaceType w:st="on">UNIVERSITY</st1:PlaceType>
OF <st1:PlaceName w:st="on">CALIFORNIA</st1:PlaceName></st1:place>, THE <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><st1:place w:st="on"><st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><st1:place w:st="on"><st1:PlaceType
w:st="on">UNIVERSITY</st1:PlaceType> OF <st1:PlaceName w:st="on">UTAH</st1:PlaceName></st1:place>
OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>PARTY FOR DIRECT,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>PARTY FOR DIRECT,
INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>DAMAGES ARISING OUT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>DAMAGES ARISING OUT
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>EVEN IF THE AUTHORS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>EVEN IF THE AUTHORS
OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE POSSIBILITY OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE POSSIBILITY OF
SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE AUTHOR, THE <st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE AUTHOR, THE <st1:PlaceType
w:st="on">UNIVERSITY</st1:PlaceType> OF <st1:PlaceName w:st="on">CALIFORNIA</st1:PlaceName>,
AND THE <st1:place w:st="on"><st1:PlaceType w:st="on">UNIVERSITY</st1:PlaceType>
OF <st1:PlaceName w:st="on">UTAH</st1:PlaceName></st1:place><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>SPECIFICALLY DISCLAIM
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>SPECIFICALLY DISCLAIM
ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE IMPLIED
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>PURPOSE. THE SOFTWARE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>PURPOSE. THE SOFTWARE
PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND <o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE AUTHORS AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE AUTHORS AND
DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>SUPPORT, UPDATES,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>SUPPORT, UPDATES,
ENHANCEMENTS, OR MODIFICATIONS.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -420,293 +420,293 @@
<p class=MsoNormal><st1:City w:st="on"><st1:place w:st="on">Berkeley</st1:place></st1:City>
DB<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c)
1990-2004<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-tab-count:1'> </span>Sleepycat Software.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-tab-count:1'>�������� </span>Sleepycat Software.<span
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>documentation and/or other materials
provided with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. Redistributions
in any form must be accompanied by information on<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>how to obtain complete source code for the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>how to obtain complete source code for the
DB software and any<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>accompanying software that uses the DB
-software.<span style='mso-spacerun:yes'> </span>The source code<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>accompanying software that uses the DB
+software.<span style='mso-spacerun:yes'>� </span>The source code<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>must either be included in the distribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>must either be included in the distribution
or be available for no<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span><span style='mso-spacerun:yes'> </span>more
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>�� </span><span style='mso-spacerun:yes'>�</span>more
than the cost of distribution plus a nominal fee, and must be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>freely redistributable under reasonable
-conditions.<span style='mso-spacerun:yes'> </span>For an<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>freely redistributable under reasonable
+conditions.<span style='mso-spacerun:yes'>� </span>For an<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>executable file, complete source code means
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>executable file, complete source code means
the source code for all<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>modules it contains.<span
-style='mso-spacerun:yes'> </span>It does not include source code for modules
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>modules it contains.<span
+style='mso-spacerun:yes'>� </span>It does not include source code for modules
or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>files that typically accompany the major
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>files that typically accompany the major
components of the operating<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>system on which the executable file runs.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>system on which the executable file runs.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR IMPLIED
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* WARRANTIES OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* NON-INFRINGEMENT,
-ARE DISCLAIMED.<span style='mso-spacerun:yes'> </span>IN NO EVENT SHALL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* NON-INFRINGEMENT,
+ARE DISCLAIMED.<span style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL
SLEEPYCAT SOFTWARE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* BE LIABLE FOR ANY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONSEQUENTIAL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUBSTITUTE GOODS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* INTERRUPTION)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONTRACT, STRICT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ARISING IN ANY WAY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THE POSSIBILITY OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THE POSSIBILITY OF
SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c) 1990,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c) 1990,
1993, 1994, 1995<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-tab-count:1'> </span>The Regents of the <st1:place w:st="on"><st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-tab-count:1'>�������� </span>The Regents of the <st1:place w:st="on"><st1:PlaceType
w:st="on">University</st1:PlaceType> of <st1:PlaceName w:st="on">California</st1:PlaceName></st1:place>.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span><span
-style='mso-spacerun:yes'> </span>documentation and/or other materials provided
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>� </span><span
+style='mso-spacerun:yes'>��</span>documentation and/or other materials provided
with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. Neither the name
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. Neither the name
of the University nor the names of its contributors<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>may be used to endorse or promote products
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>may be used to endorse or promote products
derived from this software<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>without specific prior written permission.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>without specific prior written permission.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ANY EXPRESS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* IMPLIED WARRANTIES
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ARE DISCLAIMED.<span
-style='mso-spacerun:yes'> </span>IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ARE DISCLAIMED.<span
+style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
BE LIABLE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* FOR ANY DIRECT,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* DAMAGES (INCLUDING,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR SERVICES; LOSS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* HOWEVER CAUSED AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* LIABILITY, OR TORT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OUT OF THE USE OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUCH DAMAGE.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c) 1995,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c) 1995,
1996<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-tab-count:1'> </span>The President and Fellows of <st1:place
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-tab-count:1'>�������� </span>The President and Fellows of <st1:place
w:st="on"><st1:PlaceName w:st="on">Harvard</st1:PlaceName> <st1:PlaceType
w:st="on">University</st1:PlaceType></st1:place>.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>documentation and/or other materials
provided with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. Neither the name
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. Neither the name
of the University nor the names of its contributors<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>may be used to endorse or promote products
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>may be used to endorse or promote products
derived from this software<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>without specific prior written permission.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>without specific prior written permission.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ANY EXPRESS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* IMPLIED WARRANTIES
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ARE
-DISCLAIMED.<span style='mso-spacerun:yes'> </span>IN NO EVENT SHALL HARVARD OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ARE
+DISCLAIMED.<span style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL HARVARD OR
ITS CONTRIBUTORS BE LIABLE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* FOR ANY DIRECT,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* DAMAGES (INCLUDING,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR SERVICES; LOSS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* HOWEVER CAUSED AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* LIABILITY, OR TORT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OUT OF THE USE OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUCH DAMAGE.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -721,290 +721,290 @@
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c)
2001-2005<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>Sleepycat Software.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>Sleepycat Software.<span
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>documentation and/or other materials
provided with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. Redistributions
in any form must be accompanied by information on<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>how to obtain complete source code for the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>how to obtain complete source code for the
DB software and any<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>accompanying software that uses the DB
-software.<span style='mso-spacerun:yes'> </span>The source code<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>accompanying software that uses the DB
+software.<span style='mso-spacerun:yes'>� </span>The source code<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>must either be included in the distribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>must either be included in the distribution
or be available for no<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>more than the cost of distribution plus a
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>more than the cost of distribution plus a
nominal fee, and must be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>freely redistributable under reasonable
-conditions.<span style='mso-spacerun:yes'> </span>For an<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>freely redistributable under reasonable
+conditions.<span style='mso-spacerun:yes'>� </span>For an<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>executable file, complete source code means
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>executable file, complete source code means
the source code for all<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>modules it contains.<span
-style='mso-spacerun:yes'> </span>It does not include source code for modules
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>modules it contains.<span
+style='mso-spacerun:yes'>� </span>It does not include source code for modules
or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>files that typically accompany the major
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>files that typically accompany the major
components of the operating<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>system on which the executable file runs.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>system on which the executable file runs.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR IMPLIED
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* WARRANTIES OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* NON-INFRINGEMENT,
-ARE DISCLAIMED.<span style='mso-spacerun:yes'> </span>IN NO EVENT SHALL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* NON-INFRINGEMENT,
+ARE DISCLAIMED.<span style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL
SLEEPYCAT SOFTWARE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* BE LIABLE FOR ANY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONSEQUENTIAL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUBSTITUTE GOODS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* INTERRUPTION)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONTRACT, STRICT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ARISING IN ANY WAY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THE POSSIBILITY OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THE POSSIBILITY OF
SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* The Apache Software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* The Apache Software
License, Version 1.1<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c) 2000
-The Apache Software Foundation.<span style='mso-spacerun:yes'> </span>All
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c) 2000
+The Apache Software Foundation.<span style='mso-spacerun:yes'>� </span>All
rights<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>the documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>the documentation and/or other materials
provided with the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>distribution.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. The end-user
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. The end-user
documentation included with the redistribution,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>if any, must include the following
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>if any, must include the following
acknowledgment:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>"This product includes software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>������ </span>"This product includes software
developed by the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>Apache Software Foundation
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>������� </span>Apache Software Foundation
(http://www.apache.org/)."<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>Alternately, this acknowledgment may appear
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>Alternately, this acknowledgment may appear
in the software itself,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>if and wherever such third-party
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>if and wherever such third-party
acknowledgments normally appear.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 4. The names
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 4. The names
"Apache" and "Apache Software Foundation" must<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>not be used to endorse or promote products
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>not be used to endorse or promote products
derived from this<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>software without prior written permission.
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>software without prior written permission.
For written<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>permission, please contact
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>permission, please contact
apache at apache.org.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 5. Products derived
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 5. Products derived
from this software may not be called "Apache",<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>nor may "Apache" appear in their
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>nor may "Apache" appear in their
name, without prior written<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>permission of the Apache Software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>permission of the Apache Software
Foundation.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* WARRANTIES,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OF MERCHANTABILITY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* DISCLAIMED.<span
-style='mso-spacerun:yes'> </span>IN NO EVENT SHALL THE APACHE SOFTWARE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* DISCLAIMED.<span
+style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL THE APACHE SOFTWARE
FOUNDATION OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ITS CONTRIBUTORS BE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ITS CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SPECIAL, EXEMPLARY,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* LIMITED TO,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* USE, DATA, OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ON ANY THEORY OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR TORT (INCLUDING
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OF THE USE OF THIS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUCH DAMAGE.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*
====================================================================<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* This software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* This software
consists of voluntary contributions made by many<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* individuals on
-behalf of the Apache Software Foundation.<span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* individuals on
+behalf of the Apache Software Foundation.<span style='mso-spacerun:yes'>�
</span>For more<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* information on the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* information on the
Apache Software Foundation, please see<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* .<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* .<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Portions of this
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Portions of this
software are based upon public domain software<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* originally written
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* originally written
at the <st1:place w:st="on"><st1:PlaceName w:st="on">National</st1:PlaceName> <st1:PlaceType
w:st="on">Center</st1:PlaceType></st1:place> for Supercomputing Applications,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* <st1:place w:st="on"><st1:PlaceType
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* <st1:place w:st="on"><st1:PlaceType
w:st="on">University</st1:PlaceType> of <st1:PlaceName w:st="on">Illinois</st1:PlaceName></st1:place>,
Urbana-Champaign.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -1021,511 +1021,511 @@
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal><span
-style='mso-spacerun:yes'> </span>Apache License<o:p></o:p></p>
+style='mso-spacerun:yes'>�������������������������������� </span>Apache License<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
-</span><span style='mso-spacerun:yes'> </span>Version 2.0, January 2004<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�������������������������
+</span><span style='mso-spacerun:yes'>�</span>Version 2.0, January 2004<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����������������������
</span>http://www.apache.org/licenses/<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>TERMS AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>TERMS AND
CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>1. Definitions.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>1. Definitions.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"License" shall mean the terms and conditions for use,
reproduction,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and distribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>and distribution
as defined by Sections 1 through 9 of this document.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"Licensor" shall mean the copyright owner or entity authorized
by<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the copyright
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the copyright
owner that is granting the License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Legal
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>"Legal
Entity" shall mean the union of the acting entity and all<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>other entities
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>other entities
that control, are controlled by, or are under common<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>control with
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>control with
that entity. For the purposes of this definition,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"control" means (i) the power, direct or indirect, to cause
the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>direction or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>direction or
management of such entity, whether by contract or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>otherwise, or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>otherwise, or
(ii) ownership of fifty percent (50%) or more of the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>outstanding
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>outstanding
shares, or (iii) beneficial ownership of such entity.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"You"
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>"You"
(or "Your") shall mean an individual or Legal Entity<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>exercising
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>exercising
permissions granted by this License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"Source" form shall mean the preferred form for making
modifications,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>including but
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>including but
not limited to software source code, documentation<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><span
-style='mso-spacerun:yes'> </span>source, and configuration files.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span><span
+style='mso-spacerun:yes'>����</span>source, and configuration files.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"Object" form shall mean any form resulting from mechanical<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>transformation
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>transformation
or translation of a Source form, including but<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>not limited to
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>not limited to
compiled object code, generated documentation,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and conversions
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>and conversions
to other media types.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Work"
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>"Work"
shall mean the work of authorship, whether in Source or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Object form,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Object form,
made available under the License, as indicated by a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>copyright notice
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>copyright notice
that is included in or attached to the work<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(an example is
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(an example is
provided in the Appendix below).<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Derivative
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>"Derivative
Works" shall mean any work, whether in Source or Object<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>form, that is
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>form, that is
based on (or derived from) the Work and for which the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>editorial
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>editorial
revisions, annotations, elaborations, or other modifications<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>represent, as a
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>represent, as a
whole, an original work of authorship. For the purposes<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of this License,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>of this License,
Derivative Works shall not include works that remain<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>separable from,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>separable from,
or merely link (or bind by name) to the interfaces of,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the Work and
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the Work and
Derivative Works thereof.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�����
</span>"Contribution" shall mean any work of authorship, including<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the original
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the original
version of the Work and any modifications or additions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>to that Work or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>to that Work or
Derivative Works thereof, that is intentionally<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>submitted to
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>submitted to
Licensor for inclusion in the Work by the copyright owner<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>or by an
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>or by an
individual or Legal Entity authorized to submit on behalf of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the copyright
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the copyright
owner. For the purposes of this definition, "submitted"<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>means any form
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>means any form
of electronic, verbal, or written communication sent<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>to the Licensor
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>to the Licensor
or its representatives, including but not limited to<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>communication on
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>communication on
electronic mailing lists, source code control systems,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and issue
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>and issue
tracking systems that are managed by, or on behalf of, the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Licensor for the
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Licensor for the
purpose of discussing and improving the Work, but<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>excluding
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>excluding
communication that is conspicuously marked or otherwise<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>designated in
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>designated in
writing by the copyright owner as "Not a Contribution."<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Contributor"
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>"Contributor"
shall mean Licensor and any individual or Legal Entity<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>on behalf of
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>on behalf of
whom a Contribution has been received by Licensor and<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>subsequently
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>subsequently
incorporated within the Work.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>2. Grant of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>2. Grant of
Copyright License. Subject to the terms and conditions of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>this License,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>this License,
each Contributor hereby grants to You a perpetual,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>worldwide,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>worldwide,
non-exclusive, no-charge, royalty-free, irrevocable<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>copyright
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>copyright
license to reproduce, prepare Derivative Works of,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>publicly
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>publicly
display, publicly perform, sublicense, and distribute the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Work and such
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Work and such
Derivative Works in Source or Object form.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>3. Grant of Patent
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>3. Grant of Patent
License. Subject to the terms and conditions of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>this License,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>this License,
each Contributor hereby grants to You a perpetual,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>worldwide,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>worldwide,
non-exclusive, no-charge, royalty-free, irrevocable<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(except as
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(except as
stated in this section) patent license to make, have made,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>use, offer to
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>use, offer to
sell, sell, import, and otherwise transfer the Work,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>where such
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>where such
license applies only to those patent claims licensable<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>by such
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>by such
Contributor that are necessarily infringed by their<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Contribution(s)
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Contribution(s)
alone or by combination of their Contribution(s)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>with the Work to
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>with the Work to
which such Contribution(s) was submitted. If You<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>institute patent
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>institute patent
litigation against any entity (including a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>cross-claim or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>cross-claim or
counterclaim in a lawsuit) alleging that the Work<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>or a
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>or a
Contribution incorporated within the Work constitutes direct<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>or contributory
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>or contributory
patent infringement, then any patent licenses<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>granted to You
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>granted to You
under this License for that Work shall terminate<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>as of the date
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>as of the date
such litigation is filed.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>4. Redistribution.
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>4. Redistribution.
You may reproduce and distribute copies of the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Work or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Work or
Derivative Works thereof in any medium, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>modifications,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>modifications,
and in Source or Object form, provided that You<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>meet the
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>meet the
following conditions:<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(a) You must
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(a) You must
give any other recipients of the Work or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Derivative
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>Derivative
Works a copy of this License; and<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(b) You must
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(b) You must
cause any modified files to carry prominent notices<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>stating that
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>stating that
You changed the files; and<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(c) You must
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(c) You must
retain, in the Source form of any Derivative Works<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>that You
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>that You
distribute, all copyright, patent, trademark, and<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>attribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>attribution
notices from the Source form of the Work,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>excluding
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>excluding
those notices that do not pertain to any part of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>the
Derivative Works; and<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(d) If the Work
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>(d) If the Work
includes a "NOTICE" text file as part of its<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>distribution,
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>distribution,
then any Derivative Works that You distribute must<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>include a
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>include a
readable copy of the attribution notices contained<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>within such
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>within such
NOTICE file, excluding those notices that do not<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>pertain to
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>pertain to
any part of the Derivative Works, in at least one<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>of the
following places: within a NOTICE text file distributed<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>as part of
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>as part of
the Derivative Works; within the Source form or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���������
</span>documentation, if provided along with the Derivative Works; or,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>within a
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>within a
display generated by the Derivative Works, if and<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>wherever
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>wherever
such third-party notices normally appear. The contents<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>of the
NOTICE file are for informational purposes only and<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>do not
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>do not
modify the License. You may add Your own attribution<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><span
-style='mso-spacerun:yes'> </span>notices within Derivative Works that
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><span
+style='mso-spacerun:yes'>�������� </span>notices within Derivative Works that
You distribute, alongside<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>or as an
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>or as an
addendum to the NOTICE text from the Work, provided<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>that such
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>that such
additional attribution notices cannot be construed<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>as modifying
+<p class=MsoNormal><span style='mso-spacerun:yes'>��������� </span>as modifying
the License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><span
-style='mso-spacerun:yes'> </span>You may add Your own copyright statement to
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span><span
+style='mso-spacerun:yes'>�</span>You may add Your own copyright statement to
Your modifications and<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>may provide
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>may provide
additional or different license terms and conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>for use,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>for use,
reproduction, or distribution of Your modifications, or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>for any such
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>for any such
Derivative Works as a whole, provided Your use,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>reproduction,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>reproduction,
and distribution of the Work otherwise complies with<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the conditions
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the conditions
stated in this License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>5. Submission of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>5. Submission of
Contributions. Unless You explicitly state otherwise,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>any Contribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>any Contribution
intentionally submitted for inclusion in the Work<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>by You to the
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>by You to the
Licensor shall be under the terms and conditions of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>this License,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>this License,
without any additional terms or conditions.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Notwithstanding
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Notwithstanding
the above, nothing herein shall supersede or modify<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the terms of any
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the terms of any
separate license agreement you may have executed<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>with Licensor
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>with Licensor
regarding such Contributions.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>6. Trademarks. This
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>6. Trademarks. This
License does not grant permission to use the trade<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>names,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>names,
trademarks, service marks, or product names of the Licensor,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>except as
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>except as
required for reasonable and customary use in describing the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>origin of the
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>origin of the
Work and reproducing the content of the NOTICE file.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>7. Disclaimer of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>7. Disclaimer of
Warranty. Unless required by applicable law or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>agreed to in
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>agreed to in
writing, Licensor provides the Work (and each<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Contributor
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Contributor
provides its Contributions) on an "AS IS" BASIS,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>WITHOUT
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>implied,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>implied,
including, without limitation, any warranties or conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of TITLE,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>of TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>PARTICULAR
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>PARTICULAR
PURPOSE. You are solely responsible for determining the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>appropriateness
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>appropriateness
of using or redistributing the Work and assume any<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>risks associated
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>risks associated
with Your exercise of permissions under this License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>8. Limitation of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>8. Limitation of
Liability. In no event and under no legal theory,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>whether in tort
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>whether in tort
(including negligence), contract, or otherwise,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>unless required
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>unless required
by applicable law (such as deliberate and grossly<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>negligent acts)
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>negligent acts)
or agreed to in writing, shall any Contributor be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>liable to You
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>liable to You
for damages, including any direct, indirect, special,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>incidental, or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>incidental, or
consequential damages of any character arising as a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>result of this
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>result of this
License or out of the use or inability to use the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Work (including
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>Work (including
but not limited to damages for loss of goodwill,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>work stoppage,
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>work stoppage,
computer failure or malfunction, or any and all<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>other commercial
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>other commercial
damages or losses), even if such Contributor<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>has been advised
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>has been advised
of the possibility of such damages.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>9. Accepting
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>9. Accepting
Warranty or Additional Liability. While redistributing<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the Work or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>the Work or
Derivative Works thereof, You may choose to offer,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and charge a fee
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>and charge a fee
for, acceptance of support, warranty, indemnity,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>or other
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>or other
liability obligations and/or rights consistent with this<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>License.
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>License.
However, in accepting such obligations, You may act only<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>on Your own
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>on Your own
behalf and on Your sole responsibility, not on behalf<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><span
-style='mso-spacerun:yes'> </span>of any other Contributor, and only if You
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><span
+style='mso-spacerun:yes'>���� </span>of any other Contributor, and only if You
agree to indemnify,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>defend, and hold
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>defend, and hold
each Contributor harmless for any liability<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>incurred by, or
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>incurred by, or
claims asserted against, such Contributor by reason<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of your
+<p class=MsoNormal><span style='mso-spacerun:yes'>����� </span>of your
accepting any such warranty or additional liability.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>END OF TERMS AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>END OF TERMS AND
CONDITIONS<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -1538,7 +1538,7 @@
<p class=MsoNormal>Pathan<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
<p class=MsoNormal>The DecisionSoft Open Source Licence<o:p></o:p></p>
@@ -1638,209 +1638,209 @@
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c)
2001-2005<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-tab-count:1'> </span>Sleepycat Software.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-tab-count:1'>�������� </span>Sleepycat Software.<span
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>documentation and/or other materials
provided with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. Redistributions
in any form must be accompanied by information on<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>how to obtain complete source code for the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>how to obtain complete source code for the
DB software and any<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>accompanying software that uses the DB
-software.<span style='mso-spacerun:yes'> </span>The source code<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>accompanying software that uses the DB
+software.<span style='mso-spacerun:yes'>� </span>The source code<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>must either be included in the distribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>must either be included in the distribution
or be available for no<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>more than the cost of distribution plus a
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>more than the cost of distribution plus a
nominal fee, and must be<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>freely redistributable under reasonable
-conditions.<span style='mso-spacerun:yes'> </span>For an<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>freely redistributable under reasonable
+conditions.<span style='mso-spacerun:yes'>� </span>For an<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>executable file, complete source code means
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>executable file, complete source code means
the source code for all<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>modules it contains.<span
-style='mso-spacerun:yes'> </span>It does not include source code for modules
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>modules it contains.<span
+style='mso-spacerun:yes'>� </span>It does not include source code for modules
or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>files that typically accompany the major
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>files that typically accompany the major
components of the operating<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>system on which the executable file runs.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>system on which the executable file runs.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* OR IMPLIED
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* WARRANTIES OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* NON-INFRINGEMENT,
-ARE DISCLAIMED.<span style='mso-spacerun:yes'> </span>IN NO EVENT SHALL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* NON-INFRINGEMENT,
+ARE DISCLAIMED.<span style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL
SLEEPYCAT SOFTWARE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* BE LIABLE FOR ANY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONSEQUENTIAL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SUBSTITUTE GOODS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* INTERRUPTION)
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* CONTRACT, STRICT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* ARISING IN ANY WAY
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THE POSSIBILITY OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THE POSSIBILITY OF
SUCH DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal>/*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Copyright (c) 2005<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Copyright (c) 2005<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-tab-count:1'> </span>Progress Software Corporation.<span
-style='mso-spacerun:yes'> </span>All rights reserved.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-tab-count:1'>�������� </span>Progress Software Corporation.<span
+style='mso-spacerun:yes'>� </span>All rights reserved.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* Redistribution and
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* Redistribution and
use in source and binary forms, with or without<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* modification, are
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* modification, are
permitted provided that the following conditions<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* are met:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* are met:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* notice, this list
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* notice, this list
of conditions and the following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>notice, this list of conditions and the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>notice, this list of conditions and the
following disclaimer in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>documentation and/or other materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>documentation and/or other materials
provided with the distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* 3. The end-user
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* 3. The end-user
documentation included with the redistribution, if any,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>must include the following acknowledgment:
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>must include the following acknowledgment:
"This product includes<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>software developed by Progress Software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>software developed by Progress Software
Corporation." Alternately,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>this acknowledgment may appear in the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>this acknowledgment may appear in the
software itself, if and wherever<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<span
-style='mso-spacerun:yes'> </span>such third-party acknowledgments normally
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<span
+style='mso-spacerun:yes'>��� </span>such third-party acknowledgments normally
appear.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* THIS SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* THIS SOFTWARE IS
PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* WARRANTIES,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* MERCHANTABILITY AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.<span
-style='mso-spacerun:yes'> </span>IN<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>IN<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* NO EVENT SHALL
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* NO EVENT SHALL
PROGRESS SOFTWARE CORPORATION BE LIABLE FOR ANY DIRECT,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* INDIRECT,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* (INCLUDING, BUT NOT
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* SERVICES; LOSS OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* HOWEVER CAUSED AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* STRICT LIABILITY,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* IN ANY WAY OUT OF
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>* POSSIBILITY OF SUCH
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>* POSSIBILITY OF SUCH
DAMAGE.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>*/<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>*/<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -1858,53 +1858,53 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Permission is hereby
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Permission is hereby
granted, free of charge, to any person obtaining a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>copy of this software
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>copy of this software
and associated documentation files (the "Software"),<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>to deal in the
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>to deal in the
Software without restriction, including without limitation<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the rights to use,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>the rights to use,
copy, modify, merge, publish, distribute, sublicense,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>and/or sell copies of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>and/or sell copies of
the Software, and to permit persons to whom the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Software is furnished
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Software is furnished
to do so, subject to the following conditions:<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The above copyright
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>The above copyright
notice and this permission notice shall be included<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>in all copies or
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>in all copies or
substantial portions of the Software.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE SOFTWARE IS
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE SOFTWARE IS
PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>OR IMPLIED, INCLUDING
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>FITNESS FOR A
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>THE AUTHORS OR
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>LIABILITY, WHETHER IN
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>FROM, OUT OF OR IN
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>DEALINGS IN THE
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>DEALINGS IN THE
SOFTWARE.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -2006,7 +2006,7 @@
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Portions relating to GIF animations copyright 2004 Jaakko
-Hyvätti<o:p></o:p></p>
+Hyv�tti<o:p></o:p></p>
<p class=MsoNormal>(jaakko.hyvatti at iki.fi) <o:p></o:p></p>
@@ -2075,7 +2075,7 @@
"Documentation") are<o:p></o:p></p>
<p class=MsoNormal>copyrighted by Open Market, Inc ("Open
-Market").<span style='mso-spacerun:yes'> </span>The following terms<o:p></o:p></p>
+Market").<span style='mso-spacerun:yes'>� </span>The following terms<o:p></o:p></p>
<p class=MsoNormal>apply to all files associated with the Software and
Documentation<o:p></o:p></p>
@@ -2110,7 +2110,7 @@
<p class=MsoNormal>No written agreement, license, or royalty fee is required
for any of<o:p></o:p></p>
-<p class=MsoNormal>the authorized uses.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>the authorized uses.<span style='mso-spacerun:yes'>�
</span>Modifications to this Software and Documentation<o:p></o:p></p>
<p class=MsoNormal>may be copyrighted by their authors and need not follow the
@@ -2128,7 +2128,7 @@
<p class=MsoNormal>by Open Market and promulgated by an open standards
organization and<o:p></o:p></p>
-<p class=MsoNormal>for no other purpose.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>for no other purpose.<span style='mso-spacerun:yes'>�
</span>If modifications to this Software and<o:p></o:p></p>
<p class=MsoNormal>Documentation have new licensing terms, the new terms must
@@ -2161,7 +2161,7 @@
ANY<o:p></o:p></p>
<p class=MsoNormal>WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE.<span style='mso-spacerun:yes'> </span>IN<o:p></o:p></p>
+PURPOSE.<span style='mso-spacerun:yes'>� </span>IN<o:p></o:p></p>
<p class=MsoNormal>NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD
PARTY FOR ANY<o:p></o:p></p>
@@ -2177,7 +2177,7 @@
<p class=MsoNormal>LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE
POSSIBILITY OF<o:p></o:p></p>
-<p class=MsoNormal>SUCH DAMAGES.<span style='mso-spacerun:yes'> </span>THE
+<p class=MsoNormal>SUCH DAMAGES.<span style='mso-spacerun:yes'>� </span>THE
SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS".<o:p></o:p></p>
<p class=MsoNormal>OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE
@@ -2195,7 +2195,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The
+<p class=MsoNormal><span style='mso-spacerun:yes'>����������������� </span>The
PHP License, version 3.0<o:p></o:p></p>
<p class=MsoNormal>Copyright (c) 1999 - 2005 The PHP Group. All rights
@@ -2213,97 +2213,97 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>1. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>1. Redistributions
of source code must retain the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>notice, this list
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>notice, this list
of conditions and the following disclaimer.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>2. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>2. Redistributions
in binary form must reproduce the above copyright<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>notice, this list
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>notice, this list
of conditions and the following disclaimer in<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the documentation
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>the documentation
and/or other materials provided with the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>distribution.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>distribution.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>3. The name "PHP"
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>3. The name "PHP"
must not be used to endorse or promote products<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>derived from this
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>derived from this
software without prior written permission. For<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>written
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>written
permission, please contact group at php.net.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>4. Products derived
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>4. Products derived
from this software may not be called "PHP", nor<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>may
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>may
"PHP" appear in their name, without prior written permission<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>from
-group at php.net.<span style='mso-spacerun:yes'> </span>You may indicate that
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>from
+group at php.net.<span style='mso-spacerun:yes'>� </span>You may indicate that
your software works in<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>conjunction with
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>conjunction with
PHP by saying "Foo for PHP" instead of calling<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>it "PHP
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>it "PHP
Foo" or "phpfoo"<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>5. The PHP Group may
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>5. The PHP Group may
publish revised and/or new versions of the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>license from time
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>license from time
to time. Each version will be given a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>distinguishing
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>distinguishing
version number.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Once covered code
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>Once covered code
has been published under a particular version<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of the license,
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>of the license,
you may always continue to use it under the terms<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of that version.
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>of that version.
You may also choose to use such covered code<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>under the terms
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>under the terms
of any subsequent version of the license<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>published by the
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>published by the
PHP Group. No one other than the PHP Group has<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the right to
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>the right to
modify the terms applicable to covered code created<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>under this
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>under this
License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>6. Redistributions
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>6. Redistributions
of any form whatsoever must retain the following<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>acknowledgment:<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>acknowledgment:<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"This
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>"This
product includes PHP, freely available from<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>����
</span><http://www.php.net/>".<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
@@ -2317,7 +2317,7 @@
<p class=MsoNormal>THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A <o:p></o:p></p>
<p class=MsoNormal>PARTICULAR PURPOSE ARE DISCLAIMED.<span
-style='mso-spacerun:yes'> </span>IN NO EVENT SHALL THE PHP<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>IN NO EVENT SHALL THE PHP<o:p></o:p></p>
<p class=MsoNormal>DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, <o:p></o:p></p>
@@ -2387,6 +2387,46 @@
<p class=MsoNormal><o:p> </o:p></p>
+<p class=MsoNormal>tclap<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<p class=MsoNormal>Copyright (c) 2003 Michael E. Smoot <o:p></o:p></p>
+<p class=MsoNormal>Copyright (c) 2004 Daniel Aarno<o:p></o:p></p>
+<p class=MsoNormal>Copyright (c) 2017 Google Inc.<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<p class=MsoNormal>Permission is hereby granted, free of charge, to any person <o:p></o:p></p>
+<p class=MsoNormal>obtaining a copy of this software and associated documentation <o:p></o:p></p>
+<p class=MsoNormal>files (the "Software"), to deal in the Software without restriction, <o:p></o:p></p>
+<p class=MsoNormal>including without limitation the rights to use, copy, modify, merge, <o:p></o:p></p>
+<p class=MsoNormal>publish, distribute, sublicense, and/or sell copies of the Software, <o:p></o:p></p>
+<p class=MsoNormal>and to permit persons to whom the Software is furnished to do so, <o:p></o:p></p>
+<p class=MsoNormal>subject to the following conditions:<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<p class=MsoNormal>The above copyright notice and this permission notice shall be <o:p></o:p></p>
+<p class=MsoNormal>included in all copies or substantial portions of the Software.<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<p class=MsoNormal>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, <o:p></o:p></p>
+<p class=MsoNormal>EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES <o:p></o:p></p>
+<p class=MsoNormal>OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND <o:p></o:p></p>
+<p class=MsoNormal>NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS <o:p></o:p></p>
+<p class=MsoNormal>BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN <o:p></o:p></p>
+<p class=MsoNormal>AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR <o:p></o:p></p>
+<p class=MsoNormal>IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <o:p></o:p></p>
+<p class=MsoNormal>THE SOFTWARE.<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<p class=MsoNormal>=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=<o:p></o:p></p>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
<p class=MsoNormal>MapGuide Open Source, CppUnit, GEOS, SQLite, FDO and the Javascript
Vector Graphics
<o:p></o:p></p>
@@ -2402,52 +2442,52 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:2'> </span><span
-style='mso-spacerun:yes'> </span>GNU LESSER GENERAL PUBLIC LICENSE<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:2'>����������������������� </span><span
+style='mso-spacerun:yes'>� </span>GNU LESSER GENERAL PUBLIC LICENSE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:2'> </span><span
-style='mso-spacerun:yes'> </span>Version 2.1, February 1999<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:2'>����������������������� </span><span
+style='mso-spacerun:yes'>������ </span>Version 2.1, February 1999<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Copyright (C) 1991,
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Copyright (C) 1991,
1999 Free Software Foundation, Inc.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>51 Franklin St,
-Fifth Floor, Boston, MA<span style='mso-spacerun:yes'> </span>02110-1301<span
-style='mso-spacerun:yes'> </span>USA<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���� </span>51 Franklin St,
+Fifth Floor, Boston, MA<span style='mso-spacerun:yes'>� </span>02110-1301<span
+style='mso-spacerun:yes'>� </span>USA<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Everyone is permitted
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>Everyone is permitted
to copy and distribute verbatim copies<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>of this license
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>of this license
document, but changing it is not allowed.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>[This is the first released version of the Lesser GPL.<span
-style='mso-spacerun:yes'> </span>It also counts<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>It also counts<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>as the successor of
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>as the successor of
the GNU Library Public License, version 2, hence<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the version number
+<p class=MsoNormal><span style='mso-spacerun:yes'>�</span>the version number
2.1.]<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:3'> </span><span
-style='mso-spacerun:yes'> </span>Preamble<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:3'>����������������������������������� </span><span
+style='mso-spacerun:yes'>��� </span>Preamble<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The licenses for
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>The licenses for
most software are designed to take away your<o:p></o:p></p>
<p class=MsoNormal>freedom to share and change it.<span
-style='mso-spacerun:yes'> </span>By contrast, the GNU General Public<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>By contrast, the GNU General Public<o:p></o:p></p>
<p class=MsoNormal>Licenses are intended to guarantee your freedom to share and
change<o:p></o:p></p>
@@ -2457,14 +2497,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>This license, the
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>This license, the
Lesser General Public License, applies to some<o:p></o:p></p>
<p class=MsoNormal>specially designated software packages--typically
libraries--of the<o:p></o:p></p>
<p class=MsoNormal>Free Software Foundation and other authors who decide to use
-it.<span style='mso-spacerun:yes'> </span>You<o:p></o:p></p>
+it.<span style='mso-spacerun:yes'>� </span>You<o:p></o:p></p>
<p class=MsoNormal>can use it too, but we suggest you first think carefully
about whether<o:p></o:p></p>
@@ -2477,10 +2517,10 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>When we speak of
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>When we speak of
free software, we are referring to freedom of use,<o:p></o:p></p>
-<p class=MsoNormal>not price.<span style='mso-spacerun:yes'> </span>Our
+<p class=MsoNormal>not price.<span style='mso-spacerun:yes'>� </span>Our
General Public Licenses are designed to make sure that<o:p></o:p></p>
<p class=MsoNormal>you have the freedom to distribute copies of free software
@@ -2499,13 +2539,13 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>To protect your
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>To protect your
rights, we need to make restrictions that forbid<o:p></o:p></p>
<p class=MsoNormal>distributors to deny you these rights or to ask you to
surrender these<o:p></o:p></p>
-<p class=MsoNormal>rights.<span style='mso-spacerun:yes'> </span>These
+<p class=MsoNormal>rights.<span style='mso-spacerun:yes'>� </span>These
restrictions translate to certain responsibilities for<o:p></o:p></p>
<p class=MsoNormal>you if you distribute copies of the library or if you modify
@@ -2513,16 +2553,16 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>For example, if you
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>For example, if you
distribute copies of the library, whether gratis<o:p></o:p></p>
<p class=MsoNormal>or for a fee, you must give the recipients all the rights
that we gave<o:p></o:p></p>
-<p class=MsoNormal>you.<span style='mso-spacerun:yes'> </span>You must make
+<p class=MsoNormal>you.<span style='mso-spacerun:yes'>� </span>You must make
sure that they, too, receive or can get the source<o:p></o:p></p>
-<p class=MsoNormal>code.<span style='mso-spacerun:yes'> </span>If you link
+<p class=MsoNormal>code.<span style='mso-spacerun:yes'>� </span>If you link
other code with the library, you must provide<o:p></o:p></p>
<p class=MsoNormal>complete object files to the recipients, so that they can
@@ -2531,12 +2571,12 @@
<p class=MsoNormal>with the library after making changes to the library and
recompiling<o:p></o:p></p>
-<p class=MsoNormal>it.<span style='mso-spacerun:yes'> </span>And you must show
+<p class=MsoNormal>it.<span style='mso-spacerun:yes'>� </span>And you must show
them these terms so they know their rights.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>We protect your
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>We protect your
rights with a two-step method: (1) we copyright the<o:p></o:p></p>
<p class=MsoNormal>library, and (2) we offer you this license, which gives you
@@ -2546,11 +2586,11 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>To protect each
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>To protect each
distributor, we want to make it very clear that<o:p></o:p></p>
<p class=MsoNormal>there is no warranty for the free library.<span
-style='mso-spacerun:yes'> </span>Also, if the library is<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Also, if the library is<o:p></o:p></p>
<p class=MsoNormal>modified by someone else and passed on, the recipients
should know<o:p></o:p></p>
@@ -2567,17 +2607,17 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Finally, software
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Finally, software
patents pose a constant threat to the existence of<o:p></o:p></p>
-<p class=MsoNormal>any free program.<span style='mso-spacerun:yes'> </span>We
+<p class=MsoNormal>any free program.<span style='mso-spacerun:yes'>� </span>We
wish to make sure that a company cannot<o:p></o:p></p>
<p class=MsoNormal>effectively restrict the users of a free program by
obtaining a<o:p></o:p></p>
<p class=MsoNormal>restrictive license from a patent holder.<span
-style='mso-spacerun:yes'> </span>Therefore, we insist that<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Therefore, we insist that<o:p></o:p></p>
<p class=MsoNormal>any patent license obtained for a version of the library
must be<o:p></o:p></p>
@@ -2587,17 +2627,17 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Most GNU software,
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Most GNU software,
including some libraries, is covered by the<o:p></o:p></p>
<p class=MsoNormal>ordinary GNU General Public License.<span
-style='mso-spacerun:yes'> </span>This license, the GNU Lesser<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>This license, the GNU Lesser<o:p></o:p></p>
<p class=MsoNormal>General Public License, applies to certain designated
libraries, and<o:p></o:p></p>
<p class=MsoNormal>is quite different from the ordinary General Public
-License.<span style='mso-spacerun:yes'> </span>We use<o:p></o:p></p>
+License.<span style='mso-spacerun:yes'>� </span>We use<o:p></o:p></p>
<p class=MsoNormal>this license for certain libraries in order to permit
linking those<o:p></o:p></p>
@@ -2606,20 +2646,20 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>When a program is
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>When a program is
linked with a library, whether statically or using<o:p></o:p></p>
<p class=MsoNormal>a shared library, the combination of the two is legally
speaking a<o:p></o:p></p>
<p class=MsoNormal>combined work, a derivative of the original library.<span
-style='mso-spacerun:yes'> </span>The ordinary<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>The ordinary<o:p></o:p></p>
<p class=MsoNormal>General Public License therefore permits such linking only
if the<o:p></o:p></p>
<p class=MsoNormal>entire combination fits its criteria of freedom.<span
-style='mso-spacerun:yes'> </span>The Lesser General<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>The Lesser General<o:p></o:p></p>
<p class=MsoNormal>Public License permits more lax criteria for linking other
code with<o:p></o:p></p>
@@ -2628,42 +2668,42 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>We call this license
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>We call this license
the "Lesser" General Public License because it<o:p></o:p></p>
<p class=MsoNormal>does Less to protect the user's freedom than the ordinary
General<o:p></o:p></p>
-<p class=MsoNormal>Public License.<span style='mso-spacerun:yes'> </span>It
+<p class=MsoNormal>Public License.<span style='mso-spacerun:yes'>� </span>It
also provides other free software developers Less<o:p></o:p></p>
<p class=MsoNormal>of an advantage over competing non-free programs.<span
-style='mso-spacerun:yes'> </span>These disadvantages<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>These disadvantages<o:p></o:p></p>
<p class=MsoNormal>are the reason we use the ordinary General Public License
for many<o:p></o:p></p>
-<p class=MsoNormal>libraries.<span style='mso-spacerun:yes'> </span>However,
+<p class=MsoNormal>libraries.<span style='mso-spacerun:yes'>� </span>However,
the Lesser license provides advantages in certain<o:p></o:p></p>
<p class=MsoNormal>special circumstances.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>For example, on rare
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>For example, on rare
occasions, there may be a special need to<o:p></o:p></p>
<p class=MsoNormal>encourage the widest possible use of a certain library, so
that it becomes<o:p></o:p></p>
-<p class=MsoNormal>a de-facto standard.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>a de-facto standard.<span style='mso-spacerun:yes'>�
</span>To achieve this, non-free programs must be<o:p></o:p></p>
-<p class=MsoNormal>allowed to use the library.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>allowed to use the library.<span style='mso-spacerun:yes'>�
</span>A more frequent case is that a free<o:p></o:p></p>
<p class=MsoNormal>library does the same job as widely used non-free
-libraries.<span style='mso-spacerun:yes'> </span>In this<o:p></o:p></p>
+libraries.<span style='mso-spacerun:yes'>� </span>In this<o:p></o:p></p>
<p class=MsoNormal>case, there is little to gain by limiting the free library
to free<o:p></o:p></p>
@@ -2672,13 +2712,13 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>In other cases,
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>In other cases,
permission to use a particular library in non-free<o:p></o:p></p>
<p class=MsoNormal>programs enables a greater number of people to use a large
body of<o:p></o:p></p>
-<p class=MsoNormal>free software.<span style='mso-spacerun:yes'> </span>For
+<p class=MsoNormal>free software.<span style='mso-spacerun:yes'>� </span>For
example, permission to use the GNU C Library in<o:p></o:p></p>
<p class=MsoNormal>non-free programs enables many more people to use the whole
@@ -2691,7 +2731,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Although the Lesser
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Although the Lesser
General Public License is Less protective of the<o:p></o:p></p>
<p class=MsoNormal>users' freedom, it does ensure that the user of a program
@@ -2704,14 +2744,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The precise terms
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>The precise terms
and conditions for copying, distribution and<o:p></o:p></p>
-<p class=MsoNormal>modification follow.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>modification follow.<span style='mso-spacerun:yes'>�
</span>Pay close attention to the difference between a<o:p></o:p></p>
<p class=MsoNormal>"work based on the library" and a "work that
-uses the library".<span style='mso-spacerun:yes'> </span>The<o:p></o:p></p>
+uses the library".<span style='mso-spacerun:yes'>� </span>The<o:p></o:p></p>
<p class=MsoNormal>former contains code derived from the library, whereas the
latter must<o:p></o:p></p>
@@ -2722,15 +2762,15 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:2'> </span><span
-style='mso-spacerun:yes'> </span>GNU LESSER GENERAL PUBLIC LICENSE<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:2'>����������������������� </span><span
+style='mso-spacerun:yes'>� </span>GNU LESSER GENERAL PUBLIC LICENSE<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>TERMS AND
+<p class=MsoNormal><span style='mso-spacerun:yes'>�� </span>TERMS AND
CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>0. This License
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>0. This License
Agreement applies to any software library or other<o:p></o:p></p>
<p class=MsoNormal>program which contains a notice placed by the copyright
@@ -2746,7 +2786,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>A
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>A
"library" means a collection of software functions and/or data<o:p></o:p></p>
<p class=MsoNormal>prepared so as to be conveniently linked with application
@@ -2757,11 +2797,11 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>The
"Library", below, refers to any such software library or work<o:p></o:p></p>
<p class=MsoNormal>which has been distributed under these terms.<span
-style='mso-spacerun:yes'> </span>A "work based on the<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>A "work based on the<o:p></o:p></p>
<p class=MsoNormal>Library" means either the Library or any derivative
work under<o:p></o:p></p>
@@ -2773,17 +2813,17 @@
translated<o:p></o:p></p>
<p class=MsoNormal>straightforwardly into another language.<span
-style='mso-spacerun:yes'> </span>(Hereinafter, translation is<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>(Hereinafter, translation is<o:p></o:p></p>
<p class=MsoNormal>included without limitation in the term
"modification".)<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>"Source
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>"Source
code" for a work means the preferred form of the work for<o:p></o:p></p>
-<p class=MsoNormal>making modifications to it.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>making modifications to it.<span style='mso-spacerun:yes'>�
</span>For a library, complete source code means<o:p></o:p></p>
<p class=MsoNormal>all the source code for all modules it contains, plus any associated<o:p></o:p></p>
@@ -2795,11 +2835,11 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Activities other
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Activities other
than copying, distribution and modification are not<o:p></o:p></p>
<p class=MsoNormal>covered by this License; they are outside its scope.<span
-style='mso-spacerun:yes'> </span>The act of<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>The act of<o:p></o:p></p>
<p class=MsoNormal>running a program using the Library is not restricted, and
output from<o:p></o:p></p>
@@ -2810,14 +2850,14 @@
<p class=MsoNormal>on the Library (independent of the use of the Library in a
tool for<o:p></o:p></p>
-<p class=MsoNormal>writing it).<span style='mso-spacerun:yes'> </span>Whether
+<p class=MsoNormal>writing it).<span style='mso-spacerun:yes'>� </span>Whether
that is true depends on what the Library does<o:p></o:p></p>
<p class=MsoNormal>and what the program that uses the Library does.<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span><o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span><o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>1. You may copy and
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>1. You may copy and
distribute verbatim copies of the Library's<o:p></o:p></p>
<p class=MsoNormal>complete source code as you receive it, in any medium,
@@ -2838,7 +2878,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>You may charge a fee
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>You may charge a fee
for the physical act of transferring a copy,<o:p></o:p></p>
<p class=MsoNormal>and you may at your option offer warranty protection in
@@ -2850,7 +2890,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>2. You may modify
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>2. You may modify
your copy or copies of the Library or any portion<o:p></o:p></p>
<p class=MsoNormal>of it, thus forming a work based on the Library, and copy
@@ -2863,72 +2903,72 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>a) The modified
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>a) The modified
work must itself be a software library.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>b) You must cause
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>b) You must cause
the files modified to carry prominent notices<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>stating that you
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>stating that you
changed the files and the date of any change.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>c) You must cause
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>c) You must cause
the whole of the work to be licensed at no<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>charge to all
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>charge to all
third parties under the terms of this License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>d) If a facility
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>d) If a facility
in the modified Library refers to a function or a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>table of data to
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>table of data to
be supplied by an application program that uses<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the facility,
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>the facility,
other than as an argument passed when the facility<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>is invoked, then
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>is invoked, then
you must make a good faith effort to ensure that,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>in the event an
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>in the event an
application does not supply such function or<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>table, the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>table, the
facility still operates, and performs whatever part of<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>its purpose
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>its purpose
remains meaningful.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>(For example, a
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>(For example, a
function in a library to compute square roots has<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>a purpose that is
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>a purpose that is
entirely well-defined independent of the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>application.<span
-style='mso-spacerun:yes'> </span>Therefore, Subsection 2d requires that any<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>application.<span
+style='mso-spacerun:yes'>� </span>Therefore, Subsection 2d requires that any<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���
</span>application-supplied function or table used by this function must<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>be optional: if
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>be optional: if
the application does not supply it, the square<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>root function must
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>root function must
still compute square roots.)<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>These requirements apply to the modified work as a
-whole.<span style='mso-spacerun:yes'> </span>If<o:p></o:p></p>
+whole.<span style='mso-spacerun:yes'>� </span>If<o:p></o:p></p>
<p class=MsoNormal>identifiable sections of that work are not derived from the
Library,<o:p></o:p></p>
@@ -2940,7 +2980,7 @@
to those<o:p></o:p></p>
<p class=MsoNormal>sections when you distribute them as separate works.<span
-style='mso-spacerun:yes'> </span>But when you<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>But when you<o:p></o:p></p>
<p class=MsoNormal>distribute the same sections as part of a whole which is a
work based<o:p></o:p></p>
@@ -2984,11 +3024,11 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>3. You may opt to
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>3. You may opt to
apply the terms of the ordinary GNU General Public<o:p></o:p></p>
<p class=MsoNormal>License instead of this License to a given copy of the
-Library.<span style='mso-spacerun:yes'> </span>To do<o:p></o:p></p>
+Library.<span style='mso-spacerun:yes'>� </span>To do<o:p></o:p></p>
<p class=MsoNormal>this, you must alter all the notices that refer to this
License, so<o:p></o:p></p>
@@ -2996,14 +3036,14 @@
<p class=MsoNormal>that they refer to the ordinary GNU General Public License,
version 2,<o:p></o:p></p>
-<p class=MsoNormal>instead of to this License.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>instead of to this License.<span style='mso-spacerun:yes'>�
</span>(If a newer version than version 2 of the<o:p></o:p></p>
<p class=MsoNormal>ordinary GNU General Public License has appeared, then you
can specify<o:p></o:p></p>
<p class=MsoNormal>that version instead if you wish.)<span
-style='mso-spacerun:yes'> </span>Do not make any other change in<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Do not make any other change in<o:p></o:p></p>
<p class=MsoNormal>these notices.<o:p></o:p></p>
@@ -3011,7 +3051,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Once this change is
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Once this change is
made in a given copy, it is irreversible for<o:p></o:p></p>
<p class=MsoNormal>that copy, so the ordinary GNU General Public License
@@ -3021,14 +3061,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>This option is
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>This option is
useful when you wish to copy part of the code of<o:p></o:p></p>
<p class=MsoNormal>the Library into a program that is not a library.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>4. You may copy and
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>4. You may copy and
distribute the Library (or a portion or<o:p></o:p></p>
<p class=MsoNormal>derivative of it, under Section 2) in object code or
@@ -3047,7 +3087,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>If distribution of
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>If distribution of
object code is made by offering access to copy<o:p></o:p></p>
<p class=MsoNormal>from a designated place, then offering equivalent access to
@@ -3062,14 +3102,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>5. A program that
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>5. A program that
contains no derivative of any portion of the<o:p></o:p></p>
<p class=MsoNormal>Library, but is designed to work with the Library by being
compiled or<o:p></o:p></p>
<p class=MsoNormal>linked with it, is called a "work that uses the
-Library".<span style='mso-spacerun:yes'> </span>Such a<o:p></o:p></p>
+Library".<span style='mso-spacerun:yes'>� </span>Such a<o:p></o:p></p>
<p class=MsoNormal>work, in isolation, is not a derivative work of the Library,
and<o:p></o:p></p>
@@ -3078,7 +3118,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>However, linking a
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>However, linking a
"work that uses the Library" with the Library<o:p></o:p></p>
<p class=MsoNormal>creates an executable that is a derivative of the Library
@@ -3087,14 +3127,14 @@
<p class=MsoNormal>contains portions of the Library), rather than a "work
that uses the<o:p></o:p></p>
-<p class=MsoNormal>library".<span style='mso-spacerun:yes'> </span>The
+<p class=MsoNormal>library".<span style='mso-spacerun:yes'>� </span>The
executable is therefore covered by this License.<o:p></o:p></p>
<p class=MsoNormal>Section 6 states terms for distribution of such executables.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>When a "work
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>When a "work
that uses the Library" uses material from a header file<o:p></o:p></p>
<p class=MsoNormal>that is part of the Library, the object code for the work
@@ -3107,14 +3147,14 @@
can be<o:p></o:p></p>
<p class=MsoNormal>linked without the Library, or if the work is itself a
-library.<span style='mso-spacerun:yes'> </span>The<o:p></o:p></p>
+library.<span style='mso-spacerun:yes'>� </span>The<o:p></o:p></p>
<p class=MsoNormal>threshold for this to be true is not precisely defined by
law.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>If such an object
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>If such an object
file uses only numerical parameters, data<o:p></o:p></p>
<p class=MsoNormal>structure layouts and accessors, and small macros and small
@@ -3126,14 +3166,14 @@
<p class=MsoNormal>file is unrestricted, regardless of whether it is legally a
derivative<o:p></o:p></p>
-<p class=MsoNormal>work.<span style='mso-spacerun:yes'> </span>(Executables
+<p class=MsoNormal>work.<span style='mso-spacerun:yes'>� </span>(Executables
containing this object code plus portions of the<o:p></o:p></p>
<p class=MsoNormal>Library will still fall under Section 6.)<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Otherwise, if the
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>Otherwise, if the
work is a derivative of the Library, you may<o:p></o:p></p>
<p class=MsoNormal>distribute the object code for the work under the terms of
@@ -3149,7 +3189,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>6. As an exception
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>6. As an exception
to the Sections above, you may also combine or<o:p></o:p></p>
<p class=MsoNormal>link a "work that uses the Library" with the
@@ -3167,14 +3207,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>You must give
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>You must give
prominent notice with each copy of the work that the<o:p></o:p></p>
<p class=MsoNormal>Library is used in it and that the Library and its use are
covered by<o:p></o:p></p>
-<p class=MsoNormal>this License.<span style='mso-spacerun:yes'> </span>You
-must supply a copy of this License.<span style='mso-spacerun:yes'> </span>If
+<p class=MsoNormal>this License.<span style='mso-spacerun:yes'>� </span>You
+must supply a copy of this License.<span style='mso-spacerun:yes'>� </span>If
the work<o:p></o:p></p>
<p class=MsoNormal>during execution displays copyright notices, you must include
@@ -3184,113 +3224,113 @@
reference<o:p></o:p></p>
<p class=MsoNormal>directing the user to the copy of this License.<span
-style='mso-spacerun:yes'> </span>Also, you must do one<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Also, you must do one<o:p></o:p></p>
<p class=MsoNormal>of these things:<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>a) Accompany the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>a) Accompany the
work with the complete corresponding<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>machine-readable
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>machine-readable
source code for the Library including whatever<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>changes were used
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>changes were used
in the work (which must be distributed under<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Sections 1 and 2
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>Sections 1 and 2
above); and, if the work is an executable linked<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>with the Library,
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>with the Library,
with the complete machine-readable "work that<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>uses the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>uses the
Library", as object code and/or source code, so that the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>user can modify
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>user can modify
the Library and then relink to produce a modified<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>executable
-containing the modified Library.<span style='mso-spacerun:yes'> </span>(It is
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>executable
+containing the modified Library.<span style='mso-spacerun:yes'>� </span>(It is
understood<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>that the user who
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>that the user who
changes the contents of definitions files in the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Library will not
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>Library will not
necessarily be able to recompile the application<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>to use the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>to use the
modified definitions.)<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>b) Use a suitable
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>b) Use a suitable
shared library mechanism for linking with the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Library.<span
-style='mso-spacerun:yes'> </span>A suitable mechanism is one that (1) uses at
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>Library.<span
+style='mso-spacerun:yes'>� </span>A suitable mechanism is one that (1) uses at
run time a<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>copy of the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>copy of the
library already present on the user's computer system,<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>rather than
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>rather than
copying library functions into the executable, and (2)<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>will operate
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>will operate
properly with a modified version of the library, if<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>the user installs
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>the user installs
one, as long as the modified version is<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'>
+<p class=MsoNormal><span style='mso-spacerun:yes'>���
</span>interface-compatible with the version that the work was made with.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>c) Accompany the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>c) Accompany the
work with a written offer, valid for at<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>least three years,
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>least three years,
to give the same user the materials<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>specified in Subsection
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>specified in Subsection
6a, above, for a charge no more<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>than the cost of
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>than the cost of
performing this distribution.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>d) If distribution
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>d) If distribution
of the work is made by offering access to copy<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>from a designated
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>from a designated
place, offer equivalent access to copy the above<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>specified materials
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>specified materials
from the same place.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>e) Verify that the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>e) Verify that the
user has already received a copy of these<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>materials or that
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>materials or that
you have already sent this user a copy.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>For an executable,
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>For an executable,
the required form of the "work that uses the<o:p></o:p></p>
<p class=MsoNormal>Library" must include any data and utility programs
needed for<o:p></o:p></p>
<p class=MsoNormal>reproducing the executable from it.<span
-style='mso-spacerun:yes'> </span>However, as a special exception,<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>However, as a special exception,<o:p></o:p></p>
<p class=MsoNormal>the materials to be distributed need not include anything
that is<o:p></o:p></p>
@@ -3308,14 +3348,14 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>It may happen that
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>It may happen that
this requirement contradicts the license<o:p></o:p></p>
<p class=MsoNormal>restrictions of other proprietary libraries that do not
normally<o:p></o:p></p>
<p class=MsoNormal>accompany the operating system.<span
-style='mso-spacerun:yes'> </span>Such a contradiction means you cannot<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Such a contradiction means you cannot<o:p></o:p></p>
<p class=MsoNormal>use both them and the Library together in an executable that
you<o:p></o:p></p>
@@ -3326,7 +3366,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>7. You may place
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>7. You may place
library facilities that are a work based on the<o:p></o:p></p>
<p class=MsoNormal>Library side-by-side in a single library together with other
@@ -3344,43 +3384,43 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>a) Accompany the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>a) Accompany the
combined library with a copy of the same work<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>based on the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>based on the
Library, uncombined with any other library<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>facilities.<span
-style='mso-spacerun:yes'> </span>This must be distributed under the terms of
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>facilities.<span
+style='mso-spacerun:yes'>� </span>This must be distributed under the terms of
the<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>Sections above.<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>Sections above.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>b) Give prominent
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>b) Give prominent
notice with the combined library of the fact<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>that part of it is
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>that part of it is
a work based on the Library, and explaining<o:p></o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>where to find the
+<p class=MsoNormal><span style='mso-spacerun:yes'>��� </span>where to find the
accompanying uncombined form of the same work.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>8. You may not copy,
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>8. You may not copy,
modify, sublicense, link with, or distribute<o:p></o:p></p>
<p class=MsoNormal>the Library except as expressly provided under this
-License.<span style='mso-spacerun:yes'> </span>Any<o:p></o:p></p>
+License.<span style='mso-spacerun:yes'>� </span>Any<o:p></o:p></p>
<p class=MsoNormal>attempt otherwise to copy, modify, sublicense, link with, or<o:p></o:p></p>
<p class=MsoNormal>distribute the Library is void, and will automatically
terminate your<o:p></o:p></p>
-<p class=MsoNormal>rights under this License.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>rights under this License.<span style='mso-spacerun:yes'>�
</span>However, parties who have received copies,<o:p></o:p></p>
<p class=MsoNormal>or rights, from you under this License will not have their
@@ -3391,17 +3431,17 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>9. You are not
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>9. You are not
required to accept this License, since you have not<o:p></o:p></p>
-<p class=MsoNormal>signed it.<span style='mso-spacerun:yes'> </span>However,
+<p class=MsoNormal>signed it.<span style='mso-spacerun:yes'>� </span>However,
nothing else grants you permission to modify or<o:p></o:p></p>
<p class=MsoNormal>distribute the Library or its derivative works.<span
-style='mso-spacerun:yes'> </span>These actions are<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>These actions are<o:p></o:p></p>
<p class=MsoNormal>prohibited by law if you do not accept this License.<span
-style='mso-spacerun:yes'> </span>Therefore, by<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Therefore, by<o:p></o:p></p>
<p class=MsoNormal>modifying or distributing the Library (or any work based on
the<o:p></o:p></p>
@@ -3416,7 +3456,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>10. Each time you
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>10. Each time you
redistribute the Library (or any work based on the<o:p></o:p></p>
<p class=MsoNormal>Library), the recipient automatically receives a license
@@ -3426,7 +3466,7 @@
the Library<o:p></o:p></p>
<p class=MsoNormal>subject to these terms and conditions.<span
-style='mso-spacerun:yes'> </span>You may not impose any further<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>You may not impose any further<o:p></o:p></p>
<p class=MsoNormal>restrictions on the recipients' exercise of the rights
granted herein.<o:p></o:p></p>
@@ -3440,7 +3480,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>11. If, as a
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>11. If, as a
consequence of a court judgment or allegation of patent<o:p></o:p></p>
<p class=MsoNormal>infringement or for any other reason (not limited to patent
@@ -3453,7 +3493,7 @@
they do not<o:p></o:p></p>
<p class=MsoNormal>excuse you from the conditions of this License. <span
-style='mso-spacerun:yes'> </span>If you cannot<o:p></o:p></p>
+style='mso-spacerun:yes'>�</span>If you cannot<o:p></o:p></p>
<p class=MsoNormal>distribute so as to satisfy simultaneously your obligations
under this<o:p></o:p></p>
@@ -3462,7 +3502,7 @@
consequence you<o:p></o:p></p>
<p class=MsoNormal>may not distribute the Library at all.<span
-style='mso-spacerun:yes'> </span>For example, if a patent<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>For example, if a patent<o:p></o:p></p>
<p class=MsoNormal>license would not permit royalty-free redistribution of the
Library by<o:p></o:p></p>
@@ -3500,7 +3540,7 @@
<p class=MsoNormal>integrity of the free software distribution system which is<o:p></o:p></p>
<p class=MsoNormal>implemented by public license practices.<span
-style='mso-spacerun:yes'> </span>Many people have made<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>Many people have made<o:p></o:p></p>
<p class=MsoNormal>generous contributions to the wide range of software
distributed<o:p></o:p></p>
@@ -3525,7 +3565,7 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>12. If the
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>12. If the
distribution and/or use of the Library is restricted in<o:p></o:p></p>
<p class=MsoNormal>certain countries either by patents or by copyrighted
@@ -3540,14 +3580,14 @@
<p class=MsoNormal>so that distribution is permitted only in or among countries
not thus<o:p></o:p></p>
-<p class=MsoNormal>excluded.<span style='mso-spacerun:yes'> </span>In such
+<p class=MsoNormal>excluded.<span style='mso-spacerun:yes'>� </span>In such
case, this License incorporates the limitation as if<o:p></o:p></p>
<p class=MsoNormal>written in the body of this License.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>13. The Free
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>13. The Free
Software Foundation may publish revised and/or new<o:p></o:p></p>
<p class=MsoNormal>versions of the Lesser General Public License from time to
@@ -3562,7 +3602,7 @@
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Each version is given a distinguishing version number.<span
-style='mso-spacerun:yes'> </span>If the Library<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>If the Library<o:p></o:p></p>
<p class=MsoNormal>specifies a version number of this License which applies to
it and<o:p></o:p></p>
@@ -3574,7 +3614,7 @@
published by<o:p></o:p></p>
<p class=MsoNormal>the Free Software Foundation.<span
-style='mso-spacerun:yes'> </span>If the Library does not specify a<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>If the Library does not specify a<o:p></o:p></p>
<p class=MsoNormal>license version number, you may choose any version ever
published by<o:p></o:p></p>
@@ -3585,20 +3625,20 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>14. If you wish to
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>14. If you wish to
incorporate parts of the Library into other free<o:p></o:p></p>
<p class=MsoNormal>programs whose distribution conditions are incompatible with
these,<o:p></o:p></p>
<p class=MsoNormal>write to the author to ask for permission.<span
-style='mso-spacerun:yes'> </span>For software which is<o:p></o:p></p>
+style='mso-spacerun:yes'>� </span>For software which is<o:p></o:p></p>
<p class=MsoNormal>copyrighted by the Free Software Foundation, write to the
Free<o:p></o:p></p>
<p class=MsoNormal>Software Foundation; we sometimes make exceptions for
-this.<span style='mso-spacerun:yes'> </span>Our<o:p></o:p></p>
+this.<span style='mso-spacerun:yes'>� </span>Our<o:p></o:p></p>
<p class=MsoNormal>decision will be guided by the two goals of preserving the
free status<o:p></o:p></p>
@@ -3610,12 +3650,12 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:3'> </span><span
-style='mso-spacerun:yes'> </span>NO WARRANTY<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:3'>����������������������������������� </span><span
+style='mso-spacerun:yes'>��� </span>NO WARRANTY<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>15. BECAUSE THE
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>15. BECAUSE THE
LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO<o:p></o:p></p>
<p class=MsoNormal>WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
@@ -3633,17 +3673,17 @@
<p class=MsoNormal>IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR<o:p></o:p></p>
-<p class=MsoNormal>PURPOSE.<span style='mso-spacerun:yes'> </span>THE ENTIRE
+<p class=MsoNormal>PURPOSE.<span style='mso-spacerun:yes'>� </span>THE ENTIRE
RISK AS TO THE QUALITY AND PERFORMANCE OF THE<o:p></o:p></p>
-<p class=MsoNormal>LIBRARY IS WITH YOU.<span style='mso-spacerun:yes'>
+<p class=MsoNormal>LIBRARY IS WITH YOU.<span style='mso-spacerun:yes'>�
</span>SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME<o:p></o:p></p>
<p class=MsoNormal>THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>16. IN NO EVENT
+<p class=MsoNormal><span style='mso-spacerun:yes'>� </span>16. IN NO EVENT
UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN<o:p></o:p></p>
<p class=MsoNormal>WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
@@ -3673,8 +3713,8 @@
<p class=MsoNormal><o:p> </o:p></p>
-<p class=MsoNormal><span style='mso-tab-count:2'> </span><span
-style='mso-spacerun:yes'> </span>END OF TERMS AND CONDITIONS<o:p></o:p></p>
+<p class=MsoNormal><span style='mso-tab-count:2'>����������������������� </span><span
+style='mso-spacerun:yes'>���� </span>END OF TERMS AND CONDITIONS<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
Modified: trunk/MgDev/License.txt
===================================================================
--- trunk/MgDev/License.txt 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/License.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -667,7 +667,7 @@
Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004
Maurice Szmurlo and Johan Van den Brande.
-Portions relating to GIF animations copyright 2004 Jaakko Hyvätti
+Portions relating to GIF animations copyright 2004 Jaakko Hyv�tti
(jaakko.hyvatti at iki.fi)
Permission has been granted to copy, distribute and modify gd in any context
@@ -815,6 +815,34 @@
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+tclap
+
+Copyright (c) 2003 Michael E. Smoot
+Copyright (c) 2004 Daniel Aarno
+Copyright (c) 2017 Google Inc.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
MapGuide Open Source, CppUnit, GEOS, SQLite, FDO and the Javascript Vector Graphics
Library are each licensed under the GNU Lesser General Public License.
@@ -1294,15 +1322,15 @@
License for DWF Toolkit 7
NOTICE TO USER:
THIS LICENSE AGREEMENT ("AGREEMENT") IS A LEGAL AGREEMENT BETWEEN YOU (EITHER AN INDIVIDUAL OR A SINGLE ENTITY) AND AUTODESK, INC. FOR THE DWF TOOLKIT 7, WHICH INCLUDES COMPUTER SOFTWARE AND MAY INCLUDE ASSOCIATED MEDIA, PRINTED MATERIALS AND ONLINE OR ELECTRONIC DOCUMENTATION ("LICENSED SOFTWARE"). BY INSTALLING THE LICENSED SOFTWARE YOU ACCEPT ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THE LICENSED SOFTWARE.
-
+�
1 LICENSE GRANT
1.1 Autodesk grants to you ("Licensee") a perpetual, nontransferable, nonexclusive, royalty-free, limited license to:
1.1.1 (a) Use the Licensed Software for development, research, internal, educational, or commercial purposes; (b) Modify the Licensed Software to create derivative works and applications, including ports; and (c) Compile the Licensed Software, derivative works and applications prepared in accordance with subsection 1.1.1(b) into binary code.
-1.1.2 Reproduce, distribute and sublicense free of charge or for a fee the Licensed Software in binary code form in conjunction with derivative works or applications created by Licensee or licensed from third parties by Licensee, provided, that: (a) Licensee makes no use of Autodesk’s trademarks, trade names, or trade dress; (b) In the event Licensee makes any modification to the Licensed Software, Licensee must publish the specification for such modifications for use by third party developers and provide Autodesk with a copy thereof; and (c) The Licensee must sublicense the Licensed Software “as is”, without warranty of any kind.
-1.1.3 Reproduce, distribute and sublicense free of charge to sublicensees the source code of the unmodified Licensed Software, provided that (a) Licensee must state in its sublicenses that the Licensed Software is being distributed pursuant to a license granted by Autodesk, Inc.; (b)The terms of sublicenses granted by Licensee must (i) contain all applicable terms of this Agreement, and (ii) not be broader than the terms of the license granted by this Agreement; (c) Licensee must exactly reproduce Autodesk’s copyright and other proprietary rights notices which accompany the copy of the Licensed Software licensed by Autodesk to Licensee; and (d) Licensee shall conspicuously state in its sublicenses that the Licensed Software is offered “as is”, without warranty of any kind.
-1.1.4 Reproduce, distribute and sublicense the source code of the Licensed Software as modified by Licensee, provided that (a) Licensee must state in its sublicense that the Licensed Software has been modified by Licensee; (b) Licensee must exactly reproduce Autodesk’s copyright and other proprietary rights notices which accompany the copy of the Licensed Software licensed by Autodesk to Licensee; (c) As to the unmodified portions of the Licensed Software, the terms of the sublicenses granted by Licensee must (i) contain all applicable terms of this Agreement, and (ii) not be broader than the terms of the license granted by this Agreement; (d) Licensee must conspicuously state in its sublicenses that the original, unmodified portions of the Licensed Software are offered “as is”, without warranty of any kind; and (e) Licensee must (i) publish the modified Licensed Software to the Worldwide Web, (ii) make available with the modified Licensed Software documentation which describes in d
etail the modifications which Licensee has made to the Licensed Software, and (iii) provide to Autodesk a copy of the modified Licensed Software and the documentation.
-
+1.1.2 Reproduce, distribute and sublicense free of charge or for a fee the Licensed Software in binary code form in conjunction with derivative works or applications created by Licensee or licensed from third parties by Licensee, provided, that: (a) Licensee makes no use of Autodesk�s trademarks, trade names, or trade dress; (b) In the event Licensee makes any modification to the Licensed Software, Licensee must publish the specification for such modifications for use by third party developers and provide Autodesk with a copy thereof; and (c) The Licensee must sublicense the Licensed Software �as is�, without warranty of any kind.
+1.1.3 Reproduce, distribute and sublicense free of charge to sublicensees the source code of the unmodified Licensed Software, provided that (a) Licensee must state in its sublicenses that the Licensed Software is being distributed pursuant to a license granted by Autodesk, Inc.; (b)The terms of sublicenses granted by Licensee must (i) contain all applicable terms of this Agreement, and (ii) not be broader than the terms of the license granted by this Agreement; (c) Licensee must exactly reproduce Autodesk�s copyright and other proprietary rights notices which accompany the copy of the Licensed Software licensed by Autodesk to Licensee; and (d) Licensee shall conspicuously state in its sublicenses that the Licensed Software is offered �as is�, without warranty of any kind.
+1.1.4 Reproduce, distribute and sublicense the source code of the Licensed Software as modified by Licensee, provided that (a) Licensee must state in its sublicense that the Licensed Software has been modified by Licensee; (b) Licensee must exactly reproduce Autodesk�s copyright and other proprietary rights notices which accompany the copy of the Licensed Software licensed by Autodesk to Licensee; (c) As to the unmodified portions of the Licensed Software, the terms of the sublicenses granted by Licensee must (i) contain all applicable terms of this Agreement, and (ii) not be broader than the terms of the license granted by this Agreement; (d) Licensee must conspicuously state in its sublicenses that the original, unmodified portions of the Licensed Software are offered �as is�, without warranty of any kind; and (e) Licensee must (i) publish the modified Licensed Software to the Worldwide Web, (ii) make available with the modified Licensed Software documentation which describe
s in detail the modifications which Licensee has made to the Licensed Software, and (iii) provide to Autodesk a copy of the modified Licensed Software and the documentation.
+�
1.2 Licensee acquires no right, title, or interest in or to the Licensed Software,
1.3 Licensee shall retain all rights to any independently developed software, such as applications, developed by or for Licensee.
1.4 Autodesk is under no obligation to provide maintenance, support, or upgrades for the Licensed Software.
@@ -1316,7 +1344,7 @@
5.1 The Licensed Software is provided "AS IS" and without any warranty of any kind.
5.2 AUTODESK DOES NOT MAKE AND HEREBY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTIES INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE.
6 LIMITATION OF LIABILITY
-6.1 In no event will Autodesk be liable for any lost revenues, data, or profits, or special, indirect, or consequential damages, even if Autodesk has been advised of the possibility or probability of such damages. Autodesk’s maximum liability for damages shall be limited to the fees, if any, required under Section 3 for the particular Licensed Software which caused the damages.
+6.1 In no event will Autodesk be liable for any lost revenues, data, or profits, or special, indirect, or consequential damages, even if Autodesk has been advised of the possibility or probability of such damages. Autodesk�s maximum liability for damages shall be limited to the fees, if any, required under Section 3 for the particular Licensed Software which caused the damages.
6.2 The Licensed Software is not fault-tolerant and is not designed, manufactured, or intended for use or resale as online control equipment in hazardous environments requiring fail-safe performance, such as in the operation of nuclear facilities, aircraft navigation or communication systems, air traffic control, direct life support machines, or weapons systems, in which the failure of the Licensed Software or derived binaries could lead directly to death, personal injury, or severe physical or environmental damage ("High Risk Activities"). Autodesk specifically disclaims any express or implied warranty of fitness for High Risk Activities. Licensee will not knowingly use, distribute, or sublicense the Licensed Software or derived binaries for High Risk Activities and will ensure that its customers and end-users of Licensee's products are provided with a copy of the notice specified in the first sentence of this Section 6.2.
7 PROPRIETARY INFORMATION
The Licensed Software is the proprietary information of Autodesk, Inc. ("Confidential Information"). Except as permitted by this Agreement, Licensee shall not disclose Confidential Information and shall use it only for purposes specifically contemplated by this Agreement. This Agreement will not affect any non-disclosure agreement between the parties.
@@ -1326,4 +1354,4 @@
This Licensed Software is provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software Clause as DFARS 252.227-7013 and FAR 52.227-19 as applicable. Manufacturer is Autodesk, Inc., 111 McInnis Parkway, San Rafael, California 94903.
10 GOVERNING LAW
Any action related to this Agreement will be governed by California law, excluding choice of law rules.
-
+�
Copied: trunk/MgDev/Oem/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,21 @@
+###### Fusion #####
+file(COPY "fusion" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "fusionMG" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+set(FUSION_WORK_DIR ${CMAKE_CURRENT_BINARY_DIR}/fusion)
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${FUSION_WORK_DIR} ant deploy -Ddeploy.home=${MG_WWWROOT}/fusion)")
+if (UNIX)
+ # httpd's default config is to use user/group daemon/daemon, so make it own the tcpdf cache directory in order for QuickPlot to work
+ install(CODE "execute_process(COMMAND chown daemon:daemon ${MG_WWWROOT}/fusion/lib/tcpdf/cache)")
+endif (UNIX)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fusionMG/templates DESTINATION ${MG_WWWROOT}/fusion)
+###### Everything else ######
+
+# TODO: We have geos in-tree, which is CMake-enabled, so if required we can use
+# the internal copy of geos if required through an option like INTERNAL_GEOS
+# at the moment, we are just using the system-provided version of GEOS
+#set(GEOS_ENABLE_TESTS OFF)
+#add_subdirectory(geos)
+add_subdirectory(DWFTK)
+add_subdirectory(CsMapLibrary)
+add_subdirectory(SWIGEx)
+add_subdirectory(LinuxApt)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(develop)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(global)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/global/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(src)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,116 @@
+project(dwftk)
+
+add_definitions(-DDWFCORE_BUILD_ZLIB -DDWFCORE_BUILD_EXPAT)
+
+find_library(pthread REQUIRED)
+find_library(uuid REQUIRED)
+if (NOT uuid-NOTFOUND)
+ #add_definitions(-DHAVE_LIBUUID)
+ set (HAVE_LIBUUID 1)
+else (NOT uuid-NOTFOUND)
+ message(STATUS "Could not find libuuid")
+endif (NOT uuid-NOTFOUND)
+
+check_include_file(bits/stl_algobase.h HAVE_ALGOBASE_H)
+check_include_file(asm/atomic.h HAVE_ATOMIC_H)
+check_include_file(alsa/iatomic.h HAVE_IATOMIC_H)
+check_include_file(netinet/ether.h HAVE_NETINET_ETHER_H)
+
+#if (HAVE_NETINET_ETHER_H)
+# add_definitions(-DHAVE_NETINET_ETHER_H)
+#endif (HAVE_NETINET_ETHER_H)
+
+if (HAVE_ATOMIC_H)
+ check_cxx_source_compiles(
+ "#include <asm/atomic.h>
+ int main() {
+ int i = 0;
+ atomic_t tValue;
+ atomic_set( &tValue, i );
+ atomic_inc( &tValue );
+ atomic_dec( &tValue );
+ i = atomic_read( &tValue );
+ }"
+ CAN_COMPILE_WITH_ATOMIC_H)
+ if (CAN_COMPILE_WITH_ATOMIC_H)
+ #add_definitions(-D_DWFCORE_USE_ASM_ATOMIC_H)
+ set (_DWFCORE_USE_ASM_ATOMIC_H 1)
+ else (CAN_COMPILE_WITH_ATOMIC_H)
+ message(WARNING "Found asm/atomic.h but could not compile with it")
+ endif (CAN_COMPILE_WITH_ATOMIC_H)
+endif (HAVE_ATOMIC_H)
+
+if (HAVE_IATOMIC_H)
+check_cxx_source_compiles(
+ "#include <alsa/iatomic.h>
+ int main() {
+ int i = 0;
+ atomic_t tValue;
+ atomic_set( &tValue, i );
+ atomic_inc( &tValue );
+ atomic_dec( &tValue );
+ i = atomic_read( &tValue );
+ }"
+ CAN_COMPILE_WITH_IATOMIC_H)
+ if (CAN_COMPILE_WITH_IATOMIC_H)
+ #add_definitions(-D_DWFCORE_USE_ALSA_IATOMIC_H)
+ set (_DWFCORE_USE_ALSA_IATOMIC_H 1)
+ else (CAN_COMPILE_WITH_IATOMIC_H)
+ message(WARNING "Found alsa/atomic.h but could not compile with it")
+ endif (CAN_COMPILE_WITH_IATOMIC_H)
+endif (HAVE_IATOMIC_H)
+
+check_function_exists(max HAVE_MAX)
+check_function_exists(min HAVE_MIN)
+check_function_exists(memmove HAVE_MEMMOVE)
+
+#if (HAVE_MEMMOVE)
+# add_definitions(-DHAVE_MEMMOVE)
+#else (HAVE_MEMMOVE)
+# message(ERROR "Could not find required function memmove")
+#endif (HAVE_MEMMOVE)
+
+if (NOT HAVE_MEMMOVE)
+ message(ERROR "Could not find required function memmove")
+endif (NOT HAVE_MEMMOVE)
+
+# DWFCore's CMakeLists.txt will generate a config.h for us
+add_definitions(-DHAVE_CONFIG_H)
+
+# This is to ensure dwfcore/config.h will properly resolve not only for
+# DWFCore, but DWFToolkit and downstream dependencies
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# Autotools does not define these in debug, and neither shall we
+remove_definitions(-DDEBUG -D_DEBUG)
+
+# We don't use W3D, so we don't care about needing to build the internal libjpeg.
+# This will also help us avoid unexpected surprises if a system libjpeg is also loaded
+set (DISABLE_STREAM_JPEG 1)
+set (DWFTK_EXPORT_API 1)
+set (WHIP_USE_WCHAR_STRINGS 1)
+set (WHIPTOOL_CLIENT 1)
+set (DWFTK_USE_DWFCORE_ZLIB 1)
+
+set (DWF_VERSION_MAJOR 7)
+set (DWF_VERSION_MINOR 7)
+set (DWF_VERSION_REV 0)
+set (DWF_VERSION "${DWF_VERSION_MAJOR}.${DWF_VERSION_MINOR}.${DWF_VERSION_REV}")
+
+set (DWFCORE_VERSION_MAJOR 1)
+set (DWFCORE_VERSION_MINOR 7)
+set (DWFCORE_VERSION_REV 0)
+set (DWFCORE_VERSION "${DWFCORE_VERSION_MAJOR}.${DWFCORE_VERSION_MINOR}.${DWFCORE_VERSION_REV}")
+
+set (W3DTK_VERSION_MAJOR 1)
+set (W3DTK_VERSION_MINOR 7)
+set (W3DTK_VERSION_REV 1555)
+set (W3DTK_VERSION "${W3DTK_VERSION_MAJOR}.${W3DTK_VERSION_MINOR}.${W3DTK_VERSION_REV}")
+
+set (W2DTK_VERSION_MAJOR 7)
+set (W2DTK_VERSION_MINOR 13)
+set (W2DTK_VERSION_REV 1601)
+set (W2DTK_VERSION "${W3DTK_VERSION_MAJOR}.${W3DTK_VERSION_MINOR}.${W3DTK_VERSION_REV}")
+
+add_subdirectory(dwf)
+add_subdirectory(dwfcore)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,342 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+set (dwftk_SRCS
+ Toolkit.cpp
+ #dwfx
+ dwfx/Constants.cpp
+ dwfx/ContentPart.cpp
+ dwfx/CustomProperties.cpp
+ dwfx/DocumentPresentationsPart.cpp
+ dwfx/DWFDocument.cpp
+ dwfx/DWFDocumentSequence.cpp
+ dwfx/DWFProperties.cpp
+ dwfx/DWFSection.cpp
+ dwfx/FixedDocument.cpp
+ dwfx/FixedDocumentSequence.cpp
+ dwfx/FixedPage.cpp
+ dwfx/Package.cpp
+ dwfx/ResourcePart.cpp
+ dwfx/reader/CustomPropertiesReader.cpp
+ dwfx/reader/DWFDocumentSequenceReader.cpp
+ dwfx/reader/DWFPropertiesReader.cpp
+ dwfx/reader/FixedPageResourceExtractor.cpp
+ #opc
+ opc/Constants.cpp
+ opc/ContentTypes.cpp
+ opc/CoreProperties.cpp
+ opc/Package.cpp
+ opc/Part.cpp
+ opc/PartContainer.cpp
+ opc/PhysicalLayerReader.cpp
+ opc/PhysicalLayerWriter.cpp
+ opc/Relationship.cpp
+ opc/RelationshipContainer.cpp
+ opc/XMLPart.cpp
+ opc/ZipFileReader.cpp
+ opc/ZipWriter.cpp
+ opc/reader/CorePropertiesReader.cpp
+ opc/reader/RelationshipContainerReader.cpp
+ #package
+ package/Bookmark.cpp
+ package/Class.cpp
+ package/Constants.cpp
+ package/Content.cpp
+ package/ContentElement.cpp
+ package/ContentManager.cpp
+ package/CoordinateSystem.cpp
+ package/CustomSection.cpp
+ package/DataSection.cpp
+ package/DefinedObject.cpp
+ package/EModelSection.cpp
+ package/Entity.cpp
+ package/EPlotSection.cpp
+ package/Feature.cpp
+ package/FontResource.cpp
+ package/GlobalSection.cpp
+ package/GraphicResource.cpp
+ package/Group.cpp
+ package/Instance.cpp
+ package/Interface.cpp
+ package/Manifest.cpp
+ package/Object.cpp
+ package/ObjectDefinition.cpp
+ package/ObjectDefinitionResource.cpp
+ package/Paper.cpp
+ package/Property.cpp
+ package/PropertySet.cpp
+ package/Resource.cpp
+ package/Section.cpp
+ package/SectionBuilder.cpp
+ package/SectionContentResource.cpp
+ package/Signature.cpp
+ package/SignatureRequest.cpp
+ package/SignatureResource.cpp
+ package/SignatureSection.cpp
+ package/Source.cpp
+ package/Units.cpp
+ package/X509.cpp
+ package/XML.cpp
+ package/reader/ContentReader.cpp
+ package/reader/ContentResourceReader.cpp
+ package/reader/DataSectionDescriptorReader.cpp
+ package/reader/DuplicateAttributeFilter.cpp
+ package/reader/EModelSectionDescriptorReader.cpp
+ package/reader/EPlotSectionDescriptorReader.cpp
+ package/reader/GlobalSectionDescriptorReader.cpp
+ package/reader/ObjectDefinitionReader.cpp
+ package/reader/PackageManifestReader.cpp
+ package/reader/PackageReader.cpp
+ package/reader/SectionDescriptorReader.cpp
+ package/reader/SignatureReader.cpp
+ package/reader/SignatureSectionDescriptorReader.cpp
+ package/utility/DefinedObjectContainer.cpp
+ package/utility/DWFPackageFileDescriptor.cpp
+ package/utility/PropertyContainer.cpp
+ package/utility/ResourceContainer.cpp
+ package/writer/DWF6PackageWriter.cpp
+ package/writer/DWFXPackageWriter.cpp
+ package/writer/PackageWriter.cpp
+ package/writer/extensions/6.0/PackageVersionExtension60.cpp
+ package/writer/extensions/6.01/PackageVersionExtension601.cpp
+ package/writer/extensions/6.11/PackageVersionExtension611.cpp
+ package/writer/extensions/6.20/PackageVersionExtension620.cpp
+ #presentation
+ presentation/ContentPresentation.cpp
+ presentation/ContentPresentationModelViewNode.cpp
+ presentation/ContentPresentationNode.cpp
+ presentation/ContentPresentationReferenceNode.cpp
+ presentation/ContentPresentationResource.cpp
+ presentation/ContentPresentationView.cpp
+ presentation/ModelScene.cpp
+ presentation/PropertyReference.cpp
+ presentation/ContentPresentationDocument.cpp
+ presentation/PackageContentPresentations.cpp
+ presentation/reader/ContentPresentationReader.cpp
+ presentation/utility/ContentPresentationContainer.cpp
+ presentation/utility/ContentPresentationNodeContainer.cpp
+ presentation/utility/ContentPresentationViewContainer.cpp
+ presentation/utility/PropertyReferenceContainer.cpp
+ #publisher
+ publisher/EmbeddedFont.cpp
+ publisher/PublishedObject.cpp
+ publisher/data/Data.cpp
+ publisher/impl/ContentElementPropertyVisitor.cpp
+ publisher/impl/DefinedObjectPropertyVisitor.cpp
+ publisher/impl/DWF6PackagePublisher.cpp
+ publisher/impl/DWFPackagePublisher.cpp
+ publisher/impl/DWFXPackagePublisher.cpp
+ publisher/impl/PublishedContentElement.cpp
+ publisher/impl/PublishedDefinedObject.cpp
+ publisher/model/IncludeSegment.cpp
+ publisher/model/Model.cpp
+ publisher/model/Segment.cpp
+ publisher/model/StyleSegment.cpp
+ publisher/plot/Plot.cpp
+ #w3dtk
+ w3dtk/BCompress.cpp
+ w3dtk/BCompressData.cpp
+ w3dtk/BEdgeBreakerCommon.cpp
+ w3dtk/BEdgeBreakerCompress.cpp
+ w3dtk/BEdgeBreakerDecompress.cpp
+ w3dtk/BOpcodeHandler.cpp
+ w3dtk/BOpcodeShell.cpp
+ w3dtk/BPointCloud.cpp
+ w3dtk/BPolyhedron.cpp
+ w3dtk/BPolyPoly.cpp
+ w3dtk/BStreamFileToolkit.cpp
+ w3dtk/W3DCamera.cpp
+ w3dtk/W3DStreamWriter.cpp
+ w3dtk/BPolyhedronAscii.cpp
+ w3dtk/BOpcodeShellAscii.cpp
+ w3dtk/BAscii.cpp
+ w3dtk/hoops/fastlod.c
+ w3dtk/hoops/mxmain.c
+ w3dtk/hoops/mxmath.c
+ w3dtk/hoops/mxmetric.c
+ w3dtk/hoops/mxmodel.c
+ w3dtk/hoops/mxqslim.c
+ w3dtk/hoops/mxtype.c
+ w3dtk/hoops/shellopt.cpp
+ w3dtk/hoops/trialate.c
+ # DISABLE_STREAM_JPEG
+ #w3dtk/jpeg/jcapimin.c
+ #w3dtk/jpeg/jcomapi.c
+ #w3dtk/jpeg/jdcoefct.c
+ #w3dtk/jpeg/jdpostct.c
+ #w3dtk/jpeg/jidctred.c
+ #w3dtk/jpeg/jcapistd.c
+ #w3dtk/jpeg/jcparam.c
+ #w3dtk/jpeg/jdcolor.c
+ #w3dtk/jpeg/jdsample.c
+ #w3dtk/jpeg/jccoefct.c
+ #w3dtk/jpeg/jcphuff.c
+ #w3dtk/jpeg/jddctmgr.c
+ #w3dtk/jpeg/jdtrans.c
+ #w3dtk/jpeg/jccolor.c
+ #w3dtk/jpeg/jcprepct.c
+ #w3dtk/jpeg/jdhuff.c
+ #w3dtk/jpeg/jerror.c
+ #w3dtk/jpeg/jcdctmgr.c
+ #w3dtk/jpeg/jcsample.c
+ #w3dtk/jpeg/jdinput.c
+ #w3dtk/jpeg/jfdctflt.c
+ #w3dtk/jpeg/jmemmgr.c
+ #w3dtk/jpeg/jchuff.c
+ #w3dtk/jpeg/jctrans.c
+ #w3dtk/jpeg/jdmainct.c
+ #w3dtk/jpeg/jfdctfst.c
+ #w3dtk/jpeg/jcinit.c
+ #w3dtk/jpeg/jdapimin.c
+ #w3dtk/jpeg/jdmarker.c
+ #w3dtk/jpeg/jfdctint.c
+ #w3dtk/jpeg/jmemnobs.c
+ #w3dtk/jpeg/jcmainct.c
+ #w3dtk/jpeg/jdapistd.c
+ #w3dtk/jpeg/jdmaster.c
+ #w3dtk/jpeg/jidctflt.c
+ #w3dtk/jpeg/jquant1.c
+ #w3dtk/jpeg/jcmarker.c
+ #w3dtk/jpeg/jdatadst.c
+ #w3dtk/jpeg/jdmerge.c
+ #w3dtk/jpeg/jidctfst.c
+ #w3dtk/jpeg/jquant2.c
+ #w3dtk/jpeg/jcmaster.c
+ #w3dtk/jpeg/jdatasrc.c
+ #w3dtk/jpeg/jdphuff.c
+ #w3dtk/jpeg/jidctint.c
+ #w3dtk/jpeg/jutils.c
+ w3dtk/utility/cache_memory_object.cpp
+ w3dtk/utility/huffman.cpp
+ w3dtk/utility/tempfile_utils.cpp
+ w3dtk/utility/utf_utils.cpp
+ w3dtk/utility/vconf.cpp
+ w3dtk/utility/vdlist.cpp
+ w3dtk/utility/vhash.cpp
+ w3dtk/utility/vlist.cpp
+ w3dtk/utility/vlogfile.cpp
+ #whiptk
+ whiptk/assert.cpp
+ whiptk/attribute.cpp
+ whiptk/attribute_url.cpp
+ whiptk/backgrnd.cpp
+ whiptk/blockref.cpp
+ whiptk/blockref_defs.cpp
+ whiptk/blockref_list.cpp
+ whiptk/code_page.cpp
+ whiptk/color.cpp
+ whiptk/colormap.cpp
+ whiptk/compdata.cpp
+ whiptk/contour_set.cpp
+ whiptk/contrastcolor.cpp
+ whiptk/convert_utf.cpp
+ whiptk/dashpat.cpp
+ whiptk/delineate.cpp
+ whiptk/directory.cpp
+ whiptk/dpat_list.cpp
+ whiptk/drawable.cpp
+ whiptk/dwfhead.cpp
+ whiptk/dwginfo.cpp
+ whiptk/ellipse.cpp
+ whiptk/embed.cpp
+ whiptk/embedded_font.cpp
+ whiptk/endofdwf.cpp
+ whiptk/file.cpp
+ whiptk/file_stats.cpp
+ whiptk/filetime.cpp
+ whiptk/fill.cpp
+ whiptk/fillpat.cpp
+ whiptk/font.cpp
+ whiptk/font_extension.cpp
+ whiptk/font_options.cpp
+ whiptk/gouraud_pointset.cpp
+ whiptk/gouraud_polyline.cpp
+ whiptk/gouraud_polytri.cpp
+ whiptk/group_begin.cpp
+ whiptk/group_end.cpp
+ whiptk/guid_list.cpp
+ whiptk/heuristics.cpp
+ whiptk/image.cpp
+ whiptk/informational.cpp
+ whiptk/inked_area.cpp
+ whiptk/layer.cpp
+ whiptk/layer_list.cpp
+ whiptk/linepat.cpp
+ whiptk/linestyle.cpp
+ whiptk/logical_point.cpp
+ whiptk/lweight.cpp
+ whiptk/lz77comp.cpp
+ whiptk/lz77decp.cpp
+ whiptk/macro_definition.cpp
+ whiptk/macro_draw.cpp
+ whiptk/macro_scale.cpp
+ whiptk/macro_index.cpp
+ whiptk/marksize.cpp
+ whiptk/marksymb.cpp
+ whiptk/matrix.cpp
+ whiptk/merge_control.cpp
+ whiptk/named_view.cpp
+ whiptk/named_view_list.cpp
+ whiptk/object.cpp
+ whiptk/object_node.cpp
+ whiptk/object_node_list.cpp
+ whiptk/object_stream.cpp
+ whiptk/opcode.cpp
+ whiptk/origin.cpp
+ whiptk/overpost.cpp
+ whiptk/pattern_scale.cpp
+ whiptk/pch.cpp
+ whiptk/penpat.cpp
+ whiptk/penpat_options.cpp
+ whiptk/plot_optimized.cpp
+ whiptk/plotinfo.cpp
+ whiptk/pnggroup4image.cpp
+ whiptk/pointset.cpp
+ whiptk/polygon.cpp
+ whiptk/polyline.cpp
+ whiptk/polymark.cpp
+ whiptk/polytri.cpp
+ whiptk/projection.cpp
+ whiptk/rendition.cpp
+ whiptk/rendopts.cpp
+ whiptk/signdata.cpp
+ whiptk/text.cpp
+ whiptk/text_background.cpp
+ whiptk/text_options.cpp
+ whiptk/text_halign.cpp
+ whiptk/text_valign.cpp
+ whiptk/timestamp.cpp
+ whiptk/trusted_font_list.cpp
+ whiptk/units.cpp
+ whiptk/unknown.cpp
+ whiptk/url.cpp
+ whiptk/url_list.cpp
+ whiptk/userdata.cpp
+ whiptk/usrfillpat.cpp
+ whiptk/usrhatchpat.cpp
+ whiptk/view.cpp
+ whiptk/viewport.cpp
+ whiptk/viewport_options.cpp
+ whiptk/visible.cpp
+ whiptk/wtstring.cpp
+ whiptk/class_factory.cpp
+ whiptk/w2d_class_factory.cpp
+ #XAML
+ #xps
+ xps/Constants.cpp
+ xps/FixedDocument.cpp
+ xps/FixedDocumentSequence.cpp
+ xps/FixedPage.cpp
+ xps/Package.cpp
+ xps/XPSDocRefResourceExtractor.cpp
+ xps/XPSFixedDocumentResourceExtractor.cpp
+ xps/XPSFixedPageResourceExtractor.cpp
+ xps/XPSFontResourceExtractor.cpp
+)
+
+add_library(dwftk-${DWF_VERSION} SHARED ${dwftk_SRCS})
+target_link_libraries(dwftk-${DWF_VERSION}
+ -Wl,-Bsymbolic
+ dwfcore-${DWFCORE_VERSION})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,84 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../dwf)
+
+set (dwfXAML_SRCS
+ pch.cpp
+ XamlArcSegment.cpp
+ XamlAttribute_Url.cpp
+ XamlBrushes.cpp
+ XamlCanvas.cpp
+ XamlClassFactory.cpp
+ XamlCode_Page.cpp
+ XamlColor.cpp
+ XamlColorMap.cpp
+ XamlContour_Set.cpp
+ XamlContrastColor.cpp
+ XamlDashPattern.cpp
+ XamlDelineate.cpp
+ XamlDrawable.cpp
+ XamlDrawableAttributes.cpp
+ XamlDwfHeader.cpp
+ XamlEllipse.cpp
+ XamlEmbed.cpp
+ XamlEmbeddedFont.cpp
+ XamlFile.cpp
+ XamlFill.cpp
+ XamlFillPattern.cpp
+ XamlFont.cpp
+ XamlFontExtension.cpp
+ XamlGlyphs.cpp
+ XamlGouraud_Polyline.cpp
+ XamlGouraud_Polytriangle.cpp
+ XamlGraphicsObject.cpp
+ XamlImage.cpp
+ XamlLayer.cpp
+ XamlLinePattern.cpp
+ XamlLineStyle.cpp
+ XamlLineWeight.cpp
+ XamlMacro_Definition.cpp
+ XamlMacro_Draw.cpp
+ XamlMacro_Index.cpp
+ XamlMacro_Scale.cpp
+ XamlMerge_Control.cpp
+ XamlNamed_View.cpp
+ XamlNamed_View_List.cpp
+ XamlObject.cpp
+ XamlObjectFactory.cpp
+ XamlObjectNode.cpp
+ XamlOverpost.cpp
+ XamlParser.cpp
+ XamlPath.cpp
+ XamlPathGeometry.cpp
+ XamlPenPattern.cpp
+ XamlPNGGroup4Image.cpp
+ XamlPointset.cpp
+ XamlPolygon.cpp
+ XamlPolyline.cpp
+ XamlPolyLineSegment.cpp
+ XamlPolymarker.cpp
+ XamlPolytriangle.cpp
+ XamlProjection.cpp
+ XamlRendition.cpp
+ XamlRenditionPath.cpp
+ XamlResource.cpp
+ XamlResourceDictionaryParser.cpp
+ XamlText.cpp
+ XamlText_Background.cpp
+ XamlText_HAlign.cpp
+ XamlText_VAlign.cpp
+ XamlUnits.cpp
+ XamlUnknown.cpp
+ XamlURL.cpp
+ XamlUserData.cpp
+ XamlUserFillPattern.cpp
+ XamlUserHatchPattern.cpp
+ XamlView.cpp
+ XamlViewport.cpp
+ XamlVisible.cpp
+ XamlW2XParser.cpp
+ XamlXML.cpp
+)
+
+add_definitions(-DWHIP_USE_WCHAR_STRINGS)
+
+add_library(dwfXAML STATIC ${dwfXAML_SRCS})
\ No newline at end of file
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/config.h.in (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/config.h.in)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/config.h.in (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/config.h.in 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,12 @@
+#ifndef DWF_CONFIG_H
+#define DWF_CONFIG_H
+
+// This is a config.h template used by CMake
+
+#cmakedefine DISABLE_STREAM_JPEG @DISABLE_STREAM_JPEG@
+#cmakedefine DWFTK_EXPORT_API @DWFTK_EXPORT_API@
+#cmakedefine WHIP_USE_WCHAR_STRINGS @WHIP_USE_WCHAR_STRINGS@
+#cmakedefine WHIPTOOL_CLIENT @WHIPTOOL_CLIENT@
+#cmakedefine DWFTK_USE_DWFCORE_ZLIB @DWFTK_USE_DWFCORE_ZLIB@
+
+#endif
\ No newline at end of file
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1145,7 +1145,7 @@
* making no progress - uh oh
* you know what that means
*/
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
@@ -1156,7 +1156,7 @@
/*
* rats.
*/
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
@@ -1238,7 +1238,7 @@
/* sanity check - shouldn't be null for behaved figures */
if (current_edge == null) {
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,124 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+set (dwfcore_SRCS
+ BufferInputStream.cpp
+ BufferOutputStream.cpp
+ DecompressingInputStream.cpp
+ DWFCompressingInputStream.cpp
+ DWFEncryptingInputStream.cpp
+ DWFDecryptingInputStream.cpp
+ Digest.cpp
+ DigestInputStream.cpp
+ DigestOutputStream.cpp
+ DWFXMLSerializer.cpp
+ Exception.cpp
+ File.cpp
+ FileInputStream.cpp
+ FileOutputStream.cpp
+ MIME.cpp
+ MonitoredInputStream.cpp
+ Owner.cpp
+ StreamOutputBufferDescriptor.cpp
+ ThreadPool.cpp
+ UnzippingInputStream.cpp
+ UTF8EncodingOutputStream.cpp
+ UUID.cpp
+ XML.cpp
+ XMLEncodingOutputStream.cpp
+ XMLParser.cpp
+ ZipFileDescriptor.cpp
+ ZippingOutputStream.cpp
+ #ansi
+ ansi/Core.cpp
+ ansi/Mutex.cpp
+ ansi/Semaphore.cpp
+ ansi/Signal.cpp
+ ansi/StandardFileDescriptor.cpp
+ ansi/StreamFileDescriptor.cpp
+ ansi/String.cpp
+ ansi/TempFile.cpp
+ ansi/Thread.cpp
+ ansi/UUID.cpp
+ #crypto
+ crypto/AsymmetricAlgorithm.cpp
+ crypto/CryptoEngine.cpp
+ crypto/CryptoEngineProvider.cpp
+ crypto/CryptoKeyGeneratorProvider.cpp
+ crypto/DigestEngine.cpp
+ crypto/SymmetricCipher.cpp
+ crypto/X509Certificate.cpp
+ #digest
+ digest/md5.c
+ digest/sha1.c
+ #expat
+ expat/xmlparse.c
+ expat/xmlrole.c
+ expat/xmltok.c
+ #mac
+ mac/Core.cpp
+ mac/Timer.cpp
+ #paging
+ paging/FileAdapter.cpp
+ paging/MemoryManager.cpp
+ paging/PagingStrategy.cpp
+ paging/SqlAdapter.cpp
+ #sqlite
+ sqlite/sqlite3.c
+ #utility
+ utility/XMLCompatibilityContext.cpp
+ utility/XMLCompatibilityPP.cpp
+ utility/XMLCompatibilityProcessChoices.cpp
+ utility/XMLCompatibilityProcessConsider.cpp
+ utility/XMLCompatibilityProcessIgnore.cpp
+ utility/XMLCompatibilityProcessStandard.cpp
+ utility/XMLCompatibilityStack.cpp
+ utility/XMLCompatibilityStreamFilter.cpp
+ utility/XMLIdentityWriter.cpp
+ utility/XMLNamespaceCollection.cpp
+ utility/XMLQualifiedNameCollection.cpp
+ #x64
+ x64/Core.cpp
+ x64/Timer.cpp
+ #x86
+ x86/Core.cpp
+ x86/Timer.cpp
+ #zip
+ zip/gvmat32c.cpp
+ zip/password.cpp
+ zip/unzip.cpp
+ zip/zip.cpp
+ #zlib
+ zlib/adler32.c
+ zlib/compress.c
+ zlib/crc32.c
+ zlib/deflate.c
+ zlib/infblock.c
+ zlib/infcodes.c
+ zlib/inffast.c
+ zlib/inflate.c
+ zlib/inftrees.c
+ zlib/infutil.c
+ zlib/maketree.c
+ zlib/trees.c
+ zlib/uncompr.c
+ zlib/zutil.c
+)
+
+add_library(dwfcore-${DWFCORE_VERSION} SHARED ${dwfcore_SRCS})
+
+if (NOT uuid-NOTFOUND)
+ target_link_libraries(dwfcore-${DWFCORE_VERSION}
+ -Wl,-Bsymbolic
+ dl
+ pthread
+ uuid
+ )
+else (NOT uuid-NOTFOUND)
+ target_link_libraries(dwfcore-${DWFCORE_VERSION}
+ -Wl,-Bsymbolic
+ dl
+ pthread
+ )
+endif (NOT uuid-NOTFOUND)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
\ No newline at end of file
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -81,7 +81,7 @@
pNext = pNext->_next;
if(pLast->_buffer != NULL)
{
- DWFCORE_FREE_OBJECT( pLast->_buffer );
+ DWFCORE_FREE_MEMORY( pLast->_buffer );
}
DWFCORE_FREE_OBJECT( pLast );
}
Copied: trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/config.h.in (from rev 9317, sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/config.h.in)
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/config.h.in (rev 0)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/config.h.in 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,12 @@
+#ifndef DWFCORE_CONFIG_H
+#define DWFCORE_CONFIG_H
+
+// This is a config.h template used by CMake
+
+#cmakedefine _DWFCORE_USE_ASM_ATOMIC_H @_DWFCORE_USE_ASM_ATOMIC_H@
+#cmakedefine _DWFCORE_USE_ALSA_IATOMIC_H @_DWFCORE_USE_ALSA_IATOMIC_H@
+#cmakedefine HAVE_MEMMOVE @HAVE_MEMMOVE@
+#cmakedefine HAVE_NETINET_ETHER_H @HAVE_NETINET_ETHER_H@
+#cmakedefine HAVE_LIBUUID @HAVE_LIBUUID@
+
+#endif
\ No newline at end of file
Copied: trunk/MgDev/Oem/LinuxApt/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/LinuxApt/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/LinuxApt/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/LinuxApt/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,26 @@
+configure_file(${CMAKE_MODULE_PATH}/../configs/php.ini.in ${CMAKE_CURRENT_BINARY_DIR}/php.ini)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/php.ini DESTINATION ${MG_INSTALL_WEB_PREFIX}/php/lib COMPONENT ${MG_COMPONENT})
+
+configure_file(${CMAKE_MODULE_PATH}/../configs/mapguide.conf.in ${CMAKE_CURRENT_BINARY_DIR}/mapguide.conf)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapguide.conf DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/conf/mapguide COMPONENT ${MG_COMPONENT})
+
+if (WITH_JAVA)
+ configure_file(${CMAKE_MODULE_PATH}/../configs/workers.properties.in ${CMAKE_CURRENT_BINARY_DIR}/workers.properties)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/workers.properties DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/conf/mapguide COMPONENT ${MG_COMPONENT})
+
+ configure_file(${CMAKE_MODULE_PATH}/../configs/tomcat.conf.in ${CMAKE_CURRENT_BINARY_DIR}/tomcat.conf)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tomcat.conf DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/conf/mapguide COMPONENT ${MG_COMPONENT})
+
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tomcat)
+ execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-7.0.68.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
+
+ configure_file(${CMAKE_MODULE_PATH}/../configs/mapguide.xml.in ${CMAKE_CURRENT_BINARY_DIR}/tomcat/conf/Catalina/localhost/mapguide.xml)
+ # Don't overwrite startup.sh in the CMAKE_CURRENT_BINARY_DIR as the subseqent install will do the same thing
+ # and we'll get auto chmod+x as a bonus
+ configure_file(${CMAKE_MODULE_PATH}/../configs/tomcat_startup.sh.in ${CMAKE_CURRENT_BINARY_DIR}/startup.sh)
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tomcat DESTINATION ${MG_INSTALL_WEB_PREFIX})
+ file(GLOB TOMCAT_SCRIPTS "${CMAKE_CURRENT_BINARY_DIR}/tomcat/bin/*.sh")
+ install(PROGRAMS ${TOMCAT_SCRIPTS} DESTINATION ${MG_INSTALL_WEB_PREFIX}/tomcat/bin)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startup.sh DESTINATION ${MG_INSTALL_WEB_PREFIX}/tomcat/bin)
+endif (WITH_JAVA)
\ No newline at end of file
Deleted: trunk/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
===================================================================
(Binary files differ)
Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh 2018-01-24 12:38:11 UTC (rev 9318)
@@ -19,8 +19,6 @@
PHP_VER=5.6.23
TOMCAT_VER=7.0.68
CONNECTOR_VER=1.2.41
-APR_VER=1.5.2
-APR_UTIL_VER=1.5.4
PORT=8008
TOMCAT=0
TOMCAT_PORT=8009
@@ -147,14 +145,7 @@
#**********************************************************
echo "Apache Httpd build started"
tar -jxf httpd-$HTTPD_VER.tar.bz2
-if [ ! -d "httpd-$HTTPD_VER/srclib/apr" ]; then
- tar -jxf apr-$APR_VER.tar.bz2
- mv apr-$APR_VER httpd-$HTTPD_VER/srclib/apr
-fi
-if [ ! -d "httpd-$HTTPD_VER/srclib/aprutil" ]; then
- tar -jxf apr-util-$APR_UTIL_VER.tar.bz2
- mv apr-util-$APR_UTIL_VER httpd-$HTTPD_VER/srclib/apr-util
-fi
+tar -jxf httpd-$HTTPD_VER-deps.tar.bz2
pushd httpd-$HTTPD_VER
./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
--with-included-apr --with-port=$PORT
Copied: trunk/MgDev/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2 (from rev 9317, sandbox/jng/cmake_v2/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2)
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Oem/SWIGEx/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Oem/SWIGEx/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Oem/SWIGEx/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Oem/SWIGEx/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,71 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source/CParse
+ ${CMAKE_CURRENT_SOURCE_DIR}/Source/DOH
+ ${CMAKE_CURRENT_SOURCE_DIR}/Source/Include
+ ${CMAKE_CURRENT_SOURCE_DIR}/Source/Swig
+ ${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules
+ ${CMAKE_CURRENT_SOURCE_DIR}/Source/Preprocessor
+)
+
+set(Swig_SRCS
+ Source/CParse/cscanner.c
+ Source/CParse/parser.c
+ Source/CParse/templ.c
+ Source/CParse/util.c
+ Source/DOH/base.c
+ Source/DOH/file.c
+ Source/DOH/fio.c
+ Source/DOH/hash.c
+ Source/DOH/list.c
+ Source/DOH/memory.c
+ Source/DOH/string.c
+ Source/DOH/void.c
+ Source/Modules/allocate.cxx
+ Source/Modules/browser.cxx
+ Source/Modules/chicken.cxx
+ Source/Modules/contract.cxx
+ Source/Modules/csharp.cxx
+ Source/Modules/directors.cxx
+ Source/Modules/emit.cxx
+ Source/Modules/guile.cxx
+ Source/Modules/java.cxx
+ Source/Modules/lang.cxx
+ Source/Modules/main.cxx
+ Source/Modules/module.cxx
+ Source/Modules/mzscheme.cxx
+ Source/Modules/ocaml.cxx
+ Source/Modules/overload.cxx
+ Source/Modules/perl5.cxx
+ Source/Modules/php4.cxx
+ Source/Modules/php5.cxx
+ Source/Modules/pike.cxx
+ Source/Modules/python.cxx
+ Source/Modules/ruby.cxx
+ Source/Modules/s-exp.cxx
+ Source/Modules/swigmain.cxx
+ Source/Modules/tcl8.cxx
+ Source/Modules/typepass.cxx
+ Source/Modules/utils.cxx
+ Source/Modules/xml.cxx
+ Source/Swig/cwrap.c
+ Source/Swig/error.c
+ Source/Swig/fragment.c
+ Source/Swig/getopt.c
+ Source/Swig/include.c
+ Source/Swig/misc.c
+ Source/Swig/naming.c
+ Source/Swig/parms.c
+ Source/Swig/scanner.c
+ Source/Swig/stype.c
+ Source/Swig/symbol.c
+ Source/Swig/tree.c
+ Source/Swig/typemap.c
+ Source/Swig/typeobj.c
+ Source/Swig/typesys.c
+ Source/Swig/warn.c
+ Source/Swig/wrapfunc.c
+ Source/Preprocessor/cpp.c
+ Source/Preprocessor/expr.c
+)
+
+add_executable(swig ${Swig_SRCS})
+file(COPY "Lib" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
Modified: trunk/MgDev/Oem/dbxml/buildall.sh
===================================================================
--- trunk/MgDev/Oem/dbxml/buildall.sh 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/buildall.sh 2018-01-24 12:38:11 UTC (rev 9318)
@@ -97,6 +97,9 @@
--build-one=<library> build only the specified library,
which is one of berkeleydb, xerces,
xqilla, dbxml, or perl
+ --have-system-xerces Specifies that you intend to use a system-installed
+ copy of xerces-c, thus xerces is not built when
+ --build-one is not specified
EOF
}
@@ -145,6 +148,7 @@
BUILD_PERL="no"
PERL_INSTALLDIR=""
PERL="perl"
+HAVE_SYSTEM_XERCES="no"
# Parse arguments
for option
@@ -210,6 +214,9 @@
DBXML_CONF_ARGS="$DBXML_CONF_ARGS $option"
JAVA_ENABLED="yes"
;;
+ --have-system-xerces)
+ HAVE_SYSTEM_XERCES="yes"
+ ;;
--with-tcl=*)
DB_CONF_ARGS="$DB_CONF_ARGS $option"
DBXML_CONF_ARGS="$DBXML_CONF_ARGS $option"
@@ -383,41 +390,45 @@
# Xerces
# change args, depending on platform
-if [ $BUILD_ONE = "no" -o $BUILD_ONE = "xerces" ]; then
- echo Start Xerces build: `date`
- cd $XERCES_DIR
- if [ $DO_CONFIGURE = "yes" ]; then
- echo Configuring Xerces
- chmod +x ./configure
- eval $CONF_ENV ./configure --prefix=$XERCES_INSTALL_DIR \
- $XERCES_CONF_ARGS $XERCES_CONF_XARGS || exit $?
- fi
+if [ $HAVE_SYSTEM_XERCES = "no" ]; then
+ if [ $BUILD_ONE = "no" -o $BUILD_ONE = "xerces" ]; then
+ echo Start Xerces build: `date`
+ cd $XERCES_DIR
+ if [ $DO_CONFIGURE = "yes" ]; then
+ echo Configuring Xerces
+ chmod +x ./configure
+ eval $CONF_ENV ./configure --prefix=$XERCES_INSTALL_DIR \
+ $XERCES_CONF_ARGS $XERCES_CONF_XARGS || exit $?
+ fi
- echo Building Xerces
- # only build source/library tree
- cd src
- $MAKE || exit $?
- cd ..
+ echo Building Xerces
+ # only build source/library tree
+ cd src
+ $MAKE || exit $?
+ cd ..
- if [ $DO_INSTALL = "yes" ]; then
- echo Installing Xerces
- # remove symlinks that cause make install to fail if re-run
- for i in $XERCES_TO_REMOVE
- do
- rm -f $XERCES_INSTALL_DIR/lib/$i
- done
- # only install source tree, not samples
- cd src
- $MAKE install || exit $?
- cd ..
- # remove unused xerces library. Cannot suppress build, but can remove it.
- for i in $XERCES_DEPDOM
- do
- rm -f $XERCES_INSTALL_DIR/lib/$i
- done
+ if [ $DO_INSTALL = "yes" ]; then
+ echo Installing Xerces
+ # remove symlinks that cause make install to fail if re-run
+ for i in $XERCES_TO_REMOVE
+ do
+ rm -f $XERCES_INSTALL_DIR/lib/$i
+ done
+ # only install source tree, not samples
+ cd src
+ $MAKE install || exit $?
+ cd ..
+ # remove unused xerces library. Cannot suppress build, but can remove it.
+ for i in $XERCES_DEPDOM
+ do
+ rm -f $XERCES_INSTALL_DIR/lib/$i
+ done
+ fi
+ cd $TOP
+ echo End Xerces build: `date`
fi
- cd $TOP
- echo End Xerces build: `date`
+else
+ echo Skipping Xerces build as HAVE_SYSTEM_XERCES is $HAVE_SYSTEM_XERCES
fi
echo "********************************"
@@ -458,6 +469,10 @@
if [ $BUILD_ONE = "no" -o $BUILD_ONE = "dbxml" ]; then
echo Start DB XML build: `date`
cd $DBXML_BUILD_DIR
+ XERCES_INST=$XERCES_DIR
+ if [ ! -d $XERCES_INST ]; then
+ XERCES_INST=$XERCES_INSTALL_DIR
+ fi
if [ $DO_CONFIGURE = "yes" ]; then
echo Configuring DB XML
# Note: passing ../../$DB_DIR for --with-dbbuild will not work
@@ -466,7 +481,7 @@
chmod +x ../configure
eval $CONF_ENV ../configure --prefix=$DBXML_INSTALL_DIR \
--with-xqilla=$XQILLA_INSTALL_DIR \
- --with-xerces=$XERCES_INSTALL_DIR \
+ --with-xerces=$XERCES_INST \
--with-berkeleydb=$DB_INSTALL_DIR \
--with-dbbuild=../../$DB_DIR $DBXML_CONF_ARGS \
$DBXML_CONF_XARGS || exit $?
Modified: trunk/MgDev/Oem/dbxml/dbxml/configure
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/configure 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/dbxml/configure 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1,62 +1,83 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Berkeley DB XML 2.5.16.
+# Generated by GNU Autoconf 2.69 for Berkeley DB XML 2.5.16.
#
# Report bugs to <Oracle Technology Network Berkeley DB XML forum>.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992-1996, 1998-2012 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. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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
+ # Pre-4.2 versions of Zsh do 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 ;;
+ 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=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -65,20 +86,19 @@
# 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=
+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
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -89,354 +109,367 @@
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; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-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) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
-# Required to use basename.
-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
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
- 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
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-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.
+ exitcode=1; echo positional parameters were not saved.
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
- :
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-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
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
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
-
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and Oracle Technology
+$0: Network Berkeley DB XML forum about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
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
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
-test $exitcode = 0) || { (exit 1); exit 1; }
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-(
- 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; }
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_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 ||
+$as_echo X"$as_dir" |
+ 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 -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-_ASEOF
-}; then
- break
-fi
-fi
+} # as_fn_mkdir_p
- done
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
- 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
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
- 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
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-
-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
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
+ as_expr=false
fi
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
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
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# 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
- 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 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
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -453,9 +486,12 @@
s/-\n.*//
' >$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; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# 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 sensitive to this).
@@ -464,84 +500,55 @@
exit
}
-
-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
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-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
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- 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'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ 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 -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
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=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-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
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# 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'"
@@ -551,7 +558,6 @@
-
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -705,10 +711,11 @@
tagnames=${tagnames+${tagnames},}F77
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -723,7 +730,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Berkeley DB XML'
@@ -731,6 +737,7 @@
PACKAGE_VERSION='2.5.16'
PACKAGE_STRING='Berkeley DB XML 2.5.16'
PACKAGE_BUGREPORT='Oracle Technology Network Berkeley DB XML forum'
+PACKAGE_URL=''
ac_unique_file="src/dbxml/Buffer.cpp"
ac_default_prefix=/usr/local/BerkeleyDBXML.2.5
@@ -770,162 +777,189 @@
# 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
-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
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-DBXML_VERSION_MAJOR
-DBXML_VERSION_MINOR
-DBXML_VERSION_PATCH
-DBXML_VERSION_STRING
-DB_TCLLIB
-DB_TEST_PATH
-DB_UTIL_PATH
-DB_DIR
-berkeleydb_include
-berkeleydb_lib
-berkeleydb_library
-berkeleydb_jar
-XQILLA_DIR
-xqilla_include
-xqilla_lib
-XERCES_DIR
-xerces_include
-xerces_include_dir
-xerces_lib
-JUNIT_JAR
-zlib_include
-zlib_lib
-zlib_library
-BUILD_TCL_TRUE
-BUILD_TCL_FALSE
-BUILD_JAVA_TRUE
-BUILD_JAVA_FALSE
-BUILD_TEST_TRUE
-BUILD_TEST_FALSE
-USE_COMPRESSION_TRUE
-USE_COMPRESSION_FALSE
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-DSYMUTIL
-NMEDIT
-CPP
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-LIBOBJS
-POW_LIB
-JAVAC
-JAR
-_ACJNI_JAVAC
-JAVACFLAGS
-SWIGCPPFLAGS
-JAVA_INCLUDE_SPEC
-MODSUFFIX
-JAVA_LIBRARY_EXTENSION
-LIBJSO_LIBS
-LIBTSO_MODSUFFIX
-LIBTSO_LIBS
-TCL_LIBRARY_EXTENSION
-TCL_BIN_DIR
-TCL_INCLUDE_SPEC
-TCL_LIB_FILE
-TCL_SRC_DIR
+ac_subst_vars='LTLIBOBJS
TCL_TCLSH
-LTLIBOBJS'
+TCL_SRC_DIR
+TCL_LIB_FILE
+TCL_INCLUDE_SPEC
+TCL_BIN_DIR
+TCL_LIBRARY_EXTENSION
+LIBTSO_LIBS
+LIBTSO_MODSUFFIX
+LIBJSO_LIBS
+JAVA_LIBRARY_EXTENSION
+MODSUFFIX
+JAVA_INCLUDE_SPEC
+SWIGCPPFLAGS
+JAVACFLAGS
+_ACJNI_JAVAC
+JAR
+JAVAC
+POW_LIB
+LIBOBJS
+LIBTOOL
+ac_ct_F77
+FFLAGS
+F77
+CXXCPP
+CPP
+NMEDIT
+DSYMUTIL
+RANLIB
+AR
+ECHO
+LN_S
+EGREP
+GREP
+SED
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+USE_COMPRESSION_FALSE
+USE_COMPRESSION_TRUE
+BUILD_TEST_FALSE
+BUILD_TEST_TRUE
+BUILD_JAVA_FALSE
+BUILD_JAVA_TRUE
+BUILD_TCL_FALSE
+BUILD_TCL_TRUE
+zlib_library
+zlib_lib
+zlib_include
+JUNIT_JAR
+xerces_lib
+xerces_include_dir
+xerces_include
+XERCES_DIR
+xqilla_lib
+xqilla_include
+XQILLA_DIR
+berkeleydb_jar
+berkeleydb_library
+berkeleydb_lib
+berkeleydb_include
+DB_DIR
+DB_UTIL_PATH
+DB_TEST_PATH
+DB_TCLLIB
+DBXML_VERSION_STRING
+DBXML_VERSION_PATCH
+DBXML_VERSION_MINOR
+DBXML_VERSION_MAJOR
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_debug
+enable_test
+with_berkeleydb
+with_dbbuild
+with_xqilla
+with_xerces
+enable_java
+with_junit
+enable_tcl
+with_tcl
+enable_compression
+with_zlib
+enable_static_zlib
+enable_rpath
+enable_dependency_tracking
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -946,6 +980,8 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -1001,8 +1037,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1044,13 +1081,20 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- 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 ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -1063,13 +1107,20 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- 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=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1260,22 +1311,36 @@
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- 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=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- 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 ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1295,26 +1360,26 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1322,23 +1387,36 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "missing argument to $ac_option"
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
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=\$$ac_var
+ # Remove trailing slashes.
case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
+ case $ac_val in
[\\/$]* | ?:[\\/]* ) 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; }; }
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1352,8 +1430,6 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1368,23 +1444,21 @@
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; }; }
+ as_fn_error $? "working directory cannot be determined"
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; }; }
+ as_fn_error $? "pwd does not report name of working directory"
# 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 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 ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1411,13 +1485,11 @@
fi
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; }; }
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
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; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1457,7 +1529,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1465,9 +1537,9 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1477,25 +1549,25 @@
For better control, use the options below.
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]
- --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]
- --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/dbxml-2.5.16]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --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]
+ --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/dbxml-2.5.16]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1518,6 +1590,7 @@
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-debug Build a debugging version.
@@ -1559,7 +1632,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib 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
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -1579,15 +1652,17 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_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/ ;;
@@ -1623,7 +1698,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1633,21 +1708,765 @@
if $ac_init_version; then
cat <<\_ACEOF
Berkeley DB XML configure 2.5.16
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.69
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2012 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
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## -------------------------------------------------------------- ##
+## Report this to Oracle Technology Network Berkeley DB XML forum ##
+## -------------------------------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* 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
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_f77_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_f77_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_f77_try_compile
+
+# ac_fn_f77_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_f77_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_f77_try_link
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_find_intX_t LINENO BITS VAR
+# -----------------------------------
+# Finds a signed integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_intX_t ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+$as_echo_n "checking for int$2_t... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in int$2_t 'int' 'long int' \
+ 'long long int' 'short int' 'signed char'; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
+int
+main ()
+{
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
+int
+main ()
+{
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ case $ac_type in #(
+ int$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+ break
+fi
+ done
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_intX_t
+
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ case $ac_type in #(
+ uint$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+ break
+fi
+ done
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
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 Berkeley DB XML $as_me 2.5.16, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1683,8 +2502,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1718,12 +2537,12 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1739,13 +2558,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1757,11 +2576,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -1770,12 +2587,13 @@
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;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1794,128 +2612,136 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
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;}
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1929,69 +2755,57 @@
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
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# 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=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2016,9 +2830,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in dist \"$srcdir\"/dist" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in dist \"$srcdir\"/dist" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in dist \"$srcdir\"/dist" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2045,22 +2857,23 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2068,7 +2881,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2078,17 +2891,29 @@
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
-done
+
+ done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -2101,8 +2926,8 @@
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -2112,8 +2937,8 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -2136,11 +2961,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
fi
test "$2" = conftest.file
@@ -2149,26 +2971,20 @@
# Ok.
:
else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
+# Double any \ or $.
# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -2179,24 +2995,24 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if ${ac_cv_path_mkdir+:} false; then :
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2206,11 +3022,12 @@
esac
done
done
-done
+ done
IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2218,12 +3035,11 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
@@ -2235,10 +3051,10 @@
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; }
-if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2248,43 +3064,44 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2294,12 +3111,12 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2318,9 +3135,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2374,10 +3189,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; 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_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2387,25 +3202,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2414,10 +3229,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; 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_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2427,25 +3242,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2453,12 +3268,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2489,35 +3300,27 @@
# Host info
# Make sure we can run config.sub.
$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; }; }
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
else
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; }; }
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
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; }; }
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$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; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2533,28 +3336,24 @@
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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
else
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; }; }
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$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; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2582,64 +3381,64 @@
DBXML_VERSION_PATCH="16"
-DBXML_VERSION_STRING='"Oracle: Berkeley DB XML 2.5.16: (December 22, 2009)"'
+DBXML_VERSION_STRING='"Oracle: Berkeley DB XML 2.5.16: (January 6, 2018)"'
# Process all options before using them.
# Check debug option
-{ echo "$as_me:$LINENO: checking if --enable-debug option specified" >&5
-echo $ECHO_N "checking if --enable-debug option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-debug option specified" >&5
+$as_echo_n "checking if --enable-debug option specified... " >&6; }
# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; db_cv_debug="$enable_debug"
else
db_cv_debug="no"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_debug" >&5
-echo "${ECHO_T}$db_cv_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_debug" >&5
+$as_echo "$db_cv_debug" >&6; }
# Check if we want to build the tests
-{ echo "$as_me:$LINENO: checking if --enable-test option specified" >&5
-echo $ECHO_N "checking if --enable-test option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-test option specified" >&5
+$as_echo_n "checking if --enable-test option specified... " >&6; }
# Check whether --enable-test was given.
-if test "${enable_test+set}" = set; then
+if test "${enable_test+set}" = set; then :
enableval=$enable_test; db_cv_test="$enable_test"
else
db_cv_test="no"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_test" >&5
-echo "${ECHO_T}$db_cv_test" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_test" >&5
+$as_echo "$db_cv_test" >&6; }
# Check for Berkeley DB
-{ echo "$as_me:$LINENO: checking if --with-berkeleydb=DIR option specified" >&5
-echo $ECHO_N "checking if --with-berkeleydb=DIR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-berkeleydb=DIR option specified" >&5
+$as_echo_n "checking if --with-berkeleydb=DIR option specified... " >&6; }
# Check whether --with-berkeleydb was given.
-if test "${with_berkeleydb+set}" = set; then
+if test "${with_berkeleydb+set}" = set; then :
withval=$with_berkeleydb; with_berkeleydb="$withval"
else
with_berkeleydb="no"
fi
-{ echo "$as_me:$LINENO: result: $with_berkeleydb" >&5
-echo "${ECHO_T}$with_berkeleydb" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_berkeleydb" >&5
+$as_echo "$with_berkeleydb" >&6; }
# Check for Berkeley DB build directory
-{ echo "$as_me:$LINENO: checking if --with-dbbuild=DIR option specified" >&5
-echo $ECHO_N "checking if --with-dbbuild=DIR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-dbbuild=DIR option specified" >&5
+$as_echo_n "checking if --with-dbbuild=DIR option specified... " >&6; }
# Check whether --with-dbbuild was given.
-if test "${with_dbbuild+set}" = set; then
+if test "${with_dbbuild+set}" = set; then :
withval=$with_dbbuild; with_dbbuild="$withval"
else
with_dbbuild="no"
fi
-{ echo "$as_me:$LINENO: result: $with_dbbuild" >&5
-echo "${ECHO_T}$with_dbbuild" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbbuild" >&5
+$as_echo "$with_dbbuild" >&6; }
# If --with-berkeleydb isn't specified, assume it's here | wc -l` -gt 0
if test "$with_berkeleydb" = "no"; then
@@ -2657,11 +3456,11 @@
# Check for a DB install tree
if test `ls "$with_berkeleydb"/lib/libdb-*.la 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5
-echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version from install tree" >&5
+$as_echo_n "checking for Berkeley DB version from install tree... " >&6; }
db_version=`ls "$with_berkeleydb"/lib/libdb-*.la | sed 's/.*db-\(.*\).la/\1/'`
- { echo "$as_me:$LINENO: result: $db_version" >&5
-echo "${ECHO_T}$db_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_version" >&5
+$as_echo "$db_version" >&6; }
DB_TCLLIB="<replace_with:_path_to_db_libs_with_tcl>/libdb_tcl-$db_version"
berkeleydb_include="-I$with_berkeleydb/include"
@@ -2672,11 +3471,11 @@
# Check for a built DB source tree
elif test `ls "$with_berkeleydb"/build_unix/libdb-*.la 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: checking for Berkeley DB version from build tree" >&5
-echo $ECHO_N "checking for Berkeley DB version from build tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version from build tree" >&5
+$as_echo_n "checking for Berkeley DB version from build tree... " >&6; }
db_version=`ls "$with_berkeleydb"/build_unix/libdb-*.la | sed 's/.*db-\(.*\).la/\1/'`
- { echo "$as_me:$LINENO: result: $db_version" >&5
-echo "${ECHO_T}$db_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_version" >&5
+$as_echo "$db_version" >&6; }
berkeleydb_include="-I$with_berkeleydb/build_unix -I$with_berkeleydb -I$with_berkeleydb/dbinc"
berkeleydb_lib="$with_berkeleydb/build_unix"
@@ -2690,11 +3489,11 @@
# Alternate check for a built DB source tree
elif test `ls "$with_berkeleydb"/build_unix/libdb-*.a 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: checking for Berkeley DB version from build tree" >&5
-echo $ECHO_N "checking for Berkeley DB version from build tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version from build tree" >&5
+$as_echo_n "checking for Berkeley DB version from build tree... " >&6; }
db_version=`ls "$with_berkeleydb"/build_unix/libdb-*.a | sed 's/.*db-\(.*\).a/\1/'`
- { echo "$as_me:$LINENO: result: $db_version" >&5
-echo "${ECHO_T}$db_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_version" >&5
+$as_echo "$db_version" >&6; }
berkeleydb_include="-I$with_berkeleydb/build_unix -I$with_berkeleydb -I$with_berkeleydb/dbinc"
berkeleydb_lib="$with_berkeleydb/build_unix"
@@ -2708,11 +3507,11 @@
# Check if path points to the build directory itself for DB
elif test `ls "$with_berkeleydb"/libdb-*.la 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: checking for Berkeley DB version from build tree" >&5
-echo $ECHO_N "checking for Berkeley DB version from build tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version from build tree" >&5
+$as_echo_n "checking for Berkeley DB version from build tree... " >&6; }
db_version=`ls "$with_berkeleydb"/libdb-*.la | sed 's/.*db-\(.*\).la/\1/'`
- { echo "$as_me:$LINENO: result: $db_version" >&5
-echo "${ECHO_T}$db_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_version" >&5
+$as_echo "$db_version" >&6; }
berkeleydb_include="-I$with_berkeleydb -I$with_berkeleydb/.. -I$with_berkeleydb/../dbinc"
berkeleydb_lib="$with_berkeleydb"
@@ -2726,11 +3525,11 @@
# Alternate check if path points to the build directory itself for DB
elif test `ls "$with_berkeleydb"/libdb-*.a 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: checking for Berkeley DB version from build tree" >&5
-echo $ECHO_N "checking for Berkeley DB version from build tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version from build tree" >&5
+$as_echo_n "checking for Berkeley DB version from build tree... " >&6; }
db_version=`ls "$with_berkeleydb"/libdb-*.a | sed 's/.*db-\(.*\).a/\1/'`
- { echo "$as_me:$LINENO: result: $db_version" >&5
-echo "${ECHO_T}$db_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_version" >&5
+$as_echo "$db_version" >&6; }
berkeleydb_include="-I$with_berkeleydb -I$with_berkeleydb/.. -I$with_berkeleydb/../dbinc"
berkeleydb_lib="$with_berkeleydb"
@@ -2741,15 +3540,11 @@
DB_TEST_PATH="$with_berkeleydb/../test"
DB_UTIL_PATH="$with_berkeleydb"
else
- { { echo "$as_me:$LINENO: error: $with_berkeleydb not a valid Berkeley DB tree. Note that Berkeley DB must be configured and built with '--enable-cxx'." >&5
-echo "$as_me: error: $with_berkeleydb not a valid Berkeley DB tree. Note that Berkeley DB must be configured and built with '--enable-cxx'." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "$with_berkeleydb not a valid Berkeley DB tree. Note that Berkeley DB must be configured and built with '--enable-cxx'." "$LINENO" 5
fi
if test "$db_version" != "4.3" && test "$db_version" != "4.4" && test "$db_version" != "4.5" && test "$db_version" != "4.6" && test "$db_version" != "4.7" && test "$db_version" != "4.8"; then
- { { echo "$as_me:$LINENO: error: $with_berkeleydb is version $db_version, which is not a supported version of Berkeley DB. The version must be at least 4.3" >&5
-echo "$as_me: error: $with_berkeleydb is version $db_version, which is not a supported version of Berkeley DB. The version must be at least 4.3" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "$with_berkeleydb is version $db_version, which is not a supported version of Berkeley DB. The version must be at least 4.3" "$LINENO" 5
fi
if test "$db_cv_test" = "yes"; then
@@ -2772,18 +3567,18 @@
# Check for XQilla
-{ echo "$as_me:$LINENO: checking if --with-xqilla=DIR option specified" >&5
-echo $ECHO_N "checking if --with-xqilla=DIR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-xqilla=DIR option specified" >&5
+$as_echo_n "checking if --with-xqilla=DIR option specified... " >&6; }
# Check whether --with-xqilla was given.
-if test "${with_xqilla+set}" = set; then
+if test "${with_xqilla+set}" = set; then :
withval=$with_xqilla; with_xqilla="$withval"
else
with_xqilla="no"
fi
-{ echo "$as_me:$LINENO: result: $with_xqilla" >&5
-echo "${ECHO_T}$with_xqilla" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xqilla" >&5
+$as_echo "$with_xqilla" >&6; }
if test "$with_xqilla" = "no"; then
with_xqilla="@XQILLA_HOME@"
fi
@@ -2805,9 +3600,7 @@
fi
xqilla_lib="$with_xqilla"
else
- { { echo "$as_me:$LINENO: error: XQilla is required to build DB XML. $with_xqilla is not a valid XQilla tree (maybe it has not been compiled). You should specify the path where XQilla is installed with --with-xqilla." >&5
-echo "$as_me: error: XQilla is required to build DB XML. $with_xqilla is not a valid XQilla tree (maybe it has not been compiled). You should specify the path where XQilla is installed with --with-xqilla." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "XQilla is required to build DB XML. $with_xqilla is not a valid XQilla tree (maybe it has not been compiled). You should specify the path where XQilla is installed with --with-xqilla." "$LINENO" 5
fi
XQILLA_DIR=$with_xqilla
@@ -2815,18 +3608,18 @@
# Check for the Xerces-C library
-{ echo "$as_me:$LINENO: checking if --with-xerces=DIR option specified" >&5
-echo $ECHO_N "checking if --with-xerces=DIR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-xerces=DIR option specified" >&5
+$as_echo_n "checking if --with-xerces=DIR option specified... " >&6; }
# Check whether --with-xerces was given.
-if test "${with_xerces+set}" = set; then
+if test "${with_xerces+set}" = set; then :
withval=$with_xerces; with_xerces="$withval"
else
with_xerces="no"
fi
-{ echo "$as_me:$LINENO: result: $with_xerces" >&5
-echo "${ECHO_T}$with_xerces" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xerces" >&5
+$as_echo "$with_xerces" >&6; }
if test "$with_xerces" = "no"; then
with_xerces="/usr/local"
fi
@@ -2848,19 +3641,17 @@
xerces_source_tree="yes"
else
- { { echo "$as_me:$LINENO: error: Unable to find the Xerces-C include directory." >&5
-echo "$as_me: error: Unable to find the Xerces-C include directory." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Unable to find the Xerces-C include directory." "$LINENO" 5
fi
# Work out the Xerces-C version
-{ echo "$as_me:$LINENO: checking for Xerces-C version" >&5
-echo $ECHO_N "checking for Xerces-C version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xerces-C version" >&5
+$as_echo_n "checking for Xerces-C version... " >&6; }
xerces_version_major=`grep "^\#define XERCES_VERSION_MAJOR" "$xerces_include_dir"/xercesc/util/XercesVersion.hpp | sed -e 's/^\#define XERCES_VERSION_MAJOR \([0-9]*\)/\1/'`
xerces_version_minor=`grep "^\#define XERCES_VERSION_MINOR" "$xerces_include_dir"/xercesc/util/XercesVersion.hpp | sed -e 's/^\#define XERCES_VERSION_MINOR \([0-9]*\)/\1/'`
xerces_version=$xerces_version_major"."$xerces_version_minor
-{ echo "$as_me:$LINENO: result: $xerces_version" >&5
-echo "${ECHO_T}$xerces_version" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xerces_version" >&5
+$as_echo "$xerces_version" >&6; }
# Find the library
if test `ls $with_xerces/lib/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
@@ -2868,14 +3659,21 @@
elif test `ls $with_xerces/src/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
xerces_lib="$with_xerces/src"
else
- if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
- xerces_lib="$with_xerces/src"
+ # For distros like Ubuntu there are extra places to check for non-source-tree xerces assuming --with-xerces=/usr was given
+ # NOTE: Surely one would've have both 32 and 64 bit versions of this library installed ... right?
+ if test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/i386-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/i386-linux-gnu"
+ elif test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/x86_64-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/x86_64-linux-gnu"
else
- xerces_lib="$with_xerces/lib"
+ if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
+ xerces_lib="$with_xerces/src"
+ else
+ xerces_lib="$with_xerces/lib"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&5
+$as_echo "$as_me: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&2;}
fi
-
- { echo "$as_me:$LINENO: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&5
-echo "$as_me: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&2;}
fi
XERCES_DIR=$with_xerces
@@ -2885,61 +3683,61 @@
# Check if we want to compile the Java API
-{ echo "$as_me:$LINENO: checking if --enable-java option specified" >&5
-echo $ECHO_N "checking if --enable-java option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-java option specified" >&5
+$as_echo_n "checking if --enable-java option specified... " >&6; }
# Check whether --enable-java was given.
-if test "${enable_java+set}" = set; then
+if test "${enable_java+set}" = set; then :
enableval=$enable_java; db_cv_java="$enable_java"
else
db_cv_java="no"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_java" >&5
-echo "${ECHO_T}$db_cv_java" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_java" >&5
+$as_echo "$db_cv_java" >&6; }
# JUnit location
-{ echo "$as_me:$LINENO: checking if --with-junit=JUNIT_JAR option specified" >&5
-echo $ECHO_N "checking if --with-junit=JUNIT_JAR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-junit=JUNIT_JAR option specified" >&5
+$as_echo_n "checking if --with-junit=JUNIT_JAR option specified... " >&6; }
# Check whether --with-junit was given.
-if test "${with_junit+set}" = set; then
+if test "${with_junit+set}" = set; then :
withval=$with_junit; with_junit="$withval"
else
with_junit="no"
fi
-{ echo "$as_me:$LINENO: result: $with_junit" >&5
-echo "${ECHO_T}$with_junit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_junit" >&5
+$as_echo "$with_junit" >&6; }
if test "$with_junit" != "no"; then
JUNIT_JAR=$with_junit
fi
# Check if we want to compile the Tcl API
-{ echo "$as_me:$LINENO: checking if --enable-tcl option specified" >&5
-echo $ECHO_N "checking if --enable-tcl option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-tcl option specified" >&5
+$as_echo_n "checking if --enable-tcl option specified... " >&6; }
# Check whether --enable-tcl was given.
-if test "${enable_tcl+set}" = set; then
+if test "${enable_tcl+set}" = set; then :
enableval=$enable_tcl; db_cv_tcl="$enable_tcl"
else
db_cv_tcl="no"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_tcl" >&5
-echo "${ECHO_T}$db_cv_tcl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_tcl" >&5
+$as_echo "$db_cv_tcl" >&6; }
-{ echo "$as_me:$LINENO: checking if --with-tcl=DIR option specified" >&5
-echo $ECHO_N "checking if --with-tcl=DIR option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-tcl=DIR option specified" >&5
+$as_echo_n "checking if --with-tcl=DIR option specified... " >&6; }
# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then
+if test "${with_tcl+set}" = set; then :
withval=$with_tcl; with_tclconfig="$withval"
else
with_tclconfig="no"
fi
-{ echo "$as_me:$LINENO: result: $with_tclconfig" >&5
-echo "${ECHO_T}$with_tclconfig" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tclconfig" >&5
+$as_echo "$with_tclconfig" >&6; }
if test "$with_tclconfig" != "no"; then
db_cv_tcl="yes"
fi
@@ -2953,74 +3751,70 @@
if test "$db_cv_java" != "no"; then
tmp_has_lang="yes"
if test "$with_junit" = "no"; then
- { { echo "$as_me:$LINENO: error: --enable-test plus --enable-java requires --with-junit" >&5
-echo "$as_me: error: --enable-test plus --enable-java requires --with-junit" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "--enable-test plus --enable-java requires --with-junit" "$LINENO" 5
fi
fi
if test "$tmp_has_lang" = "no"; then
- { { echo "$as_me:$LINENO: error: --enable-test requires either --enable-tcl or --enable-java" >&5
-echo "$as_me: error: --enable-test requires either --enable-tcl or --enable-java" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "--enable-test requires either --enable-tcl or --enable-java" "$LINENO" 5
fi
fi
# Check default compression option
-{ echo "$as_me:$LINENO: checking if --enable-compression option specified" >&5
-echo $ECHO_N "checking if --enable-compression option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-compression option specified" >&5
+$as_echo_n "checking if --enable-compression option specified... " >&6; }
# Check whether --enable-compression was given.
-if test "${enable_compression+set}" = set; then
+if test "${enable_compression+set}" = set; then :
enableval=$enable_compression; db_cv_compression="$enable_compression"
else
db_cv_compression="yes"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_compression" >&5
-echo "${ECHO_T}$db_cv_compression" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_compression" >&5
+$as_echo "$db_cv_compression" >&6; }
# Check if the ZLIB library is present
if test "$db_cv_compression" != "no"; then
- { echo "$as_me:$LINENO: checking if --with-zlib=DIR option specified" >&5
-echo $ECHO_N "checking if --with-zlib=DIR option specified... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-zlib=DIR option specified" >&5
+$as_echo_n "checking if --with-zlib=DIR option specified... " >&6; }
# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
+if test "${with_zlib+set}" = set; then :
withval=$with_zlib; with_zlib="$withval"
else
with_zlib="/usr"
fi
- { echo "$as_me:$LINENO: result: $with_zlib" >&5
-echo "${ECHO_T}$with_zlib" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib" >&5
+$as_echo "$with_zlib" >&6; }
if test "$with_zlib" != "no"; then
- { echo "$as_me:$LINENO: checking if the ZLIB library is present" >&5
-echo $ECHO_N "checking if the ZLIB library is present... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the ZLIB library is present" >&5
+$as_echo_n "checking if the ZLIB library is present... " >&6; }
if test `ls $with_zlib/lib/libz.a 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
zlib_lib="-L$with_zlib/lib -R$with_zlib/lib"
zlib_library="-lz"
zlib_include="-I$with_zlib/include"
with_zlib="$with_zlib/lib"
elif test `ls $with_zlib/libz.a 2>/dev/null | wc -l` -gt 0 ; then
if test `ls $with_zlib/include/zlib.h 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
zlib_lib="-L$with_zlib -R$with_zlib"
zlib_library="-lz"
zlib_include="-I$with_zlib/include"
elif test `ls $with_zlib/../include/zlib.h 2>/dev/null | wc -l` -gt 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
zlib_lib="-L$with_zlib -R$with_zlib"
zlib_library="-lz"
zlib_include="-I$with_zlib/../include"
fi
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: ZLIB not found, disabling default data compression." >&5
-echo "$as_me: ZLIB not found, disabling default data compression." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: ZLIB not found, disabling default data compression." >&5
+$as_echo "$as_me: ZLIB not found, disabling default data compression." >&6;}
zlib_lib=""
zlib_library=""
zlib_include=""
@@ -3034,17 +3828,17 @@
#link zlib statically
if test "$db_cv_compression" != "no"; then
- { echo "$as_me:$LINENO: checking if --enable-static-zlib option specified" >&5
-echo $ECHO_N "checking if --enable-static-zlib option specified... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-static-zlib option specified" >&5
+$as_echo_n "checking if --enable-static-zlib option specified... " >&6; }
# Check whether --enable-static_zlib was given.
-if test "${enable_static_zlib+set}" = set; then
+if test "${enable_static_zlib+set}" = set; then :
enableval=$enable_static_zlib; db_cv_zlib_static="yes"
else
db_cv_zlib_static="no"
fi
- { echo "$as_me:$LINENO: result: $db_cv_zlib_static" >&5
-echo "${ECHO_T}$db_cv_zlib_static" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_zlib_static" >&5
+$as_echo "$db_cv_zlib_static" >&6; }
if test "$db_cv_zlib_static" != "no"; then
zlib_library="$with_zlib/libz.a"
fi
@@ -3059,17 +3853,17 @@
# Check if rpath is disabled
-{ echo "$as_me:$LINENO: checking if --enable-rpath option specified" >&5
-echo $ECHO_N "checking if --enable-rpath option specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-rpath option specified" >&5
+$as_echo_n "checking if --enable-rpath option specified... " >&6; }
# Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
enableval=$enable_rpath; db_cv_rpath="$enable_rpath"
else
db_cv_rpath="yes"
fi
-{ echo "$as_me:$LINENO: result: $db_cv_rpath" >&5
-echo "${ECHO_T}$db_cv_rpath" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_cv_rpath" >&5
+$as_echo "$db_cv_rpath" >&6; }
if test "$with_tclconfig" != "no"; then
BUILD_TCL_TRUE=
@@ -3156,28 +3950,19 @@
esac
if test "$db_cv_debug" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
+ $as_echo "#define DEBUG 1" >>confdefs.h
+ $as_echo "#define ENABLE_ASSERTS 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define ENABLE_ASSERTS 1
-_ACEOF
-
-
optimize_def=$optimize_debug
fi
-cat >>confdefs.h <<\_ACEOF
-#define DBXML_COMPRESSION 1
-_ACEOF
+$as_echo "#define DBXML_COMPRESSION 1" >>confdefs.h
-
# Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf
# compiler configuration macros, because if we don't, they set CFLAGS
# to no optimization and -g, which isn't what we want.
@@ -3193,10 +3978,10 @@
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; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3206,25 +3991,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3233,10 +4018,10 @@
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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3246,25 +4031,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -3272,12 +4057,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3290,10 +4071,10 @@
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; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3303,25 +4084,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3330,10 +4111,10 @@
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; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3344,18 +4125,18 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -3374,11 +4155,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3389,10 +4170,10 @@
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; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3402,25 +4183,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3433,10 +4214,10 @@
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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3446,25 +4227,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3476,12 +4257,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3491,51 +4268,37 @@
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&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
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (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); }
-{ (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); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3547,42 +4310,38 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# 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,
@@ -3592,14 +4351,14 @@
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -3618,78 +4377,41 @@
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
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# 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; }
-# 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'
- { (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
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# 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 { (ac_try="$ac_link"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3697,37 +4419,90 @@
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 | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
-rm -f conftest$ac_cv_exeext
-{ 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; }
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3739,51 +4514,46 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
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 | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$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; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3797,54 +4567,34 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
else
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
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3855,34 +4605,11 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3893,35 +4620,12 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3932,42 +4636,18 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
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_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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$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
@@ -3983,23 +4663,18 @@
CFLAGS=
fi
fi
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4051,31 +4726,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -4086,17 +4739,19 @@
# 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; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
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; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4115,8 +4770,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
@@ -4143,12 +4798,12 @@
fi
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
@@ -4168,10 +4823,10 @@
depcc="$CC" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -4259,8 +4914,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
@@ -4288,10 +4943,10 @@
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; }
-if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4301,25 +4956,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4332,10 +4987,10 @@
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; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -4345,25 +5000,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4375,12 +5030,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@ -4390,49 +5041,36 @@
fi
fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&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
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (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); }
-{ (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); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4446,54 +5084,34 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; 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 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; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+ $as_echo_n "(cached) " >&6
else
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
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4504,34 +5122,11 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4542,35 +5137,12 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4581,42 +5153,18 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$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
@@ -4640,10 +5188,10 @@
depcc="$CXX" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -4731,8 +5279,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
@@ -4749,7 +5297,7 @@
# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
@@ -4773,7 +5321,7 @@
# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
@@ -4797,7 +5345,7 @@
# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
@@ -4820,10 +5368,10 @@
fi
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${lt_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
@@ -4834,7 +5382,7 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
fi
done
@@ -4876,48 +5424,43 @@
SED=$lt_cv_path_SED
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- # 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
+ if test -z "$GREP"; then
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
+ # 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.
+ 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"
+ as_fn_executable_p "$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"
+ $as_echo_n 0123456789 >"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"
+ $as_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`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
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"
@@ -4929,77 +5472,61 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
-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
-
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&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
+ if test -z "$EGREP"; then
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
+ # 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.
+ 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"
+ as_fn_executable_p "$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"
+ $as_echo_n 0123456789 >"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"
+ $as_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`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
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"
@@ -5011,39 +5538,28 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
-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
-
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -5052,8 +5568,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -5082,14 +5598,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -5119,19 +5635,17 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@ -5143,20 +5657,20 @@
;;
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
@@ -5173,10 +5687,10 @@
;;
esac
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
# Let the user override the test.
@@ -5222,25 +5736,25 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
NM="$lt_cv_path_NM"
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
fi
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -5423,8 +5937,8 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -5443,7 +5957,7 @@
# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
@@ -5455,11 +5969,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -5473,12 +5987,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5476 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo '#line 5990 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -5512,11 +6026,11 @@
s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -5565,10 +6079,10 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -5576,11 +6090,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5591,34 +6101,13 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_cc_needs_belf=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5626,8 +6115,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
@@ -5636,11 +6125,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -5668,15 +6157,15 @@
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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -5690,11 +6179,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -5703,76 +6188,34 @@
#endif
Syntax error
_ACEOF
-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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
@@ -5784,8 +6227,8 @@
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -5795,11 +6238,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -5808,83 +6247,40 @@
#endif
Syntax error
_ACEOF
-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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -5894,16 +6290,12 @@
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; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -5918,47 +6310,23 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -5968,18 +6336,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -5989,14 +6353,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -6023,113 +6383,35 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
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 { 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -6137,145 +6419,12 @@
done
-
for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-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 && {
- 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
-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; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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 Oracle Technology Network Berkeley DB XML forum ##
-## -------------------------------------------------------------- ##
-_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 { 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
-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
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
_ACEOF
fi
@@ -6292,11 +6441,11 @@
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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if ${ac_cv_prog_CXXCPP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -6310,11 +6459,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -6323,76 +6468,34 @@
#endif
Syntax error
_ACEOF
-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 && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-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 && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
@@ -6404,8 +6507,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@ -6415,11 +6518,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -6428,83 +6527,40 @@
#endif
Syntax error
_ACEOF
-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 && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-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 && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=cpp
@@ -6521,14 +6577,14 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
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; }
-if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_F77+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$F77"; then
ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -6538,25 +6594,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
F77=$ac_cv_prog_F77
if test -n "$F77"; then
- { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
+$as_echo "$F77" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6565,14 +6621,14 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
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; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_F77+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_F77"; then
ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -6582,25 +6638,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6612,12 +6668,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
F77=$ac_ct_F77
@@ -6626,50 +6678,41 @@
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&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
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (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); }
-{ (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); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
rm -f a.out
# If we don't use `.F' as extension, the preprocessor is not run on the
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+if ${ac_cv_f77_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ cat > conftest.$ac_ext <<_ACEOF
program main
#ifndef __GNUC__
choke me
@@ -6677,82 +6720,42 @@
end
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_f77_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
ac_ext=$ac_save_ext
ac_test_FFLAGS=${FFLAGS+set}
ac_save_FFLAGS=$FFLAGS
FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+if ${ac_cv_prog_f77_g+:} false; then :
+ $as_echo_n "(cached) " >&6
else
FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
+cat > conftest.$ac_ext <<_ACEOF
program main
end
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_f77_try_compile "$LINENO"; then :
ac_cv_prog_f77_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_prog_f77_g=no
+ ac_cv_prog_f77_g=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
@@ -6769,7 +6772,11 @@
fi
fi
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+ G77=yes
+else
+ G77=
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6780,10 +6787,10 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+ $as_echo_n "(cached) " >&6
else
i=0
teststring="ABCD"
@@ -6892,11 +6899,11 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
- { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
fi
@@ -6904,10 +6911,10 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# These are sane defaults that work on at least a few old systems.
@@ -7009,18 +7016,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -7071,11 +7078,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
@@ -7109,17 +7116,17 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
else
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
fi
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+ $as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
@@ -7131,8 +7138,8 @@
fi
rmdir .libs 2>/dev/null
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@ -7183,10 +7190,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; 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_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -7196,25 +7203,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7223,10 +7230,10 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; 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_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -7236,25 +7243,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_AR" = x; then
@@ -7262,12 +7269,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
@@ -7279,10 +7282,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -7292,25 +7295,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7319,10 +7322,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; 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_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -7332,25 +7335,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -7358,12 +7361,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -7375,10 +7374,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; 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_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -7388,25 +7387,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7415,10 +7414,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; 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_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -7428,25 +7427,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -7454,12 +7453,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -7522,10 +7517,10 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
@@ -7575,19 +7570,19 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
@@ -7637,11 +7632,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
else
@@ -7659,10 +7654,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -7672,25 +7667,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7699,10 +7694,10 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; 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_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -7712,25 +7707,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7738,12 +7733,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7755,10 +7746,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -7768,25 +7759,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
- { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7795,10 +7786,10 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; 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_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -7808,25 +7799,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_NMEDIT" = x; then
@@ -7834,12 +7825,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
NMEDIT=$ac_ct_NMEDIT
@@ -7849,10 +7836,10 @@
fi
- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
@@ -7870,22 +7857,18 @@
rm conftest.c
fi
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -7896,39 +7879,18 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_ld_exported_symbols_list=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
+ lt_cv_ld_exported_symbols_list=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[0123])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -7969,7 +7931,7 @@
enable_win32_dll=no
# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
@@ -7977,7 +7939,7 @@
# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
@@ -8040,10 +8002,10 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -8058,11 +8020,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8023: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8065: \$? = $ac_status" >&5
+ echo "$as_me:8027: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8075,8 +8037,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -8090,8 +8052,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -8322,18 +8284,18 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -8348,11 +8310,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8351: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8355: \$? = $ac_status" >&5
+ echo "$as_me:8317: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8365,8 +8327,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
@@ -8393,10 +8355,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
@@ -8421,8 +8383,8 @@
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
@@ -8431,10 +8393,10 @@
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
$rm -r conftest 2>/dev/null
@@ -8452,11 +8414,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8455: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8417: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8459: \$? = $ac_status" >&5
+ echo "$as_me:8421: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8478,34 +8440,34 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
allow_undefined_flag=
@@ -8915,11 +8877,7 @@
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8930,24 +8888,7 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -8961,15 +8902,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -8981,11 +8916,7 @@
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8996,24 +8927,7 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -9027,15 +8941,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9485,8 +9393,8 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
#
@@ -9506,16 +9414,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -9529,11 +9437,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc=no
else
@@ -9544,16 +9452,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -10166,19 +10074,19 @@
dynamic_linker=no
;;
esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
@@ -10190,8 +10098,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
@@ -10215,8 +10123,8 @@
# directories.
hardcode_action=unsupported
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink; then
# Fast installation is not supported
@@ -10229,13 +10137,13 @@
striplib=
old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
@@ -10243,16 +10151,16 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
fi
@@ -10284,18 +10192,14 @@
darwin*)
# if libdl is installed we need to link against it
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10313,39 +10217,18 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -10358,102 +10241,18 @@
;;
*)
- { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* 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
-char shl_load ();
-/* 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_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
- ;
- 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_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
-fi
-
-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_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10471,137 +10270,32 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_shl_load=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* 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
-char dlopen ();
-/* 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_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- 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_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-fi
-
-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_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10619,53 +10313,28 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10683,53 +10352,28 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svld_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10747,39 +10391,18 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_dld_link=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -10818,10 +10441,10 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
@@ -10829,7 +10452,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10832 "configure"
+#line 10455 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10892,11 +10515,11 @@
exit (status);
}
EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -10913,15 +10536,15 @@
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
@@ -10929,7 +10552,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10932 "configure"
+#line 10555 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10992,11 +10615,11 @@
exit (status);
}
EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11013,8 +10636,8 @@
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -11036,13 +10659,13 @@
# Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -11062,15 +10685,15 @@
fi
;;
esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -11163,8 +10786,8 @@
cfgfile="${ofile}T"
trap "$rm \"$cfgfile\"; exit 1" 1 2 15
$rm -f "$cfgfile"
- { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
cat <<__EOF__ >> "$cfgfile"
#! $SHELL
@@ -11569,25 +11192,25 @@
# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
+if test "${with_tags+set}" = set; then :
withval=$with_tags; tagnames="$withval"
fi
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
fi
if test -z "$LTCC"; then
eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
if test -z "$LTCC"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
else
- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
if test -z "$LTCFLAGS"; then
@@ -11604,17 +11227,13 @@
# Check whether tagname contains only valid characters
case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
"") ;;
- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
+ *) as_fn_error $? "invalid tag name: $tagname" "$LINENO" 5
;;
esac
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
then
- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "tag name \"$tagname\" already exists" "$LINENO" 5
fi
# Update the list of available tags.
@@ -11747,7 +11366,7 @@
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -11756,8 +11375,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -11786,14 +11405,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -11823,19 +11442,17 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@ -11847,8 +11464,8 @@
;;
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -11898,8 +11515,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@ -11995,11 +11612,7 @@
# -berok will link without error, but may produce a broken library.
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12010,24 +11623,7 @@
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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_cxx_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -12041,15 +11637,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -12062,11 +11652,7 @@
archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12077,24 +11663,7 @@
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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_cxx_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -12108,15 +11677,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -12844,8 +12407,8 @@
ld_shlibs_CXX=no
;;
esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
@@ -12861,11 +12424,11 @@
};
EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -13020,8 +12583,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -13304,18 +12867,18 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -13330,11 +12893,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13333: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12896: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13337: \$? = $ac_status" >&5
+ echo "$as_me:12900: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13347,8 +12910,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
@@ -13375,10 +12938,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
@@ -13403,8 +12966,8 @@
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
@@ -13413,10 +12976,10 @@
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
$rm -r conftest 2>/dev/null
@@ -13434,11 +12997,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13437: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13000: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13441: \$? = $ac_status" >&5
+ echo "$as_me:13004: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13460,34 +13023,34 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -13515,8 +13078,8 @@
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
@@ -13536,16 +13099,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -13559,11 +13122,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc_CXX=no
else
@@ -13574,16 +13137,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -14144,19 +13707,19 @@
dynamic_linker=no
;;
esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
@@ -14168,8 +13731,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
@@ -14193,8 +13756,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
@@ -14732,13 +14295,13 @@
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -14757,15 +14320,15 @@
fi
;;
esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
GCC_F77="$G77"
LD_F77="$LD"
@@ -14774,8 +14337,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
@@ -15006,18 +14569,18 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_F77+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -15032,11 +14595,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15035: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14598: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15039: \$? = $ac_status" >&5
+ echo "$as_me:14602: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15049,8 +14612,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
@@ -15077,10 +14640,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_F77+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
@@ -15105,8 +14668,8 @@
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
@@ -15115,10 +14678,10 @@
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_F77+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_F77=no
$rm -r conftest 2>/dev/null
@@ -15136,11 +14699,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15139: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14702: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15143: \$? = $ac_status" >&5
+ echo "$as_me:14706: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15162,34 +14725,34 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
allow_undefined_flag_F77=
@@ -15599,29 +15162,12 @@
# -berok will link without error, but may produce a broken library.
allow_undefined_flag_F77='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ cat > conftest.$ac_ext <<_ACEOF
program main
end
_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_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_f77_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -15635,15 +15181,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15655,29 +15195,12 @@
archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ cat > conftest.$ac_ext <<_ACEOF
program main
end
_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_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_f77_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -15691,15 +15214,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -16149,8 +15666,8 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
#
@@ -16170,16 +15687,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -16193,11 +15710,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_F77
allow_undefined_flag_F77=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc_F77=no
else
@@ -16208,16 +15725,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -16778,19 +16295,19 @@
dynamic_linker=no
;;
esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
@@ -16802,8 +16319,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
@@ -16827,8 +16344,8 @@
# directories.
hardcode_action_F77=unsupported
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
@@ -17338,10 +16855,10 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -17356,11 +16873,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17359: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16876: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17363: \$? = $ac_status" >&5
+ echo "$as_me:16880: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17373,8 +16890,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -17388,8 +16905,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -17620,18 +17137,18 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_GCJ"; then
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_GCJ+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -17646,11 +17163,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17649: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17166: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17653: \$? = $ac_status" >&5
+ echo "$as_me:17170: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17663,8 +17180,8 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
@@ -17691,10 +17208,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_GCJ+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
@@ -17719,8 +17236,8 @@
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
@@ -17729,10 +17246,10 @@
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_GCJ+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_GCJ=no
$rm -r conftest 2>/dev/null
@@ -17750,11 +17267,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17753: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17757: \$? = $ac_status" >&5
+ echo "$as_me:17274: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17776,34 +17293,34 @@
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
allow_undefined_flag_GCJ=
@@ -18213,11 +17730,7 @@
# -berok will link without error, but may produce a broken library.
allow_undefined_flag_GCJ='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -18228,24 +17741,7 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -18259,15 +17755,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -18279,11 +17769,7 @@
archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -18294,24 +17780,7 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -18325,15 +17794,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -18783,8 +18246,8 @@
esac
fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
@@ -18804,16 +18267,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -18827,11 +18290,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
allow_undefined_flag_GCJ=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc_GCJ=no
else
@@ -18842,16 +18305,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -19412,19 +18875,19 @@
dynamic_linker=no
;;
esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
@@ -19436,8 +18899,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
@@ -19461,8 +18924,8 @@
# directories.
hardcode_action_GCJ=unsupported
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
@@ -20385,9 +19848,7 @@
;;
*)
- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Unsupported tag name: $tagname" "$LINENO" 5
;;
esac
@@ -20405,9 +19866,7 @@
chmod +x "$ofile"
else
rm -f "${ofile}T"
- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "unable to update list of available tagged configurations." "$LINENO" 5
fi
fi
@@ -20440,98 +19899,20 @@
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
-esac
-done
-IFS=$as_save_IFS
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -20541,22 +19922,22 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -20566,25 +19947,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -20593,10 +19974,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; 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_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -20606,25 +19987,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -20632,12 +20013,8 @@
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 at 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 at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -20648,16 +20025,12 @@
# Checks for header files.
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -20672,47 +20045,23 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -20722,18 +20071,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -20743,14 +20088,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -20777,195 +20118,32 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-
-
-
-
-
-
for ac_header in float.h limits.h stdlib.h string.h sys/time.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-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 && {
- 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
-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; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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 Oracle Technology Network Berkeley DB XML forum ##
-## -------------------------------------------------------------- ##
-_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 { 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
-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
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -20974,177 +20152,85 @@
# Checks for typedefs, structures, and compiler characteristics.
-{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if ${ac_cv_header_stdbool_h+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdbool.h>
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
- struct s { _Bool s: 1; _Bool t; } s;
+ struct s { _Bool s: 1; _Bool t; } s;
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) 0.5 == true ? 1 : -1];
- bool e = &s;
- char f[(_Bool) 0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
- enum { j = false, k = true, l = false * true, m = true * 256 };
- _Bool n[m];
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-# if defined __xlc__ || defined __GNUC__
- /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
- reported by James Lemley on 2005-10-05; see
- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
- This test is not quite right, since xlc is allowed to
- reject this program, as the initializer for xlcbug is
- not one of the forms that C requires support for.
- However, doing the test right would require a runtime
- test, and that would make cross-compilation harder.
- Let us hope that IBM fixes the xlc bug, and also adds
- support for this kind of constant expression. In the
- meantime, this test will reject xlc, which is OK, since
- our stdbool.h substitute should suffice. We also test
- this with GCC, where it should work, to detect more
- quickly whether someone messes up the test in the
- future. */
- char digs[] = "0123456789";
- int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-# endif
- /* Catch a bug in an HP-UX C compiler. See
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
- */
- _Bool q = true;
- _Bool *pq = &q;
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
int
main ()
{
- *pq |= q;
- *pq |= ! q;
- /* Refer to every declared value, to avoid compiler optimizations. */
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
- + !m + !n + !o + !p + !q + !pq);
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdbool_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdbool_h=no
+ ac_cv_header_stdbool_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
-{ echo "$as_me:$LINENO: checking for _Bool" >&5
-echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
-if test "${ac_cv_type__Bool+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-typedef _Bool ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type__Bool=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
- ac_cv_type__Bool=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
-if test $ac_cv_type__Bool = yes; then
-
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
_ACEOF
@@ -21152,34 +20238,29 @@
fi
+
if test $ac_cv_header_stdbool_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -21196,8 +20277,9 @@
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -21213,10 +20295,10 @@
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -21229,55 +20311,29 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -21286,40 +20342,17 @@
#endif
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_inline=$ac_kw
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
test "$ac_cv_c_inline" != no && break
done
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
-
case $ac_cv_c_inline in
inline | yes) ;;
*)
@@ -21335,111 +20368,8 @@
;;
esac
-
- { echo "$as_me:$LINENO: checking for int32_t" >&5
-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
-if test "${ac_cv_c_int32_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_int32_t=no
- for ac_type in 'int32_t' 'int' 'long int' \
- 'long long int' 'short int' 'signed char'; do
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(0 < ($ac_type) (((($ac_type) 1 << (32 - 2)) - 1) * 2 + 1))];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) (((($ac_type) 1 << (32 - 2)) - 1) * 2 + 1)
- < ($ac_type) (((($ac_type) 1 << (32 - 2)) - 1) * 2 + 2))];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $ac_type in
- int32_t) ac_cv_c_int32_t=yes ;;
- *) ac_cv_c_int32_t=$ac_type ;;
-esac
-
-fi
-
-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
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_int32_t" != no && break
- done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_int32_t" >&5
-echo "${ECHO_T}$ac_cv_c_int32_t" >&6; }
- case $ac_cv_c_int32_t in #(
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
no|yes) ;; #(
*)
@@ -21447,113 +20377,10 @@
#define int32_t $ac_cv_c_int32_t
_ACEOF
;;
- esac
-
-
- { echo "$as_me:$LINENO: checking for int64_t" >&5
-echo $ECHO_N "checking for int64_t... $ECHO_C" >&6; }
-if test "${ac_cv_c_int64_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_int64_t=no
- for ac_type in 'int64_t' 'int' 'long int' \
- 'long long int' 'short int' 'signed char'; do
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(0 < ($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 1))];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 1)
- < ($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 2))];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $ac_type in
- int64_t) ac_cv_c_int64_t=yes ;;
- *) ac_cv_c_int64_t=$ac_type ;;
-esac
-
-fi
-
-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
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_int64_t" != no && break
- done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_int64_t" >&5
-echo "${ECHO_T}$ac_cv_c_int64_t" >&6; }
- case $ac_cv_c_int64_t in #(
+ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
+case $ac_cv_c_int64_t in #(
no|yes) ;; #(
*)
@@ -21561,63 +20388,11 @@
#define int64_t $ac_cv_c_int64_t
_ACEOF
;;
- esac
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_size_t=no
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -21626,16 +20401,12 @@
fi
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
@@ -21650,53 +20421,27 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_time=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_time=no
+ ac_cv_header_time=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
@@ -21706,116 +20451,32 @@
{
struct tm tm;
int *p = &tm.tm_sec;
- return !p;
+ return !p;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_struct_tm=time.h
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
-
- { echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
-if test "${ac_cv_c_uint32_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_uint32_t=no
- for ac_type in 'uint32_t' 'unsigned int' 'unsigned long int' \
- 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) -1 >> (32 - 1) == 1)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- case $ac_type in
- uint32_t) ac_cv_c_uint32_t=yes ;;
- *) ac_cv_c_uint32_t=$ac_type ;;
-esac
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_uint32_t" != no && break
- done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_c_uint32_t" >&6; }
- case $ac_cv_c_uint32_t in #(
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
no|yes) ;; #(
*)
-cat >>confdefs.h <<\_ACEOF
-#define _UINT32_T 1
-_ACEOF
+$as_echo "#define _UINT32_T 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -21824,74 +20485,12 @@
;;
esac
-
- { echo "$as_me:$LINENO: checking for uint64_t" >&5
-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
-if test "${ac_cv_c_uint64_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_uint64_t=no
- for ac_type in 'uint64_t' 'unsigned int' 'unsigned long int' \
- 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) -1 >> (64 - 1) == 1)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- case $ac_type in
- uint64_t) ac_cv_c_uint64_t=yes ;;
- *) ac_cv_c_uint64_t=$ac_type ;;
-esac
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_uint64_t" != no && break
- done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_c_uint64_t" >&6; }
- case $ac_cv_c_uint64_t in #(
+ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
+case $ac_cv_c_uint64_t in #(
no|yes) ;; #(
*)
-cat >>confdefs.h <<\_ACEOF
-#define _UINT64_T 1
-_ACEOF
+$as_echo "#define _UINT64_T 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -21900,74 +20499,12 @@
;;
esac
-
- { echo "$as_me:$LINENO: checking for uint8_t" >&5
-echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; }
-if test "${ac_cv_c_uint8_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_uint8_t=no
- for ac_type in 'uint8_t' 'unsigned int' 'unsigned long int' \
- 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
- 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
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) -1 >> (8 - 1) == 1)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- case $ac_type in
- uint8_t) ac_cv_c_uint8_t=yes ;;
- *) ac_cv_c_uint8_t=$ac_type ;;
-esac
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_uint8_t" != no && break
- done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_uint8_t" >&5
-echo "${ECHO_T}$ac_cv_c_uint8_t" >&6; }
- case $ac_cv_c_uint8_t in #(
+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
+case $ac_cv_c_uint8_t in #(
no|yes) ;; #(
*)
-cat >>confdefs.h <<\_ACEOF
-#define _UINT8_T 1
-_ACEOF
+$as_echo "#define _UINT8_T 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -21976,61 +20513,9 @@
;;
esac
-{ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-typedef ptrdiff_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_ptrdiff_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
- ac_cv_type_ptrdiff_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
-if test $ac_cv_type_ptrdiff_t = yes; then
-
cat >>confdefs.h <<_ACEOF
#define HAVE_PTRDIFF_T 1
_ACEOF
@@ -22040,16 +20525,12 @@
# Checks for library functions.
-{ echo "$as_me:$LINENO: checking for error_at_line" >&5
-echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6; }
-if test "${ac_cv_lib_error_at_line+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+$as_echo_n "checking for error_at_line... " >&6; }
+if ${ac_cv_lib_error_at_line+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <error.h>
int
@@ -22060,37 +20541,16 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_error_at_line=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_error_at_line=no
+ ac_cv_lib_error_at_line=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
-echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+$as_echo "$ac_cv_lib_error_at_line" >&6; }
if test $ac_cv_lib_error_at_line = no; then
case " $LIBOBJS " in
*" error.$ac_objext "* ) ;;
@@ -22100,164 +20560,27 @@
fi
-
for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-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 && {
- 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
-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; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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 Oracle Technology Network Berkeley DB XML forum ##
-## -------------------------------------------------------------- ##
-_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 { 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
-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
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
_ACEOF
fi
done
-{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
-echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; }
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_malloc_0_nonnull=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
@@ -22273,52 +20596,24 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_malloc_0_nonnull=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_malloc_0_nonnull=no
+ ac_cv_func_malloc_0_nonnull=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 1
-_ACEOF
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
else
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 0
-_ACEOF
+ $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
case " $LIBOBJS " in
*" malloc.$ac_objext "* ) ;;
@@ -22327,27 +20622,20 @@
esac
-cat >>confdefs.h <<\_ACEOF
-#define malloc rpl_malloc
-_ACEOF
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
fi
-
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
+if ${ac_cv_func_memcmp_working+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_memcmp_working=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -22382,42 +20670,18 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_memcmp_working=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
+ ac_cv_func_memcmp_working=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -22425,164 +20689,27 @@
esac
-
for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-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 && {
- 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
-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; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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 Oracle Technology Network Berkeley DB XML forum ##
-## -------------------------------------------------------------- ##
-_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 { 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
-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
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
_ACEOF
fi
done
-{ echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
-echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6; }
-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_realloc_0_nonnull=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
@@ -22598,52 +20725,24 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_realloc_0_nonnull=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_realloc_0_nonnull=no
+ ac_cv_func_realloc_0_nonnull=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+if test $ac_cv_func_realloc_0_nonnull = yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 1
-_ACEOF
+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
else
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 0
-_ACEOF
+ $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
case " $LIBOBJS " in
*" realloc.$ac_objext "* ) ;;
@@ -22652,24 +20751,17 @@
esac
-cat >>confdefs.h <<\_ACEOF
-#define realloc rpl_realloc
-_ACEOF
+$as_echo "#define realloc rpl_realloc" >>confdefs.h
fi
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if ${ac_cv_type_signal+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
@@ -22682,64 +20774,40 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_type_signal=int
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_signal=void
+ ac_cv_type_signal=void
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
_ACEOF
-{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+ $as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
echo >conftest.file
if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_dereferences_slashed_symlink=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
struct stat sbuf;
- /* Linux will dereference the symlink and fail.
+ /* Linux will dereference the symlink and fail, as required by POSIX.
That is better in the sense that it means we will not
have to compile and use the lstat wrapper. */
return lstat ("conftest.sym/", &sbuf) == 0;
@@ -22747,39 +20815,15 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_lstat_dereferences_slashed_symlink=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_lstat_dereferences_slashed_symlink=no
+ ac_cv_func_lstat_dereferences_slashed_symlink=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
else
# If the `ln -s' command failed, then we probably don't even
# have an lstat function.
@@ -22788,8 +20832,8 @@
rm -f conftest.sym conftest.file
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
@@ -22798,7 +20842,7 @@
_ACEOF
-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
case " $LIBOBJS " in
*" lstat.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS lstat.$ac_objext"
@@ -22807,19 +20851,15 @@
fi
-{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
-echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; }
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+$as_echo_n "checking whether stat accepts an empty string... " >&6; }
+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_stat_empty_string_bug=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -22831,42 +20871,18 @@
return 0;
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_stat_empty_string_bug=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_stat_empty_string_bug=yes
+ ac_cv_func_stat_empty_string_bug=yes
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
-echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
if test $ac_cv_func_stat_empty_string_bug = yes; then
case " $LIBOBJS " in
*" stat.$ac_objext "* ) ;;
@@ -22881,111 +20897,24 @@
fi
-
for ac_func in strftime
-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 { 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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
-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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-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
+do :
+ ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
+if test "x$ac_cv_func_strftime" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_STRFTIME 1
_ACEOF
else
# strftime is in -lintl on SCO UNIX.
-{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_intl_strftime+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
+$as_echo_n "checking for strftime in -lintl... " >&6; }
+if ${ac_cv_lib_intl_strftime+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -23003,42 +20932,19 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_strftime=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_strftime=no
+ ac_cv_lib_intl_strftime=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; }
-if test $ac_cv_lib_intl_strftime = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRFTIME 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+ $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
fi
@@ -23046,19 +20952,15 @@
fi
done
-{ echo "$as_me:$LINENO: checking for working strtod" >&5
-echo $ECHO_N "checking for working strtod... $ECHO_C" >&6; }
-if test "${ac_cv_func_strtod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+$as_echo_n "checking for working strtod... " >&6; }
+if ${ac_cv_func_strtod+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_strtod=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
@@ -23091,42 +20993,18 @@
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_strtod=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_strtod=no
+ ac_cv_func_strtod=no
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
-echo "${ECHO_T}$ac_cv_func_strtod" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
*" strtod.$ac_objext "* ) ;;
@@ -23134,101 +21012,20 @@
;;
esac
-{ echo "$as_me:$LINENO: checking for pow" >&5
-echo $ECHO_N "checking for pow... $ECHO_C" >&6; }
-if test "${ac_cv_func_pow+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define pow to an innocuous variant, in case <limits.h> declares pow.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define pow innocuous_pow
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = xyes; then :
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pow (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef pow
-
-/* 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
-char pow ();
-/* 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_pow || defined __stub___pow
-choke me
-#endif
-
-int
-main ()
-{
-return pow ();
- ;
- 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_func_pow=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_pow=no
fi
-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_pow" >&5
-echo "${ECHO_T}$ac_cv_func_pow" >&6; }
-
if test $ac_cv_func_pow = no; then
- { echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if ${ac_cv_lib_m_pow+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -23246,149 +21043,35 @@
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_pow=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_pow=no
+ ac_cv_lib_m_pow=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = xyes; then :
POW_LIB=-lm
else
- { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
-echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
fi
fi
-
-
-
-
-
-
-
-
-
-
-
-
for ac_func in floor gettimeofday localtime_r memset pow sqrt strcasecmp strchr strdup strerror strstr strtoul
-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 { 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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
-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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-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
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -23413,9 +21096,7 @@
if test "$db_cv_java" = "yes"; then
# Java requires shared libraries.
if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then
- { { echo "$as_me:$LINENO: error: Java requires shared libraries" >&5
-echo "$as_me: error: Java requires shared libraries" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Java requires shared libraries" "$LINENO" 5
fi
@@ -23424,10 +21105,10 @@
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; }
-if test "${ac_cv_prog_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_JAVAC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$JAVAC"; then
ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
@@ -23437,25 +21118,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_JAVAC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
JAVAC=$ac_cv_prog_JAVAC
if test -n "$JAVAC"; then
- { echo "$as_me:$LINENO: result: $JAVAC" >&5
-echo "${ECHO_T}$JAVAC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
+$as_echo "$JAVAC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -23467,10 +21148,10 @@
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; }
-if test "${ac_cv_prog_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_JAVAC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$JAVAC"; then
ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
@@ -23480,25 +21161,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_JAVAC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
JAVAC=$ac_cv_prog_JAVAC
if test -n "$JAVAC"; then
- { echo "$as_me:$LINENO: result: $JAVAC" >&5
-echo "${ECHO_T}$JAVAC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
+$as_echo "$JAVAC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -23507,42 +21188,38 @@
test -n "$JAVAC" || JAVAC="$JAVAPREFIX"
fi
-test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: no acceptable Java compiler found in \$PATH" >&5
-echo "$as_me: error: no acceptable Java compiler found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
+test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
-{ echo "$as_me:$LINENO: checking if $JAVAC works" >&5
-echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6; }
-if test "${ac_cv_prog_javac_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVAC works" >&5
+$as_echo_n "checking if $JAVAC works... " >&6; }
+if ${ac_cv_prog_javac_works+:} false; then :
+ $as_echo_n "(cached) " >&6
else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
-/* #line 23523 "configure" */
+/* #line 21202 "configure" */
public class Test {
}
EOF
if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } >/dev/null 2>&1; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; } >/dev/null 2>&1; then
ac_cv_prog_javac_works=yes
else
- { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5
-echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
fi
rm -f $JAVA_TEST $CLASS_TEST
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5
-echo "${ECHO_T}$ac_cv_prog_javac_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
+$as_echo "$ac_cv_prog_javac_works" >&6; }
@@ -23551,10 +21228,10 @@
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; }
-if test "${ac_cv_prog_JAR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_JAR+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$JAR"; then
ac_cv_prog_JAR="$JAR" # Let the user override the test.
@@ -23564,25 +21241,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_JAR="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
JAR=$ac_cv_prog_JAR
if test -n "$JAR"; then
- { echo "$as_me:$LINENO: result: $JAR" >&5
-echo "${ECHO_T}$JAR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAR" >&5
+$as_echo "$JAR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -23594,10 +21271,10 @@
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; }
-if test "${ac_cv_prog_JAR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_JAR+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$JAR"; then
ac_cv_prog_JAR="$JAR" # Let the user override the test.
@@ -23607,25 +21284,25 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_JAR="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
JAR=$ac_cv_prog_JAR
if test -n "$JAR"; then
- { echo "$as_me:$LINENO: result: $JAR" >&5
-echo "${ECHO_T}$JAR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAR" >&5
+$as_echo "$JAR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -23634,23 +21311,19 @@
test -n "$JAR" || JAR="$JAVAPREFIX"
fi
-test "x$JAR" = x && { { echo "$as_me:$LINENO: error: no acceptable jar program found in \$PATH" >&5
-echo "$as_me: error: no acceptable jar program found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
+test "x$JAR" = x && as_fn_error $? "no acceptable jar program found in \$PATH" "$LINENO" 5
JNI_INCLUDE_DIRS=""
-test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: '$JAVAC' undefined" >&5
-echo "$as_me: error: '$JAVAC' undefined" >&2;}
- { (exit 1); exit 1; }; }
+test "x$JAVAC" = x && as_fn_error $? "'$JAVAC' undefined" "$LINENO" 5
# Extract the first word of "$JAVAC", so it can be a program name with args.
set dummy $JAVAC; 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__ACJNI_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path__ACJNI_JAVAC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
case $_ACJNI_JAVAC in
[\\/]* | ?:[\\/]*)
@@ -23662,14 +21335,14 @@
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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path__ACJNI_JAVAC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path__ACJNI_JAVAC" && ac_cv_path__ACJNI_JAVAC="$JAVAC"
@@ -23678,41 +21351,37 @@
fi
_ACJNI_JAVAC=$ac_cv_path__ACJNI_JAVAC
if test -n "$_ACJNI_JAVAC"; then
- { echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5
-echo "${ECHO_T}$_ACJNI_JAVAC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_ACJNI_JAVAC" >&5
+$as_echo "$_ACJNI_JAVAC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-test ! -x "$_ACJNI_JAVAC" && { { echo "$as_me:$LINENO: error: $JAVAC could not be found in path" >&5
-echo "$as_me: error: $JAVAC could not be found in path" >&2;}
- { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking absolute path of $JAVAC" >&5
-echo $ECHO_N "checking absolute path of $JAVAC... $ECHO_C" >&6; }
+test ! -x "$_ACJNI_JAVAC" && as_fn_error $? "$JAVAC could not be found in path" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute path of $JAVAC" >&5
+$as_echo_n "checking absolute path of $JAVAC... " >&6; }
case "$_ACJNI_JAVAC" in
-/*) { echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5
-echo "${ECHO_T}$_ACJNI_JAVAC" >&6; };;
-*) { { echo "$as_me:$LINENO: error: $_ACJNI_JAVAC is not an absolute path name" >&5
-echo "$as_me: error: $_ACJNI_JAVAC is not an absolute path name" >&2;}
- { (exit 1); exit 1; }; };;
+/*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_ACJNI_JAVAC" >&5
+$as_echo "$_ACJNI_JAVAC" >&6; };;
+*) as_fn_error $? "$_ACJNI_JAVAC is not an absolute path name" "$LINENO" 5;;
esac
# find the include directory relative to the javac executable
_cur=""$_ACJNI_JAVAC""
while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
- { echo "$as_me:$LINENO: checking symlink for $_cur" >&5
-echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking symlink for $_cur" >&5
+$as_echo_n "checking symlink for $_cur... " >&6; }
_slink=`ls -ld "$_cur" | sed 's/.* -> //'`
case "$_slink" in
/*) _cur="$_slink";;
# 'X' avoids triggering unwanted echo options.
*) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[^/]*$::'`"$_slink";;
esac
- { echo "$as_me:$LINENO: result: $_cur" >&5
-echo "${ECHO_T}$_cur" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cur" >&5
+$as_echo "$_cur" >&6; }
done
_ACJNI_FOLLOWED="$_cur"
@@ -23789,8 +21458,8 @@
# Set SOSUFFIX and friends
- { echo "$as_me:$LINENO: checking MODSUFFIX from libtool" >&5
-echo $ECHO_N "checking MODSUFFIX from libtool... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking MODSUFFIX from libtool" >&5
+$as_echo_n "checking MODSUFFIX from libtool... " >&6; }
module=yes
versuffix=""
@@ -23802,17 +21471,17 @@
if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then
if test "$_SOSUFFIX_MESSAGE" = ""; then
_SOSUFFIX_MESSAGE=yes
- { echo "$as_me:$LINENO: WARNING: libtool may not know about this architecture." >&5
-echo "$as_me: WARNING: libtool may not know about this architecture." >&2;}
- { echo "$as_me:$LINENO: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&5
-echo "$as_me: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libtool may not know about this architecture." >&5
+$as_echo "$as_me: WARNING: libtool may not know about this architecture." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&5
+$as_echo "$as_me: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&2;}
fi
fi
fi
MODSUFFIX=$_SOSUFFIX
- { echo "$as_me:$LINENO: result: $MODSUFFIX" >&5
-echo "${ECHO_T}$MODSUFFIX" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MODSUFFIX" >&5
+$as_echo "$MODSUFFIX" >&6; }
@@ -23838,14 +21507,12 @@
if test "$db_cv_tcl" = "yes"; then
if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then
- { { echo "$as_me:$LINENO: error: Tcl requires shared libraries" >&5
-echo "$as_me: error: Tcl requires shared libraries" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Tcl requires shared libraries" "$LINENO" 5
fi
- if test "${ac_cv_c_tclconfig+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if ${ac_cv_c_tclconfig+:} false; then :
+ $as_echo_n "(cached) " >&6
else
@@ -23854,9 +21521,7 @@
if test -f "${with_tclconfig}/tclConfig.sh" ; then
ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
else
- { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
fi
fi
@@ -23876,32 +21541,28 @@
if test x"${ac_cv_c_tclconfig}" = x ; then
TCL_BIN_DIR="# no Tcl configs found"
- { { echo "$as_me:$LINENO: error: can't find Tcl configuration definitions" >&5
-echo "$as_me: error: can't find Tcl configuration definitions" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "can't find Tcl configuration definitions" "$LINENO" 5
else
TCL_BIN_DIR=${ac_cv_c_tclconfig}
fi
- { echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; }
if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
- { echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
. $TCL_BIN_DIR/tclConfig.sh
else
- { echo "$as_me:$LINENO: result: file not found" >&5
-echo "${ECHO_T}file not found" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
fi
# DB requires at least version 8.4.
if test ${TCL_MAJOR_VERSION} -lt 8 \
-o ${TCL_MAJOR_VERSION} -eq 8 -a ${TCL_MINOR_VERSION} -lt 4; then
- { { echo "$as_me:$LINENO: error: Berkeley DB requires Tcl version 8.4 or better." >&5
-echo "$as_me: error: Berkeley DB requires Tcl version 8.4 or better." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Berkeley DB requires Tcl version 8.4 or better." "$LINENO" 5
fi
# The eval is required to do substitution (for example, the TCL_DBGX
@@ -23940,24 +21601,19 @@
# Test that zlib actually runs
if test "$db_cv_compression" != "no"; then
- { echo "$as_me:$LINENO: checking if a zlib test program runs" >&5
-echo $ECHO_N "checking if a zlib test program runs... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if a zlib test program runs" >&5
+$as_echo_n "checking if a zlib test program runs... " >&6; }
OLD_CFLAGS="$CFLAGS"
CFLAGS="$zlib_include"
OLD_LIBS="$LIBS"
LIBS="$zlib_lib $zlib_library"
- 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; }; }
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "zlib.h"
int main()
@@ -23969,53 +21625,29 @@
return compress(dest, &destLen, src, srcLen);
}
_ACEOF
-rm -f 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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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; }
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: program exited with status $ac_status" >&5
-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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
zlib_lib=""
zlib_library=""
zlib_include=""
db_cv_compression="no"
fi
-rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext
fi
-
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
fi
# Patch libtool to not use rpath if required
if test "$db_cv_rpath" = "no"; then
- { echo "$as_me:$LINENO: result: Patching libtool to not use rpath." >&5
-echo "${ECHO_T}Patching libtool to not use rpath." >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Patching libtool to not use rpath." >&5
+$as_echo "Patching libtool to not use rpath." >&6; }
sed < libtool > libtool-2 \
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/'
mv libtool-2 libtool
@@ -24051,12 +21683,13 @@
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;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -24064,8 +21697,8 @@
(set) 2>&1 |
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 \).
+ # `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"
@@ -24087,13 +21720,24 @@
: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
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -24106,14 +21750,15 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_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'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -24121,61 +21766,42 @@
if test -z "${BUILD_TCL_TRUE}" && test -z "${BUILD_TCL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BUILD_TCL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_TCL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"BUILD_TCL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_JAVA_TRUE}" && test -z "${BUILD_JAVA_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BUILD_JAVA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_JAVA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"BUILD_JAVA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_TEST_TRUE}" && test -z "${BUILD_TEST_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BUILD_TEST\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_TEST\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"BUILD_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_COMPRESSION_TRUE}" && test -z "${USE_COMPRESSION_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_COMPRESSION\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_COMPRESSION\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"USE_COMPRESSION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -24185,59 +21811,79 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
+
SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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
+ # Pre-4.2 versions of Zsh do 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 ;;
+ 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=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -24246,20 +21892,19 @@
# 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=
+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
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -24270,32 +21915,111 @@
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; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-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) >/dev/null 2>&1 && $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
-done
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-# Required to use basename.
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -24309,13 +22033,17 @@
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -24330,132 +22058,119 @@
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# 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
-
-
- 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 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
- # 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
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$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 sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-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
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-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
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- 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'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ 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 -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_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 ||
+$as_echo X"$as_dir" |
+ 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 -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-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
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
# 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'"
@@ -24464,13 +22179,19 @@
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# 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.
ac_log="
This file was extended by Berkeley DB XML $as_me 2.5.16, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -24483,7 +22204,16 @@
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
@@ -24491,22 +22221,25 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -24517,16 +22250,17 @@
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to <Oracle Technology Network Berkeley DB XML forum>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Berkeley DB XML config.status 2.5.16
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -24534,20 +22268,26 @@
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -24560,34 +22300,41 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_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: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -24602,27 +22349,29 @@
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@ -24630,7 +22379,7 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -24643,9 +22392,7 @@
"$srcdir/src/python/setup.py") CONFIG_FILES="$CONFIG_FILES $srcdir/src/python/setup.py:$srcdir/src/python/setup.py.in" ;;
"$srcdir/src/perl/config") CONFIG_FILES="$CONFIG_FILES $srcdir/src/perl/config:$srcdir/src/perl/config.in" ;;
- *) { { 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; }; };;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -24668,307 +22415,302 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
-#
-# 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
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
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
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$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
-DBXML_VERSION_MAJOR!$DBXML_VERSION_MAJOR$ac_delim
-DBXML_VERSION_MINOR!$DBXML_VERSION_MINOR$ac_delim
-DBXML_VERSION_PATCH!$DBXML_VERSION_PATCH$ac_delim
-DBXML_VERSION_STRING!$DBXML_VERSION_STRING$ac_delim
-DB_TCLLIB!$DB_TCLLIB$ac_delim
-DB_TEST_PATH!$DB_TEST_PATH$ac_delim
-DB_UTIL_PATH!$DB_UTIL_PATH$ac_delim
-DB_DIR!$DB_DIR$ac_delim
-berkeleydb_include!$berkeleydb_include$ac_delim
-berkeleydb_lib!$berkeleydb_lib$ac_delim
-berkeleydb_library!$berkeleydb_library$ac_delim
-berkeleydb_jar!$berkeleydb_jar$ac_delim
-XQILLA_DIR!$XQILLA_DIR$ac_delim
-xqilla_include!$xqilla_include$ac_delim
-xqilla_lib!$xqilla_lib$ac_delim
-XERCES_DIR!$XERCES_DIR$ac_delim
-xerces_include!$xerces_include$ac_delim
-xerces_include_dir!$xerces_include_dir$ac_delim
-xerces_lib!$xerces_lib$ac_delim
-JUNIT_JAR!$JUNIT_JAR$ac_delim
-zlib_include!$zlib_include$ac_delim
-zlib_lib!$zlib_lib$ac_delim
-zlib_library!$zlib_library$ac_delim
-BUILD_TCL_TRUE!$BUILD_TCL_TRUE$ac_delim
-BUILD_TCL_FALSE!$BUILD_TCL_FALSE$ac_delim
-BUILD_JAVA_TRUE!$BUILD_JAVA_TRUE$ac_delim
-BUILD_JAVA_FALSE!$BUILD_JAVA_FALSE$ac_delim
-BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
-BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
-USE_COMPRESSION_TRUE!$USE_COMPRESSION_TRUE$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`
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_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
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-USE_COMPRESSION_FALSE!$USE_COMPRESSION_FALSE$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
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-CPP!$CPP$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-POW_LIB!$POW_LIB$ac_delim
-JAVAC!$JAVAC$ac_delim
-JAR!$JAR$ac_delim
-_ACJNI_JAVAC!$_ACJNI_JAVAC$ac_delim
-JAVACFLAGS!$JAVACFLAGS$ac_delim
-SWIGCPPFLAGS!$SWIGCPPFLAGS$ac_delim
-JAVA_INCLUDE_SPEC!$JAVA_INCLUDE_SPEC$ac_delim
-MODSUFFIX!$MODSUFFIX$ac_delim
-JAVA_LIBRARY_EXTENSION!$JAVA_LIBRARY_EXTENSION$ac_delim
-LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim
-LIBTSO_MODSUFFIX!$LIBTSO_MODSUFFIX$ac_delim
-LIBTSO_LIBS!$LIBTSO_LIBS$ac_delim
-TCL_LIBRARY_EXTENSION!$TCL_LIBRARY_EXTENSION$ac_delim
-TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
-TCL_INCLUDE_SPEC!$TCL_INCLUDE_SPEC$ac_delim
-TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
-TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
-TCL_TCLSH!$TCL_TCLSH$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; 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; }; }
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
-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 || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
_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
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries 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/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
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; }; };;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -24987,7 +22729,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_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 `:'.
@@ -24996,26 +22738,34 @@
[\\/$]*) 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; }; };;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append 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."
+ configure_input='Generated from '`
+ $as_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;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -25025,7 +22775,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25043,55 +22793,15 @@
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 :; 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 ||
-echo X"$as_dir" |
- 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 -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; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_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/ ;;
@@ -25136,12 +22846,12 @@
esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -25149,36 +22859,37 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $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;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
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' ;;
+ 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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -25189,121 +22900,51 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
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;}
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
+$as_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"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
# CONFIG_HEADER
#
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
- rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
@@ -25318,7 +22959,7 @@
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25338,8 +22979,8 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -25361,7 +23002,7 @@
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25405,7 +23046,7 @@
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25423,47 +23064,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- 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 ||
-echo X"$as_dir" |
- 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 -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; }; }; }
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -25474,12 +23075,14 @@
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
# Unfortunately, on DOS this fails, as config.log is still kept open
@@ -25498,6 +23101,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit 1
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
Modified: trunk/MgDev/Oem/dbxml/dbxml/dist/aclocal/options.ac
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/dist/aclocal/options.ac 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/dbxml/dist/aclocal/options.ac 2018-01-24 12:38:11 UTC (rev 9318)
@@ -228,13 +228,20 @@
elif test `ls $with_xerces/src/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
xerces_lib="$with_xerces/src"
else
- if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
- xerces_lib="$with_xerces/src"
+ # For distros like Ubuntu there are extra places to check for non-source-tree xerces assuming --with-xerces=/usr was given
+ # NOTE: Surely one would've have both 32 and 64 bit versions of this library installed ... right?
+ if test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/i386-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/i386-linux-gnu"
+ elif test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/x86_64-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/x86_64-linux-gnu"
else
- xerces_lib="$with_xerces/lib"
+ if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
+ xerces_lib="$with_xerces/src"
+ else
+ xerces_lib="$with_xerces/lib"
+ fi
+ AC_MSG_WARN([Unable to find the Xerces-C library. Guessed path is $xerces_lib.])
fi
-
- AC_MSG_WARN([Unable to find the Xerces-C library. Guessed path is $xerces_lib.])
fi
XERCES_DIR=$with_xerces
Property changes on: trunk/MgDev/Oem/dbxml/dbxml/dist/s_paths
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/MgDev/Oem/dbxml/xerces-c-src/src/xercesc/util/XMLString.hpp
===================================================================
--- trunk/MgDev/Oem/dbxml/xerces-c-src/src/xercesc/util/XMLString.hpp 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/xerces-c-src/src/xercesc/util/XMLString.hpp 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1443,7 +1443,7 @@
, const XMLCh* const srcStr
, const XMLSize_t count)
{
- memcpy(targetStr, srcStr, count * sizeof(XMLCh));
+ memmove(targetStr, srcStr, count * sizeof(XMLCh));
}
inline XMLSize_t XMLString::stringLen(const XMLCh* const src)
Modified: trunk/MgDev/Oem/dbxml/xqilla/configure
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/configure 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/xqilla/configure 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for XQilla 2.2.4.
+# Generated by GNU Autoconf 2.69 for XQilla 2.2.4.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@ -87,6 +87,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -131,6 +132,31 @@
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -164,7 +190,8 @@
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -209,14 +236,25 @@
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -314,10 +352,18 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -354,19 +400,19 @@
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -439,6 +485,10 @@
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# 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 sensitive to this).
@@ -473,16 +523,16 @@
# ... 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'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -494,28 +544,8 @@
as_mkdir_p=false
fi
-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
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# 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'"
@@ -673,10 +703,11 @@
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -973,8 +1004,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1019,7 +1051,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1045,7 +1077,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1249,7 +1281,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1265,7 +1297,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1295,8 +1327,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1304,7 +1336,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1314,7 +1346,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1322,13 +1354,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1351,7 +1383,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1365,8 +1397,6 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1381,9 +1411,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1422,11 +1452,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1466,7 +1496,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1560,14 +1590,15 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib 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
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
CXXCPP C++ preprocessor
- YACC The `Yet Another C Compiler' implementation to use. Defaults to
- the first program found out of: `bison -y', `byacc', `yacc'.
+ YACC The `Yet Another Compiler Compiler' implementation to use.
+ Defaults to the first program found out of: `bison -y', `byacc',
+ `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
This script will default YFLAGS to the empty string to avoid a
default value of `-d' given by some make applications.
@@ -1639,9 +1670,9 @@
if $ac_init_version; then
cat <<\_ACEOF
XQilla configure 2.2.4
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.69
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1685,8 +1716,8 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -1723,8 +1754,8 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1755,7 +1786,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1769,8 +1800,8 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1783,7 +1814,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1801,7 +1832,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
@@ -1826,7 +1857,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1837,8 +1868,8 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1879,8 +1910,8 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1892,7 +1923,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1947,7 +1978,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
@@ -1972,7 +2003,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1983,8 +2014,8 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -2015,7 +2046,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2029,11 +2060,65 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -2042,10 +2127,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2081,7 +2166,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2108,7 +2193,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2117,69 +2202,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_type
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 XQilla $as_me 2.2.4, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2289,11 +2320,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2327,11 +2356,9 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2344,11 +2371,9 @@
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -2362,11 +2387,9 @@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2421,7 +2444,12 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2432,18 +2460,22 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -2515,7 +2547,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2530,16 +2562,22 @@
ac_aux_dir=
for ac_dir in autotools "$srcdir"/autotools; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ 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
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ 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
- as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2553,27 +2591,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
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 &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2591,14 +2629,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
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` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2606,7 +2644,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2624,14 +2662,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
$as_echo_n "(cached) " >&6
else
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` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2639,7 +2677,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2680,7 +2718,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2700,7 +2738,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2767,11 +2805,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2793,7 +2831,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2803,7 +2841,7 @@
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2857,7 +2895,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2869,7 +2907,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2897,7 +2935,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2909,7 +2947,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2950,7 +2988,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2960,7 +2998,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2975,6 +3013,7 @@
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2982,7 +3021,6 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -3001,7 +3039,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3013,7 +3051,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3041,7 +3079,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3049,7 +3087,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3083,7 +3121,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3276,7 +3314,7 @@
xerces_source_tree="yes"
else
- as_fn_error "Unable to find the Xerces-C include directory." "$LINENO" 5
+ as_fn_error $? "Unable to find the Xerces-C include directory." "$LINENO" 5
fi
# Work out the Xerces-C version
@@ -3289,7 +3327,7 @@
$as_echo "$xerces_version" >&6; }
if test "$xerces_version_major" -lt "3" -a "$xerces_source_tree" = "no"; then
- as_fn_error "For Xerces-C versions before 3.0 the source tree is required to build XQilla. You must specify the path to the Xerces-C source tree using --with-xerces." "$LINENO" 5
+ as_fn_error $? "For Xerces-C versions before 3.0 the source tree is required to build XQilla. You must specify the path to the Xerces-C source tree using --with-xerces." "$LINENO" 5
fi
# Find the library
@@ -3298,14 +3336,21 @@
elif test `ls $with_xerces/src/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
xerces_lib="$with_xerces/src"
else
- if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
- xerces_lib="$with_xerces/src"
+ # For distros like Ubuntu there are extra places to check for non-source-tree xerces assuming --with-xerces=/usr was given
+ # NOTE: Surely one would've have both 32 and 64 bit versions of this library installed ... right?
+ if test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/i386-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/i386-linux-gnu"
+ elif test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/x86_64-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/x86_64-linux-gnu"
else
- xerces_lib="$with_xerces/lib"
+ if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
+ xerces_lib="$with_xerces/src"
+ else
+ xerces_lib="$with_xerces/lib"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&5
+$as_echo "$as_me: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&2;}
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&5
-$as_echo "$as_me: WARNING: Unable to find the Xerces-C library. Guessed path is $xerces_lib." >&2;}
fi
@@ -3410,7 +3455,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -3422,7 +3467,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3454,7 +3499,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -3466,7 +3511,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3524,32 +3569,30 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
+
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3611,62 +3654,28 @@
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C++ compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C++ compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@ -3696,19 +3705,78 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3748,8 +3816,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3759,7 +3827,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3796,7 +3864,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3882,7 +3950,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4216,7 +4284,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -4228,7 +4296,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4260,7 +4328,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -4272,7 +4340,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4330,15 +4398,15 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4375,7 +4443,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -4461,7 +4529,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4594,7 +4662,7 @@
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4606,7 +4674,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4634,7 +4702,7 @@
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4646,7 +4714,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4687,7 +4755,7 @@
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4699,7 +4767,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4727,7 +4795,7 @@
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4740,7 +4808,7 @@
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
+ if as_fn_executable_p "$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
@@ -4786,7 +4854,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4798,7 +4866,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4830,7 +4898,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4842,7 +4910,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4884,8 +4952,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4906,15 +4974,15 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4951,7 +5019,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5029,7 +5097,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -5038,8 +5106,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5128,7 +5195,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5278,7 +5345,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -5298,7 +5365,7 @@
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5333,7 +5400,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -5360,7 +5427,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -5374,7 +5441,7 @@
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
+ as_fn_executable_p "$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
@@ -5409,7 +5476,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -5423,7 +5490,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5440,7 +5507,7 @@
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
+ as_fn_executable_p "$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
@@ -5475,7 +5542,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -5490,7 +5557,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -5507,7 +5574,7 @@
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -5542,7 +5609,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -5621,7 +5688,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -5658,10 +5725,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5688,7 +5755,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -5748,7 +5815,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -5760,7 +5827,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5792,7 +5859,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -5804,7 +5871,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5855,18 +5922,18 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5863: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5930: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5866: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5933: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5869: output\"" >&5)
+ (eval echo "\"\$as_me:5936: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5890,7 +5957,7 @@
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -6082,7 +6149,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
@@ -6118,7 +6185,7 @@
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -6130,7 +6197,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6158,7 +6225,7 @@
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -6170,7 +6237,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6217,7 +6284,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -6433,7 +6500,7 @@
set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -6445,7 +6512,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6473,7 +6540,7 @@
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -6485,7 +6552,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6538,7 +6605,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -6550,7 +6617,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6578,7 +6645,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -6590,7 +6657,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6637,7 +6704,7 @@
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -6649,7 +6716,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6677,7 +6744,7 @@
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -6689,7 +6756,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6794,7 +6861,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -7072,7 +7139,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7075 "configure"' > conftest.$ac_ext
+ echo '#line 7142 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7166,7 +7233,7 @@
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -7242,7 +7309,7 @@
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -7254,7 +7321,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7282,7 +7349,7 @@
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -7294,7 +7361,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7334,7 +7401,7 @@
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -7346,7 +7413,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7374,7 +7441,7 @@
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -7386,7 +7453,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7426,7 +7493,7 @@
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -7438,7 +7505,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7466,7 +7533,7 @@
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -7478,7 +7545,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7518,7 +7585,7 @@
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -7530,7 +7597,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7558,7 +7625,7 @@
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -7570,7 +7637,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7610,7 +7677,7 @@
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -7622,7 +7689,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7650,7 +7717,7 @@
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -7662,7 +7729,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7725,7 +7792,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -7754,7 +7821,7 @@
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
@@ -7831,7 +7898,7 @@
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -7861,7 +7928,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7877,11 +7944,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -7920,7 +7987,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7936,18 +8003,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -7959,7 +8026,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8076,8 +8143,7 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -8091,7 +8157,7 @@
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
@@ -8118,7 +8184,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -8130,7 +8196,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8162,7 +8228,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -8174,7 +8240,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8232,15 +8298,15 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8277,7 +8343,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -8363,7 +8429,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -8497,7 +8563,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+ if ${ac_cv_prog_CXXCPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -8527,7 +8593,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8543,11 +8609,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -8586,7 +8652,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8602,11 +8668,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
@@ -8801,7 +8867,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -8909,7 +8975,7 @@
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8975,7 +9041,7 @@
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -9112,7 +9178,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -9128,11 +9194,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9131: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9197: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9135: \$? = $ac_status" >&5
+ echo "$as_me:9201: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9451,7 +9517,7 @@
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -9467,11 +9533,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9474: \$? = $ac_status" >&5
+ echo "$as_me:9540: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9510,7 +9576,7 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -9553,7 +9619,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -9572,11 +9638,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9641: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9579: \$? = $ac_status" >&5
+ echo "$as_me:9645: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9608,7 +9674,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -9627,11 +9693,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9630: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9696: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9634: \$? = $ac_status" >&5
+ echo "$as_me:9700: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11752,7 +11818,7 @@
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11786,7 +11852,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -11800,12 +11866,12 @@
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11839,16 +11905,16 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11882,12 +11948,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11921,12 +11987,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11960,7 +12026,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -12001,7 +12067,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -12010,7 +12076,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12013 "configure"
+#line 12079 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12097,7 +12163,7 @@
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -12106,7 +12172,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12109 "configure"
+#line 12175 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12484,7 +12550,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -12521,10 +12587,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -14046,7 +14112,7 @@
if test -n "$lt_prog_compiler_pic_CXX"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
@@ -14062,11 +14128,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14065: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14069: \$? = $ac_status" >&5
+ echo "$as_me:14135: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14102,7 +14168,7 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
@@ -14142,7 +14208,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -14161,11 +14227,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14230: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14168: \$? = $ac_status" >&5
+ echo "$as_me:14234: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14194,7 +14260,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -14213,11 +14279,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14282: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14220: \$? = $ac_status" >&5
+ echo "$as_me:14286: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15192,7 +15258,7 @@
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -15222,7 +15288,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -15238,11 +15304,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -15281,7 +15347,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -15297,18 +15363,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -15333,7 +15399,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -15341,7 +15407,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -15366,7 +15432,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if ${ac_cv_prog_YACC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
@@ -15378,7 +15444,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_YACC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -15409,7 +15475,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then :
+if ${ac_cv_prog_LEX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
@@ -15421,7 +15487,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LEX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -15453,7 +15519,8 @@
b { REJECT; }
c { yymore (); }
d { yyless (1); }
-e { yyless (input () != 0); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */
+ yyless ((input () != 0)); }
f { unput (yytext[0]); }
. { BEGIN INITIAL; }
%%
@@ -15479,7 +15546,7 @@
test $ac_status = 0; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
$as_echo_n "checking lex output file root... " >&6; }
-if test "${ac_cv_prog_lex_root+set}" = set; then :
+if ${ac_cv_prog_lex_root+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -15488,7 +15555,7 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
@@ -15498,7 +15565,7 @@
if test -z "${LEXLIB+set}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
$as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then :
+if ${ac_cv_lib_lex+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -15528,7 +15595,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
@@ -15539,7 +15606,8 @@
LIBS="$LEXLIB $ac_save_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#define YYTEXT_POINTER 1
+
+ #define YYTEXT_POINTER 1
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -15602,7 +15670,7 @@
# Checks for libraries.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15636,7 +15704,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREAD 1
_ACEOF
@@ -15647,7 +15715,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15681,7 +15749,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
@@ -15692,7 +15760,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15726,7 +15794,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
@@ -15737,11 +15805,22 @@
# Checks for header files.
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15774,7 +15853,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15793,7 +15872,7 @@
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
# endif
# endif
# endif
@@ -15837,7 +15916,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15864,8 +15943,7 @@
for ac_func in _getb67 GETB67 getb67; do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -15879,7 +15957,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -15889,23 +15967,20 @@
/* end confdefs.h. */
$ac_includes_default
int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
+ int dir, dummy = 0;
+ if (! addr)
+ addr = &dummy;
+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+ return dir + dummy;
}
int
-main ()
+main (int argc, char **argv)
{
- return find_stack_direction () < 0;
+ return find_stack_direction (0, argc + !argv + 20) < 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -15929,7 +16004,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16043,8 +16118,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -16057,84 +16131,66 @@
# Checks for typedefs, structures, and compiler characteristics.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then :
+if ${ac_cv_header_stdbool_h+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdbool.h>
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
- struct s { _Bool s: 1; _Bool t; } s;
+ struct s { _Bool s: 1; _Bool t; } s;
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) 0.5 == true ? 1 : -1];
- bool e = &s;
- char f[(_Bool) 0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
- enum { j = false, k = true, l = false * true, m = true * 256 };
- /* The following fails for
- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
- _Bool n[m];
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-# if defined __xlc__ || defined __GNUC__
- /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
- reported by James Lemley on 2005-10-05; see
- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
- This test is not quite right, since xlc is allowed to
- reject this program, as the initializer for xlcbug is
- not one of the forms that C requires support for.
- However, doing the test right would require a runtime
- test, and that would make cross-compilation harder.
- Let us hope that IBM fixes the xlc bug, and also adds
- support for this kind of constant expression. In the
- meantime, this test will reject xlc, which is OK, since
- our stdbool.h substitute should suffice. We also test
- this with GCC, where it should work, to detect more
- quickly whether someone messes up the test in the
- future. */
- char digs[] = "0123456789";
- int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-# endif
- /* Catch a bug in an HP-UX C compiler. See
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
- */
- _Bool q = true;
- _Bool *pq = &q;
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
int
main ()
{
- *pq |= q;
- *pq |= ! q;
- /* Refer to every declared value, to avoid compiler optimizations. */
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
- + !m + !n + !o + !p + !q + !pq);
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
;
return 0;
@@ -16149,8 +16205,8 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = x""yes; then :
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
@@ -16159,6 +16215,7 @@
fi
+
if test $ac_cv_header_stdbool_h = yes; then
$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
@@ -16167,7 +16224,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16176,11 +16233,11 @@
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -16197,8 +16254,9 @@
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -16214,10 +16272,10 @@
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -16247,7 +16305,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
@@ -16288,7 +16346,7 @@
esac
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
else
@@ -16300,7 +16358,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16335,7 +16393,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16369,7 +16427,7 @@
fi
ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
+if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTRDIFF_T 1
@@ -16382,7 +16440,7 @@
# Checks for library functions.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
$as_echo_n "checking for error_at_line... " >&6; }
-if test "${ac_cv_lib_error_at_line+set}" = set; then :
+if ${ac_cv_lib_error_at_line+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16423,8 +16481,7 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -16444,8 +16501,7 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -16459,7 +16515,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
-if test "${ac_cv_func_working_mktime+set}" = set; then :
+if ${ac_cv_func_working_mktime+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -16497,8 +16553,8 @@
static time_t time_t_min;
/* Values we'll use to set the TZ environment variable. */
-static char *tz_strings[] = {
- (char *) 0, "TZ=GMT0", "TZ=JST-9",
+static const char *tz_strings[] = {
+ (const char *) 0, "TZ=GMT0", "TZ=JST-9",
"TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
};
#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
@@ -16515,7 +16571,7 @@
instead of "TZ=America/Vancouver" in order to detect the bug even
on systems that don't support the Olson extension, or don't have the
full zoneinfo tables installed. */
- putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+ putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
tm.tm_year = 98;
tm.tm_mon = 3;
@@ -16528,16 +16584,14 @@
}
static int
-mktime_test1 (now)
- time_t now;
+mktime_test1 (time_t now)
{
struct tm *lt;
return ! (lt = localtime (&now)) || mktime (lt) == now;
}
static int
-mktime_test (now)
- time_t now;
+mktime_test (time_t now)
{
return (mktime_test1 (now)
&& mktime_test1 ((time_t) (time_t_max - now))
@@ -16561,8 +16615,7 @@
}
static int
-bigtime_test (j)
- int j;
+bigtime_test (int j)
{
struct tm tm;
time_t now;
@@ -16606,7 +16659,7 @@
instead of "TZ=America/Vancouver" in order to detect the bug even
on systems that don't support the Olson extension, or don't have the
full zoneinfo tables installed. */
- putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+ putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
t = mktime (&tm);
@@ -16641,7 +16694,7 @@
for (i = 0; i < N_STRINGS; i++)
{
if (tz_strings[i])
- putenv (tz_strings[i]);
+ putenv ((char*) tz_strings[i]);
for (t = 0; t <= time_t_max - delta; t += delta)
if (! mktime_test (t))
@@ -16687,8 +16740,7 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -16763,10 +16815,21 @@
: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" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -16782,6 +16845,7 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -16805,35 +16869,35 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_DOM_SAMPLES_TRUE}" && test -z "${BUILD_DOM_SAMPLES_FALSE}"; then
- as_fn_error "conditional \"BUILD_DOM_SAMPLES\" was never defined.
+ as_fn_error $? "conditional \"BUILD_DOM_SAMPLES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -16934,6 +16998,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -16979,19 +17044,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -17129,16 +17194,16 @@
# ... 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'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17187,7 +17252,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -17198,29 +17263,17 @@
as_mkdir_p=false
fi
-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
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
# 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'"
@@ -17241,7 +17294,7 @@
# values after options handling.
ac_log="
This file was extended by XQilla $as_me 2.2.4, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -17281,6 +17334,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -17303,12 +17357,13 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
XQilla config.status 2.2.4
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -17326,11 +17381,16 @@
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -17344,12 +17404,15 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -17362,7 +17425,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -17371,7 +17434,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -17391,7 +17454,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -17782,7 +17845,7 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -17805,9 +17868,10 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -17815,12 +17879,13 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -17837,12 +17902,12 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -17851,18 +17916,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -17870,7 +17935,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -17884,7 +17949,7 @@
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -17898,7 +17963,7 @@
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -17918,7 +17983,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -17950,21 +18015,29 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries 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/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -17976,7 +18049,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -17988,11 +18061,11 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -18077,7 +18150,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -18090,7 +18163,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -18109,7 +18182,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_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 `:'.
@@ -18118,7 +18191,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -18144,8 +18217,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -18281,23 +18354,24 @@
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
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"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+which seems to be undefined. Please make sure it is defined" >&5
$as_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;}
+which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -18306,21 +18380,21 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -19272,7 +19346,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -19293,7 +19367,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
Modified: trunk/MgDev/Oem/dbxml/xqilla/configure.in
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/configure.in 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/dbxml/xqilla/configure.in 2018-01-24 12:38:11 UTC (rev 9318)
@@ -120,13 +120,20 @@
elif test `ls $with_xerces/src/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
xerces_lib="$with_xerces/src"
else
- if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
- xerces_lib="$with_xerces/src"
+ # For distros like Ubuntu there are extra places to check for non-source-tree xerces assuming --with-xerces=/usr was given
+ # NOTE: Surely one would've have both 32 and 64 bit versions of this library installed ... right?
+ if test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/i386-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/i386-linux-gnu"
+ elif test "$xerces_source_tree" = "no" -a `ls $with_xerces/lib/x86_64-linux-gnu/libxerces-c.* 2>/dev/null | wc -l` -gt 0 ; then
+ xerces_lib="$with_xerces/lib/x86_64-linux-gnu"
else
- xerces_lib="$with_xerces/lib"
+ if test "$xerces_source_tree" = "yes" -a "$xerces_version_major" -ge "3"; then
+ xerces_lib="$with_xerces/src"
+ else
+ xerces_lib="$with_xerces/lib"
+ fi
+ AC_MSG_WARN([Unable to find the Xerces-C library. Guessed path is $xerces_lib.])
fi
-
- AC_MSG_WARN([Unable to find the Xerces-C library. Guessed path is $xerces_lib.])
fi
AC_SUBST(xerces_include)
Modified: trunk/MgDev/Oem/geos/geos_svn_revision.h
===================================================================
--- trunk/MgDev/Oem/geos/geos_svn_revision.h 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Oem/geos/geos_svn_revision.h 2018-01-24 12:38:11 UTC (rev 9318)
@@ -1 +1 @@
-#define GEOS_SVN_REVISION 3921
+#define GEOS_SVN_REVISION 9261
Copied: trunk/MgDev/Oem/geos/tools/geos_svn_revision_cmake.h.in (from rev 9317, sandbox/jng/cmake_v2/Oem/geos/tools/geos_svn_revision_cmake.h.in)
===================================================================
--- trunk/MgDev/Oem/geos/tools/geos_svn_revision_cmake.h.in (rev 0)
+++ trunk/MgDev/Oem/geos/tools/geos_svn_revision_cmake.h.in 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+#cmakedefine GEOS_SVN_REVISION @GEOS_SVN_REVISION@
Copied: trunk/MgDev/Server/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,13 @@
+add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
+
+set(MG_COMPONENT ${MG_COMPONENT_SERVER})
+set_install_subdir("server/")
+
+add_subdirectory(src)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/RepositoryAdmin DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
+install_empty_directory("Logs" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Packages" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Repositories" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Temp" ${MG_INSTALL_SERVER_PREFIX})
+install_empty_directory("Trash" ${MG_INSTALL_SERVER_PREFIX})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,10 @@
+add_subdirectory(Common)
+add_subdirectory(Core)
+add_subdirectory(Gws)
+add_subdirectory(Services)
+add_subdirectory(UnitTesting)
+#add_subdirectory(Wfs)
+#add_subdirectory(Wms)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Wfs DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Wms DESTINATION ${MG_INSTALL_SERVER_PREFIX} COMPONENT ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Common/Base/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Common/Base/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Common/Base/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Common/Base/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,24 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/PlatformBase
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Manager
+ ${MG_SERVER_SERVICES_DIR}/Resource
+ ${MG_SERVER_SERVICES_DIR}/Site
+)
+
+set (MgServerBase_SRCS
+ ServerBaseBuild.cpp
+)
+
+add_library(MgServerBase${MG_VERSION_SUFFIX} SHARED ${MgServerBase_SRCS})
+install(TARGETS MgServerBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerBase${MG_VERSION_SUFFIX}.so libMgServerBase.so ${MG_COMPONENT})
+
+target_link_libraries(MgServerBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgServerManager${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Common/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Common/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Common/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Common/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,4 @@
+add_subdirectory(Base)
+add_subdirectory(Cache)
+add_subdirectory(Manager)
+add_subdirectory(Thread)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Common/Cache/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,21 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/PlatformBase
+)
+
+set (MgServerCache_SRCS
+ ServerCacheBuild.cpp
+)
+
+add_library(MgServerCache${MG_VERSION_SUFFIX} SHARED ${MgServerCache_SRCS})
+install(TARGETS MgServerCache${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerCache${MG_VERSION_SUFFIX}.so libMgServerCache.so ${MG_COMPONENT})
+
+target_link_libraries(MgServerCache${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Common/Cache/FeatureClassCacheItem.h
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/FeatureClassCacheItem.h 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Server/src/Common/Cache/FeatureClassCacheItem.h 2018-01-24 12:38:11 UTC (rev 9318)
@@ -19,7 +19,6 @@
#define MG_FEATURE_CLASS_CACHE_ITEM_H_
#include "ServerCacheItem.h"
-#include "Fdo.h"
class MG_SERVER_CACHE_API MgFeatureClassCacheItem : public MgServerCacheItem
{
Modified: trunk/MgDev/Server/src/Common/Cache/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/Makefile.am 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Server/src/Common/Cache/Makefile.am 2018-01-24 12:38:11 UTC (rev 9318)
@@ -10,8 +10,7 @@
-I../../../../Common/MapGuideCommon \
-I../../../../Common/Geometry \
-I../../../../Common/MdfModel \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I$(map_fdo_include)
+ -I../../../../Oem/ACE/ACE_wrappers
lib_LTLIBRARIES = libMgServerCache.la
Copied: trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Common/Manager/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,42 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${ACE_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${MG_AUTO_GENERATED_HEADER_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_SERVER_SERVICES_DIR}/Drawing
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Kml
+ ${MG_SERVER_SERVICES_DIR}/Mapping
+ ${MG_SERVER_SERVICES_DIR}/Profiling
+ ${MG_SERVER_SERVICES_DIR}/Rendering
+ ${MG_SERVER_SERVICES_DIR}/Resource
+ ${MG_SERVER_SERVICES_DIR}/ServerAdmin
+ ${MG_SERVER_SERVICES_DIR}/Site
+ ${MG_SERVER_SERVICES_DIR}/Tile
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Cache
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Thread
+)
+
+set (MgServerManager_SRCS
+ ServerManagerBuild.cpp
+)
+
+add_library(MgServerManager${MG_VERSION_SUFFIX} SHARED ${MgServerManager_SRCS})
+install(TARGETS MgServerManager${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerManager${MG_VERSION_SUFFIX}.so libMgServerManager.so ${MG_COMPONENT})
+
+target_link_libraries(MgServerManager${MG_VERSION_SUFFIX}
+ ${FDO_LIBRARY}
+ ${ACE_LIBRARY}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgServerThread${MG_VERSION_SUFFIX}
+ MgServerCache${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Common/Thread/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,20 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_SERVER_SERVICES_DIR}/Resource
+ ${MG_SERVER_SERVICES_DIR}/Site
+)
+
+set (MgServerThread_SRCS
+ ServerThreadBuild.cpp
+)
+
+add_library(MgServerThread${MG_VERSION_SUFFIX} SHARED ${MgServerThread_SRCS})
+install(TARGETS MgServerThread${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerThread${MG_VERSION_SUFFIX}.so libMgServerThread.so ${MG_COMPONENT})
+
+target_link_libraries(MgServerThread${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Core/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Core/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Core/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Core/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,126 @@
+if( CMAKE_COMPILER_IS_GNUCXX )
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+endif( CMAKE_COMPILER_IS_GNUCXX )
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ ${DBXML_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${MG_AUTO_GENERATED_HEADER_DIR}
+ ${MG_COMMON_DIR}/CoordinateSystem
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/Renderers
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_GWS_DIR}/Include
+ ${MG_SERVER_GWS_DIR}/GwsCommon/inc
+ ${MG_SERVER_GWS_DIR}/GwsQueryEngine/inc
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Cache
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_COMMON_DIR}/Thread
+ ${MG_SERVER_SERVICES_DIR}/Drawing
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Kml
+ ${MG_SERVER_SERVICES_DIR}/Mapping
+ ${MG_SERVER_SERVICES_DIR}/Profiling
+ ${MG_SERVER_SERVICES_DIR}/Rendering
+ ${MG_SERVER_SERVICES_DIR}/Resource
+ ${MG_SERVER_SERVICES_DIR}/ServerAdmin
+ ${MG_SERVER_SERVICES_DIR}/Site
+ ${MG_SERVER_SERVICES_DIR}/Tile
+)
+
+add_definitions(-DACE_HAS_SVC_DLL=1)
+
+set (mgserver_SRCS
+ ServerCoreBuild.cpp
+)
+
+add_executable(mgserver ${mgserver_SRCS})
+add_sanitizers(mgserver)
+target_link_libraries(mgserver
+ ${ACE_LIBRARY}
+ ${DB_CXX_LIBRARY}
+ ${DBXML_LIBRARY}
+ ${XERCESC_LIBRARIES}
+ ${FDO_LIBRARY}
+ ${FDO_EXPRESSIONENGINE_LIBRARY}
+ MgGwsCommon${MG_VERSION_SUFFIX}
+ MgGwsQueryEngine${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgServerAdminService${MG_VERSION_SUFFIX}
+ MgServerBase${MG_VERSION_SUFFIX}
+ MgServerCache${MG_VERSION_SUFFIX}
+ MgServerDrawingService${MG_VERSION_SUFFIX}
+ MgServerFeatureService${MG_VERSION_SUFFIX}
+ MgServerKmlService${MG_VERSION_SUFFIX}
+ MgServerManager${MG_VERSION_SUFFIX}
+ MgServerMappingService${MG_VERSION_SUFFIX}
+ MgServerProfilingService${MG_VERSION_SUFFIX}
+ MgServerRenderingService${MG_VERSION_SUFFIX}
+ MgServerResourceService${MG_VERSION_SUFFIX}
+ MgServerSiteService${MG_VERSION_SUFFIX}
+ MgServerThread${MG_VERSION_SUFFIX}
+ MgServerTileService${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgStylization${MG_VERSION_SUFFIX}
+ MgRenderers${MG_VERSION_SUFFIX}
+)
+
+########### BEGIN Development/Testing environment setup #############
+file(GLOB_RECURSE UNIT_TEST_FILES "${MG_UNIT_TEST_DATA_DIR}/*.*")
+file(COPY ${UNIT_TEST_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../UnitTestFiles)
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}/../UnitTestFiles/Shuttle.zip DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../UnitTestFiles/World.mgp)
+
+# Symlink the built copy to facilitate inner loop testing/debugging
+# The actual symlink installation is done in the UnitTesting CMakeLists.txt
+execute_process(COMMAND ln -sf ${CMAKE_CURRENT_BINARY_DIR}/../UnitTesting/libMgUnitTesting.so ${CMAKE_CURRENT_BINARY_DIR}/libMgUnitTesting.so)
+set(ORIG_MG_INSTALL_SERVER_PREFIX "${MG_INSTALL_SERVER_PREFIX}")
+set(MG_INSTALL_SERVER_PREFIX "${CMAKE_CURRENT_BINARY_DIR}")
+configure_file(${CMAKE_MODULE_PATH}/../configs/serverconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/serverconfig.ini)
+set(MG_INSTALL_SERVER_PREFIX "${ORIG_MG_INSTALL_SERVER_PREFIX}")
+file(COPY ${MG_COMMON_DIR}/MapGuideCommon/Resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${MG_COMMON_DIR}/Schema DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+########### END Development/Testing environment setup #############
+
+install(TARGETS mgserver DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+if (UNIX)
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/mapguidectl DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ execute_process(COMMAND sed -i "s#/usr/local/mapguideopensource/server#${MG_INSTALL_SERVER_PREFIX}#g" ${CMAKE_CURRENT_BINARY_DIR}/mapguidectl)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mapguidectl DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+endif (UNIX)
+configure_file(${CMAKE_MODULE_PATH}/../configs/serverconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/staging/serverconfig.ini)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging/serverconfig.ini DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+configure_file(${CMAKE_MODULE_PATH}/../configs/mgserver.sh.in ${CMAKE_CURRENT_BINARY_DIR}/mgserver.sh)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mgserver.sh DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+configure_file(${CMAKE_MODULE_PATH}/../configs/mgserverd.sh.in ${CMAKE_CURRENT_BINARY_DIR}/mgserverd.sh)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mgserverd.sh DESTINATION ${MG_SERVER_BIN_DIR} COMPONENT ${MG_COMPONENT})
+file(GLOB DBXML_LIBS "${MG_OEM_WORK_DIR}/dbxml/install/lib/libdb*.so")
+install(FILES ${DBXML_LIBS} DESTINATION ${LIB_INSTALL_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/dbxml DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/dbxml_dump DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/dbxml_load DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_archive DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_checkpoint DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_dump DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_hotbackup DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_load DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_recover DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_upgrade DESTINATION ${MG_SERVER_BIN_DIR})
+install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_verify DESTINATION ${MG_SERVER_BIN_DIR})
+# When installed into $PREFIX/server/bin, it will auto find libraries under $PREFIX/lib and $PREFIX/server/lib
+set_target_properties(mgserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Gws/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Gws/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Gws/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Gws/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,8 @@
+set(MG_COMPONENT "common")
+set(CMAKE_INSTALL_PREFIX "${MG_INSTALL_PREFIX}")
+
+set_install_subdir("")
+
+add_subdirectory(GwsCommon)
+add_subdirectory(GwsQueryEngine)
+add_subdirectory(GwsResource)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Gws/GwsCommon/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,28 @@
+include_directories(${FDO_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../GwsResource
+ ${CMAKE_CURRENT_SOURCE_DIR}/inc
+ ${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+)
+
+set(GwsCommon_SRCS
+ GwsCommonFactories.cpp
+ GwsCommonFdoUtils.cpp
+ GwsCsName.cpp
+ GwsDebugUtils.cpp
+ GwsException.cpp
+ GwsExtendedFeatureId.cpp
+ GwsFeatureId.cpp
+ GwsObjectImpl.cpp
+ GwsQualifiedName.cpp
+ GwsQualifiedNames.cpp
+ GwsResourceUtil.cpp
+ GwsXmlUtils.cpp
+ IGwsException.cpp
+)
+
+add_library(MgGwsCommon${MG_VERSION_SUFFIX} SHARED ${GwsCommon_SRCS})
+install(TARGETS MgGwsCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsCommon${MG_VERSION_SUFFIX}.so libMgGwsCommon.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Gws/GwsQueryEngine/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,54 @@
+include_directories(${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../GwsCommon/inc
+ ${CMAKE_CURRENT_SOURCE_DIR}/inc
+)
+
+set(GwsQueryEngine_SRCS
+ GwsBatchSortedBlockJoinQueryResults.cpp
+ GwsBinaryFeature.cpp
+ GwsBinaryFeatureReader.cpp
+ GwsBinaryFeatureWriter.cpp
+ GwsBinaryReader.cpp
+ GwsBinaryWriter.cpp
+ GwsCsQueryProcessor.cpp
+ GwsExtendedFeatureDescription.cpp
+ GwsFlatGwsIterator.cpp
+ GwsFlatFdoReader.cpp
+ GwsFdoCommand.cpp
+ GwsFdoCommandDelete.cpp
+ GwsFdoCommandInsert.cpp
+ GwsFdoCommandLock.cpp
+ GwsFdoCommandUnlock.cpp
+ GwsFdoCommandUpdate.cpp
+ GwsFeatureQueryDefinition.cpp
+ GwsFeatureQueryResults.cpp
+ GwsFeatureSourceQuery.cpp
+ GwsFeaturesPool.cpp
+ GwsJoinQueryDefinition.cpp
+ GwsJoinQueryResults.cpp
+ GwsMultiSelectIterator.cpp
+ GwsMutableFeature.cpp
+ GwsNestedLoopsJoinQueryResults.cpp
+ GwsNestedLoopSortedBlockJoinQueryResults.cpp
+ GwsPooledFeature.cpp
+ GwsPreparedFeatureQuery.cpp
+ GwsPreparedJoinQuery.cpp
+ GwsPropertyDesc.cpp
+ GwsQueryDefinition.cpp
+ GwsQueryFactories.cpp
+ GwsQueryUtils.cpp
+ GwsQueryXml.cpp
+ GwsRightBatchSortedBlockJoinQueryResults.cpp
+ GwsRightJoinQueryResults.cpp
+ GwsRightNestedLoopJoinQueryResults.cpp
+ GwsRightNestedLoopSortedBlockJoinQueryResults.cpp
+ GwsRightSortedJoinQueryResults.cpp
+ GwsSortMergeJoinQueryResults.cpp
+ utf8_.cpp
+)
+
+add_library(MgGwsQueryEngine${MG_VERSION_SUFFIX} SHARED ${GwsQueryEngine_SRCS})
+install(TARGETS MgGwsQueryEngine${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsQueryEngine${MG_VERSION_SUFFIX}.so libMgGwsQueryEngine.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Gws/GwsResource/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,9 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Include)
+
+set(GwsResource_SRCS
+ GwsResourceLinux.cpp
+)
+
+add_library(MgGwsResource${MG_VERSION_SUFFIX} SHARED ${GwsResource_SRCS})
+install(TARGETS MgGwsResource${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsResource${MG_VERSION_SUFFIX}.so libMgGwsResource.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,10 @@
+add_subdirectory(Drawing)
+add_subdirectory(Feature)
+add_subdirectory(Kml)
+add_subdirectory(Mapping)
+add_subdirectory(Profiling)
+add_subdirectory(Rendering)
+add_subdirectory(Resource)
+add_subdirectory(ServerAdmin)
+add_subdirectory(Site)
+add_subdirectory(Tile)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Drawing/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,24 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_OEM_DWF_INCLUDE_DIR}
+ ${MG_OEM_DWF_INCLUDE_DIR}/dwf
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_SERVICES_DIR}/Resource
+)
+
+add_definitions(-DDWFTK_BUILD_EXPAT -DDWFTK_USE_DWFCORE_ZLIB)
+
+set (MgServerDrawingService_SRCS
+ ServerDrawingServiceBuild.cpp
+)
+
+add_library(MgServerDrawingService${MG_VERSION_SUFFIX} SHARED ${MgServerDrawingService_SRCS})
+install(TARGETS MgServerDrawingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerDrawingService${MG_VERSION_SUFFIX}.so libMgServerDrawingService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Feature/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,34 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Cache
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_GWS_DIR}/Include
+ ${MG_SERVER_GWS_DIR}/GwsCommon/inc
+ ${MG_SERVER_GWS_DIR}/GwsQueryEngine/inc
+)
+
+set (MgServerFeatureService_SRCS
+ ServerFeatureServiceBuild.cpp
+)
+
+add_library(MgServerFeatureService${MG_VERSION_SUFFIX} SHARED ${MgServerFeatureService_SRCS})
+install(TARGETS MgServerFeatureService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerFeatureService${MG_VERSION_SUFFIX}.so libMgServerFeatureService.so ${MG_COMPONENT})
+
+target_link_libraries(MgServerFeatureService${MG_VERSION_SUFFIX}
+ MgGwsCommon${MG_VERSION_SUFFIX}
+ MgGwsQueryEngine${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Kml/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,31 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${MG_OEM_DWF_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/CoordinateSystem
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Renderers
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Mapping
+)
+
+add_definitions(-DDWFTK_USE_DWFCORE_ZLIB)
+
+set (MgServerKmlService_SRCS
+ ServerKmlServiceBuild.cpp
+)
+
+add_library(MgServerKmlService${MG_VERSION_SUFFIX} SHARED ${MgServerKmlService_SRCS})
+install(TARGETS MgServerKmlService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerKmlService${MG_VERSION_SUFFIX}.so libMgServerKmlService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Mapping/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,30 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_COMMON_DIR}/Renderers
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_COMMON_DIR}/Cache
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/CoordinateSystem
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_GWS_DIR}/Include
+)
+
+add_definitions(-DDWFTK_BUILD_EXPAT -DDWFTK_USE_DWFCORE_ZLIB)
+
+set (MgServerMappingService_SRCS
+ ServerMappingServiceBuild.cpp
+)
+
+add_library(MgServerMappingService${MG_VERSION_SUFFIX} SHARED ${MgServerMappingService_SRCS})
+install(TARGETS MgServerMappingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerMappingService${MG_VERSION_SUFFIX}.so libMgServerMappingService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Profiling/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,23 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/CoordinateSystem
+)
+
+add_definitions(-DDWFTK_USE_DWFCORE_ZLIB)
+
+set (MgServerProfilingService_SRCS
+ ServerProfilingServiceBuild.cpp
+)
+
+add_library(MgServerProfilingService${MG_VERSION_SUFFIX} SHARED ${MgServerProfilingService_SRCS})
+install(TARGETS MgServerProfilingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerProfilingService${MG_VERSION_SUFFIX}.so libMgServerProfilingService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Rendering/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,26 @@
+include_directories(${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Cache
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_COMMON_DIR}/Renderers
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Mapping
+)
+
+set (MgServerRenderingService_SRCS
+ ServerRenderingServiceBuild.cpp
+)
+
+add_library(MgServerRenderingService${MG_VERSION_SUFFIX} SHARED ${MgServerRenderingService_SRCS})
+install(TARGETS MgServerRenderingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerRenderingService${MG_VERSION_SUFFIX}.so libMgServerRenderingService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Resource/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,41 @@
+include_directories(${FDO_INCLUDE_DIR}
+ ${FDO_INCLUDE_DIR}/ExpressionEngine
+ ${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_OEM_DWF_INCLUDE_DIR}
+ ${DBXML_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Cache
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Site
+)
+
+set (MgServerResourceService_SRCS
+ ServerResourceServiceBuild.cpp
+)
+
+add_library(MgServerResourceService${MG_VERSION_SUFFIX} SHARED ${MgServerResourceService_SRCS})
+target_link_libraries(MgServerResourceService${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgServerBase${MG_VERSION_SUFFIX}
+ MgServerCache${MG_VERSION_SUFFIX}
+ MgServerManager${MG_VERSION_SUFFIX}
+ ${DB_CXX_LIBRARY}
+ ${DBXML_LIBRARY}
+ ${XQILLA_LIBRARY}
+ ${XERCESC_LIBRARIES}
+)
+install(TARGETS MgServerResourceService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/ServerAdmin/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,18 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+)
+
+set (MgServerAdminService_SRCS
+ ServerAdminServiceBuild.cpp
+)
+
+add_library(MgServerAdminService${MG_VERSION_SUFFIX} SHARED ${MgServerAdminService_SRCS})
+install(TARGETS MgServerAdminService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerAdminService${MG_VERSION_SUFFIX}.so libMgServerAdminService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Site/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Site/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Site/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Site/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,21 @@
+include_directories(${MG_COMMON_DIR}/Security
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_SERVICES_DIR}/Resource
+)
+
+set (MgServerSiteService_SRCS
+ ServerSiteServiceBuild.cpp
+)
+
+add_library(MgServerSiteService${MG_VERSION_SUFFIX} SHARED ${MgServerSiteService_SRCS})
+install(TARGETS MgServerSiteService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerSiteService${MG_VERSION_SUFFIX}.so libMgServerSiteService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/Services/Tile/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,20 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Base
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+)
+
+set (MgServerTileService_SRCS
+ ServerTileServiceBuild.cpp
+)
+
+add_library(MgServerTileService${MG_VERSION_SUFFIX} SHARED ${MgServerTileService_SRCS})
+install(TARGETS MgServerTileService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerTileService${MG_VERSION_SUFFIX}.so libMgServerTileService.so ${MG_COMPONENT})
\ No newline at end of file
Copied: trunk/MgDev/Server/src/UnitTesting/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Server/src/UnitTesting/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,52 @@
+include_directories(${ACE_INCLUDE_DIR}
+ ${CPPUNIT_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/MdfParser
+ ${MG_COMMON_DIR}/Stylization
+ ${MG_SERVER_COMMON_DIR}
+ ${MG_SERVER_COMMON_DIR}/Manager
+ ${MG_SERVER_SERVICES_DIR}/Feature
+ ${MG_SERVER_SERVICES_DIR}/Mapping
+ ${MG_SERVER_SERVICES_DIR}/Rendering
+ ${MG_SERVER_SERVICES_DIR}/Resource
+ ${MG_SERVER_SERVICES_DIR}/ServerAdmin
+ ${MG_SERVER_SERVICES_DIR}/Site
+ ${MG_SERVER_SERVICES_DIR}/Kml
+ ${MG_SERVER_SERVICES_DIR}/Tile
+ ${FDO_INCLUDE_DIR}
+)
+
+set(MgUnitTesting_SRCS
+ TestCoordinateSystem.cpp
+ TestDrawingService.cpp
+ TestFeatureService.cpp
+ TestGeometry.cpp
+ TestKmlService.cpp
+ TestLogManager.cpp
+ TestLogManagerThread.cpp
+ TestMappingService.cpp
+ TestMdfModel.cpp
+ TestPerformance.cpp
+ TestRenderingService.cpp
+ TestResourceService.cpp
+ TestServerAdminService.cpp
+ TestServerManager.cpp
+ TestServiceManager.cpp
+ TestSiteManager.cpp
+ TestSiteService.cpp
+ TestTileService.cpp
+ TestProfilingService.cpp
+ TestTransformMesh.cpp
+ UnitTesting.cpp
+)
+
+add_library(MgUnitTesting SHARED ${MgUnitTesting_SRCS})
+install(TARGETS MgUnitTesting DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+
+target_link_libraries(MgUnitTesting
+ ${CPPUNIT_LIBRARIES}
+)
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/UnitTest/CMakeLists.txt)
===================================================================
--- trunk/MgDev/UnitTest/CMakeLists.txt (rev 0)
+++ trunk/MgDev/UnitTest/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(WebTier)
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/WebTier/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/UnitTest/WebTier/CMakeLists.txt)
===================================================================
--- trunk/MgDev/UnitTest/WebTier/CMakeLists.txt (rev 0)
+++ trunk/MgDev/UnitTest/WebTier/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(MapAgent)
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/WebTier/MapAgent/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/UnitTest/WebTier/MapAgent/CMakeLists.txt)
===================================================================
--- trunk/MgDev/UnitTest/WebTier/MapAgent/CMakeLists.txt (rev 0)
+++ trunk/MgDev/UnitTest/WebTier/MapAgent/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1 @@
+add_subdirectory(MapAgentForms)
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/UnitTest/WebTier/MapAgent/MapAgentForms/CMakeLists.txt)
===================================================================
--- trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/CMakeLists.txt (rev 0)
+++ trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,3 @@
+file(GLOB MAPAGENT_FILES "*.html" "*.js")
+
+install(FILES ${MAPAGENT_FILES} DESTINATION ${MG_WWWROOT}/mapagent COMPONENT ${MG_COMPONENT_WEB})
\ No newline at end of file
Copied: trunk/MgDev/Web/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,14 @@
+add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
+
+# NOTE: Not applied for server tier projects except for mgserver main executable
+if( CMAKE_COMPILER_IS_GNUCXX )
+ # Stash a copy of current shared linker flags in case any project needs to build
+ # with undefined symbols
+ set ( WEB_CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+endif( CMAKE_COMPILER_IS_GNUCXX )
+
+set(MG_COMPONENT ${MG_COMPONENT_WEB})
+set_install_subdir("webserverextensions/")
+
+add_subdirectory(src)
\ No newline at end of file
Copied: trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,51 @@
+if (CMAKE_COMPILER_IS_GNUCXX)
+ message ("Restoring default linker flags for mod_mgmapagent")
+ set ( CMAKE_SHARED_LINKER_FLAGS "${WEB_CMAKE_SHARED_LINKER_FLAGS}")
+endif (CMAKE_COMPILER_IS_GNUCXX)
+
+include_directories(
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${MG_COMMON_DIR}/MdfModel
+ ${ACE_INCLUDE_DIR}
+ ${HTTPD_INCLUDE_DIR}/include
+ ${HTTPD_INCLUDE_DIR}/srclib/apr/include
+ ${HTTPD_INCLUDE_DIR}/srclib/apr-util/include
+ ${HTTPD_INCLUDE_DIR}/os/unix
+ ${CMAKE_CURRENT_SOURCE_DIR}/../HttpHandler
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebSupport
+ ${CMAKE_CURRENT_SOURCE_DIR}/../MapAgentCommon
+)
+
+set(mod_mgmapagent_SRCS
+ ApacheAgent.cpp
+ ApachePostParser.cpp
+ ApacheReaderStreamer.cpp
+ ApacheResponseHandler.cpp
+ ../MapAgentCommon/MapAgentCommon.cpp
+ ../MapAgentCommon/MapAgentGetParser.cpp
+ ../MapAgentCommon/MapAgentStrings.cpp
+ ../WebSupport/InitializeWebTier.cpp
+)
+
+add_library(mod_mgmapagent${MG_VERSION_SUFFIX} SHARED ${mod_mgmapagent_SRCS})
+add_dependencies(mod_mgmapagent${MG_VERSION_SUFFIX} httpd)
+install(TARGETS mod_mgmapagent${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+# Not using install_symlink macro here as install requirements are unique
+# The link target doesn't have to exist at this point in time, the symlink will be valid at install time
+execute_process(COMMAND ln -sf ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/mod_mgmapagent${MG_VERSION_SUFFIX}.so ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/modules COMPONENT ${MG_COMPONENT})
+
+target_link_libraries(mod_mgmapagent${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ MgHttpHandler${MG_VERSION_SUFFIX}
+ MgWebSupport${MG_VERSION_SUFFIX}
+)
+
+# Make sure this doesn't have the "lib" prefix
+set_target_properties(mod_mgmapagent${MG_VERSION_SUFFIX} PROPERTIES PREFIX "")
\ No newline at end of file
Copied: trunk/MgDev/Web/src/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,36 @@
+add_subdirectory(ApacheAgent)
+add_subdirectory(WebApp)
+add_subdirectory(WebSupport)
+add_subdirectory(HttpHandler)
+#add_subdirectory(CgiAgent)
+add_subdirectory(PhpApi)
+if (WITH_JAVA)
+ add_subdirectory(JavaApi)
+ add_subdirectory(JavaApiEx)
+endif (WITH_JAVA)
+
+# Needed for api binding generation
+file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "WEB-INF" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/localized DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapadmin DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+
+# Stamp actual version to resizableadmin.php
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/mapadmin/resizableadmin.php DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/mapadmin)
+execute_process(COMMAND sed -i "s#${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.0.0#${MG_VERSION_FULL}#g" ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapadmin/resizableadmin.php DESTINATION ${MG_WWWROOT}/mapadmin COMPONENT ${MG_COMPONENT})
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapagent DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapviewerphp DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+if (WITH_JAVA)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mapviewerjava DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/WEB-INF DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+endif (WITH_JAVA)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/schemareport DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stdicons DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/viewerfiles DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/webconfig.ini DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+configure_file(${CMAKE_MODULE_PATH}/../configs/webconfig.ini.in ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/webconfig.ini DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
+install_empty_directory("TempDir" ${MG_WWWROOT})
\ No newline at end of file
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -94,9 +94,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\FoundationConstants.xml -l C# -o ./FoundationConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\FoundationApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
</Command>
</PreBuildEvent>
@@ -131,9 +131,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\FoundationConstants.xml -l C# -o ./FoundationConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\FoundationApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
</Command>
</PreBuildEvent>
@@ -168,9 +168,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\FoundationConstants.xml -l C# -o ./FoundationConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\FoundationApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
</Command>
</PreBuildEvent>
@@ -206,9 +206,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\FoundationConstants.xml -l C# -o ./FoundationConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\FoundationApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
</Command>
</PreBuildEvent>
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -94,9 +94,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\GeometryConstants.xml -l C# -o ./GeometryConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\GeometryApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
</Command>
</PreBuildEvent>
@@ -131,9 +131,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\GeometryConstants.xml -l C# -o ./GeometryConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\GeometryApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
</Command>
</PreBuildEvent>
@@ -168,9 +168,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\GeometryConstants.xml -l C# -o ./GeometryConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\GeometryApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
</Command>
</PreBuildEvent>
@@ -206,9 +206,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\GeometryConstants.xml -l C# -o ./GeometryConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\GeometryApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
</Command>
</PreBuildEvent>
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -94,9 +94,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideCommonConstants.xml -l C# -o ./MapGuideCommonConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideCommonApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
</Command>
</PreBuildEvent>
@@ -131,9 +131,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideCommonConstants.xml -l C# -o ./MapGuideCommonConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideCommonApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
</Command>
</PreBuildEvent>
@@ -168,9 +168,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideCommonConstants.xml -l C# -o ./MapGuideCommonConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideCommonApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
</Command>
</PreBuildEvent>
@@ -206,9 +206,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideCommonConstants.xml -l C# -o ./MapGuideCommonConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideCommonApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
</Command>
</PreBuildEvent>
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -94,9 +94,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\PlatformBaseConstants.xml -l C# -o ./PlatformBaseConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\PlatformBaseApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
</Command>
</PreBuildEvent>
@@ -131,9 +131,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\PlatformBaseConstants.xml -l C# -o ./PlatformBaseConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\PlatformBaseApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
</Command>
</PreBuildEvent>
@@ -168,9 +168,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\PlatformBaseConstants.xml -l C# -o ./PlatformBaseConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\PlatformBaseApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
</Command>
</PreBuildEvent>
@@ -206,9 +206,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\PlatformBaseConstants.xml -l C# -o ./PlatformBaseConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\PlatformBaseApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
</Command>
</PreBuildEvent>
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -94,9 +94,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\WebConstants.xml -l C# -o ./WebConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\WebApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -131,9 +131,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\WebConstants.xml -l C# -o ./WebConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\WebApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -168,9 +168,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\WebConstants.xml -l C# -o ./WebConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\WebApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -206,9 +206,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\WebConstants.xml -l C# -o ./WebConstants.cs -t
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\WebApiGen.xml -l C#
..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
Copied: trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/HttpHandler/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,29 @@
+find_package (JsonCpp REQUIRED)
+
+include_directories(${JsonCpp_INCLUDE_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${ACE_INCLUDE_DIR}
+ ${XERCESC_INCLUDE_DIR}
+)
+
+set(MgHttpHandler_SRCS
+ HttpHandlerBuild.cpp
+)
+
+add_library(MgHttpHandler${MG_VERSION_SUFFIX} SHARED ${MgHttpHandler_SRCS})
+install(TARGETS MgHttpHandler${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgHttpHandler${MG_VERSION_SUFFIX}.so libMgHttpHandler.so ${MG_COMPONENT})
+
+target_link_libraries(MgHttpHandler${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ ${JsonCpp_LIBRARY}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/HttpHandler/JsonDoc.h
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/JsonDoc.h 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/HttpHandler/JsonDoc.h 2018-01-24 12:38:11 UTC (rev 9318)
@@ -23,25 +23,29 @@
struct MgJsonNode
{
- MgJsonNode() {}
+ MgJsonNode() : Name(StaticString(NULL)) {}
MgJsonNode(const StaticString &name, Json::Value element)
+ : Name(name)
{
this->Name = name;
this->Element = element;
this->isUsingStaticString = true;
}
MgJsonNode(const string &name, Json::Value element)
+ : Name(StaticString(NULL))
{
this->strName = name;
this->Element = element;
this->isUsingStaticString = false;
}
MgJsonNode(Json::Value element, int index)
+ : Name(StaticString(NULL))
{
this->Element = element;
this->Index = index;
}
MgJsonNode(Json::Value element)
+ : Name(StaticString(NULL))
{
this->Element = element;
}
Copied: trunk/MgDev/Web/src/JavaApi/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/JavaApi/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/JavaApi/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,89 @@
+include_directories(${JNI_INCLUDE_DIRS}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${ACE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../HttpHandler
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebSupport
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebApp
+ ${XERCESC_INCLUDE_DIR}
+)
+
+add_definitions(-DJAVA)
+add_definitions(-fno-strict-aliasing -fno-var-tracking-assignments)
+
+set(MapGuideJavaApi_SRCS
+ ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
+)
+
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
+add_custom_command(OUTPUT ${MapGuideJavaApi_SRCS}
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
+ COMMAND ${IMAKE_TOOL} -p ../MapGuideApi/MapGuideApiGen.xml
+ -l Java
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_BINARY_DIR}/java.i
+ ${CMAKE_CURRENT_BINARY_DIR}/language.i
+ COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml
+ -l Java
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide
+ -t
+ COMMAND ${SWIG_TOOL} -dllname MapGuideJavaApi -c++ -java -DJAVA
+ -package org.osgeo.mapguide
+ -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id
+ -catchallcode catchall.code
+ -dispose \"${DISPOSE_EXPR}\"
+ -rethrow \"${RETHROW_EXPR}\;\"
+ -nodefault -noconstants -module MapGuideJavaApi
+ -o ${MapGuideJavaApi_SRCS}
+ -lib ${SWIG_LIB_PATH}
+ ${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i
+ COMMAND ${MOVE_COMMAND}
+ ${CMAKE_CURRENT_BINARY_DIR}/*.java
+ ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide
+ COMMAND ${Java_JAVAC_EXECUTABLE} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
+ COMMAND ${Java_JAR_EXECUTABLE} -cf
+ ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi.jar
+ org/osgeo/mapguide/*.class
+ COMMAND ${Java_JAR_EXECUTABLE} -cf
+ ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi-sources.jar
+ org/osgeo/mapguide/*.java
+)
+
+add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})
+add_dependencies(MapGuideJavaApi${MG_VERSION_SUFFIX} swig IMake)
+install(TARGETS MapGuideJavaApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApi${MG_VERSION_SUFFIX}.so libMapGuideJavaApi.so ${MG_COMPONENT})
+
+set(MG_JARS
+ "${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi.jar"
+ "${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi-sources.jar"
+)
+install(FILES ${MG_JARS} DESTINATION ${MG_WWWROOT}/WEB-INF/lib)
+
+target_link_libraries(MapGuideJavaApi${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ ${JNI_LIBRARIES}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgHttpHandler${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+ MgWebApp${MG_VERSION_SUFFIX}
+)
+
+file(COPY "java.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "getclassid.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "catchall.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "org" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
Modified: trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -93,9 +93,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -133,9 +133,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -173,9 +173,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -214,9 +214,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
Modified: trunk/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/JavaApi/Makefile.am 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/JavaApi/Makefile.am 2018-01-24 12:38:11 UTC (rev 9318)
@@ -457,9 +457,9 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/MapGuideApiGen.xml -l Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/Constants.xml -l Java -o . -t
../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApi -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
Copied: trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,92 @@
+include_directories(${JNI_INCLUDE_DIRS}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${ACE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../HttpHandler
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebSupport
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebApp
+ ${XERCESC_INCLUDE_DIR}
+)
+
+add_definitions(-DJAVA)
+add_definitions(-fno-strict-aliasing -fno-var-tracking-assignments)
+
+set(MapGuideJavaApiEx_SRCS
+ ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
+)
+
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
+add_custom_command(OUTPUT ${MapGuideJavaApiEx_SRCS}
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
+ COMMAND ${IMAKE_TOOL} -p ../MapGuideApi/MapGuideApiGen.xml
+ -l Java
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_BINARY_DIR}/java.i
+ ${CMAKE_CURRENT_BINARY_DIR}/language.i
+ COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml
+ -l Java
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide
+ -t
+ COMMAND ${SWIG_TOOL} -dllname MapGuideJavaApiEx -c++ -java -DJAVA
+ -mgjavanothrow -mgjavacasing
+ -package org.osgeo.mapguide
+ -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id
+ -catchallcode catchall.code
+ -dispose \"${DISPOSE_EXPR}\"
+ -rethrow \"${RETHROW_EXPR}\;\"
+ -nodefault -noconstants -module MapGuideJavaApiEx
+ -o ${MapGuideJavaApiEx_SRCS}
+ -lib ${SWIG_LIB_PATH}
+ ${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i
+ COMMAND ${MOVE_COMMAND}
+ ${CMAKE_CURRENT_BINARY_DIR}/*.java
+ ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide
+ COMMAND ${Java_JAVAC_EXECUTABLE} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
+ COMMAND ${Java_JAR_EXECUTABLE} -cf
+ ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx.jar
+ org/osgeo/mapguide/*.class
+ COMMAND ${Java_JAR_EXECUTABLE} -cf
+ ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx-sources.jar
+ org/osgeo/mapguide/*.java
+)
+
+add_library(MapGuideJavaApiEx${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApiEx_SRCS})
+add_dependencies(MapGuideJavaApiEx${MG_VERSION_SUFFIX} swig IMake)
+install(TARGETS MapGuideJavaApiEx${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApiEx${MG_VERSION_SUFFIX}.so libMapGuideJavaApiEx.so ${MG_COMPONENT})
+
+set(MG_JARS
+ "${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx.jar"
+ "${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx-sources.jar"
+)
+install(FILES ${MG_JARS} DESTINATION ${MG_WWWROOT}/WEB-INF/lib)
+
+target_link_libraries(MapGuideJavaApiEx${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ ${JNI_LIBRARIES}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgHttpHandler${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+ MgWebApp${MG_VERSION_SUFFIX}
+)
+
+file(COPY "java.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "getclassid.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "catchall.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "org" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+# Specific for JavaApiEx
+file(COPY "javaextensions.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
Modified: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -93,9 +93,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -133,9 +133,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -173,9 +173,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
@@ -215,9 +215,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l Java -o . -t
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l Java
..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
Modified: trunk/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/Makefile.am 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/JavaApiEx/Makefile.am 2018-01-24 12:38:11 UTC (rev 9318)
@@ -457,9 +457,9 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/MapGuideApiGen.xml -l Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/Constants.xml -l Java -o . -t
../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
Copied: trunk/MgDev/Web/src/PhpApi/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/PhpApi/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/PhpApi/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,79 @@
+if (CMAKE_COMPILER_IS_GNUCXX)
+ message ("Restoring default linker flags for libphp_MapGuideApi")
+ set ( CMAKE_SHARED_LINKER_FLAGS "${WEB_CMAKE_SHARED_LINKER_FLAGS}")
+endif (CMAKE_COMPILER_IS_GNUCXX)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${PHP_INCLUDE_DIR}/TSRM
+ ${PHP_INCLUDE_DIR}/Zend
+ ${PHP_INCLUDE_DIR}/main
+ ${PHP_INCLUDE_DIR}
+ ${ACE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../HttpHandler
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebSupport
+ ${CMAKE_CURRENT_SOURCE_DIR}/../WebApp
+ ${XERCESC_INCLUDE_DIR}
+)
+
+add_definitions(-DPHP -DPHPPROXYAPI_EXPORTS)
+add_definitions(-fno-var-tracking-assignments)
+
+set(php_MapGuideApi_SRCS
+ ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
+)
+
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
+add_custom_command(OUTPUT ${php_MapGuideApi_SRCS}
+ COMMAND ${IMAKE_TOOL} -p ../MapGuideApi/MapGuideApiGen.xml
+ -l PHP
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_BINARY_DIR}/php.i
+ ${CMAKE_CURRENT_BINARY_DIR}/language.i
+ COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml
+ -l PHP
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${CMAKE_CURRENT_BINARY_DIR}/constants.php
+ -t
+ COMMAND ${SWIG_TOOL} -c++ -php -DPHPSWIG
+ -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id
+ -catchallcode catchall.code
+ -dispose \"${DISPOSE_EXPR}\"
+ -rethrow \"${RETHROW_EXPR}\;\"
+ -nodefault
+ -o ${php_MapGuideApi_SRCS}
+ -lib ${SWIG_LIB_PATH}
+ ${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i
+)
+
+add_library(php_MapGuideApi${MG_VERSION_SUFFIX} SHARED ${php_MapGuideApi_SRCS})
+add_dependencies(php_MapGuideApi${MG_VERSION_SUFFIX} swig IMake php)
+install(TARGETS php_MapGuideApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libphp_MapGuideApi${MG_VERSION_SUFFIX}.so libphp_MapGuideApi.so ${MG_COMPONENT})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/constants.php DESTINATION ${MG_WWWROOT}/mapadmin COMPONENT ${MG_COMPONENT})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/constants.php DESTINATION ${MG_WWWROOT}/mapviewerphp COMPONENT ${MG_COMPONENT})
+
+target_link_libraries(php_MapGuideApi${MG_VERSION_SUFFIX}
+ ${ACE_LIBRARY}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+ MgHttpHandler${MG_VERSION_SUFFIX}
+ MgMdfModel${MG_VERSION_SUFFIX}
+ MgMdfParser${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+ MgWebApp${MG_VERSION_SUFFIX}
+)
+
+file(COPY "php.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "getclassid.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "catchall.code" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
Modified: trunk/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/PhpApi/Makefile.am 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/PhpApi/Makefile.am 2018-01-24 12:38:11 UTC (rev 9318)
@@ -455,9 +455,9 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml PHP ./constants.php
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/Constants.xml -l PHP -o ./constants.php -t
cp -f php.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml PHP
+ ../../../BuildTools/WebTools/IMake/Linux/IMake -p ../MapGuideApi/MapGuideApiGen.xml -l PHP
../../../Oem/SWIGEx/Linux/swig -c++ -php -DPHPSWIG -baseexception MgException \
-clsidcode getclassid.code \
-clsiddata m_cls_id \
Modified: trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2018-01-24 12:38:11 UTC (rev 9318)
@@ -93,11 +93,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l PHP -o ./constants.php -t
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l PHP
..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -128,11 +128,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l PHP -o ./constants.php -t
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l PHP
..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -163,11 +163,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\Constants.xml -l PHP -o ./constants.php -t
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l PHP
..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
@@ -199,11 +199,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\Constants.xml -l PHP -o ./constants.php -t
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p ..\MapGuideApi\MapGuideApiGen.xml -l PHP
..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
</Command>
</PreBuildEvent>
Copied: trunk/MgDev/Web/src/WebApp/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/WebApp/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/WebApp/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/WebApp/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,51 @@
+include_directories(${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${XERCESC_INCLUDE_DIR}
+ ${ACE_INCLUDE_DIR}
+)
+
+set(MgWebApp_SRCS
+ WebBufferCommand.cpp
+ WebCommand.cpp
+ WebCommandCollection.cpp
+ WebCommandWidget.cpp
+ WebContextMenu.cpp
+ WebFlyoutWidget.cpp
+ WebGettingStarted.cpp
+ WebGetPrintablePageCommand.cpp
+ WebHelpCommand.cpp
+ WebInformationPane.cpp
+ WebInvokeScriptCommand.cpp
+ WebInvokeUrlCommand.cpp
+ WebLayout.cpp
+ WebMeasureCommand.cpp
+ WebPrintCommand.cpp
+ WebSearchCommand.cpp
+ WebSelectWithinCommand.cpp
+ WebSeparatorWidget.cpp
+ WebTaskBarWidget.cpp
+ WebTaskBar.cpp
+ WebTaskPane.cpp
+ WebToolbar.cpp
+ WebUiPane.cpp
+ WebUiSizablePane.cpp
+ WebUiTargetCommand.cpp
+ WebViewOptionsCommand.cpp
+ WebWidget.cpp
+ WebWidgetCollection.cpp
+)
+
+add_library(MgWebApp${MG_VERSION_SUFFIX} SHARED ${MgWebApp_SRCS})
+install(TARGETS MgWebApp${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebApp${MG_VERSION_SUFFIX}.so libMgWebApp.so ${MG_COMPONENT})
+
+target_link_libraries(MgWebApp${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgGeometry${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Copied: trunk/MgDev/Web/src/WebSupport/CMakeLists.txt (from rev 9317, sandbox/jng/cmake_v2/Web/src/WebSupport/CMakeLists.txt)
===================================================================
--- trunk/MgDev/Web/src/WebSupport/CMakeLists.txt (rev 0)
+++ trunk/MgDev/Web/src/WebSupport/CMakeLists.txt 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,21 @@
+include_directories(${MG_COMMON_DIR}/MdfModel
+ ${MG_COMMON_DIR}/Foundation
+ ${MG_COMMON_DIR}/Geometry
+ ${MG_COMMON_DIR}/PlatformBase
+ ${MG_COMMON_DIR}/MapGuideCommon
+ ${ACE_INCLUDE_DIR}
+)
+
+set(MgWebSupport_SRCS
+ InitializeWebTier.cpp
+)
+
+add_library(MgWebSupport${MG_VERSION_SUFFIX} SHARED ${MgWebSupport_SRCS})
+install(TARGETS MgWebSupport${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebSupport${MG_VERSION_SUFFIX}.so libMgWebSupport.so ${MG_COMPONENT})
+
+target_link_libraries(MgWebSupport${MG_VERSION_SUFFIX}
+ MgFoundation${MG_VERSION_SUFFIX}
+ MgPlatformBase${MG_VERSION_SUFFIX}
+ MgMapGuideCommon${MG_VERSION_SUFFIX}
+)
\ No newline at end of file
Modified: trunk/MgDev/Web/src/WebTier.sln
===================================================================
--- trunk/MgDev/Web/src/WebTier.sln 2018-01-17 11:45:02 UTC (rev 9317)
+++ trunk/MgDev/Web/src/WebTier.sln 2018-01-24 12:38:11 UTC (rev 9318)
@@ -25,8 +25,14 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSupport", "WebSupport\WebSupport.vcxproj", "{795B1B0E-4EC8-469D-B641-E26324266FBF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApi", "JavaApi\JavaApi.vcxproj", "{671F648B-3538-4706-9DBA-B4BDB21BD458}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhpApi", "PhpApi\PhpApi.vcxproj", "{696D2664-D17F-4357-8A19-2B5DC4B29962}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapGuideApi", "MapGuideApi\MapGuideApi.vcxproj", "{0D09DB57-3E55-4D53-A111-6BCF71C49002}"
EndProject
@@ -41,20 +47,26 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhpMapGuideApiEnvConfig", "PhpMapGuideApiEnvConfig\PhpMapGuideApiEnvConfig.vcxproj", "{D8741687-CBAC-4A3D-9A0D-C7068A9FD3B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FoundationApi", "DotNetUnmanagedApi\Foundation\FoundationApi.vcxproj", "{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeometryApi", "DotNetUnmanagedApi\Geometry\GeometryApi.vcxproj", "{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}"
ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapGuideCommonApi", "DotNetUnmanagedApi\MapGuideCommon\MapGuideCommonApi.vcxproj", "{FD5CC86A-D557-4D59-AFC2-6C562E67A596}"
ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBaseApi", "DotNetUnmanagedApi\PlatformBase\PlatformBaseApi.vcxproj", "{CB91F23F-4882-433B-961B-15946BA8B965}"
ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
@@ -63,6 +75,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebApi", "DotNetUnmanagedApi\Web\WebApi.vcxproj", "{1B43CC8A-7A76-4A2C-97E4-DE3CDB53C99A}"
ProjectSection(ProjectDependencies) = postProject
{CB91F23F-4882-433B-961B-15946BA8B965} = {CB91F23F-4882-433B-961B-15946BA8B965}
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
{FD5CC86A-D557-4D59-AFC2-6C562E67A596} = {FD5CC86A-D557-4D59-AFC2-6C562E67A596}
{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
@@ -79,7 +92,12 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebDotNetApi", "DotNetApi\Web\WebDotNetApi.vcxproj", "{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApiEx", "JavaApiEx\JavaApiEx.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
+ EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IMake", "..\..\BuildTools\WebTools\IMake\IMake.vcxproj", "{B601F04C-0D42-4AFC-A092-B31185E2EA8C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -328,8 +346,19 @@
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {4BB3FC02-5737-4C34-884F-B1C451186AE4}
+ EndGlobalSection
EndGlobal
Copied: trunk/MgDev/cmake_bootstrap.sh (from rev 9317, sandbox/jng/cmake_v2/cmake_bootstrap.sh)
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh (rev 0)
+++ trunk/MgDev/cmake_bootstrap.sh 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,242 @@
+#!/bin/sh
+
+MG_INST_PREFIX=/usr/local/mapguideopensource-3.3.0
+CMAKE_BUILD_DIR=~/mapguide_build_area
+OEM_WORK_DIR=~/mapguide_oem_build
+BUILD_CPU=32
+BUILD_CONFIG=Release
+BUILD_DBXML=0
+BUILD_LINUXAPT=0
+HAVE_SYSTEM_XERCES=0
+while [ $# -gt 0 ]; do # Until you run out of parameters...
+ case "$1" in
+ --prefix)
+ MG_INST_PREFIX="$2"
+ shift
+ ;;
+ --oem_working_dir)
+ OEM_WORK_DIR="$2"
+ shift
+ ;;
+ --build)
+ BUILD_CPU=$2
+ shift
+ ;;
+ --config)
+ BUILD_CONFIG=$2
+ shift
+ ;;
+ --have-system-xerces)
+ HAVE_SYSTEM_XERCES=1
+ ;;
+ --help)
+ echo "Usage: $0 (options)"
+ echo "Options:"
+ echo " --prefix [install prefix]"
+ echo " --oem_working_dir [installation directory]"
+ echo " --build [32(default)|64]"
+ echo " --config [Release(default)|Debug]"
+ echo " --have-system-xerces [Use system-installed xerces]"
+ echo " --help [Display usage]"
+ exit
+ ;;
+ esac
+ shift # Check next set of parameters.
+done
+
+SOURCE_DIR=`pwd`
+
+check_build()
+{
+ error=$?
+ if [ $error -ne 0 ]; then
+ echo "$LIB_NAME: Error build failed ($error)................."
+ # Return back to this dir before bailing
+ cd $SOURCE_DIR
+ exit $error
+ fi
+}
+
+# Validate
+if test "$BUILD_CPU" != "32" -a "$BUILD_CPU" != "64"; then
+ echo "--build must be 32 or 64"
+ exit 1;
+fi
+if test "$BUILD_CONFIG" != "Release" -a "$BUILD_CONFIG" != "Debug"; then
+ echo "--config must be Release or Debug"
+ exit 1;
+fi
+
+echo "Current source dir is: $SOURCE_DIR"
+echo "Building for: $BUILD_CPU-bit"
+echo "Building in: $BUILD_CONFIG"
+echo "Using system xerces: $HAVE_SYSTEM_XERCES"
+echo "OEM Working Directory is: $OEM_WORK_DIR"
+
+echo "Checking if OEM working dir exists"
+if [ ! -d $OEM_WORK_DIR ]; then
+ mkdir -p $OEM_WORK_DIR
+ echo "Created OEM working dir at: $OEM_WORK_DIR"
+fi
+
+echo "Checking if we need to build DBXML"
+# Basically perform the same checks as FindDbXml.cmake
+HAS_DBXML_HEADERS=0
+HAS_DBXML_LIB=0
+HAS_DBCXX_LIB=0
+HAS_XQILLA_LIB=0
+if [ -f "${OEM_WORK_DIR}/dbxml/install/include/dbxml/DbXml.hpp" ]; then
+ HAS_DBXML_HEADERS=1
+fi
+if [ -f "${OEM_WORK_DIR}/dbxml/install/lib/libdb_cxx.so" ]; then
+ HAS_DBCXX_LIB=1
+fi
+if [ -f "${OEM_WORK_DIR}/dbxml/install/lib/libdbxml.so" ]; then
+ HAS_DBXML_LIB=1
+fi
+if [ -f "${OEM_WORK_DIR}/dbxml/install/lib/libxqilla.so" ]; then
+ HAS_XQILLA_LIB=1
+fi
+echo "Has DBXML headers: $HAS_DBXML_HEADERS"
+echo "Has DB C++ Library: $HAS_DBCXX_LIB"
+echo "Has DBXML Library: $HAS_DBXML_LIB"
+echo "Has XQilla Library: $HAS_XQILLA_LIB"
+
+# (Re)build DBXML if any of the above is false
+if test $HAS_DBXML_HEADERS -eq 0 -o $HAS_DBCXX_LIB -eq 0 -o $HAS_DBXML_LIB -eq 0 -o $HAS_XQILLA_LIB -eq 0; then
+ echo "Re-building DBXML (${BUILD_CONFIG})"
+ cp -Rf Oem/dbxml ${OEM_WORK_DIR}/dbxml
+ cd ${OEM_WORK_DIR}/dbxml
+ if test $HAVE_SYSTEM_XERCES -eq 1; then
+ echo "Building DBXML with system-installed xerces. Please wait"
+ if test $BUILD_CONFIG == "Debug"; then
+ ./buildall.sh --enable-debug --with-xerces=/usr --have-system-xerces 2>&1 | tee $OEM_WORK_DIR/dbxml_build.log
+ check_build
+ else
+ ./buildall.sh --with-xerces=/usr --have-system-xerces 2>&1 | tee $OEM_WORK_DIR/dbxml_build.log
+ check_build
+ fi
+ else
+ echo "Building DBXML with internal copy of xerces. Please wait"
+ if test $BUILD_CONFIG == "Debug"; then
+ ./buildall.sh --enable-debug 2>&1 | tee $OEM_WORK_DIR/dbxml_build.log
+ check_build
+ else
+ ./buildall.sh 2>&1 | tee $OEM_WORK_DIR/dbxml_build.log
+ check_build
+ fi
+ fi
+fi
+
+PHP_VER=5.6.23
+HTTPD_VER=2.4.18
+TC_VER=1.2.41
+
+HTTPD_PORT=8008
+TOMCAT_PORT=8009
+
+MG_INSTALL_WEB_PREFIX=$MG_INST_PREFIX/webserverextensions
+
+LA_WORKDIR=${OEM_WORK_DIR}/LinuxApt
+HTTPD_FAKE_INSTALL=${OEM_WORK_DIR}/HttpdFakeInstall
+HTTPD_WORKDIR=${LA_WORKDIR}/httpd-${HTTPD_VER}
+PHP_WORKDIR=${LA_WORKDIR}/php-${PHP_VER}
+TC_WORKDIR=${LA_WORKDIR}/tomcat-connectors-${TC_VER}-src
+
+if [ ! -d ${LA_WORKDIR} ]; then
+ mkdir -p $LA_WORKDIR
+fi
+
+echo "Checking if we need to build httpd"
+HAS_HTTPD=0
+if [ -d ${HTTPD_WORKDIR} ]; then
+ HAS_HTTPD=1
+fi
+echo "Checking if we need to build php"
+HAS_PHP=0
+if [ -d ${PHP_WORKDIR} ]; then
+ HAS_PHP=1
+fi
+echo "Checking if we need to build tomcat connector"
+HAS_TOMCAT_CONNECTOR=0
+if [ -d ${TC_WORKDIR} ]; then
+ HAS_TOMCAT_CONNECTOR=1
+fi
+echo "Has HTTPD: ${HAS_HTTPD}"
+echo "Has PHP: ${HAS_PHP}"
+echo "Has Tomcat Connector: ${HAS_TOMCAT_CONNECTOR}"
+if test $HAS_HTTPD -eq 0; then
+ cd $SOURCE_DIR/Oem/LinuxApt
+ echo "Extracting HTTPD tarballs"
+ tar -jxf httpd-${HTTPD_VER}.tar.bz2 -C ${LA_WORKDIR}
+ tar -jxf httpd-${HTTPD_VER}-deps.tar.bz2 -C ${LA_WORKDIR}
+ cd ${HTTPD_WORKDIR}
+ echo "Configuring HTTPD"
+ ./configure --prefix=${MG_INSTALL_WEB_PREFIX}/apache2 --enable-mods-shared-all --with-included-apr --with-port=${HTTPD_PORT} 2>&1 | tee $OEM_WORK_DIR/configure_httpd_fake.log
+ check_build
+ echo "Building HTTPD. Please wait"
+ make 2>&1 | tee $OEM_WORK_DIR/make_httpd_fake.log
+ check_build
+fi
+cd ${HTTPD_WORKDIR}
+echo "Installing HTTPD"
+make install 2>&1 | tee $OEM_WORK_DIR/make_install_httpd_fake.log
+check_build
+echo "Include conf/mapguide/*.conf" >> ${MG_INSTALL_WEB_PREFIX}/apache2/conf/httpd.conf
+# Activate mod_rewrite
+sed -i "s/#LoadModule rewrite_module modules\/mod_rewrite.so/LoadModule rewrite_module modules\/mod_rewrite.so/g" ${MG_INSTALL_WEB_PREFIX}/apache2/conf/httpd.conf
+# Make sure lib dirs are in envvars
+cat >> ${MG_INSTALL_WEB_PREFIX}/apache2/bin/envvars <<END-OF-ENVVARS
+export LD_LIBRARY_PATH=${MG_INSTALL_WEB_PREFIX}/lib:${MG_INSTALL_WEB_PREFIX}/php/lib:${MG_INST_PREFIX}/lib
+export MENTOR_DICTIONARY_PATH=${MG_INST_PREFIX}/share/gis/coordsys
+END-OF-ENVVARS
+
+if test $HAS_PHP -eq 0; then
+ cd $SOURCE_DIR/Oem/LinuxApt
+ echo "Extracting PHP tarball"
+ tar -jxf php-${PHP_VER}.tar.bz2 -C ${LA_WORKDIR}
+ cd ${PHP_WORKDIR}
+ echo "Configuring PHP"
+ ./configure --prefix=${MG_INSTALL_WEB_PREFIX}/php --with-apxs2=${MG_INSTALL_WEB_PREFIX}/apache2/bin/apxs --with-openssl --with-curl --enable-xml --enable-wddx --enable-shared --with-zlib --enable-zip --enable-mbstring=all --with-xsl=/usr/lib --with-gd --with-png-dir=/usr/lib --with-jpeg-dir=/usr/lib --with-freetype-dir=/usr/lib 2>&1 | tee $OEM_WORK_DIR/configure_php.log
+ check_build
+ echo "Building PHP. Please wait"
+ make 2>&1 | tee $OEM_WORK_DIR/make_php.log
+ check_build
+fi
+cd ${PHP_WORKDIR}
+echo "Installing PHP"
+make install 2>&1 | tee $OEM_WORK_DIR/make_install_php.log
+check_build
+
+if test $HAS_TOMCAT_CONNECTOR -eq 0; then
+ cd $SOURCE_DIR/Oem/LinuxApt
+ echo "Extracting Tomcat Connector tarball"
+ tar -zxf tomcat-connectors-${TC_VER}-src.tar.gz -C ${LA_WORKDIR}
+ cd ${TC_WORKDIR}/native
+ echo "Configuring Tomcat Connector"
+ ./configure --with-apxs=${MG_INSTALL_WEB_PREFIX}/apache2/bin/apxs 2>&1 | tee $OEM_WORK_DIR/configure_tc.log
+ check_build
+ echo "Building Tomcat Connector. Please wait"
+ make 2>&1 | tee $OEM_WORK_DIR/make_tc.log
+ check_build
+fi
+echo "Installing Tomcat Connector"
+cd ${TC_WORKDIR}/native
+make install 2>&1 | tee $OEM_WORK_DIR/make_install_tc.log
+check_build
+
+# dump vars to setup script
+echo "#!/bin/sh" > $OEM_WORK_DIR/env_vars.sh
+echo "export MG_INST_PREFIX=$MG_INST_PREFIX" >> $OEM_WORK_DIR/env_vars.sh
+echo "export BUILD_CPU=$BUILD_CPU" >> $OEM_WORK_DIR/env_vars.sh
+echo "export BUILD_CONFIG=$BUILD_CONFIG" >> $OEM_WORK_DIR/env_vars.sh
+echo "export PHP_VER=$PHP_VER" >> $OEM_WORK_DIR/env_vars.sh
+echo "export HTTPD_VER=$HTTPD_VER" >> $OEM_WORK_DIR/env_vars.sh
+echo "export TC_VER=$TC_VER" >> $OEM_WORK_DIR/env_vars.sh
+echo "export HTTPD_PORT=$HTTPD_PORT" >> $OEM_WORK_DIR/env_vars.sh
+echo "export TOMCAT_PORT=$TOMCAT_PORT" >> $OEM_WORK_DIR/env_vars.sh
+echo "export HAVE_SYSTEM_XERCES=$HAVE_SYSTEM_XERCES" >> $OEM_WORK_DIR/env_vars.sh
+chmod +x $OEM_WORK_DIR/env_vars.sh
+
+echo "$OEM_WORK_DIR/env_vars.sh written"
+echo "Make sure to run cmake_build.sh with --oem_working_dir set to: $OEM_WORK_DIR"
\ No newline at end of file
Copied: trunk/MgDev/cmake_build.sh (from rev 9317, sandbox/jng/cmake_v2/cmake_build.sh)
===================================================================
--- trunk/MgDev/cmake_build.sh (rev 0)
+++ trunk/MgDev/cmake_build.sh 2018-01-24 12:38:11 UTC (rev 9318)
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+CMAKE_BUILD_DIR=~/mapguide_build_area
+OEM_WORK_DIR=~/mapguide_oem_build
+#BUILD_CPU=32
+#BUILD_CONFIG=Release
+BUILD_DBXML=0
+BUILD_LINUXAPT=0
+#HAVE_SYSTEM_XERCES=0
+USE_NINJA=0
+USE_ASAN=OFF
+while [ $# -gt 0 ]; do # Until you run out of parameters...
+ case "$1" in
+ --cmake_build_dir)
+ CMAKE_BUILD_DIR="$2"
+ shift
+ ;;
+ --oem_working_dir)
+ OEM_WORK_DIR="$2"
+ shift
+ ;;
+ --ninja)
+ USE_NINJA=1
+ ;;
+ --with-asan)
+ USE_ASAN=ON
+ ;;
+ --help)
+ echo "Usage: $0 (options)"
+ echo "Options:"
+ echo " --cmake_build_dir [CMake build directory]"
+ echo " --oem_working_dir [installation directory]"
+ echo " --with-asan [build with ASAN]"
+ echo " --ninja [Use ninja build system]"
+ echo " --help [Display usage]"
+ exit
+ ;;
+ esac
+ shift # Check next set of parameters.
+done
+
+SOURCE_DIR=`pwd`
+
+check_build()
+{
+ error=$?
+ if [ $error -ne 0 ]; then
+ echo "$LIB_NAME: Error build failed ($error)................."
+ # Return back to this dir before bailing
+ cd $SOURCE_DIR
+ exit $error
+ fi
+}
+
+if [ ! -f $OEM_WORK_DIR/env_vars.sh ]; then
+ echo "ERROR: Could not find env_vars.sh in $OEM_WORK_DIR"
+ echo " This file should exist if you ran cmake_bootstrap.sh with (--oem_working_dir $OEM_WORK_DIR)"
+ exit 1;
+fi
+
+source $OEM_WORK_DIR/env_vars.sh
+
+# Validate
+if test "$BUILD_CPU" != "32" -a "$BUILD_CPU" != "64"; then
+ echo "--build must be 32 or 64"
+ exit 1;
+fi
+if test "$BUILD_CONFIG" != "Release" -a "$BUILD_CONFIG" != "Debug"; then
+ echo "--config must be Release or Debug"
+ exit 1;
+fi
+
+echo "Install prefix is: $MG_INST_PREFIX"
+echo "Current source dir is: $SOURCE_DIR"
+echo "Building for: $BUILD_CPU-bit"
+echo "Building in: $BUILD_CONFIG"
+echo "Using Ninja build: $USE_NINJA"
+echo "CMake build directory is: $CMAKE_BUILD_DIR"
+echo "OEM Working Directory is: $OEM_WORK_DIR"
+
+echo "Creating CMake build directory"
+mkdir -p $CMAKE_BUILD_DIR
+
+INTERNAL_XERCES=TRUE
+if test $HAVE_SYSTEM_XERCES -eq 1; then
+ INTERNAL_XERCES=FALSE
+fi
+
+# Now for the main event
+echo "Setting up CMake in: $CMAKE_BUILD_DIR"
+cd $CMAKE_BUILD_DIR
+if test $USE_NINJA -eq 1; then
+ cmake -G Ninja $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DINTERNAL_XERCES=$INTERNAL_XERCES -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
+ check_build
+ ninja
+ check_build
+else
+ cmake $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DINTERNAL_XERCES=$INTERNAL_XERCES -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
+ check_build
+ make
+ check_build
+fi
\ No newline at end of file
More information about the mapguide-commits
mailing list