You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/06/26 21:38:21 UTC
svn commit: r550918 - /activemq/activemq-cpp/trunk/configure.ac
Author: tabish
Date: Tue Jun 26 12:38:21 2007
New Revision: 550918
URL: http://svn.apache.org/viewvc?view=rev&rev=550918
Log:
http://issues.apache.org/activemq/browse/AMQCPP-115
Attempting to get shared libraries building on Unix systems.
Modified:
activemq/activemq-cpp/trunk/configure.ac
Modified: activemq/activemq-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/configure.ac?view=diff&rev=550918&r1=550917&r2=550918
==============================================================================
--- activemq/activemq-cpp/trunk/configure.ac (original)
+++ activemq/activemq-cpp/trunk/configure.ac Tue Jun 26 12:38:21 2007
@@ -52,9 +52,10 @@
AC_PROG_CC
AC_PROG_CXX
-## Uncomment to use libtool for shared libs
-## AC_PROG_LIBTOOL
-AC_PROG_RANLIB
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+AC_SUBST([LIBTOOL_DEPS])
+
AM_SANITY_CHECK
AC_LANG_CPLUSPLUS
@@ -71,7 +72,6 @@
AC_CHECK_SIZEOF(double, 8)
AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [AC_DEFINE([HAVE_UUID_T], [1], [Define if uuid_t exists.])])
-# AC_CHECK_HEADERS([uuid/uuid.h])
AC_CHECK_HEADERS([objbase.h])
AC_CHECK_HEADERS([repcdce.h])
AC_CHECK_HEADERS([sys/filio.h])
@@ -86,28 +86,26 @@
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)
-CXXFLAGS="$CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
-LIBS="$LIBS"
+PLAT_CXXFLAGS=
+PLAT_LIBS=
case "${host_os}" in
*darwin* ) ## Mac OS X configuration
- CXXFLAGS="-ansi -pedantic $CXXFLAGS"
- LIBS="$LIBS"
+ PLAT_CXXFLAGS="-ansi -pedantic"
;;
*cygwin* ) ## Cygwin configuration
- # LIBS="-lwinmm -lm";
- CXXFLAGS="$CXXFLAGS -Wno-uninitialized"
- LIBS="$LIBS -lm -lpthread -luuid -lrpcrt4"
+ PLAT_CXXFLAGS="-Wno-uninitialized"
+ PLAT_LIBS="-lm -lpthread -luuid -lrpcrt4"
;;
*solaris* ) ## Solaris configuration
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
- CXXFLAGS="-ansi -pedantic $CXXFLAGS"
- LIBS="$LIBS -lm -lpthread -luuid -lsocket -lrt"
+ PLAT_CXXFLAGS="-ansi -pedantic"
+ PLAT_LIBS="-lm -lpthread -luuid -lsocket -lrt"
;;
*) ## Unix configuration
@@ -115,10 +113,13 @@
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
- CXXFLAGS="-ansi -pedantic $CXXFLAGS"
- LIBS="$LIBS -lm -lpthread -luuid"
+ PLAT_CXXFLAGS="-ansi -pedantic"
+ PLAT_LIBS="-lm -lpthread -luuid"
esac
+CXXFLAGS="$CXXFLAGS $PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+LIBS="$LIBS $PLAT_LIBS"
+
##
## Not all platforms define addrinfo and related functions
##
@@ -155,7 +156,6 @@
DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN(activemq-cpp, doxygen.cfg, doc)
-
## -----------------------------------------------------
## configuration