Author: tabish
Date: Mon Nov 5 07:25:37 2007
New Revision: 592044
URL: http://svn.apache.org/viewvc?rev=592044&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Added:
activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4 (with props)
activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4 (with props)
Added: 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=592044&view=auto
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4 (added)
+++ activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4 Mon Nov 5 07:25:37 2007
@@ -0,0 +1,71 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl
+dnl This Macro File defines functions that help to manage the libraries
+dnl dependance on the Apache Decaf Library.
+dnl
+dnl DECAF_CONFIGURE_DECAF()
+dnl
+dnl Check configure options and assign variables related to
+dnl the Apache Decaf Library.
+dnl
+
+AC_DEFUN([DECAF_CONFIGURE_DECAF],
+[
+ AC_MSG_NOTICE([Apache Decaf Library configuration])
+ DECAF_FIND_DECAF([], [], 1, [0 1])
+
+ if test $decaf_found = "no"; then
+ AC_MSG_WARN([Decaf not found])
+ DECAF_DOWNLOAD_DECAF
+ fi
+
+ dnl Get build information from Decaf
+
+ CPPFLAGS="$CPPFLAGS `$decaf_config --cppflags --includes`"
+ if test $? -ne 0; then
+ AC_MSG_ERROR([decaf-config --cppflags failed])
+ fi
+
+ CFLAGS="$CFLAGS `$decaf_config --cflags --includes`"
+ if test $? -ne 0; then
+ AC_MSG_ERROR([decaf-config --cflags failed])
+ fi
+
+ LDFLAGS="$LDFLAGS `$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])
+ fi
+
+ AC_SUBST([DECAF_LIBS])
+])
+
+dnl DECAF_DOWNLOAD_DECAF()
+dnl no decaf found, print out a message telling the user what to do
+AC_DEFUN([DECAF_DOWNLOAD_DECAF],
+[
+ echo "The Apache Decaf library cannot be found."
+ echo "Please install Decaf on this system and supply the appropriate"
+ echo "--with-decaf option to 'configure'"
+
+ AC_MSG_ERROR([no suitable Decaf Install found])
+])
Propchange: activemq/activemq-cpp/decaf/trunk/m4/decaf_tools.m4
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4?rev=592044&view=auto
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4 (added)
+++ activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4 Mon Nov 5 07:25:37 2007
@@ -0,0 +1,167 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl
+dnl find_decaf.m4 : locate the decaf include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the Decaf
+dnl library. It provides a standardized mechanism for using Decaf. It supports
+dnl embedding Decaf into the application source, or locating an installed
+dnl copy of Decaf.
+dnl
+dnl DECAF_FIND_DECAF(srcdir, builddir, implicit-install-check,
acceptable-majors)
+dnl
+dnl where srcdir is the location of the bundled Decaf source directory, or
+dnl empty if source is not bundled.
+dnl
+dnl where builddir is the location where the bundled Decaf will will be
built,
+dnl or empty if the build will occur in the srcdir.
+dnl
+dnl where implicit-install-check set to 1 indicates if there is no
+dnl --with-decaf option specified, we will look for installed copies.
+dnl
+dnl where acceptable-majors is a space separated list of acceptable major
+dnl version numbers. Often only a single major version will be acceptable.
+dnl If multiple versions are specified, and --with-decaf=PREFIX or the
+dnl implicit installed search are used, then the first (leftmost) version
+dnl in the list that is found will be used. Currently defaults to [0 1].
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl decaf_found : "yes", "no", "reconfig"
+dnl
+dnl decaf_config : If the decaf-config tool exists, this refers to it. If
+dnl decaf_found is "reconfig", then the bundled directory
+dnl should be reconfigured *before* using decaf_config.
+dnl
+dnl Note: this macro file assumes that decaf-config has been installed; it
+dnl is normally considered a required part of an Decaf installation.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then decaf_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If decaf_found is "yes" or "reconfig", then the caller should use the
+dnl value of decaf_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([DECAF_FIND_DECAF], [
+ decaf_found="no"
+
+ if test "$target_os" = "os2-emx"; then
+ # Scripts don't pass test -x on OS/2
+ TEST_X="test -f"
+ else
+ TEST_X="test -x"
+ fi
+
+ ifelse([$4], [], [
+ ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4
(acceptable-majors): Defaulting to DECAF 0.x then DECAF 1.x]))
+ acceptable_majors="0 1"],
+ [acceptable_majors="$4"])
+
+ decaf_temp_acceptable_decaf_config=""
+ for decaf_temp_major in $acceptable_majors
+ do
+ case $decaf_temp_major in
+ 0)
+ decaf_temp_acceptable_decaf_config="$decaf_temp_acceptable_decaf_config
decaf-config"
+ ;;
+ *)
+ decaf_temp_acceptable_decaf_config="$decaf_temp_acceptable_decaf_config
decaf-$decaf_temp_major-config"
+ ;;
+ esac
+ done
+
+ AC_MSG_CHECKING(for DECAF)
+ AC_ARG_WITH(decaf,
+ [ --with-decaf=PATH prefix for installed Decaf, path to Decaf build
tree,
+ or the full path to decaf-config],
+ [
+ if test "$withval" = "no" || test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-decaf requires a directory or file to be provided])
+ fi
+
+ for decaf_temp_decaf_config_file in $decaf_temp_acceptable_decaf_config
+ do
+ for lookdir in "$withval/bin" "$withval"
+ do
+ if $TEST_X "$lookdir/$decaf_temp_decaf_config_file"; then
+ decaf_found="yes"
+ decaf_config="$lookdir/$decaf_temp_decaf_config_file"
+ break 2
+ fi
+ done
+ done
+
+ if test "$decaf_found" != "yes" && $TEST_X "$withval" && $withval --help >
/dev/null 2>&1 ; then
+ decaf_found="yes"
+ decaf_config="$withval"
+ fi
+
+ dnl if --with-decaf is used, it is a fatal error for its argument
+ dnl to be invalid
+ if test "$decaf_found" != "yes"; then
+ AC_MSG_ERROR([the --with-decaf parameter is incorrect. It must specify
an install prefix, a build directory, or an decaf-config file.])
+ fi
+ ],[
+ dnl If we allow installed copies, check those before using bundled copy.
+ if test -n "$3" && test "$3" = "1"; then
+ for decaf_temp_decaf_config_file in $decaf_temp_acceptable_decaf_config
+ do
+ if $decaf_temp_decaf_config_file --help > /dev/null 2>&1 ; then
+ decaf_found="yes"
+ decaf_config="$decaf_temp_decaf_config_file"
+ break
+ else
+ dnl look in some standard places
+ for lookdir in /usr /usr/local /usr/local/decaf /opt/decaf; do
+ if $TEST_X "$lookdir/bin/$decaf_temp_decaf_config_file"; then
+ decaf_found="yes"
+ decaf_config="$lookdir/bin/$decaf_temp_decaf_config_file"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ dnl if we have not found anything yet and have bundled source, use that
+ if test "$decaf_found" = "no" && test -d "$1"; then
+ decaf_temp_abs_srcdir="`cd $1 && pwd`"
+ decaf_found="reconfig"
+ decaf_bundled_major="`sed -n
'/#define.*DECAF_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
\"$1/include/decaf_version.h\"`"
+ case $decaf_bundled_major in
+ "")
+ AC_MSG_ERROR([failed to find major version of bundled Decaf])
+ ;;
+ 0)
+ decaf_temp_decaf_config_file="decaf-config"
+ ;;
+ *)
+ decaf_temp_decaf_config_file="decaf-$decaf_bundled_major-config"
+ ;;
+ esac
+ if test -n "$2"; then
+ decaf_config="$2/$decaf_temp_decaf_config_file"
+ else
+ decaf_config="$1/$decaf_temp_decaf_config_file"
+ fi
+ fi
+ ])
+
+ AC_MSG_RESULT($decaf_found)
+])
Propchange: activemq/activemq-cpp/decaf/trunk/m4/find_decaf.m4
------------------------------------------------------------------------------
svn:eol-style = native
