svn commit: r834169 - /activemq/activemq-cpp/trunk/activemq-cpp/configure.ac

[tabish]

Author: tabish
Date: Mon Nov  9 18:33:27 2009
New Revision: 834169

URL: http://svn.apache.org/viewvc?rev=834169&view=rev
Log:
Refactor the platform detection and configuration section to account for platforms not using the GCC compiler toolset.

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?rev=834169&r1=834168&r2=834169&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Mon Nov  9 18:33:27 2009
@@ -68,6 +68,11 @@
 # Gives us access to the host_os environment variable
 AC_CANONICAL_HOST
 
+echo "Configuring ActiveMQ-CPP library"
+echo "   Platform: $host_os"
+echo "   CPU: $host_cpu"
+echo "   Vendor: $host_vendor"
+
 ## -----------------------------------------------
 ## Checks for programs.
 ## -----------------------------------------------
@@ -142,36 +147,53 @@
 PLAT_CXXFLAGS=
 PLAT_LIBS=
 
+# Detect the presence of pthreads and the correct linker settings.
+DECAF_CHECK_PTHREADS()
+
 case "${host_os}" in
 
   *darwin* ) ## Mac OS X configuration
 
-    DECAF_CHECK_PTHREADS()
-    PLAT_CXXFLAGS="-ansi -pedantic"
     ;;
 
   *solaris* ) ## Solaris configuration
-    DECAF_CHECK_PTHREADS()
 
-    PLAT_LIBS="-lm -lpthread -luuid -lsocket -lrt"
+    PLAT_LIBS="-lm -luuid -lsocket -lrt"
 
-    if test "$GCC" = "yes"; then
-       PLAT_CXXFLAGS="-ansi -pedantic"
-    else
+    if test "$GCC" = "no"; then
        # Assuming Sun Compiler and adding in optimization
        # because autoconf can't seem to figure it out.
        PLAT_CXXFLAGS="-mt -w -O5 -library=stlport4"
     fi
     ;;
 
-  *) ## Unix configuration
+  *hpux10* )
+
+    if test "$GCC" = "no"; then
+       # Assuming aCC Compiler unknown yet if any additional settings are needed.
+       PLAT_CXXFLAGS=""
+    fi
+    ;;
+
+  *hpux11* )
+
+    if test "$GCC" = "no"; then
+       # Assuming aCC Compiler unknown yet if any additional settings are needed.
+       PLAT_CXXFLAGS=""
+    fi
+    ;;
+
+  *linux*) ## Unix configuration
 
-    DECAF_CHECK_PTHREADS()
-    PLAT_CXXFLAGS="-ansi -pedantic"
-    PLAT_LIBS="-lm -lpthread -luuid"
+    PLAT_LIBS="-lm -luuid"
+    ;;
 
 esac
 
+if test "$GCC" = "yes"; then
+   PLAT_CXXFLAGS="-ansi -pedantic"
+fi
+
 ## find and configure the Apache Decaf Library
 ## DECAF_CONFIGURE_DECAF - Future use for decaf as a standalone lib
 ## Flags for building the decaf cpp library