Author: tabish
Date: Mon Mar 28 15:26:58 2011
New Revision: 1086270
URL: http://svn.apache.org/viewvc?rev=1086270&view=rev
Log:
Ensures that the -fPIC option gets applied to the C source files for zlib
compression.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
Modified: activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?rev=1086270&r1=1086269&r2=1086270&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Mon Mar 28 15:26:58
2011
@@ -240,9 +240,11 @@ if test "$use_ssl" = "yes"; then
fi
DECAF_CXXFLAGS="$APR_CPPFLAGS $APR_INCLUDES $APU_INCLUDES $OPENSSL_INCLUDES"
+DECAF_CFLAGS="$APR_CFLAGS $APR_INCLUDES $APU_INCLUDES $OPENSSL_INCLUDES"
DECAF_LIBS="$APR_LIBS $APR_LDFLAGS $APU_LIBS $APU_LDFLAGS $OPENSSL_LIBS
$OPENSSL_LDFLAGS"
AC_SUBST([DECAF_CXXFLAGS])
+AC_SUBST([DECAF_CFLAGS])
AC_SUBST([DECAF_LIBS])
## Flags for building the test applications.
@@ -251,12 +253,15 @@ AC_SUBST([DECAF_TEST_CXXFLAGS])
## Flags for building the activemq-cpp library
AC_SUBST([AMQ_CXXFLAGS])
+AC_SUBST([AMQ_CFLAGS])
AC_SUBST([AMQ_LIBS])
if test "$GCC" = "yes"; then
AMQ_CXXFLAGS="$PLAT_CXXFLAGS $DECAF_INCLUDES $DECAF_CXXFLAGS -W -Wall
-Wextra -Wconversion -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+ AMQ_CFLAGS="$PLAT_CFLAGS $DECAF_INCLUDES $DECAF_CFLAGS -W -Wall -fPIC"
else
AMQ_CXXFLAGS="$PLAT_CXXFLAGS $DECAF_INCLUDES $DECAF_CXXFLAGS -PIC"
+ AMQ_CFLAGS="$PLAT_CXXFLAGS $DECAF_INCLUDES $DECAF_CXXFLAGS -PIC"
fi
AMQ_LIBS="$PLAT_LIBS $DECAF_LIBS"
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?rev=1086270&r1=1086269&r2=1086270&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Mon Mar 28
15:26:58 2011
@@ -1094,6 +1094,7 @@ h_sources = \
lib_LTLIBRARIES= libactivemq-cpp.la
libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS)
+libactivemq_cpp_la_CFLAGS= $(AMQ_CFLAGS)
libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION)
libactivemq_cpp_la_LIBADD= $(AMQ_LIBS)
