You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/04/17 16:57:20 UTC
svn commit: r649138 - in /incubator/uima/uimacpp/trunk/src: Makefile.am
Makefile.prebuild Makefile.unix base.mak configure.in framework/Makefile.am
test/Makefile.am test/fvt.sh utils/Makefile.am
Author: eae
Date: Thu Apr 17 07:56:59 2008
New Revision: 649138
URL: http://svn.apache.org/viewvc?rev=649138&view=rev
Log:
UIMA-996 Force LF
Modified:
incubator/uima/uimacpp/trunk/src/Makefile.am (props changed)
incubator/uima/uimacpp/trunk/src/Makefile.prebuild (props changed)
incubator/uima/uimacpp/trunk/src/Makefile.unix (props changed)
incubator/uima/uimacpp/trunk/src/base.mak (props changed)
incubator/uima/uimacpp/trunk/src/configure.in (contents, props changed)
incubator/uima/uimacpp/trunk/src/framework/Makefile.am (props changed)
incubator/uima/uimacpp/trunk/src/test/Makefile.am (props changed)
incubator/uima/uimacpp/trunk/src/test/fvt.sh (props changed)
incubator/uima/uimacpp/trunk/src/utils/Makefile.am (props changed)
Propchange: incubator/uima/uimacpp/trunk/src/Makefile.am
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF
Propchange: incubator/uima/uimacpp/trunk/src/Makefile.prebuild
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: incubator/uima/uimacpp/trunk/src/Makefile.unix
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF
Propchange: incubator/uima/uimacpp/trunk/src/base.mak
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: incubator/uima/uimacpp/trunk/src/configure.in
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/configure.in?rev=649138&r1=649137&r2=649138&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/configure.in (original)
+++ incubator/uima/uimacpp/trunk/src/configure.in Thu Apr 17 07:56:59 2008
@@ -1,208 +1,208 @@
-
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
-
-AC_INIT(libuima, 2.2)
-AC_CONFIG_SRCDIR(framework/engine.cpp)
-AM_INIT_AUTOMAKE
-
-#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
-#LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
-
-AC_ARG_ENABLE(debuguima,
-[ --enable-debuguima Turn on debugging],
-[case "${enableval}" in
- yes) debuguima=true ;;
- no) debuguima=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debuguima) ;;
-esac],[debuguima=false])
-AM_CONDITIONAL([DEBUG_UIMA], [test x$debuguima = xtrue])
-
-
-AC_ARG_ENABLE(debugtest,
-[ --enable-debugtest Turn on debugging],
-[case "${enableval}" in
- yes) debugtest=true ;;
- no) debugtest=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debugtest) ;;
-esac],[debugtest=false])
-AM_CONDITIONAL([DEBUG_TEST], [test x$debugtest = xtrue])
-
-
-LIB_VERSION="2.2"
-LIB_VERSION_MAJOR="2"
-LIB_VERSION_MINOR="2"
-AC_SUBST(VERSION)
-AC_SUBST(LIB_VERSION)
-AC_SUBST(LIB_VERSION_MAJOR)
-AC_SUBST(LIB_VERSION_MINOR)
-AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
-
-AC_PROG_LIBTOOL
-AC_PROG_CXX
-
-AC_C_BIGENDIAN
-
-######################################
-# setup for using default dependencies
-UIMACPP_HOME_INCLUDE="-I$UIMACPP_HOME/include"
-UIMACPP_HOME_LIB="-L$UIMACPP_HOME/lib"
-
-
-#########################################################################
-#
-# check for XercesC
-#
-
-AC_ARG_WITH([xerces], AC_HELP_STRING([--with-xerces],
- [use Xerces C++ Library (uses $UIMACPP_HOME by default)]),
- [UIMA_XERCES_INCLUDE="-I$withval/include"
- UIMA_XERCES_LIB="-L$withval/lib -lxerces-c"
- XERCES_TEST_INCLUDE="$UIMA_XERCES_INCLUDE"
- AC_SUBST(UIMA_XERCES_INCLUDE)
- AC_SUBST(UIMA_XERCES_LIB)
- ],
- [XERCES_TEST_INCLUDE="-I$UIMACPP_HOME/include"
- UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lxerces-c"])
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XERCES_TEST_INCLUDE"
-AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],
- [:],
- [AC_MSG_ERROR([Unable to find Xerces C++ headers])])
-CPPFLAGS="$CPPFLAGS_save"
-
-
-#########################################################################
-#
-# check for APR
-#
-
-AC_ARG_WITH([apr], AC_HELP_STRING([--with-apr],
- [use APR Library (uses $UIMACPP_HOME by default)]),
- [APR_VER=`echo $withval/include/apr-* | sed -e 's/.*apr-//'`
- UIMA_APR_INCLUDE="-I$withval/include/apr-$APR_VER"
- UIMA_APR_LIB="-L$withval/lib -lapr-$APR_VER"
- APR_TEST_INCLUDE="$UIMA_APR_INCLUDE"
- AC_SUBST(UIMA_APR_INCLUDE)
- AC_SUBST(UIMA_APR_LIB)
- ],
- [APR_VER=`echo $UIMACPP_HOME/include/apr-* | sed -e 's/.*apr-//'`
- APR_TEST_INCLUDE="-I$UIMACPP_HOME/include/apr-$APR_VER"
- UIMACPP_HOME_INCLUDE="$UIMACPP_HOME_INCLUDE $APR_TEST_INCLUDE"
- UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lapr-$APR_VER"])
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $APR_TEST_INCLUDE -D_GNU_SOURCE"
-AC_CHECK_HEADER([apr.h],
- [:],
- [AC_MSG_ERROR([Unable to find APR Headers])])
-CPPFLAGS="$CPPFLAGS_save"
-
-
-#########################################################################
-#
-# check for ICU
-#
-
-AC_ARG_WITH([icu], AC_HELP_STRING([--with-icu],
- [use ICU Library (uses $UIMACPP_HOME by default)]),
- [UIMA_ICU_INCLUDE="-I$withval/include"
- UIMA_ICU_LIB="-L$withval/lib -licui18n -licuuc -licuio -licudata"
- ICU_TEST_INCLUDE="$UIMA_ICU_INCLUDE"
- AC_SUBST(UIMA_ICU_INCLUDE)
- AC_SUBST(UIMA_ICU_LIB)
- ],
- [ICU_TEST_INCLUDE="-I$UIMACPP_HOME/include"
- UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -licui18n -licuuc -licuio -licudata"])
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $ICU_TEST_INCLUDE"
-AC_CHECK_HEADER([unicode/uversion.h],
- [:],
- [AC_MSG_ERROR([Unable to find ICU Headers])])
-CPPFLAGS="$CPPFLAGS_save"
-#########################################################################
-#
-# check for ACTIVEMQ
-#
-
-AC_ARG_WITH([activemq], AC_HELP_STRING([--with-activemq],
- [use ACTIVEMQ Library (no deployment wrapper by default)]),
- [UIMA_ACTIVEMQ_INCLUDE="-I$withval/include/activemq-cpp-2.1.3"
- UIMA_ACTIVEMQ_LIB="-L$withval/lib -lactivemq-cpp -lpthread -luuid"
- ACTIVEMQ_TEST_INCLUDE="$UIMA_ACTIVEMQ_INCLUDE"
- AC_SUBST(UIMA_ACTIVEMQ_INCLUDE)
- AC_SUBST(UIMA_ACTIVEMQ_LIB)
- ])
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $ACTIVEMQ_TEST_INCLUDE"
-activemq=true
-AC_CHECK_HEADER([activemq/exceptions/ExceptionDefines.h],
- [:],
- [activemq=false])
-
-CPPFLAGS="$CPPFLAGS_save"
-AM_CONDITIONAL([ACTIVEMQ_FOUND], [test x$activemq = xtrue])
-if test "x$activemq" = "xfalse"; then
-AC_MSG_RESULT(***ACTIVEMQ dependency not found)
-AC_MSG_RESULT(***Not building deployCppService)
-AC_MSG_RESULT(***To try again ... touch configure before running make)
-fi
-
-
-
-####################################
-#Substitute default paths, if needed
-AC_SUBST(UIMACPP_HOME_INCLUDE)
-AC_SUBST(UIMACPP_HOME_LIB)
-
-
-#########################################################################
-#
-# check for Java JDK
-#
-
-AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk],
- [use local JDK (uses /opt/IBMJava2-142 by default)]),
- [UIMA_JDK_INCLUDE="-I$withval"
- JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"],
- [UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include"
- JDK_TEST_INCLUDE="-I/opt/IBMJava2-142/include"])
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $JDK_TEST_INCLUDE"
-AC_CHECK_HEADER([jni.h],
- [:],
- [AC_MSG_ERROR([Unable to find JDK Headers])])
-CPPFLAGS="$CPPFLAGS_save"
-
-AC_SUBST(UIMA_JDK_INCLUDE)
-
-
-#########################################################################
-#
-# setup for link with UIMA lib
-#
-
-UIMA_LIB="-L\$(top_srcdir)/../src/framework -luima"
-AC_SUBST(UIMA_LIB)
-
-AM_CONDITIONAL(APPLE, test x$build_vendor = xapple)
-
-AC_OUTPUT(Makefile framework/Makefile utils/Makefile test/Makefile)
+
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing,
+ # software distributed under the License is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ # KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+
+AC_INIT(libuima, 2.2)
+AC_CONFIG_SRCDIR(framework/engine.cpp)
+AM_INIT_AUTOMAKE
+
+#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
+#LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
+
+AC_ARG_ENABLE(debuguima,
+[ --enable-debuguima Turn on debugging],
+[case "${enableval}" in
+ yes) debuguima=true ;;
+ no) debuguima=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debuguima) ;;
+esac],[debuguima=false])
+AM_CONDITIONAL([DEBUG_UIMA], [test x$debuguima = xtrue])
+
+
+AC_ARG_ENABLE(debugtest,
+[ --enable-debugtest Turn on debugging],
+[case "${enableval}" in
+ yes) debugtest=true ;;
+ no) debugtest=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debugtest) ;;
+esac],[debugtest=false])
+AM_CONDITIONAL([DEBUG_TEST], [test x$debugtest = xtrue])
+
+
+LIB_VERSION="2.2"
+LIB_VERSION_MAJOR="2"
+LIB_VERSION_MINOR="2"
+AC_SUBST(VERSION)
+AC_SUBST(LIB_VERSION)
+AC_SUBST(LIB_VERSION_MAJOR)
+AC_SUBST(LIB_VERSION_MINOR)
+AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
+
+AC_PROG_LIBTOOL
+AC_PROG_CXX
+
+AC_C_BIGENDIAN
+
+######################################
+# setup for using default dependencies
+UIMACPP_HOME_INCLUDE="-I$UIMACPP_HOME/include"
+UIMACPP_HOME_LIB="-L$UIMACPP_HOME/lib"
+
+
+#########################################################################
+#
+# check for XercesC
+#
+
+AC_ARG_WITH([xerces], AC_HELP_STRING([--with-xerces],
+ [use Xerces C++ Library (uses $UIMACPP_HOME by default)]),
+ [UIMA_XERCES_INCLUDE="-I$withval/include"
+ UIMA_XERCES_LIB="-L$withval/lib -lxerces-c"
+ XERCES_TEST_INCLUDE="$UIMA_XERCES_INCLUDE"
+ AC_SUBST(UIMA_XERCES_INCLUDE)
+ AC_SUBST(UIMA_XERCES_LIB)
+ ],
+ [XERCES_TEST_INCLUDE="-I$UIMACPP_HOME/include"
+ UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lxerces-c"])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XERCES_TEST_INCLUDE"
+AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],
+ [:],
+ [AC_MSG_ERROR([Unable to find Xerces C++ headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+
+#########################################################################
+#
+# check for APR
+#
+
+AC_ARG_WITH([apr], AC_HELP_STRING([--with-apr],
+ [use APR Library (uses $UIMACPP_HOME by default)]),
+ [APR_VER=`echo $withval/include/apr-* | sed -e 's/.*apr-//'`
+ UIMA_APR_INCLUDE="-I$withval/include/apr-$APR_VER"
+ UIMA_APR_LIB="-L$withval/lib -lapr-$APR_VER"
+ APR_TEST_INCLUDE="$UIMA_APR_INCLUDE"
+ AC_SUBST(UIMA_APR_INCLUDE)
+ AC_SUBST(UIMA_APR_LIB)
+ ],
+ [APR_VER=`echo $UIMACPP_HOME/include/apr-* | sed -e 's/.*apr-//'`
+ APR_TEST_INCLUDE="-I$UIMACPP_HOME/include/apr-$APR_VER"
+ UIMACPP_HOME_INCLUDE="$UIMACPP_HOME_INCLUDE $APR_TEST_INCLUDE"
+ UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lapr-$APR_VER"])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $APR_TEST_INCLUDE -D_GNU_SOURCE"
+AC_CHECK_HEADER([apr.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find APR Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+
+#########################################################################
+#
+# check for ICU
+#
+
+AC_ARG_WITH([icu], AC_HELP_STRING([--with-icu],
+ [use ICU Library (uses $UIMACPP_HOME by default)]),
+ [UIMA_ICU_INCLUDE="-I$withval/include"
+ UIMA_ICU_LIB="-L$withval/lib -licui18n -licuuc -licuio -licudata"
+ ICU_TEST_INCLUDE="$UIMA_ICU_INCLUDE"
+ AC_SUBST(UIMA_ICU_INCLUDE)
+ AC_SUBST(UIMA_ICU_LIB)
+ ],
+ [ICU_TEST_INCLUDE="-I$UIMACPP_HOME/include"
+ UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -licui18n -licuuc -licuio -licudata"])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $ICU_TEST_INCLUDE"
+AC_CHECK_HEADER([unicode/uversion.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find ICU Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+#########################################################################
+#
+# check for ACTIVEMQ
+#
+
+AC_ARG_WITH([activemq], AC_HELP_STRING([--with-activemq],
+ [use ACTIVEMQ Library (no deployment wrapper by default)]),
+ [UIMA_ACTIVEMQ_INCLUDE="-I$withval/include/activemq-cpp-2.1.3"
+ UIMA_ACTIVEMQ_LIB="-L$withval/lib -lactivemq-cpp -lpthread -luuid"
+ ACTIVEMQ_TEST_INCLUDE="$UIMA_ACTIVEMQ_INCLUDE"
+ AC_SUBST(UIMA_ACTIVEMQ_INCLUDE)
+ AC_SUBST(UIMA_ACTIVEMQ_LIB)
+ ])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $ACTIVEMQ_TEST_INCLUDE"
+activemq=true
+AC_CHECK_HEADER([activemq/exceptions/ExceptionDefines.h],
+ [:],
+ [activemq=false])
+
+CPPFLAGS="$CPPFLAGS_save"
+AM_CONDITIONAL([ACTIVEMQ_FOUND], [test x$activemq = xtrue])
+if test "x$activemq" = "xfalse"; then
+AC_MSG_RESULT(***ACTIVEMQ dependency not found)
+AC_MSG_RESULT(***Not building deployCppService)
+AC_MSG_RESULT(***To try again ... touch configure before running make)
+fi
+
+
+
+####################################
+#Substitute default paths, if needed
+AC_SUBST(UIMACPP_HOME_INCLUDE)
+AC_SUBST(UIMACPP_HOME_LIB)
+
+
+#########################################################################
+#
+# check for Java JDK
+#
+
+AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk],
+ [use local JDK (uses /opt/IBMJava2-142 by default)]),
+ [UIMA_JDK_INCLUDE="-I$withval"
+ JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"],
+ [UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include"
+ JDK_TEST_INCLUDE="-I/opt/IBMJava2-142/include"])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $JDK_TEST_INCLUDE"
+AC_CHECK_HEADER([jni.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find JDK Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+AC_SUBST(UIMA_JDK_INCLUDE)
+
+
+#########################################################################
+#
+# setup for link with UIMA lib
+#
+
+UIMA_LIB="-L\$(top_srcdir)/../src/framework -luima"
+AC_SUBST(UIMA_LIB)
+
+AM_CONDITIONAL(APPLE, test x$build_vendor = xapple)
+
+AC_OUTPUT(Makefile framework/Makefile utils/Makefile test/Makefile)
Propchange: incubator/uima/uimacpp/trunk/src/configure.in
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: incubator/uima/uimacpp/trunk/src/framework/Makefile.am
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF
Propchange: incubator/uima/uimacpp/trunk/src/test/Makefile.am
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF
Propchange: incubator/uima/uimacpp/trunk/src/test/fvt.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF
Propchange: incubator/uima/uimacpp/trunk/src/utils/Makefile.am
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 17 07:56:59 2008
@@ -1 +1 @@
-native
+LF