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 15:55:28 UTC

svn commit: r649105 - in /incubator/uima/uimacpp/trunk/src: configure.in utils/Makefile.am

Author: eae
Date: Thu Apr 17 06:55:25 2008
New Revision: 649105

URL: http://svn.apache.org/viewvc?rev=649105&view=rev
Log:
UIMA-790 problems building without ACTIVEMQ_HOME defined

Modified:
    incubator/uima/uimacpp/trunk/src/configure.in
    incubator/uima/uimacpp/trunk/src/utils/Makefile.am

Modified: incubator/uima/uimacpp/trunk/src/configure.in
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/configure.in?rev=649105&r1=649104&r2=649105&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/configure.in (original)
+++ incubator/uima/uimacpp/trunk/src/configure.in Thu Apr 17 06:55:25 2008
@@ -144,13 +144,11 @@
 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"
+                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)
-		],
-                      [ACTIVEMQ_TEST_INCLUDE="-I$UIMACPP_HOME/include"
-		       UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lactivemq-cpp"])
+		])
 
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $ACTIVEMQ_TEST_INCLUDE"

Modified: incubator/uima/uimacpp/trunk/src/utils/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/utils/Makefile.am?rev=649105&r1=649104&r2=649105&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/utils/Makefile.am (original)
+++ incubator/uima/uimacpp/trunk/src/utils/Makefile.am Thu Apr 17 06:55:25 2008
@@ -38,7 +38,7 @@
 AM_CPPFLAGS += -D_GNU_SOURCE
 
 # Set default for all target_LDADD values
-LDADD = $(UIMA_LIB) $(UIMA_XERCES_LIB) $(UIMA_ICU_LIB) $(UIMA_ACTIVEMQ_LIB)  -ldl $(UIMACPP_HOME_LIB) -lpthread -luuid 
+LDADD = $(UIMA_LIB) $(UIMA_XERCES_LIB) $(UIMA_ICU_LIB) $(UIMA_ACTIVEMQ_LIB)  -ldl $(UIMACPP_HOME_LIB)
 
 runAECpp_SOURCES = runAECpp.cpp
 runAECpp_CPPFLAGS  = -g -DDEBUG