svn commit: r677321 - in /logging/log4cxx/trunk/src: changes/changes.xml main/cpp/smtpappender.cpp

[ca...@apache.org]

Author: carnold
Date: Wed Jul 16 09:02:45 2008
New Revision: 677321

URL: http://svn.apache.org/viewvc?rev=677321&view=rev
Log:
LOGCXX-298: SMTPAppender does not build properly with autotools

Modified:
    logging/log4cxx/trunk/src/changes/changes.xml
    logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp

Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=677321&r1=677320&r2=677321&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Wed Jul 16 09:02:45 2008
@@ -47,6 +47,7 @@
 <action issue="LOGCXX-291">Tab characters are not recognized in property files.<action>
 <action issue="LOGCXX-292">Value continuation does not properly handle CRLF in property files.<action>
 <action issue="LOGCXX-293">Escape sequences not recognized in property files.<action>
+<action issue="LOGCXXX-298">SMTPAppender does not build properly with autotools.</action>
 <action issue="LOGCXX-299">odbcappender.cpp does not compile with unixODBC on linux.</action>
 <action issue="LOGCXX-300">ODBCAppender connection settings broken (or just have changed).</action>
 <action issue="LOGCXX-304">BasicConfigurator::configure results in writer not set warning.</action>

Modified: logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp?rev=677321&r1=677320&r2=677321&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp Wed Jul 16 09:02:45 2008
@@ -496,7 +496,7 @@
    activate &= asciiCheck(bcc, LOG4CXX_STR("bcc"));
    activate &= asciiCheck(from, LOG4CXX_STR("from"));
  
-#if !LOG4CXX_HAS_LIBESMTP
+#if !LOG4CXX_HAVE_LIBESMTP
    LogLog::error(LOG4CXX_STR("log4cxx built without SMTP support."));
    activate = false;
 #endif     
@@ -598,7 +598,7 @@
 */
 void SMTPAppender::sendBuffer(Pool& p)
 {
-#if LOG4CXX_HAS_LIBESMTP
+#if LOG4CXX_HAVE_LIBESMTP
    // Note: this code already owns the monitor for this
    // appender. This frees us from needing to synchronize on 'cb'.
    try