Author: mteira Date: Thu Mar 5 16:22:06 2009 New Revision: 750494 URL: http://svn.apache.org/viewvc?rev=750494&view=rev Log: 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)
Modified: qpid/trunk/qpid/cpp/configure.ac Modified: qpid/trunk/qpid/cpp/configure.ac URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=750494&r1=750493&r2=750494&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/configure.ac (original) +++ qpid/trunk/qpid/cpp/configure.ac Thu Mar 5 16:22:06 2009 @@ -87,13 +87,14 @@ 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 @@ 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 --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org