activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r471294 - /incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
Date Sat, 04 Nov 2006 23:04:12 GMT
Author: nmittler
Date: Sat Nov  4 15:04:11 2006
New Revision: 471294

URL: http://svn.apache.org/viewvc?view=rev&rev=471294
Log:
AMQ-1025 - Resolving the host_os environment variable and adding build support for solaris

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=471294&r1=471293&r2=471294
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Sat Nov  4 15:04:11 2006
@@ -41,7 +41,10 @@
 VERSION=$ACTIVEMQ_VERSION
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h)
+
+# Gives us access to the host_os environment variable
+AC_CANONICAL_HOST
 
 ## -----------------------------------------------
 ## Checks for programs.
@@ -66,21 +69,29 @@
 AC_CHECK_HEADERS([repcdce.h])
 
 AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no; AC_MSG_RESULT([no. Unit and Integration
tests disabled])) 
-AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, test x$cppunit = xyes)
+AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, test x$cppunit = xyes)
 
 case "${host_os}" in
 
-  darwin* ) ## Mac OS X configuration
+  *darwin* ) ## Mac OS X configuration
     LIBS=""
     ;;
 
-  cygwin* ) ## Cygwin configuration
+  *cygwin* ) ## Cygwin configuration
     # LIBS="-lwinmm -lm";
     CFLAGS="$CFLAGS -pthread" 
     LIBS="$LIBS -lm -lpthread -luuid -lrpcrt4"
-    ;;
-
-  *) ## Unix configuration
+    ;;
+    
+  *solaris* ) ## Solaris configuration
+    AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
+                AC_MSG_ERROR([libpthread not found!]))
+
+    CFLAGS="$CFLAGS -pthread" 
+    LIBS="$LIBS -lm -lpthread -luuid -lsocket -lrt"
+    ;;
+    
+  *) ## Unix configuration
 
     AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
                 AC_MSG_ERROR([libpthread not found!]))



Mime
View raw message