Return-Path: 
 <commits-return-7501-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 27118 invoked from network); 5 Nov 2007 19:03:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Nov 2007 19:03:24 -0000
Received: (qmail 49060 invoked by uid 500); 5 Nov 2007 19:03:12 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 49003 invoked by uid 500); 5 Nov 2007 19:03:12 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 48994 invoked by uid 99); 5 Nov 2007 19:03:12 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2007 11:03:12 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2007 19:03:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4064E1A9832; Mon,  5 Nov 2007 11:02:52 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r592119 - in /activemq/activemq-cpp/decaf/trunk:
 configure.ac
 decaf-config.in m4/apr_tools.m4 m4/decaf_tools.m4 src/examples/Makefile.am
 src/main/Makefile.am
Date: Mon, 05 Nov 2007 19:02:50 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071105190252.4064E1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Mon Nov  5 11:02:49 2007
New Revision: 592119

URL: http://svn.apache.org/viewvc?rev=592119&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/decaf/trunk/configure.ac
    activemq/activemq-cpp/decaf/trunk/decaf-config.in
    activemq/activemq-cpp/decaf/trunk/m4/apr_tools.m4
    activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4
    activemq/activemq-cpp/decaf/trunk/src/examples/Makefile.am
    activemq/activemq-cpp/decaf/trunk/src/main/Makefile.am

Modified: activemq/activemq-cpp/decaf/trunk/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/configure.ac?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/configure.ac (original)
+++ activemq/activemq-cpp/decaf/trunk/configure.ac Mon Nov  5 11:02:49 2007
@@ -127,16 +127,16 @@
 esac
 
 ## Flags for building the decaf cpp library
+DECAF_CXXFLAGS="$PLAT_CXXFLAGS $APR_CPPFLAGS $APR_INCLUDES $APU_INCLUDES -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+DECAF_LIBS="$PLAT_LIBS $APR_LIBS $APR_LDFLAGS $APU_LIBS $APU_LDFLAGS"
 AC_SUBST([DECAF_CXXFLAGS])
 AC_SUBST([DECAF_LIBS])
-DECAF_CXXFLAGS="$PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
-DECAF_LIBS="$PLAT_LIBS"
 
 ## Flags for building the test applications.
+DECAF_TEST_CXXFLAGS="$DECAF_CXXFLAGS $APR_CPPFLAGS $APR_INCLUDES $APU_INCLUDES -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
+DECAF_TEST_LIBS="../main/libdecaf.la"
 AC_SUBST([DECAF_TEST_CXXFLAGS])
 AC_SUBST([DECAF_TEST_LIBS])
-DECAF_TEST_CXXFLAGS="$DECAF_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
-DECAF_TEST_LIBS="../main/libdecaf.la"
 
 # Check to see if the compiler supports the visibility flags.
 # If so, define HAVE_VISIBILITY_OPTIONS

Modified: activemq/activemq-cpp/decaf/trunk/decaf-config.in
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/decaf-config.in?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/decaf-config.in (original)
+++ activemq/activemq-cpp/decaf/trunk/decaf-config.in Mon Nov  5 11:02:49 2007
@@ -22,6 +22,13 @@
 exec_prefix_set=no
 includedir=@includedir@
 
+CPPFLAGS="@CPPFLAGS@"
+APR_CPPFLAGS="@APR_CPPFLAGS@"
+
+APR_LIBS="@APR_LIBS@"
+APU_LIBS="@APU_LIBS@"
+DECAF_LIBS="@DECAF_LIBS@"
+
 usage()
 {
     cat <<EOF
@@ -32,8 +39,9 @@
   --help	display this help and exit.
 
 Compilation support options
-  --cflags	print pre-processor and compiler flags
-  --libs	print library linking information
+  --includes    print The includes needed for Decaf and its dependencies
+  --cppflags	print C++ pre-processor and compiler flags
+  --libs	    print additional libraries to link against
 
 Install directories Decaf Library was configured to
   --prefix[=DIR]
@@ -76,8 +84,11 @@
     --help)
       usage 0
       ;;
-    --cflags)
-      echo_cflags=yes
+    --includes)
+      echo_includes=yes
+      ;;
+    --cppflags)
+      echo_cppflags=yes
       ;;
     --libs)
       echo_libs=yes
@@ -97,19 +108,20 @@
     echo $exec_prefix
 fi
 
-if test "$echo_cflags" = "yes"; then
+if test "$echo_includes" = "yes"; then
       if test "$includedir" != "/usr/include" ; then
-            echo -I$includedir
+            my_include_flags="-I$includedir"
       fi
+      echo "${my_include_flags} $APR_INCLUDES $APU_INCLUDES"
+fi
+
+if test "$echo_cppflags" = "yes"; then
+      echo "${my_cpp_flags} $APR_CPPFLAGS"
 fi
 
 if test "$echo_libs" = "yes"; then
       if test @libdir@ != /usr/lib ; then
-            my_linker_flags="-L@libdir@"
+            my_libs_flags="-L@libdir@"
       fi
-      echo ${my_linker_flags} -ldecaf
+      echo "${my_libs_flags} -ldecaf $APR_LIBS $APU_LIBS"
 fi
-
-
-
-

Modified: activemq/activemq-cpp/decaf/trunk/m4/apr_tools.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/m4/apr_tools.m4?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/m4/apr_tools.m4 (original)
+++ activemq/activemq-cpp/decaf/trunk/m4/apr_tools.m4 Mon Nov  5 11:02:49 2007
@@ -42,21 +42,25 @@
 
   dnl Get build information from APR
 
-  CPPFLAGS="$CPPFLAGS `$apr_config --cppflags --includes`"
+  APR_CPPFLAGS="`$apr_config --cppflags`"
   if test $? -ne 0; then
     AC_MSG_ERROR([apr-config --cppflags failed])
   fi
 
-  CFLAGS="$CFLAGS `$apr_config --cflags --includes`"
+  APR_INCLUDES="`$apr_config --includes`"
   if test $? -ne 0; then
-    AC_MSG_ERROR([apr-config --cflags failed])
+    AC_MSG_ERROR([apr-config --includes failed])
+  fi
+  APU_INCLUDES="`$apu_config --includes`"
+  if test $? -ne 0; then
+    AC_MSG_ERROR([apu-config --includes failed])
   fi
 
-  LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
+  APR_LDFLAGS="`$apr_config --ldflags`"
   if test $? -ne 0; then
     AC_MSG_ERROR([apr-config --ldflags failed])
   fi
-  LDFLAGS="$LDFLAGS `$apu_config --ldflags`"
+  APU_LDFLAGS="`$apu_config --ldflags`"
   if test $? -ne 0; then
     AC_MSG_ERROR([apu-config --ldflags failed])
   fi
@@ -65,12 +69,19 @@
   if test $? -ne 0; then
     AC_MSG_ERROR([apr-config --link-libtool --libs failed])
   fi
-  APR_LIBS="`$apu_config --link-libtool --libs`"
+  APU_LIBS="`$apu_config --link-libtool --libs`"
   if test $? -ne 0; then
     AC_MSG_ERROR([apu-config --link-libtool --libs failed])
   fi
 
   AC_SUBST([APR_LIBS])
+  AC_SUBST([APR_LDFLAGS])
+  AC_SUBST([APR_CPPFLAGS])
+  AC_SUBST([APR_INCLUDES])
+  AC_SUBST([APU_LIBS])
+  AC_SUBST([APU_LDFLAGS])
+  AC_SUBST([APU_INCLUDES])
+
 ])
 
 dnl DECAF_DOWNLOAD_APR()

Modified: activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4 (original)
+++ activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4 Mon Nov  5 11:02:49 2007
@@ -36,27 +36,24 @@
 
   dnl Get build information from Decaf
 
-  CPPFLAGS="$CPPFLAGS `$decaf_config --cppflags --includes`"
+  DECAF_CPPFLAGS="`$decaf_config --cppflags`"
   if test $? -ne 0; then
     AC_MSG_ERROR([decaf-config --cppflags failed])
   fi
 
-  CFLAGS="$CFLAGS `$decaf_config --cflags --includes`"
+  DECAF_INCLUDES="`$decaf_config --includes`"
   if test $? -ne 0; then
-    AC_MSG_ERROR([decaf-config --cflags failed])
+    AC_MSG_ERROR([decaf-config --includes failed])
   fi
 
-  LDFLAGS="$LDFLAGS `$decaf_config --ldflags`"
+  DECAF_LIBS="'$decaf_config --ldflags`"
   if test $? -ne 0; then
-    AC_MSG_ERROR([decaf-config --ldflags failed])
-  fi
-
-  DECAF_LIBS="`$decaf_config --link-libtool --libs`"
-  if test $? -ne 0; then
-    AC_MSG_ERROR([decaf-config --link-libtool --libs failed])
+    AC_MSG_ERROR([decaf-config --libs failed])
   fi
 
   AC_SUBST([DECAF_LIBS])
+  AC_SUBST([DECAF_INCLUDES])
+  AC_SUBST([DECAF_CPPFLAGS])
 ])
 
 dnl DECAF_DOWNLOAD_DECAF()

Modified: activemq/activemq-cpp/decaf/trunk/src/examples/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/examples/Makefile.am?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/examples/Makefile.am (original)
+++ activemq/activemq-cpp/decaf/trunk/src/examples/Makefile.am Mon Nov  5 11:02:49 2007
@@ -21,9 +21,7 @@
 ## Compiler / Linker Info
 ##
 
-INCLUDES = -I$(srcdir)/../main
-
 bin_PROGRAMS = example
 example_SOURCES = $(cc_sources)
-
-example_LDADD= ../main/libdecaf.la
+example_CXXFLAGS = -I$(srcdir)/../main $(DECAF_TEST_CXXFLAGS)
+example_LDADD= $(DECAF_TEST_LIBS) ../main/libdecaf.la

Modified: activemq/activemq-cpp/decaf/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/Makefile.am?rev=592119&r1=592118&r2=592119&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/Makefile.am Mon Nov  5 11:02:49 2007
@@ -185,7 +185,7 @@
 libdecaf_la_SOURCES= $(h_sources) $(cc_sources)
 libdecaf_la_CXXFLAGS= $(DECAF_CXXFLAGS)
 libdecaf_la_LDFLAGS= -version-info $(DECAF_LIBRARY_VERSION) -release $(DECAF_VERSION)
-libdecaf_la_LIBADD= $(DECAF_LIBS) $(APR_LIBS)
+libdecaf_la_LIBADD= $(DECAF_LIBS)
 
 ##
 ## Packaging Info