You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by nm...@apache.org on 2007/07/07 22:51:40 UTC
svn commit: r554262 - in /activemq/activemq-cpp/trunk: configure.ac
m4/check_addrinfo.m4 m4/check_visibility.m4
Author: nmittler
Date: Sat Jul 7 13:51:39 2007
New Revision: 554262
URL: http://svn.apache.org/viewvc?view=rev&rev=554262
Log:
AMQCPP-115 - fixing macro for visibility test and moved tests to m4 files.
Added:
activemq/activemq-cpp/trunk/m4/check_addrinfo.m4 (with props)
activemq/activemq-cpp/trunk/m4/check_visibility.m4 (with props)
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=554262&r1=554261&r2=554262
==============================================================================
--- activemq/activemq-cpp/trunk/configure.ac (original)
+++ activemq/activemq-cpp/trunk/configure.ac Sat Jul 7 13:51:39 2007
@@ -134,58 +134,16 @@
AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized -I${srcdir}/../main"
AMQ_TEST_LIBS="../main/libactivemq-cpp.la"
-AC_DEFUN([AMQCPP_CHECK_VISIBILITY], [
- AC_MSG_CHECKING([whether -fvisibility flags work])
- OLDCXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Werror -fvisibility=hidden -fvisibility-inlines-hidden"
- AC_TRY_COMPILE([],
- [
- int i = 0;
- do {
- i++
- } while(0)
- ],
- [
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_VISIBILITY_OPTIONS],[], [define if you have -fvisibility options])
- ],
- [
- AC_MSG_RESULT(no)
- ])
+# Check to see if the compiler supports the visibility flags.
+# If so, define HAVE_VISIBILITY_OPTIONS
+CHECK_VISIBILITY()
- CXXFLAGS="$OLDCXXFLAGS"
-])
-
-AMQCPP_CHECK_VISIBILITY
-
-##
-## Not all platforms define addrinfo and related functions
-##
-AC_MSG_CHECKING([whether struct addrinfo is defined])
-AC_TRY_COMPILE(
- [ #include <stdio.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- ],
- [
- do {
- struct addrinfo a;
- (void) a.ai_flags;
- } while(0)
- ],
- [
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STRUCT_ADDRINFO,, [define if you have struct addrinfo])
- ],
- [
- AC_MSG_RESULT(no)
- ])
+## Not all platforms define addrinfo and related functions. If this platform
+## supports addrinfo, defines HAVE_STRUCT_ADDRINFO.
+CHECK_ADDRINFO()
+## Execute Doxygen macros
DX_HTML_FEATURE(ON)
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
Added: activemq/activemq-cpp/trunk/m4/check_addrinfo.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/m4/check_addrinfo.m4?view=auto&rev=554262
==============================================================================
--- activemq/activemq-cpp/trunk/m4/check_addrinfo.m4 (added)
+++ activemq/activemq-cpp/trunk/m4/check_addrinfo.m4 Sat Jul 7 13:51:39 2007
@@ -0,0 +1,48 @@
+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
+dnl check_addrinfo.m4 - checks support for addrinfo structure
+dnl
+dnl This macro determines if the platform supports the addrinfo structure.
+dnl If this platform supports addrinfo, defines HAVE_STRUCT_ADDRINFO.
+dnl
+
+AC_DEFUN([CHECK_ADDRINFO], [
+ AC_MSG_CHECKING([whether struct addrinfo is defined])
+ AC_TRY_COMPILE(
+ [ #include <stdio.h>
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ ],
+ [
+ do {
+ struct addrinfo a;
+ (void) a.ai_flags;
+ } while(0)
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STRUCT_ADDRINFO,, [define if you have struct addrinfo])
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
+])
Propchange: activemq/activemq-cpp/trunk/m4/check_addrinfo.m4
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/activemq-cpp/trunk/m4/check_visibility.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/m4/check_visibility.m4?view=auto&rev=554262
==============================================================================
--- activemq/activemq-cpp/trunk/m4/check_visibility.m4 (added)
+++ activemq/activemq-cpp/trunk/m4/check_visibility.m4 Sat Jul 7 13:51:39 2007
@@ -0,0 +1,45 @@
+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
+dnl check_visibility.m4 - checks support for visibility family of CXX flags
+dnl
+dnl This macro determines whether or not the CXX flags -fvisibility and
+dnl -fvisibility-inlines-hidden are allowed with the compiler.
+dnl
+dnl If so, the result is "yes" and HAVE_VISIBILITY_OPTIONS is defined. Else, the
+dnl result is "no".
+dnl
+
+AC_DEFUN([CHECK_VISIBILITY], [
+ AC_MSG_CHECKING([whether -fvisibility flags work])
+
+ OLDCXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -Werror -fvisibility=hidden -fvisibility-inlines-hidden"
+
+ AC_TRY_COMPILE([],
+ [
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_VISIBILITY_OPTIONS],[], [define if you have -fvisibility options])
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
+
+ CXXFLAGS="$OLDCXXFLAGS"
+])
Propchange: activemq/activemq-cpp/trunk/m4/check_visibility.m4
------------------------------------------------------------------------------
svn:eol-style = native