diff options
| author | Manuel Teira Paz <mteira@apache.org> | 2009-03-05 16:22:06 +0000 |
|---|---|---|
| committer | Manuel Teira Paz <mteira@apache.org> | 2009-03-05 16:22:06 +0000 |
| commit | 0b86db6498d1742bb5c7e3b0f1f3e061928a8aa6 (patch) | |
| tree | 695cb0ad7e739c22e20237d8eb7ddf928a6b6226 /qpid/cpp/configure.ac | |
| parent | 93a80ddf41f8062f82c741419323258db6d1f38d (diff) | |
| download | qpid-python-0b86db6498d1742bb5c7e3b0f1f3e061928a8aa6.tar.gz | |
configure.ac:
- Check for existence of LOG_FTP and LOG_AUTHPRIV to create proper defines
- Define SUNOS properly
- Reverse SUNCC detection to make it work properly
- Check if libacl is actually needed (in Solaris this functionality is
part of libc)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750494 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/configure.ac')
| -rw-r--r-- | qpid/cpp/configure.ac | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 977fd732a5..81d4f20b30 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -87,13 +87,14 @@ else AC_CHECK_DECL([__SUNPRO_CC], [SUNCC=yes], [SUNCC=no]) # Set up for sun CC compiler - if test x$SUNCC = xno; then + if test x$SUNCC = xyes; then if test "${enableval}" = yes; then WARNING_FLAGS=+w fi CXXFLAGS="$CXXFLAGS -library=stlport4 -mt" LD="$CXX" LDFLAGS="$LDFLAGS -library=stlport4 -mt" + AC_SUBST([SUNCC_RUNTIME_LIBS], [-lCrun]) fi fi @@ -368,6 +369,30 @@ if test $poller = xno; then AC_MSG_ERROR([Polling mechanism not implemented for $host]) fi +#Guess host architecture, to choose platform-dependent objects +case "$host" in + *sun-solaris*) + arch=solaris + ;; +esac +AM_CONDITIONAL([SUNOS], [test x$arch = xsolaris]) + +# Check for some syslog capabilities not present in all systems +AC_TRY_COMPILE([#include <sys/syslog.h>], + [int v = LOG_AUTHPRIV;], + [AC_DEFINE([HAVE_LOG_AUTHPRIV], [1], [Set to 1 whether LOG_AUTHPRIV is supported.])],) + +AC_TRY_COMPILE([#include <sys/syslog.h>], + [int v = LOG_FTP;], + [AC_DEFINE([HAVE_LOG_FTP], [1], [Set to 1 whether LOG_FTP is supported.])],) + +#Check if we need to include libacl to provide acl API +gl_saved_libs=$LIBS + AC_SEARCH_LIBS(acl, [acl], + [test "$ac_cv_search_acl" = "none required" || + LIB_ACL=$ac_cv_search_acl]) + AC_SUBST([LIB_ACL]) +LIBS=$gl_saved_libs AM_PATH_PYTHON() # Files to generate |