activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r499204 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: configure.ac src/test-integration/Makefile.am src/test/Makefile.am
Date Wed, 24 Jan 2007 01:02:22 GMT
Author: nmittler
Date: Tue Jan 23 17:02:20 2007
New Revision: 499204

URL: http://svn.apache.org/viewvc?view=rev&rev=499204
Log:
[AMQCPP-49] - providing different CXXFLAGS for test code

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am

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=499204&r1=499203&r2=499204
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Tue Jan 23 17:02:20 2007
@@ -41,8 +41,7 @@
 VERSION=$ACTIVEMQ_VERSION
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AC_CONFIG_HEADERS([config.h])
-# AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h)
 
 # Gives us access to the host_os environment variable
 AC_CANONICAL_HOST
@@ -84,26 +83,23 @@
 
 AC_CHECK_FUNCS([ioctl select gettimeofday time ftime])
 
-# AC_CHECK_TYPES([uuid_t],[],[],['uuid/uuid.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)
 
-# Define globals for all platforms
-CXXFLAGS="$CXXFLAGS -fstrict-aliasing -Wstrict-aliasing=2 -W -Wall"
-
+CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+# CPPUNIT_CXXFLAGS="$CPPUNIT_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
 LIBS="$LIBS"
 
 case "${host_os}" in
 
   *darwin* ) ## Mac OS X configuration
-    CXXFLAGS="$CXXFLAGS -ansi -pedantic" 
+    CXXFLAGS="$CXXFLAGS" 
     LIBS="$LIBS"
     ;;
 
   *cygwin* ) ## Cygwin configuration
     # LIBS="-lwinmm -lm";
-    CXXFLAGS="$CXXFLAGS -Wno-unused-parameter -Wno-uninitialized" 
+    CXXFLAGS="$CXXFLAGS" 
     LIBS="$LIBS -lm -lpthread -luuid -lrpcrt4"
     ;;
     
@@ -111,7 +107,7 @@
     AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
                 AC_MSG_ERROR([libpthread not found!]))
 
-    CXXFLAGS="$CXXFLAGS -ansi -pedantic"
+    CXXFLAGS="$CXXFLAGS"
     LIBS="$LIBS -lm -lpthread -luuid -lsocket -lrt"
     ;;
     
@@ -120,7 +116,7 @@
     AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
                 AC_MSG_ERROR([libpthread not found!]))
 
-    CXXFLAGS="$CXXFLAGS -ansi -pedantic" 
+    CXXFLAGS="$CXXFLAGS" 
     LIBS="$LIBS -lm -lpthread -luuid"
 esac
 
@@ -174,7 +170,6 @@
 
 if test x$cppunit = xyes
 then
-  CXXFLAGS="-D HAVE_ACTIVEMQ_CONFIG"
   AC_CONFIG_FILES(src/test/Makefile)
   AC_CONFIG_FILES(src/test-integration/Makefile)
 fi

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am?view=diff&rev=499204&r1=499203&r2=499204
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am Tue
Jan 23 17:02:20 2007
@@ -31,6 +31,7 @@
 ## 
 ## Compiler/Linker Options
 ##
+CXXFLAGS = @CXXFLAGS@ -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
 activemq_test_integration_SOURCES = $(cc_sources)
 activemq_test_integration_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
 activemq_test_integration_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am?view=diff&rev=499204&r1=499203&r2=499204
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am Tue Jan 23 17:02:20
2007
@@ -84,6 +84,7 @@
 ## 
 ## Compiler/Linker Options
 ##
+CXXFLAGS = @CXXFLAGS@ -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
 activemq_test_SOURCES = $(cc_sources)
 activemq_test_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
 activemq_test_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@



Mime
View raw message