create tag for 2.4.0 release
git-svn-id: https://svn.apache.org/repos/asf/uima/uimacpp/tags/uimacpp-2.4.0-rcN@1391171 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Makefile.am b/Makefile.am
index df92e54..8d2eeb0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,6 @@
docs/html/index.html:
cd docs && ./builddocs.sh
-sdk: install/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install)
- echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) in target directory $(ARGS)"
- export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) && ./buildsdk.sh $(ARGS)
+sdk: $(DESTDIR)$(prefix)/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
+ echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install) in target directory $(TARGETDIR)"
+ export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) APU_HOME=$(apu_install) UIMA_INSTALLDIR=$(DESTDIR)$(prefix) && ./buildsdk.sh $(TARGETDIR)
diff --git a/Makefile.in b/Makefile.in
index 9103fd6..54bba7a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,8 +55,9 @@
config/install-sh config/ltmain.sh config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
- $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
- $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_apu.m4 \
+ $(top_srcdir)/m4/find_icu.m4 $(top_srcdir)/m4/find_xerces.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -110,6 +111,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -135,6 +137,7 @@
LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -179,6 +182,7 @@
am__tar = @am__tar@
am__untar = @am__untar@
apr_install = @apr_install@
+apu_install = @apu_install@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -347,8 +351,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -373,8 +377,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -384,13 +388,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -464,6 +467,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -490,6 +497,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -641,18 +650,18 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-libtool distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-local install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
dist-hook:
@@ -670,9 +679,9 @@
docs/html/index.html:
cd docs && ./builddocs.sh
-sdk: install/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install)
- echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) in target directory $(ARGS)"
- export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) && ./buildsdk.sh $(ARGS)
+sdk: $(DESTDIR)$(prefix)/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
+ echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install) in target directory $(TARGETDIR)"
+ export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) APU_HOME=$(apu_install) UIMA_INSTALLDIR=$(DESTDIR)$(prefix) && ./buildsdk.sh $(TARGETDIR)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/README.4src b/README.4src
index d60e664..bfff6e4 100644
--- a/README.4src
+++ b/README.4src
@@ -2,111 +2,184 @@
See the LICENSE file for licensing information.
--------------------------------
-Building the Apache UIMA C++ SDK
+The Apache UIMA C++ SDK
--------------------------------
+1. General
+2. Building on Unix
+3. Building on Windows
+4. Building, testing and packaging on Mac OSX
+5. Building the dependencies
+6. UIMA C++ Release Compatibility
-The Apache UIMA C++ SDK has been built and tested in 32-bit mode
-on Linux systems with gcc version 3.4.6 and on Windows
-using MSVC version 8. 64-bit builds have only been tested on Linux with gcc 4.3.2
+----------------
+1. General
+----------------
+
+UIMACPP enables analytics written in C++, Python, Perl and Tcl to be
+easily integrated into the UIMA Java framework.
+
+The Apache UIMA C++ SDK contains UIMACPP as well as all prerequisite
+components. The SDK is intended to enable user's annotator code
+be packaged for integration into a UIMA pipeline and to make it
+easier to redistribute UIMACPP-based applications. This also allows
+different UIMACPP annotators, each using different versions of UIMACPP,
+to be integrated into a common UIMA pipeline on the same machine. For this
+reason the SDK contains UIMACPP as well as all prerequisite components.
+
+To build the SDK, it is recommended that the prerequisites be built from source.
+The SDK build process must be configured with the location of the install directory for each
+of the dependencies. It locates the headers and libraries of the dependencies relative
+to the specified location.
+
+Alternatively, on Linux, UIMACPP can be built and installed on a machine along
+with all its prerequisites in the standard system directories. In this case the
+prerequisites can be installed from binary distributions.
+
+UIMACPP runtime prerequisites are:
+
+Tool Recommended Version
+-------------------------------
+APR >= 1.3.8
+ICU >= 3.6
+Xerces-C >= 2.8
+JDK for building the JNI interface
+ActiveMQ CPP >= 3.4.1 (optional) to build the UIMA-AS service wrapper
+APR-util >= 1.3.8 (optional) an ActiveMQ prerequisite
-Setting up the build environment:
----------------------------------
-UIMACPP has dependencies on APR, ICU, Xerces-C and ActiveMQ-cpp
-libraries. ActiveMQ-cpp has a runtime dependency on APR-Util and is required to build the
-binary distribution.
+On Linux the following GNU build tools are required:
-On Windows dependent libraries must be specified with the
-environmental parameters APR_HOME, ICU_HOME, XERCES_HOME, APU_HOME and
-ACTIVEMQ_HOME. For now, the ActiveMQ CPP and APR Util dependencies are optional; if not
-specified the UIMA-AS compatible service wrapper deployCppService will
-fail to build.
+Tool Recommended Version
+-------------------------------
+autoconf >= 2.61
+automake >= 1.10
+libtool >= 1.5.24
-On Linux, the build will attempt to locate and use the system installation of the dependencies
-- APR, ICU, XERCES, ACTIVEMQ. Provided these are consistent and only the UIMACPP library is required to be built,
-there is no need for ennviroment variables to be set.
+On Windows, UIMACPP is built with Microsoft Visual Studio. The UIMA C++ MSVC projects
+are Microsoft Visual Studio 8 (2005) projects.
-To build with libraries at different location or to build the SDK, the environmental parameters
-APR_HOME, ICU_HOME, XERCES_HOME, ACTIVEMQ_HOME and APU_HOME must be set.
+The SDK build process also builds the documentation and requires doxygen for building
+the documentation.
-The ActiveMQ CPP library is required for the Linux build.
+The Apache UIMA C++ SDK has been built and tested in 32-bit mode on
+Linux systems with gcc version 3.4.6 and on Windows using MSVC version 8.
+64-bit builds have only been tested on Linux with gcc 4.3.2 and 4.4.6.
-There is also a dependency on JNI headers from a Java JDK. The build
-looks for these headers in the directory specified by JAVA_INCLUDE.
-A typical setting for JAVA_INCLUDE on Linux or Windows would be
-$JAVA_HOME/include; on MacOSX jni.h and the other headers will be in a
-"Headers" directory.
+For up-to-date build instructions. please see these pages on the Apache UIMA site:
+https://uima.apache.org/dev-quick.html
+https://uima.apache.org/doc-uimacpp-build.html
-On Unix, dependent headers are expected under $dependent_HOME/include and
-dependent libraries under $dependent_HOME/lib.
+-------------------------
+2. Building on Unix/Linux
+-------------------------
-The build of dependent libraries on Windows is less consistent.
-APR and APR-Util libraries are expected in %APR_HOME%\Release and %APU_HOME%\Release respectively.
-ActiveMQ libraries are in %ACTIVEMQ_HOME%\vs2008-build\ReleaseDLL (or DebugDLL) and
-ActiveMQ headers are expected in %ACTIVEMQ_HOME%\src\main.
+To build an SDK it is recommended that all prerequisite components, APR, ICU, Xerces-C,
+ActiveMQ-cpp and APR-util be built from source and installed by running "make
+install". They need not be installed in system directories.
-On Windows, buildsdk command tries to copy the msvc*.dll runtime libs from
-C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT
-To override the location for MSCV redistributable libraries, use MSVCRT_HOME.
+Prerequisite installs from compatible binary distributions can be used to build
+the UIMACPP components. At runtime, only one version of ICU can be loaded. Some
+binary distributions of Xerces-C are built with ICU and have been reported to have
+problems. In this case, rebuild Xerces-C from source and specify --without-icu argument
+to the configure script.
+
+There is also a dependency on JNI headers from a Java JDK.
-Building, testing and packaging on Linux:
------------------------------------------
-Set up your environment as described above. The following instructions
-assume you have unpacked the source into $HOME/uimacpp-2.X.Y.
+Optional pre-build step
+-----------------------
+If changes are made to configure.ac or Makefile.am, then configure
+needs to be re-generated using:
-1 (Optional) Create the GNU automake scripts:
- Note: This step is only done to regenerate the configure script and Makefile.in if
- the configure.ac or Makefile.am need to be modified.
- The prebuild step requires relatively up-to-date GNU tools
- GNU automake v1.9.6, autoconf v2.59 and libtool v1.5.24.
- cd root of an SVN extract
- ./autogen.sh
+ ./autogen.sh
-2 Build the UIMA shared library and test routines:
- cd root of the SVN extract
- To build with system installation of the dependencies, run:
- ./configure
- To build specifiying the path to the the location of the dependencies,
- first set the environement variables APR_HOME, ICU_HOME, XERCES_HOME, ACTIVEMQ_HOME to the respective install directories..
- set JAVA_INCLUDE
- run
- ./configure --with-jdk=$JAVA_INCLUDE --with-apr=$APR_HOME --with-icu=$ICU_HOME --with-xerces=$XERCES_HOME --with-activemq=$ACTIVEMQ_HOME
- make
- DESTDIR=`pwd` make install (or make install-strip to strip symbols to shrink the binaries)
+autogen.sh requires GNU tools at or above the following versions:
+automake v1.9.6, autoconf v2.59 and libtool v1.5.24.
-3 Build and run the test suite:
- From root of the SVN extract
- make check
+Build Steps
+-----------
-4 Build the SDK tree:
- Requires environmental parameters to be set for ICU_HOME, XERCES_HOME, APR_HOME, ACTIVEMQ_HOME, APU_HOME.
- From root of the SVN extract
- make sdk ARGS=target_dir
- This will build the documentation.
- Note: The documentation build requires Doxygen 1.3.6 or lahter.
+1 Configure and build
+ To build the UIMACPP libraries using prerequisites installed in the
+ system directories, Simply run:
+ ./configure --with-jdk=location_of_jni.h [other options]
+ make
- To rebuild the SDK at the same target_dir, run
- make sdk ARGS="target_dir clean"
+ The ./configure script will generate Makefiles customized to your
+ system, including detecting available prerequisites that have been
+ installed in standard locations.
-5 Package the SDK tarball:
- cd target_dir/..
- tar czf uimacpp-2.X.Y-bin.tgz uimacpp
+ By default the install step will put UIMACPP components in
+ /usr/local/uimacpp. To build an SDK, install them elsewhere by adding
+ the following option to configure:
+ --prefix=install_target_loc e.g. --prefix=~/uimacpp-2.4.0/install
-6 Build source tarball:
- The source tar ball contains all the files needed to build on Windows and Linux
- To build a source tar ball with only files needed for a Linux build, run:
- make dist
+ On Linux jni.h is usually in the JDK's "include" directory. On MacOSX
+ jni.h is in the JDK's "Headers" dirctory. In some cases jni.h will
+ #include files in other directories. For example, if jni.h includes
+ jni_md.h located in a subdirectory named linux, use
+ --with-jdk="loc_of_jdk/include -Iloc_of_jdk/include/linux"
+
+ If the prerequisites are not installed in the system directories as well as
+ for a full SDK build, additional parameters must be provided to the
+ configure script:
+ For a full SDK build, all of the following are needed:
+ --with-apr=loc_of_apr_install --with-icu=loc_of_icu_install \
+ --with-xerces=loc_of_xerces_install --with-activemq=loc_of_amq_install \
+ --with-apr-util=loc_of_apr-util_install
+
+ For a build of UIMACPP without UIMA-AS support, specify the option
+ --without-activemq and leave out --with-activemq and --with-apr-util.
+
+ For more help on how to customize the build configuration, run:
+ ./configure --help
+
+2 Run the test suite
+ make check
+
+3 Install and Build the SDK tree
+ make install
+ make sdk TARGETDIR=loc_of_sdk_tree [clean]
+
+ The SDK tree will be created in loc_of_sdk_tree/uimacpp. Package by:
+ cd loc_of_sdk_tree
+ tar czf uimacpp-2.X.Y-bin.tgz uimacpp
+
+4 Optionally, generate source tar ball
+ make dist
+
+For additional information on building on Mac OSX, please see Section 4.
-Building, testing and packaging on Windows:
--------------------------------------------
-Set up your environment as described above. The following instructions
-assume you have unpacked the source into \uimacpp-2.X.Y.
+----------------------
+3. Building on Windows
+----------------------
-The following commands assume you are running from a Microsoft Visual Studio 2005 Command Prompt.
+To build an SDK all prerequisite components, APR, ICU, Xerces-C,
+ActiveMQ-cpp, APR-util and APR-iconv must first be built, and a
+JDK installed. The location of the dependencies must be set in
+environment variables APR_HOME, ICU_HOME, XERCES_HOME, ACTIVEMQ_HOME
+and JAVA_HOME.
-If using MSVC Express Edition, replace the devenv command with vcexpress.
+For details on building the dependencies, please see section 5.2 of
+this document.
+
+In order to be able to build annotators, the SDK must be built as
+described below in step 4, since the annotator projects use the
+environment variable UIMACPP_HOME to locate the UIMA libraries
+and dependencies.
+
+If using MSVC Express Edition, first run these prebuild steps.
+ - cd uimacpp-2.X.Y\src
+ - run vcexpress uimacpp.sln and do any conversions as prompted.
+ - replace devenv command with vcexpress in the winmake and test/fvt.sh scripts and in all build instructions.
+ - continue with the instructions below.
+
+If using a newer version of MSVC, the uimacpp.sln in uimacpp-2.X.Y\src
+must be converted.
+
+The following commands assume you are running from a Microsoft Visual
+Studio 2005 Command Prompt.
1 Build the UIMA C++ framework in both release and debug:
cd \uimacpp-2.X.Y\src
@@ -124,21 +197,30 @@
builddocs
4 Build the SDK tree:
- set MSVCRT_HOME to the directory with the msvc*.dll files required.
- set ACTIVEMQ_HOME and APU_HOME if building and distributing the ActiveMQ CPP service wrapper, deployCppService.
+ set MSVCRT_HOME to the directory with the required msvc*.dll files.
+ set ACTIVEMQ_HOME if building the ActiveMQ service wrapper, deployCppService.
+
cd \uimacpp-2.X.Y
- buildsdk target_dir
+ buildsdk "target_dir [clean]"
5 Package the SDK zipfile by creating a compressed folder of
target_dir\uimacpp into uimacpp-2.X.Y-bin.zip
+6 Package a source zipfile by creating a compressed folder of the
+ the directory containing the source download or SVN extract.
-Building, testing and packaging on Mac OSX:
--------------------------------------------
+
+----------------------------------------------
+4. Building, testing and packaging on Mac OSX:
+----------------------------------------------
+Except for one problem with APR (see below), building is the same here as outlined
+in Building on Unix (section 2).
These instructions should work on the Max OSX but have not been tested.
-Except for one problem with APR, building is the same here as on Linux.
+4.1 Patch APR
+-------------
+
For the Intel-based Mac OSX machines we have tested with, the APR function
to dynamically load shared libraries does not respect DYLD_LIBRARY_PATH.
@@ -151,11 +233,12 @@
>#endif
>
-Packaging UIMA C++ annotators:
-
-On Mac OSX, the install names are embedded in the binaries. Run the following steps
-manually post build to neutralize the embedded name in the UIMA C++ binary and to change
-the dependency path in the annotator:
+4.2 Packaging UIMA C++ annotators:
+----------------------------------
+On Mac OSX, the install names are embedded in the binaries. Run the
+following steps manually post build to neutralize the embedded name in
+the UIMA C++ binary and to change the dependency path in the
+annotator:
1) changing the install name in libuima, to neutralize it:
@@ -167,34 +250,46 @@
"/absolute_path_to_uimacpp_home/install/lib/libuima.dylib" MyAnnotator.dylib
-Building the dependencies: APR, ICU, Xersec-c and Activemq-cpp
---------------------------------------------------------------
+----------------------------------------------------------------------------
+5. Building the dependencies: APR et al, ICU, Xerses-c and Activemq-cpp
+----------------------------------------------------------------------------
Download and build information for these libraries are at:
APR - http://apr.apache.org/
- APR-Util - http://apr.apache.org/
ICU - http://www.icu-project.org/
XERCES - http://xml.apache.org/xerces-c/
ACTIVEMQ - http://activemq.apache.org/cms/download.html
-ACTIVEMQ CPP library version 3.2 or higher is required to support the ActiveMQ failover protocol
-and to support multi-byte payload data.
-ACTIVEMQ CPP 3.2 and higher has a dependency on APR at version 1.3.8 or higher and APR-Util 1.3.8.
-
-For UNIX users that cannot or do not want to install these as
-system root, specify DESTDIR for the install step. For example,
-after building APR, install using:
-
- DESTDIR=`pwd` make install
+ACTIVEMQ CPP library version 3.2 or higher is required to support
+the ActiveMQ failover protocol and to support multi-byte payload data.
+ACTIVEMQ CPP 3.2 and higher has a dependency on APR at version 1.3.8
+or higher and APR-util 1.3.8. (On Windows APR-util requires APR-iconv)
-Building Dependencies on Windows:
---------------------------------
+5.1 Building Dependencies on Unix/MacOSX
+----------------------------------------
+The directions for these components is straightforward. The UIMACPP
+build expects to find headers in install_loc/include and libraries
+in install_loc/lib.
-ActiveMQ-CPP
-The UIMA C++ MSVC projects are Microsoft Visual Studio 8 (2005) projects.
-The ActiveMQ CPP source distribution comes with MSVC 8 (2008) project. These
-can be down converted to MSVC 2005 by following these step reproduced from
+
+5.2 Building Dependencies on Windows:
+-------------------------------------
+The build of dependent libraries on Windows is less consistent.
+The APR components must be checked out and built in parallel
+directories (see apr.apache.org) and the libraries are expected
+to be located relative to %APR_HOME%.
+ActiveMQ libraries are in %ACTIVEMQ_HOME%\vs2008-build\ReleaseDLL
+and the headers are expected in %ACTIVEMQ_HOME%\src\main.
+
+On Windows, buildsdk command tries to copy the msvc*.dll runtime libs from
+C:\Program Files\Microsoft Visual Studio8\VC\redist\x86\Microsoft.VC80.CRT
+To override the location for MSCV redistributable libraries, use MSVCRT_HOME.
+
+ActiveMQ-CPP - The UIMA C++ MSVC projects are Microsoft Visual Studio
+8 (2005) projects. The ActiveMQ CPP source distribution comes with
+MSVC 8 (2008) project. These can be down converted to MSVC 2005 by
+following these step reproduced from
http://stackoverflow.com/questions/609419/how-do-i-downgrade-a-c-visual-studio-2008-project-to-2005
Put the following sed script in a file called downgrade_vc9_to_vc8.sed :
@@ -207,33 +302,38 @@
Run
sed.exe -f downgrade_sln_vc9_to_vc8.sed vs2008-build/activemq-cpp.vcproj > vs2008-build/activemq-cpp2005.vcproj
-On Windows, the only activemq-cpp targets needed by uimacpp are ReleaseDLL and DebugDLL,
+The only activemq-cpp target needed by uimacpp is ReleaseDLL,
e.g. devenv vs2008-build/activemq-cpp2005.vcproj /build ReleaseDLL
- devenv vs2008-build/activemq-cpp2005.vcproj /build DebugDLL
-APR and APR-Util
-Also, the APR and APR-Util libraries can be built by launching libapr.dsp or by following the
-instructions in Makefile.win.
+The three APR libraries can be built by launching aprutil.dsw and
+building libaprutil or by following the instructions in Makefile.win.
XERCES and ICU
Binary distributions are available for Xerces and ICU.
+Use only those built with a compatible version of Visual Studio!
+Currently the SDK uses xerces-c_2 so if a higher version is
+installed the MSVC project files must be edited.
-UIMA C++ Release Compatibility
--------------------------------
-There a two distinct features of UIMA C++ to consider when dealing with release compatibility:
+----------------------------------
+6. UIMA C++ Release Compatibility
+----------------------------------
+There are two distinct features of UIMA C++ to consider when dealing
+with release compatibility:
-- The framework dynamically loads annotators which are user code. The annotators make calls to UIMA C++ APIs
- and are built with some version of the SDK. A possible scenario is for an application to run annotators that
- were built with different releases of UIMA C++ SDK.
-- The SDK depends on ICU, XERCES, APR and ACTIVEMQ-CPP and a release is built with a particular version of these.
- Binary compatibility therefore depends on the compatibility of these underlying libraries. In particular,
- ICU and XERCES encode the major and minor release numbers in the APIs which restricts binary compatibility across
- releases of these libraries. An application running UIMA C++ is restricted to running one version of the ICU library
- in a process and all annotators and underlying libraries must use the same ICU version.
+- The framework dynamically loads annotators which are user code. The
+ annotators make calls to UIMA C++ APIs and are built with some
+ version of the SDK. A possible scenario is for an application to
+ run annotators that were built with different releases of UIMA C++
+ SDK.
+- The SDK depends on ICU, XERCES, APR and ACTIVEMQ-CPP and a release
+ is built with a particular version of these. Binary compatibility
+ therefore also depends on the compatibility of these underlying
+ libraries. In particular, ICU and XERCES encode the major and
+ minor release numbers in the APIs which restricts binary
+ compatibility across releases of these libraries. An application
+ running UIMA C++ is restricted to running one version of the ICU
+ library in a process and all annotators and underlying libraries
+ must use the same ICU version.
-We do not enforce binary compatility when doing a release.
-
-Installing UIMACPP SDK as a system-wide shared library is discouraged since we do not
-have support for parallel versions. The include directory does not have version number and
-there cannot be multiple versions of executable runAECpp and deployCppService.
\ No newline at end of file
+In general, different UIMACPP releases are not binary compatible.
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index a45cc16..0fcf9bc 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -22,17 +22,17 @@
<o:DocumentProperties>
<o:Author>bsiyer</o:Author>
<o:LastAuthor>bsiyer</o:LastAuthor>
- <o:Revision>45</o:Revision>
- <o:TotalTime>182</o:TotalTime>
+ <o:Revision>48</o:Revision>
+ <o:TotalTime>189</o:TotalTime>
<o:Created>2012-01-03T16:09:00Z</o:Created>
- <o:LastSaved>2012-07-05T19:12:00Z</o:LastSaved>
+ <o:LastSaved>2012-09-27T19:11:00Z</o:LastSaved>
<o:Pages>1</o:Pages>
- <o:Words>1411</o:Words>
- <o:Characters>8048</o:Characters>
+ <o:Words>1454</o:Words>
+ <o:Characters>8294</o:Characters>
<o:Company>IBM</o:Company>
- <o:Lines>67</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>9441</o:CharactersWithSpaces>
+ <o:Lines>69</o:Lines>
+ <o:Paragraphs>19</o:Paragraphs>
+ <o:CharactersWithSpaces>9729</o:CharactersWithSpaces>
<o:Version>11.9999</o:Version>
</o:DocumentProperties>
</xml><![endif]--><!--[if gte mso 9]><xml>
@@ -170,6 +170,8 @@
{mso-style-name:attribute-name;}
span.end-tag
{mso-style-name:end-tag;}
+span.description
+ {mso-style-name:description;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;
@@ -469,7 +471,7 @@
mso-bidi-language:#0400;}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="9218"/>
+ <o:shapedefaults v:ext="edit" spidmax="12290"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -480,10 +482,10 @@
<div class=Section1>
-<h1><a name="_Toc313524508"></a><a name="_Toc313524308"></a><a
-name="_Toc313367453"></a><a name="_Toc313367710"></a><a name="_Toc313367811"><span
-style='mso-bookmark:_Toc313367710'><span style='mso-bookmark:_Toc313367453'><span
-style='mso-bookmark:_Toc313524308'><span style='mso-bookmark:_Toc313524508'>Apache
+<h1><a name="_Toc313367811"></a><a name="_Toc313367710"></a><a
+name="_Toc313367453"></a><a name="_Toc313524308"></a><a name="_Toc313524508"><span
+style='mso-bookmark:_Toc313524308'><span style='mso-bookmark:_Toc313367453'><span
+style='mso-bookmark:_Toc313367710'><span style='mso-bookmark:_Toc313367811'>Apache
UIMA (Unstructured Information Management Architecture) for C++ v2.4.0 Release
Notes</span></span></span></span></a></h1>
@@ -600,10 +602,10 @@
<h1><!--[if supportFields]><span style='font-size:12.0pt;mso-font-kerning:0pt;
font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><o:p> </o:p></h1>
-<h2><a name="_Toc313524509"></a><a name="_Toc313524310"></a><a
-name=what.is.uima></a><a name="_Toc313367454"></a><a name="_Toc313367711"><span
-style='mso-bookmark:_Toc313367454'><span style='mso-bookmark:"what\.is\.uima"'><span
-style='mso-bookmark:_Toc313524310'><span style='mso-bookmark:_Toc313524509'>1.
+<h2><a name="_Toc313367711"></a><a name="_Toc313367454"></a><a
+name=what.is.uima></a><a name="_Toc313524310"></a><a name="_Toc313524509"><span
+style='mso-bookmark:_Toc313524310'><span style='mso-bookmark:"what\.is\.uima"'><span
+style='mso-bookmark:_Toc313367454'><span style='mso-bookmark:_Toc313367711'>1.
What is UIMA?</span></span></span></span></a></h2>
<p>Unstructured Information Management applications are software systems that
@@ -636,10 +638,10 @@
running analytic components written in Java and C++, with some support for
Perl, Python and TCL. </p>
-<h2><a name="_Toc313524510"></a><a name="_Toc313524311"></a><a
-name=major.changes></a><a name="_Toc313367455"></a><a name="_Toc313367712"><span
-style='mso-bookmark:_Toc313367455'><span style='mso-bookmark:"major\.changes"'><span
-style='mso-bookmark:_Toc313524311'><span style='mso-bookmark:_Toc313524510'>2.
+<h2><a name="_Toc313367712"></a><a name="_Toc313367455"></a><a
+name=major.changes></a><a name="_Toc313524311"></a><a name="_Toc313524510"><span
+style='mso-bookmark:_Toc313524311'><span style='mso-bookmark:"major\.changes"'><span
+style='mso-bookmark:_Toc313367455'><span style='mso-bookmark:_Toc313367712'>2.
Major Changes in this Release</span></span></span></span></a></h2>
<p>This section describes what has changed between version 2.3.0 and version
@@ -703,12 +705,12 @@
sofa mapping in a UIMC C++ aggregate AE.</li>
</ul>
-<h2><a name="_Toc313524511"></a><a name="_Toc313524312"></a><a
-name="_Toc313367459"></a><a name="_Toc313367713"></a><a name=get.involved><span
-style='mso-bookmark:_Toc313367713'><span style='mso-bookmark:_Toc313367459'><span
-style='mso-bookmark:_Toc313524312'><span style='mso-bookmark:_Toc313524511'>3. </span></span></span></span></a><span
-style='mso-bookmark:_Toc313367713'><span style='mso-bookmark:_Toc313367459'><span
-style='mso-bookmark:_Toc313524312'><span style='mso-bookmark:_Toc313524511'>List
+<h2><a name="_Toc313367713"></a><a name="_Toc313367459"></a><a
+name="_Toc313524312"></a><a name="_Toc313524511"></a><a name=get.involved><span
+style='mso-bookmark:_Toc313524511'><span style='mso-bookmark:_Toc313524312'><span
+style='mso-bookmark:_Toc313367459'><span style='mso-bookmark:_Toc313367713'>3. </span></span></span></span></a><span
+style='mso-bookmark:_Toc313524511'><span style='mso-bookmark:_Toc313524312'><span
+style='mso-bookmark:_Toc313367459'><span style='mso-bookmark:_Toc313367713'>List
of Issues Fixed in this Release</span></span></span></span></h2>
<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=516
@@ -717,533 +719,577 @@
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:12.75pt'>
<p class=MsoNormal align=center style='text-align:center'><a
- name="_Toc313367460"></a><a name="_Toc313367714"><span style='mso-bookmark:
- _Toc313367460'><b><span style='font-size:10.0pt;font-family:Arial;color:black'>Issue
+ name="_Toc313367714"></a><a name="_Toc313367460"><span style='mso-bookmark:
+ _Toc313367714'><b><span style='font-size:10.0pt;font-family:Arial;color:black'>Issue
Key<o:p></o:p></span></b></span></a></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:12.75pt'>
<p class=MsoNormal align=center style='text-align:center'><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><b><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><b><span
style='font-size:10.0pt;font-family:Arial;color:black'>Summary<o:p></o:p></span></b></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:1;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2333"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2333</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Build
one source distribution which includes Windows and Linux files<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:2;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2328"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2328</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Cleanup
the Linux source distribution<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:3;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2312"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2312</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Migrate
UIMA C++ service wrapper to ACTIVEMQ CPP 3.4.1<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:4;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2307"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2307</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>BasicArrayFS
has two unimplemented Functions: copyToArray, copyFromArray.<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:5;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2053"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2053</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Changes to standardize UIMA C++ build and packaging on
Linux<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:6;height:38.25pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:38.25pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1964"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1964</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:38.25pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>UIMA C++ service wrapper is not correctly shutting down
when Java controller terminates<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:7;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1941"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1941</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>UIMA CPP aggregate AE incorrect handling of sofa mapping<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:8;height:38.25pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:38.25pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1940"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1940</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:38.25pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
- Arial;color:black'>TypeSystemDescription element missing when Aggregate AE
- metadata is serialized to XML<o:p></o:p></span></span></span></p>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
+ Arial;color:black'>TypeSystemDescription element missing when Aggregate AE metadata
+ is serialized to XML<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:9;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1925"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1925</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Enable failover protocol support in UIMA C++ service
wrapper<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:10;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1913"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1913</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Replace usage of ActiveMQ CPP utitlity APIs with APR
functions<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:11;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1912"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1912</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Changes for GCC 4.3+ compatibilty and header file
conventions<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:12;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-1886"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-1886</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;font-family:Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>XMI serialization incorrectly handling string feature set
to an empty string<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:13;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2328"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2328</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Cleanup Linux source distribution<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:14;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2333"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2333</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'>Build one source distribution that includes Linux and
Windows files.<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:15;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2348"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2348</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Augment
UIMACpp binary lic/notice with appropriate items from other embedded
- binaries.</span></span></span><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;font-family:
+ binaries.</span></span></span><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;font-family:
Arial;color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:16;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2352"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2352</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <h2><span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ <h2><span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black;font-weight:normal'>Build
script for uimacpp sdk on Windows does not correctly copy scriptators docs
and xerces libs.<o:p></o:p></span></span></span></h2>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:17;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2356"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;font-family:Arial;color:black'>UIMA-2356</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <h2><span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ <h2><span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
- mso-bidi-font-family:"Times New Roman";color:black;font-weight:normal'>Fix warnings
- generated when creating the UIMA C++ doxygen docs.<o:p></o:p></span></span></span></h2>
+ mso-bidi-font-family:"Times New Roman";color:black;font-weight:normal'>Fix
+ warnings generated when creating the UIMA C++ doxygen docs.<o:p></o:p></span></span></span></h2>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:18;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2361"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2361</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>UIMA
C++ fails to build with gcc 4.5.2.<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:19;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2362"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2362</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Add
APR 1.4.x to list of acceptable version to build UIMA C++<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:20;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2363"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2363</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>Add
APR-Util libraries to the UIMA C++ binary package<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
<tr style='mso-yfti-irow:21;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
href="https://issues.apache.org/jira/browse/UIMA-2365"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><u><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2365</span></u></span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'><span style='font-size:10.0pt;mso-bidi-font-size:
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span style='font-size:10.0pt;mso-bidi-font-size:
12.0pt;font-family:Arial;mso-bidi-font-family:"Times New Roman";color:black'>UIMACPP
build fails on Mac OS X stricmp unavailable replace with strcasecmp in
deployCppService.hpp<o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
- <tr style='mso-yfti-irow:22;mso-yfti-lastrow:yes;height:25.5pt'>
+ <tr style='mso-yfti-irow:22;height:25.5pt'>
<td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'>UIMA-2425</span></span></p>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
+ href="https://issues.apache.org/jira/browse/UIMA-2425"><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
+ style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
+ mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2425</span></u></span></span></a><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
<td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
height:25.5pt'>
- <p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
- style='mso-bookmark:_Toc313367460'></span></span><a
- href="https://issues.apache.org/jira/browse/UIMA-2425"><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>Xerces
- exception messages not being properly converted to native code-page.</span></span></a><span
- style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'>Xerces exception messages not being
+ properly converted to native code-page.</span></span><span style='mso-bookmark:
+ _Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
mso-bidi-font-family:"Times New Roman";color:black'><o:p></o:p></span></span></span></p>
</td>
- <span style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'></span></span>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
+ </tr>
+ <tr style='mso-yfti-irow:23;height:25.5pt'>
+ <td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
+ height:25.5pt'>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
+ href="https://issues.apache.org/jira/browse/UIMA-2433"><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
+ style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
+ mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2433</span></u></span></span></a><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span></p>
+ </td>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
+ <td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
+ height:25.5pt'>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'>Scriptator makefiles modified to work with
+ different newer versons of Python and SWIG.</span></span></p>
+ </td>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
+ </tr>
+ <tr style='mso-yfti-irow:24;mso-yfti-lastrow:yes;height:25.5pt'>
+ <td width=132 valign=top style='width:99.25pt;padding:0in 5.4pt 0in 5.4pt;
+ height:25.5pt'>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'></span></span><a
+ href="https://issues.apache.org/jira/browse/UIMA-2466"><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><u><span
+ style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:Arial;
+ mso-bidi-font-family:"Times New Roman";color:black'>UIMA-2466</span></u></span></span></a><span
+ style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span></p>
+ </td>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
+ <td width=384 valign=top style='width:4.0in;padding:0in 5.4pt 0in 5.4pt;
+ height:25.5pt'>
+ <p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+ style='mso-bookmark:_Toc313367714'><span class=description>APR-iconv missing
+ from UIMA C++ Windows binary build</span></span></span></p>
+ </td>
+ <span style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'></span></span>
</tr>
</table>
-<p class=MsoNormal><span style='mso-bookmark:_Toc313367714'><span
-style='mso-bookmark:_Toc313367460'><o:p> </o:p></span></span></p>
+<p class=MsoNormal><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367714'><o:p> </o:p></span></span></p>
<h2 style='margin-left:.25in;text-indent:-.25in;mso-list:l2 level1 lfo4;
-tab-stops:list .25in'><span style='mso-bookmark:_Toc313367714'><span
-style='mso-bookmark:_Toc313367460'><a name="_Toc313524512"></a><a
-name="_Toc313524313"><span style='mso-bookmark:_Toc313524512'><![if !supportLists]><span
+tab-stops:list .25in'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367714'><a name="_Toc313524313"></a><a
+name="_Toc313524512"><span style='mso-bookmark:_Toc313524313'><![if !supportLists]><span
style='mso-list:Ignore'>4.<span style='font:7.0pt "Times New Roman"'>
</span></span><![endif]>Release Compatibility</span></a> </span></span></h2>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>There
-are two distinct features of UIMA C++ to consider when dealing with release compatibility:</span></span></p>
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'>There
+are two distinct features of UIMA C++ to consider when dealing with release
+compatibility:</span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><o:p> </o:p></span></span></p>
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><o:p> </o:p></span></span></p>
<ul style='margin-top:0in' type=disc>
<li class=MsoNormal style='mso-list:l4 level1 lfo5;tab-stops:list .5in;
mso-layout-grid-align:none;text-autospace:none'><span style='mso-bookmark:
- _Toc313367714'><span style='mso-bookmark:_Toc313367460'>The framework
- dynamically loads annotators which are user code. The annotators make
- calls to UIMA C++ APIs </span></span></li>
+ _Toc313367460'><span style='mso-bookmark:_Toc313367714'>The framework dynamically
+ loads annotators which are user code. The annotators make calls to UIMA
+ C++ APIs </span></span></li>
</ul>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>and
are built with some version of the SDK. A possible scenario is for an
application to run annotators that </span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>were
built with different<span style='mso-spacerun:yes'> </span>releases of
UIMA C++ SDK.</span></span></p>
@@ -1251,74 +1297,74 @@
<ul style='margin-top:0in' type=disc>
<li class=MsoNormal style='mso-list:l4 level1 lfo5;tab-stops:list .5in;
mso-layout-grid-align:none;text-autospace:none'><span style='mso-bookmark:
- _Toc313367714'><span style='mso-bookmark:_Toc313367460'>The SDK depends on
+ _Toc313367460'><span style='mso-bookmark:_Toc313367714'>The SDK depends on
ICU, XERCES, APR and ACTIVEMQ-CPP and a UIMA C++ SDK release is built with
a particular version of these.<span style='mso-spacerun:yes'>
</span></span></span></li>
</ul>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>Binary
-compatibility therefore depends on the compatibility of these underlying libraries.<span
-style='mso-spacerun:yes'> </span>In particular,<span
+compatibility therefore depends on the compatibility of these underlying
+libraries.<span style='mso-spacerun:yes'> </span>In particular,<span
style='mso-spacerun:yes'> </span></span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>ICU
and XERCES encode the major and minor release numbers in the APIs which
restricts binary compatibility across </span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>releases
of these libraries.<span style='mso-spacerun:yes'> </span></span></span></p>
<ul style='margin-top:0in' type=disc>
<li class=MsoNormal style='mso-list:l4 level1 lfo5;tab-stops:list .5in;
mso-layout-grid-align:none;text-autospace:none'><span style='mso-bookmark:
- _Toc313367714'><span style='mso-bookmark:_Toc313367460'>An application
+ _Toc313367460'><span style='mso-bookmark:_Toc313367714'>An application
running UIMA C++ is restricted to running one version of the ICU library </span></span></li>
</ul>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span><span style='mso-tab-count:1'> </span>in
a process and all annotators and underlying libraries must use the same ICU
version.</span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><span
style='mso-spacerun:yes'> </span></span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>We
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'>We
do not enforce binary compatibility when doing a release.<span
style='mso-spacerun:yes'> </span>Migrating to a new version of UIMA C++
may require rebuild of the annotators.</span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'><o:p> </o:p></span></span></p>
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'><o:p> </o:p></span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>Installing
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'>Installing
UIMACPP SDK as a system-wide shared library is discouraged since we do not</span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>have
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'>have
support for parallel versions.<span style='mso-spacerun:yes'> </span>The
include directory does not have version number and</span></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='mso-bookmark:_Toc313367714'><span style='mso-bookmark:_Toc313367460'>there
+style='mso-bookmark:_Toc313367460'><span style='mso-bookmark:_Toc313367714'>there
cannot be multiple versions of executables runAECpp and deployCppService.</span></span></p>
<h2 style='margin-left:.25in;text-indent:-.25in;mso-list:l2 level1 lfo4;
-tab-stops:list .25in'><span style='mso-bookmark:_Toc313367714'><span
-style='mso-bookmark:_Toc313367460'><a name="_Toc313524513"></a><a
-name="_Toc313524314"><span style='mso-bookmark:_Toc313524513'><![if !supportLists]><span
-style='mso-list:Ignore'>5.<span style='font:7.0pt "Times New Roman"'>
+tab-stops:list .25in'><span style='mso-bookmark:_Toc313367460'><span
+style='mso-bookmark:_Toc313367714'><a name="_Toc313524314"></a><a
+name="_Toc313524513"><span style='mso-bookmark:_Toc313524314'><![if !supportLists]><span
+style='mso-list:Ignore'>4.<span style='font:7.0pt "Times New Roman"'>
</span></span><![endif]>Known Issues</span></a></span></span></h2>
<p class=MsoNormal><span style='mso-spacerun:yes'> </span>The following
@@ -1331,30 +1377,30 @@
Mapping is not supported for C++ Aggregate AE called from Java. </li>
</ul>
-<h2><a name="_Toc313524514"></a><a name="_Toc313524315"></a><a
-name="_Toc313367461"></a><a name="_Toc313367715"><span style='mso-bookmark:
-_Toc313367461'><span style='mso-bookmark:_Toc313524315'><span style='mso-bookmark:
-_Toc313524514'>6. How to Get Involved</span></span></span></a></h2>
+<h2><a name="_Toc313367715"></a><a name="_Toc313367461"></a><a
+name="_Toc313524315"></a><a name="_Toc313524514"><span style='mso-bookmark:
+_Toc313524315'><span style='mso-bookmark:_Toc313367461'><span style='mso-bookmark:
+_Toc313367715'>6. How to Get Involved</span></span></span></a></h2>
-<p>The Apache UIMA project really needs and appreciates any contributions,
-including documentation help, source code and feedback. If you are interested
-in contributing, please visit <a href="http://uima.apache.org/get-involved.html"><u><span
+<p>The Apache UIMA project really needs and appreciates any contributions, including
+documentation help, source code and feedback. If you are interested in
+contributing, please visit <a href="http://uima.apache.org/get-involved.html"><u><span
style='color:blue'>http://uima.apache.org/get-involved.html</span></u></a>. </p>
-<h2><a name="_Toc313524515"></a><a name="_Toc313524316"></a><a
-name=report.issues></a><a name="_Toc313367462"></a><a name="_Toc313367716"><span
-style='mso-bookmark:_Toc313367462'><span style='mso-bookmark:"report\.issues"'><span
-style='mso-bookmark:_Toc313524316'><span style='mso-bookmark:_Toc313524515'>7.
+<h2><a name="_Toc313367716"></a><a name="_Toc313367462"></a><a
+name=report.issues></a><a name="_Toc313524316"></a><a name="_Toc313524515"><span
+style='mso-bookmark:_Toc313524316'><span style='mso-bookmark:"report\.issues"'><span
+style='mso-bookmark:_Toc313367462'><span style='mso-bookmark:_Toc313367716'>7.
How to Report Issues</span></span></span></span></a></h2>
<p>The Apache UIMA project uses JIRA for issue tracking. Please report any
issues you find at <a href="http://issues.apache.org/jira/browse/uima"><u><span
style='color:blue'>http://issues.apache.org/jira/browse/uima</span></u></a> </p>
-<h2><a name="_Toc313524516"></a><a name="_Toc313524317"></a><a name=more.info></a><a
-name="_Toc313367463"></a><a name="_Toc313367717"><span style='mso-bookmark:
-_Toc313367463'><span style='mso-bookmark:"more\.info"'><span style='mso-bookmark:
-_Toc313524317'><span style='mso-bookmark:_Toc313524516'>8. More Documentation
+<h2><a name="_Toc313367717"></a><a name="_Toc313367463"></a><a name=more.info></a><a
+name="_Toc313524317"></a><a name="_Toc313524516"><span style='mso-bookmark:
+_Toc313524317'><span style='mso-bookmark:"more\.info"'><span style='mso-bookmark:
+_Toc313367463'><span style='mso-bookmark:_Toc313367717'>8. More Documentation
on Apache UIMA C++</span></span></span></span></a></h2>
<p>Please see <a href="docs/overview_and_setup.html"><u><span style='color:
diff --git a/aclocal.m4 b/aclocal.m4
index 3acbd63..a82eeae 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -287,9 +291,80 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -614,7 +689,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -707,7 +786,7 @@
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -978,7 +1057,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1303,7 +1382,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1644,6 +1723,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -1824,6 +1915,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2323,7 +2421,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2418,7 +2516,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -2759,7 +2857,7 @@
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -2816,6 +2914,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -2925,7 +3024,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -2938,7 +3037,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3084,51 +3183,23 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -3379,7 +3450,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3452,7 +3523,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -3814,7 +3885,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -3939,6 +4011,11 @@
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -3995,7 +4072,6 @@
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4080,7 +4156,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4257,6 +4333,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4319,7 +4396,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -4556,6 +4633,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4905,7 +4986,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -4962,7 +5043,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -4999,7 +5081,7 @@
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -5095,7 +5177,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5133,7 +5215,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5246,7 +5328,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -5316,7 +5399,8 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@ -5453,7 +5537,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5477,7 +5561,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5493,7 +5577,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5508,10 +5592,14 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5542,12 +5630,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -5597,7 +5687,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5713,12 +5803,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5816,7 +5907,7 @@
fi
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -5836,7 +5927,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -5996,11 +6087,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -6150,7 +6240,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6581,7 +6671,7 @@
AC_MSG_RESULT([$SED])
])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -6596,7 +6686,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -6612,8 +6702,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -6885,7 +6977,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -6933,13 +7025,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7044,16 +7136,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7325,7 +7418,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
@@ -7427,5 +7520,6 @@
m4_include([m4/find_activemq.m4])
m4_include([m4/find_apr.m4])
+m4_include([m4/find_apu.m4])
m4_include([m4/find_icu.m4])
m4_include([m4/find_xerces.m4])
diff --git a/buildsdk.cmd b/buildsdk.cmd
index 6de5411..4d3af04 100644
--- a/buildsdk.cmd
+++ b/buildsdk.cmd
@@ -34,7 +34,6 @@
echo ICU_HOME - root of the ICU install. Required.
echo XERCES_HOME - root of the XERCES install. Required.
echo MSVCRT_HOME - directory with required msvc*.dll files
- echo APU_HOME - root of the APR Util install Required if ACTIVEMQ_HOME is set.
echo ACTIVEMQ_HOME - root of the XERCES install. Optional.
echo Optional environment variable:
echo UIMA_INSTALL - 'install' location of uimacpp build.
@@ -55,10 +54,6 @@
if "%APR_HOME%" == "" goto Missing
if "%ICU_HOME%" == "" goto Missing
if "%XERCES_HOME%" == "" goto Missing
-if not "%ACTIVEMQ_HOME%" == "" (
- if "%APU_HOME%" == "" goto MissingAprUtil
-
-)
echo.
echo SDK directory tree will be built in %UIMA_DIR%
@@ -101,12 +96,13 @@
goto error
)
-if "%MSVCRT_HOME%" == "" (
- set MSVCRT_HOME=C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT
- echo MSVCRT_HOME undefined: trying: "%MSVCRT_HOME%"
-)
+if not "%MSVCRT_HOME%" == "" goto check
-if not exist "%MSVCRT_HOME%" (
+set MSVCRT_HOME=C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT
+echo MSVCRT_HOME undefined: trying: "%MSVCRT_HOME%"
+
+:check
+if not exist "%MSVCRT_HOME%"\msvc*.dll (
echo ERROR: MSVCRT_HOME "%MSVCRT_HOME%" is invalid.
goto error
)
@@ -188,8 +184,8 @@
echo copying from %APR_HOME%...
mkdir %UIMA_DIR%\include\apr
xcopy /Q /Y %APR_HOME%\include\apr*.h %UIMA_DIR%\include\apr
-xcopy /Q /Y %APR_HOME%\Release\libapr*.dll %UIMA_DIR%\bin
-xcopy /Q /Y %APR_HOME%\Release\libapr*.lib %UIMA_DIR%\lib
+xcopy /Q /Y %APR_HOME%\Release\libapr-*.dll %UIMA_DIR%\bin
+xcopy /Q /Y %APR_HOME%\Release\libapr-*.lib %UIMA_DIR%\lib
echo.
@@ -203,8 +199,11 @@
echo copying from %XERCES_HOME%...
mkdir %UIMA_DIR%\include\xercesc
xcopy /S /Q /Y %XERCES_HOME%\include\xercesc %UIMA_DIR%\include\xercesc
-xcopy /Q /Y %XERCES_HOME%\bin\xerces-c_2*.dll %UIMA_DIR%\bin
-xcopy /Q /Y %XERCES_HOME%\lib\xerces-c_2*.lib %UIMA_DIR%\lib
+xcopy /Q /Y %XERCES_HOME%\bin\xerces-c_*.dll %UIMA_DIR%\bin
+xcopy /Q /Y %XERCES_HOME%\lib\xerces-c_*.lib %UIMA_DIR%\lib
+del %UIMA_DIR%\bin\xerces-c*d.dll 2> NUL
+del %UIMA_DIR%\lib\xerces-c*d.lib 2> NUL
+del %UIMA_DIR%\lib\xerces-c_static* 2> NUL
echo.
echo copying MSVC redistribution libs
@@ -268,19 +267,21 @@
if not "%ACTIVEMQ_HOME%" == "" (
echo.
- echo copying from %APU_HOME%...
- xcopy /Q /Y %APU_HOME%\Release\libaprutil*.dll %UIMA_DIR%\bin
- xcopy /Q /Y %APU_HOME%\Release\libaprutil*.lib %UIMA_DIR%\lib
+ echo copying libaprutil and libapriconv ...
+ xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.dll %UIMA_DIR%\bin
+ xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.lib %UIMA_DIR%\lib
+ xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.dll %UIMA_DIR%\bin
+ xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.lib %UIMA_DIR%\lib
echo.
echo copying from %ACTIVEMQ_HOME%...
xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\ReleaseDLL\activemq-cpp.dll %UIMA_DIR%\bin
- xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\DebugDLL\activemq-cppd.dll %UIMA_DIR%\bin
)
echo cleaning the target tree
for /R %UIMA_DIR% %%d in (.) do del %%d\*~ 2> NUL
echo DONE SDK image in %UIMA_DIR%
+echo Please check that all copies were successful
goto end
:Missing
@@ -288,11 +289,6 @@
echo and must contain the directories produced by their "install" builds
goto end
-:MissingAprUtil
-echo APU_HOME must be specifed when ACTIVEMQ_HOME is specified
-echo and must contain the directories produced by apr-util "install" build
-goto end
-
:error
echo FAILED: UIMA C++ SDK was not built.
diff --git a/buildsdk.sh b/buildsdk.sh
index 066acf9..083d0ff 100755
--- a/buildsdk.sh
+++ b/buildsdk.sh
@@ -27,7 +27,7 @@
echo " in the docs directory of the uimacpp source tree."
echo " Requires the following environment variables:"
echo " UIMA_INSTALLDIR - 'install' location of uimacpp build."
- echo " Defaults to ./install"
+ echo " Defaults to ./usr/local/uimacpp"
echo " APR_HOME - root of the APR install."
echo " ICU_HOME - root of the ICU install."
echo " XERCES_HOME - root of the XERCES install."
@@ -101,7 +101,8 @@
# set default values if not set
if [ "$UIMA_INSTALLDIR" = "" ]; then
- export UIMA_INSTALLDIR=$UIMACPP_SOURCE/install
+ echo ERROR: UIMA_INSTALLDIR is not set.
+ exit
fi
if [[ "$APR_HOME" = "" || "$ICU_HOME" = "" || "$XERCES_HOME" = "" ]]; then
@@ -240,28 +241,25 @@
cp $CPL "$UIMACPP_SOURCE/src/base.mak" "$UIMA_DIR"/lib/
-echo copying from "$APR_HOME"...
+echo copying APR from "$APR_HOME"...
cp $CPLR "$APR_HOME"/include/apr-* "$UIMA_DIR"/include/
eval cp $CPLR "$APR_HOME"/lib/libapr*.$LIBEXT"*" "$UIMA_DIR"/lib/
-echo copying from "$ICU_HOME"...
+echo copying ICU from "$ICU_HOME"...
cp $CPLR "$ICU_HOME"/include/unicode "$UIMA_DIR"/include/
eval cp $CPLR "$ICU_HOME"/lib/libicuio*.$LIBEXT"*" "$UIMA_DIR"/lib/
eval cp $CPLR "$ICU_HOME"/lib/libicuuc*.$LIBEXT"*" "$UIMA_DIR"/lib/
eval cp $CPLR "$ICU_HOME"/lib/libicui18n*.$LIBEXT"*" "$UIMA_DIR"/lib/
eval cp $CPLR "$ICU_HOME"/lib/libicudata.$LIBEXT"*" "$UIMA_DIR"/lib/
-echo copying from "$XERCES_HOME"...
+echo copying Xerces from "$XERCES_HOME"...
cp $CPLR "$XERCES_HOME"/include/xercesc "$UIMA_DIR"/include/
eval cp $CPLR "$XERCES_HOME"/lib/libxerces-c*.$LIBEXT"*" "$UIMA_DIR"/lib/
if [ ! "$ACTIVEMQ_HOME" = "" ]; then
- echo copying from "$ACTIVEMQ_HOME"...
+ echo copying ActiveMQ from "$ACTIVEMQ_HOME"...
eval cp $CPLR "$ACTIVEMQ_HOME"/lib/libactivemq-cpp*.$LIBEXT"*" "$UIMA_DIR"/lib/
-fi
-
-if [ ! "$APU_HOME" = "" ]; then
- echo copying from "$APU_HOME"...
+ echo copying APR-Util from "$APU_HOME"...
eval cp $CPLR "$APU_HOME"/lib/libaprutil*.$LIBEXT"*" "$UIMA_DIR"/lib/
fi
diff --git a/config/config.guess b/config/config.guess
index 396482d..f32079a 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-07-02'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -531,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -780,7 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,18 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -829,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -950,6 +964,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1225,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1458,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config/config.sub b/config/config.sub
index fab0aa3..6759825 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-09-20'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +957,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1219,7 +1258,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1453,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/config/depcomp b/config/depcomp
index ca5ea4e..e5f9736 100755
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
diff --git a/config/install-sh b/config/install-sh
index 4fbbae7..a5897de 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
-posix_glob=
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
- -d) dir_arg=true
- shift
- continue;;
+ -C) copy_on_change=true;;
+
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
diff --git a/config/ltmain.sh b/config/ltmain.sh
index 4598ec6..0bf3848 100644
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -2,7 +2,7 @@
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007 Free Software Foundation, Inc.
+# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION="1.5.26 Debian 1.5.26-4"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
+if test -n "$lt_env"; then
+ lt_env="env $lt_env"
+fi
+
# Make sure IFS has a sensible default
lt_nl='
'
@@ -485,7 +491,7 @@
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
@@ -788,6 +794,7 @@
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
+ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@
$run $rm "$lobj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@
thread_safe=no
vinfo=
vinfo_number=no
+ single_module="${wl}-single_module"
func_infer_tag $base_compile
@@ -1646,6 +1654,11 @@
continue
;;
+ -multi_module)
+ single_module="${wl}-multi_module"
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -2122,7 +2135,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$pass" = dlopen; then
@@ -2149,7 +2165,12 @@
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ fi
+ for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@@ -2945,12 +2966,18 @@
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
+ if test -f "$deplibdir/$depdepl" ; then
+ depdepl="$deplibdir/$depdepl"
+ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
+ else
+ # Can't find it, oh well...
+ depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@@ -3098,9 +3125,10 @@
case $linkmode in
oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3244,6 +3272,11 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
esac
;;
no)
@@ -4237,9 +4270,10 @@
;;
obj)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6478,7 +6512,7 @@
fi
# Restore saved environment variables
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
diff --git a/configure b/configure
index 6fc1c48..d525663 100755
--- a/configure
+++ b/configure
@@ -731,7 +731,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="src/framework/engine.cpp"
-ac_default_prefix=/install
+ac_default_prefix=/usr/local/uimacpp
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -863,6 +863,8 @@
ECHO
AR
RANLIB
+DSYMUTIL
+NMEDIT
CPP
CXX
CXXFLAGS
@@ -896,6 +898,7 @@
ACTIVEMQ_LDFLAGS
UIMA_ACTIVEMQ_INCLUDE
UIMA_ACTIVEMQ_LIB
+apu_install
ACTIVEMQ_FOUND_TRUE
ACTIVEMQ_FOUND_FALSE
UIMACPP_HOME_INCLUDE
@@ -1527,7 +1530,10 @@
--with-icu=PATH prefix for install ICU or will try standar path
--without-activemq disable support for ActiveMQ service wrapper
--with-activemq=PATH prefix for install ACTIVEMQ or leave out to use standard path
- --with-jdk use local JDK (uses /opt/IBMJava2-142 by default)
+ --with-apr-util=PATH prefix for installed APU or the full path to
+ apu-config
+ --with-jdk use local JDK (uses /opt/IBMJava2-142/include by
+ default)
Some influential environment variables:
CC C compiler command
@@ -4199,7 +4205,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4294,7 +4300,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -4415,7 +4421,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4418 "configure"' > conftest.$ac_ext
+ echo '#line 4424 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4587,7 +4593,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -6184,7 +6194,6 @@
# 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; }
@@ -6499,7 +6508,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -7059,6 +7068,318 @@
;;
esac
+
+ case $host_os in
+ rhapsody* | darwin*)
+ 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
+else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ break 2
+ fi
+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; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ 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
+else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_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; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ 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
+else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ break 2
+ fi
+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; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ 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
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_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; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+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
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ 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
+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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ 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
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ 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; }
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+
enable_dlopen=no
enable_win32_dll=no
@@ -7124,7 +7445,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
@@ -7152,11 +7473,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:7155: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7476: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7159: \$? = $ac_status" >&5
+ echo "$as_me:7480: \$? = $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.
@@ -7426,10 +7747,10 @@
{ 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_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -7442,27 +7763,27 @@
-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:7445: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7766: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7449: \$? = $ac_status" >&5
+ echo "$as_me:7770: \$? = $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.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
+ lt_cv_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -7489,10 +7810,10 @@
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_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works=no
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -7505,20 +7826,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
else
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
else
lt_prog_compiler_static=
@@ -7546,11 +7867,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:7549: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7870: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7553: \$? = $ac_status" >&5
+ echo "$as_me:7874: \$? = $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
@@ -7630,12 +7951,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -7694,7 +8016,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -7810,12 +8132,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -7913,7 +8236,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -7933,7 +8256,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -8205,11 +8528,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -8359,7 +8681,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8729,7 +9051,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -9070,6 +9392,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9251,6 +9585,21 @@
echo "${ECHO_T}$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
+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
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -9570,7 +9919,7 @@
{ 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
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ 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; }
@@ -9846,7 +10195,7 @@
{ 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
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -9895,7 +10244,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9898 "configure"
+#line 10247 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9995,7 +10344,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9998 "configure"
+#line 10347 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10122,7 +10471,7 @@
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -10178,6 +10527,7 @@
predeps \
postdeps \
compiler_lib_search_path \
+ compiler_lib_search_dirs \
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
@@ -10238,7 +10588,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -10474,6 +10824,10 @@
# shared library.
postdeps=$lt_postdeps
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -10722,6 +11076,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -10759,7 +11114,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -10966,7 +11321,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -10979,7 +11334,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -11237,51 +11592,23 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
archive_cmds_need_lc_CXX=no
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
whole_archive_flag_spec_CXX=''
link_all_deplibs_CXX=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -11532,7 +11859,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -11605,7 +11932,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -11939,7 +12266,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
-
cat > conftest.$ac_ext <<EOF
class Foo
{
@@ -12041,6 +12367,11 @@
$rm -f confest.$objext
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
@@ -12096,7 +12427,6 @@
;;
esac
-
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
@@ -12172,7 +12502,7 @@
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -12268,7 +12598,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
@@ -12306,7 +12636,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -12399,10 +12729,10 @@
{ 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_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_CXX=no
+ lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -12415,27 +12745,27 @@
-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:12418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12748: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12422: \$? = $ac_status" >&5
+ echo "$as_me:12752: \$? = $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.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_CXX=yes
+ lt_cv_prog_compiler_pic_works_CXX=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -12462,10 +12792,10 @@
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_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_CXX=no
+ lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -12478,20 +12808,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
else
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
else
lt_prog_compiler_static_CXX=
@@ -12519,11 +12849,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:12522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12852: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12526: \$? = $ac_status" >&5
+ echo "$as_me:12856: \$? = $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
@@ -12576,7 +12906,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -12591,10 +12921,14 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
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; }
@@ -12696,7 +13030,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -13036,6 +13370,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -13217,6 +13563,21 @@
echo "${ECHO_T}$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
+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
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -13300,6 +13661,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
+ compiler_lib_search_dirs_CXX \
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
@@ -13548,6 +13910,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -13762,7 +14128,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -13800,7 +14166,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -14065,10 +14431,10 @@
{ 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_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_F77=no
+ lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -14081,27 +14447,27 @@
-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:14084: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14450: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14088: \$? = $ac_status" >&5
+ echo "$as_me:14454: \$? = $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.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_F77=yes
+ lt_cv_prog_compiler_pic_works_F77=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -14128,10 +14494,10 @@
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_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_F77=no
+ lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14144,20 +14510,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
else
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
else
lt_prog_compiler_static_F77=
@@ -14185,11 +14551,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:14188: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14554: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14192: \$? = $ac_status" >&5
+ echo "$as_me:14558: \$? = $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
@@ -14269,12 +14635,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -14333,7 +14700,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
@@ -14449,12 +14816,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -14552,7 +14920,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -14572,7 +14940,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -14824,11 +15192,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -14978,7 +15345,7 @@
link_all_deplibs_F77=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -15297,7 +15664,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15637,6 +16004,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -15818,6 +16197,21 @@
echo "${ECHO_T}$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
+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
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -15901,6 +16295,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
+ compiler_lib_search_dirs_F77 \
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
@@ -16149,6 +16544,10 @@
# shared library.
postdeps=$lt_postdeps_F77
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -16323,7 +16722,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -16372,11 +16771,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:16375: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16774: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16379: \$? = $ac_status" >&5
+ echo "$as_me:16778: \$? = $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.
@@ -16436,7 +16835,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
;;
darwin* | rhapsody*)
@@ -16506,7 +16905,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
;;
hpux9* | hpux10* | hpux11*)
@@ -16646,10 +17045,10 @@
{ 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_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_GCJ=no
+ lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -16662,27 +17061,27 @@
-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:16665: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17064: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16669: \$? = $ac_status" >&5
+ echo "$as_me:17068: \$? = $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.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_GCJ=yes
+ lt_cv_prog_compiler_pic_works_GCJ=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -16709,10 +17108,10 @@
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_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_GCJ=no
+ lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -16725,20 +17124,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_GCJ=yes
fi
else
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_GCJ=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
else
lt_prog_compiler_static_GCJ=
@@ -16766,11 +17165,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:16769: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16773: \$? = $ac_status" >&5
+ echo "$as_me:17172: \$? = $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
@@ -16850,12 +17249,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -16914,7 +17314,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
@@ -17030,12 +17430,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -17133,7 +17534,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -17153,7 +17554,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -17425,11 +17826,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -17579,7 +17979,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17898,7 +18298,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -18238,6 +18638,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -18419,6 +18831,21 @@
echo "${ECHO_T}$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
+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
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -18502,6 +18929,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
+ compiler_lib_search_dirs_GCJ \
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
@@ -18750,6 +19178,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -18923,7 +19355,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -18983,6 +19415,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
+ compiler_lib_search_dirs_RC \
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
@@ -19231,6 +19664,10 @@
# shared library.
postdeps=$lt_postdeps_RC
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -21265,8 +21702,10 @@
activemq_install="$withval"
else
- { { echo "$as_me:$LINENO: error: Invalid ACTIVEMQ path $withval" >&5
-echo "$as_me: error: Invalid ACTIVEMQ path $withval" >&2;}
+ { echo "$as_me:$LINENO: WARNING: Invalid ACTIVEMQ path $withval" >&5
+echo "$as_me: WARNING: Invalid ACTIVEMQ path $withval" >&2;}
+ { { echo "$as_me:$LINENO: error: ACTIVEMQ not found. Please use --without-activemq or--with-activemq=PATH" >&5
+echo "$as_me: error: ACTIVEMQ not found. Please use --without-activemq or--with-activemq=PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -21325,7 +21764,7 @@
{ (exit 1); exit 1; }; }
fi
- # Get build information from XERCES
+ # Get build information from ACTIVEMQ
UIMA_ACTIVEMQ_INCLUDE="$ACTIVEMQ_CXXFLAGS"
UIMA_ACTIVEMQ_LIB="$ACTIVEMQ_LDFLAGS"
@@ -21468,10 +21907,138 @@
CPPFLAGS="$CPPFLAGS_save"
if test "x$activemq" = "xfalse"; then
- { { echo "$as_me:$LINENO: error: ActiveMQ Headers not found. Specify valid path to ActivMQ." >&5
-echo "$as_me: error: ActiveMQ Headers not found. Specify valid path to ActivMQ." >&2;}
+ { { echo "$as_me:$LINENO: error: ActiveMQ Headers not found. Specify valid path to ActiveMQ." >&5
+echo "$as_me: error: ActiveMQ Headers not found. Specify valid path to ActiveMQ." >&2;}
{ (exit 1); exit 1; }; }
fi
+ { echo "$as_me:$LINENO: Apache Portable Runtime (APR Util ) library configuration" >&5
+echo "$as_me: Apache Portable Runtime (APR Util ) library configuration" >&6;}
+
+ apu_found="no"
+
+ if test "$target_os" = "os2-emx"; then
+ # Scripts don't pass test -x on OS/2
+ TEST_X="test -f"
+ else
+ TEST_X="test -x"
+ fi
+
+ acceptable_majors="1"
+
+ apu_temp_acceptable_apu_config=""
+ for apu_temp_major in $acceptable_majors
+ do
+ case $apu_temp_major in
+ 0)
+ apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"
+ ;;
+ *)
+ apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"
+ ;;
+ esac
+ done
+
+ { echo "$as_me:$LINENO: checking for APR-util" >&5
+echo $ECHO_N "checking for APR-util... $ECHO_C" >&6; }
+
+# Check whether --with-apr-util was given.
+if test "${with_apr_util+set}" = set; then
+ withval=$with_apr_util;
+ if test "$withval" = "no" || test "$withval" = "yes"; then
+ { { echo "$as_me:$LINENO: error: --with-apr-util requires a directory or file to be provided" >&5
+echo "$as_me: error: --with-apr-util requires a directory or file to be provided" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ apu_install="$withval"
+
+ for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+ do
+ for lookdir in "$withval/bin" "$withval"
+ do
+ if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
+ apu_config="$lookdir/$apu_temp_apu_config_file"
+
+ apu_found="yes"
+ break 2
+ fi
+ done
+ done
+
+ if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+ apu_config="$withval"
+ apu_found="yes"
+ fi
+
+ if test "$apu_found" != "yes"; then
+ { { echo "$as_me:$LINENO: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&5
+echo "$as_me: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+
+ if test -n "1" && test "1" = "1"; then
+ for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+ do
+ if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+ apu_config="$apu_temp_apu_config_file"
+
+ apu_found="yes"
+ break
+ else
+ for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+ if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+ apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+
+ apu_found="yes"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ if test "$apu_found" = "no" && test -d ""; then
+ apu_temp_abs_srcdir="`cd && pwd`"
+ apu_found="reconfig"
+ apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apu_version.h\"`"
+ case $apu_bundled_major in
+ "")
+ { { echo "$as_me:$LINENO: error: failed to find major version of bundled APU" >&5
+echo "$as_me: error: failed to find major version of bundled APU" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ 0)
+ apu_temp_apu_config_file="apu-config"
+ ;;
+ *)
+ apu_temp_apu_config_file="apu-$apu_bundled_major-config"
+ ;;
+ esac
+ if test -n ""; then
+ apu_config="/$apu_temp_apu_config_file"
+ else
+ apu_config="/$apu_temp_apu_config_file"
+ fi
+ fi
+
+fi
+
+
+ { echo "$as_me:$LINENO: result: $apu_found" >&5
+echo "${ECHO_T}$apu_found" >&6; }
+
+
+ if test $apu_found = "no"; then
+ { echo "$as_me:$LINENO: WARNING: APR-Util not found" >&5
+echo "$as_me: WARNING: APR-Util not found" >&2;}
+ echo "APR-Util is required if building with ActiveMQ."
+ echo "Please install APR-Util on this system and supply the appropriate"
+ echo "--with-apr-util option to 'configure'"
+ { { echo "$as_me:$LINENO: error: no suitable APR-Util found. Required to build with ActiveMQ. Rerun configure with the option --with-apr-util=PATH " >&5
+echo "$as_me: error: no suitable APR-Util found. Required to build with ActiveMQ. Rerun configure with the option --with-apr-util=PATH " >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
fi
#########################################################################
@@ -22487,8 +23054,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22530,6 +23097,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
@@ -22561,6 +23130,7 @@
ACTIVEMQ_LDFLAGS!$ACTIVEMQ_LDFLAGS$ac_delim
UIMA_ACTIVEMQ_INCLUDE!$UIMA_ACTIVEMQ_INCLUDE$ac_delim
UIMA_ACTIVEMQ_LIB!$UIMA_ACTIVEMQ_LIB$ac_delim
+apu_install!$apu_install$ac_delim
ACTIVEMQ_FOUND_TRUE!$ACTIVEMQ_FOUND_TRUE$ac_delim
ACTIVEMQ_FOUND_FALSE!$ACTIVEMQ_FOUND_FALSE$ac_delim
UIMACPP_HOME_INCLUDE!$UIMACPP_HOME_INCLUDE$ac_delim
@@ -22573,7 +23143,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -22895,7 +23465,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/configure.ac b/configure.ac
index 8294325..89dc270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_CONFIG_MACRO_DIR([m4])
AC_DISABLE_STATIC
-AC_PREFIX_DEFAULT(/install)
+AC_PREFIX_DEFAULT(/usr/local/uimacpp)
#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
#LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
@@ -231,8 +231,8 @@
#
activemq=true
AC_ARG_WITH([activemq],
- [AS_HELP_STRING([--without-activemq],
- [disable support for ActiveMQ service wrapper])],
+ [AS_HELP_STRING([--without-activemq],
+ [disable support for ActiveMQ service wrapper])],
[],
[with_activemq=check])
@@ -252,7 +252,7 @@
AC_MSG_ERROR([no suitable ACTIVEMQ found])
fi
- # Get build information from XERCES
+ # Get build information from ACTIVEMQ
UIMA_ACTIVEMQ_INCLUDE="$ACTIVEMQ_CXXFLAGS"
UIMA_ACTIVEMQ_LIB="$ACTIVEMQ_LDFLAGS"
@@ -266,8 +266,19 @@
[activemq=false])
CPPFLAGS="$CPPFLAGS_save"
if test "x$activemq" = "xfalse"; then
- AC_MSG_ERROR([ActiveMQ Headers not found. Specify valid path to ActivMQ.])
+ AC_MSG_ERROR([ActiveMQ Headers not found. Specify valid path to ActiveMQ.])
fi
+ AC_MSG_NOTICE([Apache Portable Runtime (APR Util ) library configuration])
+ APR_FIND_APU([], [], 1, [1])
+
+ if test $apu_found = "no"; then
+ AC_MSG_WARN([APR-Util not found])
+ echo "APR-Util is required if building with ActiveMQ."
+ echo "Please install APR-Util on this system and supply the appropriate"
+ echo "--with-apr-util option to 'configure'"
+ AC_MSG_ERROR([no suitable APR-Util found. Required to build with ActiveMQ. Rerun configure with the option --with-apr-util=PATH ])
+fi
+
fi
#########################################################################
@@ -307,7 +318,7 @@
#
AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk],
- [use local JDK (uses /opt/IBMJava2-142 by default)]),
+ [use local JDK (uses /opt/IBMJava2-142/include by default)]),
[UIMA_JDK_INCLUDE="-I$withval"
JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"],
[UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include"
diff --git a/docs/overview_and_setup.html b/docs/overview_and_setup.html
index 17d5685..3ece081 100644
--- a/docs/overview_and_setup.html
+++ b/docs/overview_and_setup.html
@@ -241,7 +241,7 @@
<h4>2.3.2 On Linux</h4>
<ul>
<code>
- start the ActiveMQ broker following directions in $UIMA_HOME/uima-as/readme<br>
+ start the ActiveMQ broker following directions in $UIMA_HOME/README<br>
cd $UIMACPP_HOME/examples/tutorial<br>
runRemoteAsyncAE.sh tcp://localhost:61616 MeetingAnnotator \<br>
<dir><code>-d descriptors/Deploy_MeetingAnnotator.xml</code></dir>
@@ -250,12 +250,15 @@
<h4>2.3.3 On Windows</h4>
<ul>
<code>
- start the ActiveMQ broker following directions in %UIMA_HOME%\uima-as\readme<br>
+ start the ActiveMQ broker following directions in %UIMA_HOME%\README<br>
cd %UIMACPP_HOME%\examples\tutorial<br>
runRemoteAsyncAE tcp://localhost:61616 MeetingAnnotator \<br>
<dir><code>-d descriptors\Deploy_MeetingAnnotator.xml</code></dir>
</code>
-</ul>
+<p>
+NOTE: On Windows, the case of the environment variable name 'Path' in the deployment descriptor must match the case of the Path environment variable name in the system.
+</p>
+</ul>
The runRemoteAsyncAE driver will deploy the MeetingAnnotator binary from the distribution package as a UIMA AS service and send it an empty CAS to process.
<h2>3.0 Developing a C++ Component</h2>
diff --git a/m4/find_activemq.m4 b/m4/find_activemq.m4
index 31cea94..328536a 100644
--- a/m4/find_activemq.m4
+++ b/m4/find_activemq.m4
@@ -41,7 +41,8 @@
activemq_install="$withval"
AC_SUBST(activemq_install)
else
- AC_MSG_ERROR([Invalid ACTIVEMQ path $withval])
+ AC_MSG_WARN([Invalid ACTIVEMQ path $withval])
+ AC_MSG_ERROR([ACTIVEMQ not found. Please use --without-activemq or--with-activemq=PATH])
fi
],
[
diff --git a/m4/find_apu.m4 b/m4/find_apu.m4
new file mode 100755
index 0000000..c301645
--- /dev/null
+++ b/m4/find_apu.m4
@@ -0,0 +1,212 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the APU
+dnl library. It provides a standardized mechanism for using APU. It supports
+dnl embedding APU into the application source, or locating an installed
+dnl copy of APU.
+dnl
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl detailed-check)
+dnl
+dnl where srcdir is the location of the bundled APU source directory, or
+dnl empty if source is not bundled.
+dnl
+dnl where builddir is the location where the bundled APU will be built,
+dnl or empty if the build will occur in the srcdir.
+dnl
+dnl where implicit-install-check set to 1 indicates if there is no
+dnl --with-apr-util option specified, we will look for installed copies.
+dnl
+dnl where acceptable-majors is a space separated list of acceptable major
+dnl version numbers. Often only a single major version will be acceptable.
+dnl If multiple versions are specified, and --with-apr-util=PREFIX or the
+dnl implicit installed search are used, then the first (leftmost) version
+dnl in the list that is found will be used. Currently defaults to [0 1].
+dnl
+dnl where detailed-check is an M4 macro which sets the apu_acceptable to
+dnl either "yes" or "no". The macro will be invoked for each installed
+dnl copy of APU found, with the apu_config variable set appropriately.
+dnl Only installed copies of APU which are considered acceptable by
+dnl this macro will be considered found. If no installed copies are
+dnl considered acceptable by this macro, apu_found will be set to either
+dnl either "no" or "reconfig".
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl apu_found : "yes", "no", "reconfig"
+dnl
+dnl apu_config : If the apu-config tool exists, this refers to it. If
+dnl apu_found is "reconfig", then the bundled directory
+dnl should be reconfigured *before* using apu_config.
+dnl
+dnl Note: this macro file assumes that apr-config has been installed; it
+dnl is normally considered a required part of an APR installation.
+dnl
+dnl Note: At this time, we cannot find *both* a source dir and a build dir.
+dnl If both are available, the build directory should be passed to
+dnl the --with-apr-util switch.
+dnl
+dnl Note: the installation layout is presumed to follow the standard
+dnl PREFIX/lib and PREFIX/include pattern. If the APU config file
+dnl is available (and can be found), then non-standard layouts are
+dnl possible, since it will be described in the config file.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then apu_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If apu_found is "yes" or "reconfig", then the caller should use the
+dnl value of apu_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([APR_FIND_APU], [
+ apu_found="no"
+
+ if test "$target_os" = "os2-emx"; then
+ # Scripts don't pass test -x on OS/2
+ TEST_X="test -f"
+ else
+ TEST_X="test -x"
+ fi
+
+ ifelse([$4], [],
+ [
+ ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APU 0.x then APU 1.x]))
+ acceptable_majors="0 1"
+ ], [acceptable_majors="$4"])
+
+ apu_temp_acceptable_apu_config=""
+ for apu_temp_major in $acceptable_majors
+ do
+ case $apu_temp_major in
+ 0)
+ apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"
+ ;;
+ *)
+ apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"
+ ;;
+ esac
+ done
+
+ AC_MSG_CHECKING(for APR-util)
+ AC_ARG_WITH(apr-util,
+ [ --with-apr-util=PATH prefix for installed APU or the full path to
+ apu-config],
+ [
+ if test "$withval" = "no" || test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
+ fi
+ apu_install="$withval"
+ AC_SUBST(apu_install)
+ for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+ do
+ for lookdir in "$withval/bin" "$withval"
+ do
+ if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
+ apu_config="$lookdir/$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
+ continue
+ fi])
+ apu_found="yes"
+ break 2
+ fi
+ done
+ done
+
+ if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+ apu_config="$withval"
+ ifelse([$5], [], [apu_found="yes"], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" = "yes"; then
+ apu_found="yes"
+ fi])
+ fi
+
+ dnl if --with-apr-util is used, it is a fatal error for its argument
+ dnl to be invalid
+ if test "$apu_found" != "yes"; then
+ AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])
+ fi
+ ],[
+ if test -n "$3" && test "$3" = "1"; then
+ for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+ do
+ if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+ apu_config="$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+ continue
+ fi])
+ apu_found="yes"
+ break
+ else
+ dnl look in some standard places (apparently not in builtin/default)
+ for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+ if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+ apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+ continue
+ fi])
+ apu_found="yes"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ dnl if we have not found anything yet and have bundled source, use that
+ if test "$apu_found" = "no" && test -d "$1"; then
+ apu_temp_abs_srcdir="`cd $1 && pwd`"
+ apu_found="reconfig"
+ apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
+ case $apu_bundled_major in
+ "")
+ AC_MSG_ERROR([failed to find major version of bundled APU])
+ ;;
+ 0)
+ apu_temp_apu_config_file="apu-config"
+ ;;
+ *)
+ apu_temp_apu_config_file="apu-$apu_bundled_major-config"
+ ;;
+ esac
+ if test -n "$2"; then
+ apu_config="$2/$apu_temp_apu_config_file"
+ else
+ apu_config="$1/$apu_temp_apu_config_file"
+ fi
+ fi
+ ])
+
+ AC_MSG_RESULT($apu_found)
+])
diff --git a/scriptators/perl/Makefile b/scriptators/perl/Makefile
index d87e1b5..c394fb8 100644
--- a/scriptators/perl/Makefile
+++ b/scriptators/perl/Makefile
@@ -19,7 +19,8 @@
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
$(error unable to determine SWIGVERSION)
diff --git a/scriptators/python/Makefile b/scriptators/python/Makefile
index 9732a0f..65b8eeb 100644
--- a/scriptators/python/Makefile
+++ b/scriptators/python/Makefile
@@ -19,16 +19,16 @@
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version $(SWIGMAJORMINOR).% ,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
- $(error unable to determine SWIGVERSION)
+ $(error unable to determine SWIGVERSION looking for $(SWIGMAJOR).$(MAJOR)) Rerun passing in SWIGMAJOR and SWIGMINOR)
endif
SWIGDEPS=uimapywrap.h
SWIGFLAGS=-DSWIG$(subst .,_,$(SWIGVERSION))
-
PYTHONVERSION:=$(subst ., ,$(subst Python ,,$(shell python -V 2>&1)))
ifeq ($(PYTHONVERSION),)
$(error PYTHONVERSION could not be determined)
diff --git a/scriptators/tcl/Makefile b/scriptators/tcl/Makefile
index 5806bf8..29ab969 100644
--- a/scriptators/tcl/Makefile
+++ b/scriptators/tcl/Makefile
@@ -19,7 +19,8 @@
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
$(error unable to determine SWIGVERSION)
diff --git a/scriptators/uima.i b/scriptators/uima.i
index 3ead68d..5cc2b23 100644
--- a/scriptators/uima.i
+++ b/scriptators/uima.i
@@ -67,8 +67,20 @@
// convert using default codepage
static bool PyStringConvert(PyObject *obj, UnicodeString &rv) {
char *src;
- int len;
- PyString_AsStringAndSize(obj, &src, &len);
+ #ifdef PY_VERSION_HEX
+ #if (PY_VERSION_HEX >= 0x02050000)
+ /* Python version was greater than 2.5 */
+ Py_ssize_t len;
+ PyString_AsStringAndSize(obj, &src, ( Py_ssize_t*)&len);
+ #else
+ /* Python version was less than 2.5 */
+ int len;
+ PyString_AsStringAndSize(obj, &src, &len);
+ #endif
+ #else
+ /* Could not determine version */
+ PyString_AsStringAndSize(obj, &src, &len);
+ #endif
rv = UnicodeString((const char *) src, (int32_t) len);
return true;
}
diff --git a/src/Makefile.in b/src/Makefile.in
index bfd04d6..bd3480a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,8 +52,9 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
- $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
- $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_apu.m4 \
+ $(top_srcdir)/m4/find_icu.m4 $(top_srcdir)/m4/find_xerces.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -95,6 +96,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -120,6 +122,7 @@
LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -164,6 +167,7 @@
am__tar = @am__tar@
am__untar = @am__untar@
apr_install = @apr_install@
+apu_install = @apu_install@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -321,8 +325,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -347,8 +351,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -358,13 +362,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/src/checkEnvVars.bat b/src/checkEnvVars.bat
index f181562..c6e1553 100644
--- a/src/checkEnvVars.bat
+++ b/src/checkEnvVars.bat
@@ -22,8 +22,8 @@
@REM which are include in the SDK
@REM These may be overridden by setting APR_HOME or ICU_HOME or XERCES_HOME
-if not exist "%JAVA_INCLUDE%\jni.h" (
- echo Error: failed to find JDK headers in %JAVA_INCLUDE%
+if not exist "%JAVA_HOME%\include\jni.h" (
+ echo Error: failed to find JDK headers in %JAVA_HOME%
goto end
)
diff --git a/src/deployCppService.vcproj b/src/deployCppService.vcproj
index 726fab6..95ae7c4 100644
--- a/src/deployCppService.vcproj
+++ b/src/deployCppService.vcproj
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cppD.lib xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+ AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cpp.lib xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/deployCppServiceD.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2008-build\win32\DebugDLL""
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2008-build\win32\ReleaseDLL""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -148,7 +148,7 @@
AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cpp.lib xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/deployCppService.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2008-build\win32\ReleaseDLL""
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2008-build\win32\ReleaseDLL""
GenerateDebugInformation="false"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
diff --git a/src/framework/Makefile.in b/src/framework/Makefile.in
index 8b18645..392dcfc 100644
--- a/src/framework/Makefile.in
+++ b/src/framework/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,8 +56,9 @@
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
- $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
- $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_apu.m4 \
+ $(top_srcdir)/m4/find_icu.m4 $(top_srcdir)/m4/find_xerces.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -169,6 +170,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -194,6 +196,7 @@
LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -238,6 +241,7 @@
am__tar = @am__tar@
am__untar = @am__untar@
apr_install = @apr_install@
+apu_install = @apu_install@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -374,8 +378,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -383,8 +387,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -1058,8 +1062,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1071,8 +1075,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1082,13 +1086,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/src/runaecpp.vcproj b/src/runaecpp.vcproj
index fb4ff81..3adf462 100644
--- a/src/runaecpp.vcproj
+++ b/src/runaecpp.vcproj
@@ -67,7 +67,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/runAECppD.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -148,7 +148,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/runAECpp.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
GenerateDebugInformation="false"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index a654929..a23a2a0 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,8 +55,9 @@
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
- $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
- $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_apu.m4 \
+ $(top_srcdir)/m4/find_icu.m4 $(top_srcdir)/m4/find_xerces.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -249,6 +250,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -274,6 +276,7 @@
LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -318,6 +321,7 @@
am__tar = @am__tar@
am__untar = @am__untar@
apr_install = @apr_install@
+apu_install = @apu_install@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -830,8 +834,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -843,8 +847,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -854,13 +858,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/src/uimacpp.vcproj b/src/uimacpp.vcproj
index 32b8f8b..c49e441 100644
--- a/src/uimacpp.vcproj
+++ b/src/uimacpp.vcproj
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHac"
Optimization="0"
- AdditionalIncludeDirectories="cas;framework;jni;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_INCLUDE)";"$(JAVA_INCLUDE)\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories="cas;framework;jni;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
IgnoreStandardIncludePath="false"
GeneratePreprocessedFile="0"
@@ -70,7 +70,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"
OutputFile="$(OutDir)\..\bin\uimaD.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
GenerateMapFile="true"
@@ -134,7 +134,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHac"
Optimization="3"
- AdditionalIncludeDirectories="cas;framework;jni;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_INCLUDE)";"$(JAVA_INCLUDE)\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories="cas;framework;jni;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;TRACEOFF;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
ExceptionHandling="0"
RuntimeLibrary="2"
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index dea4ff4..007717b 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -39,8 +39,9 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
- $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
- $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_apu.m4 \
+ $(top_srcdir)/m4/find_icu.m4 $(top_srcdir)/m4/find_xerces.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -113,6 +114,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -138,6 +140,7 @@
LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -182,6 +185,7 @@
am__tar = @am__tar@
am__untar = @am__untar@
apr_install = @apr_install@
+apu_install = @apu_install@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -280,8 +284,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -390,8 +394,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -403,8 +407,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -414,13 +418,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/src/winmake.cmd b/src/winmake.cmd
index 8628b8c..6822d02 100644
--- a/src/winmake.cmd
+++ b/src/winmake.cmd
@@ -23,7 +23,7 @@
set UIMACPP_HOME=
REM need a Java JRE for the JNI interface
-if not exist %JAVA_INCLUDE%\jni.h goto nojava
+if not exist %JAVA_HOME%\include\jni.h goto nojava
REM Other requied dependencies
if "%APR_HOME%"=="" goto noapr
@@ -58,7 +58,7 @@
goto end
:nojava
-echo JAVA_INCLUDE is not set or does not contain jni.h
+echo JAVA_HOME is not set or does not contain include\jni.h
:end
endlocal
