Incorporate some Debian patches.

configure.ac

@@ -102,8 +102,8 @@ AC_CHECK_FUNCS([syslog gettimeofday ftime localtime_r gmtime_r])
 # ----------------------------------------------------------------------------
 
 # for RemoteSyslogAppender
-AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,)
-AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
+AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([cannot find socket() function])])
+AC_SEARCH_LIBS([gethostbyname],[nsl],,[AC_MSG_ERROR([cannot find gethostbyname() function])])
 
 # checks for pthreads
 AX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
@@ -140,7 +140,6 @@ BB_ENABLE_DOXYGEN
 #BB_CHECK_OMNITHREADS
 #BB_CHECK_PTHREADS
 
-LOG4SHIB_CFLAGS="$CXXFLAGS"
 LOG4SHIB_LIBS="-llog4shib"
 LOG4SHIB_LIBDEPS="$LIBS"
 LOG4SHIB_VERSION="$VERSION"

doc/Doxyfile.in

@@ -62,6 +62,4 @@ COLLABORATION_GRAPH  = YES
 INCLUDE_GRAPH        = YES
 INCLUDED_BY_GRAPH    = YES
 GRAPHICAL_HIERARCHY  = YES
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
 GENERATE_LEGEND        = YES

include/log4shib/PatternLayout.hh

@@ -48,38 +48,36 @@ namespace log4shib {
         PatternLayout();
         virtual ~PatternLayout();
         
-        // NOTE: All double percentage signs ('%%') followed by a character
-        //       in the following comments should actually be a single char.
-        //       The doubles are included so that doxygen will print them correctly.
         /**
-         * Formats the LoggingEvent in the style set by
-		 * the setConversionPattern call. By default, set
-		 * to "%%m%%n"
+           Formats the LoggingEvent in the style set by
+           the setConversionPattern call. By default, set
+           to "%m%n"
          **/
         virtual std::string format(const LoggingEvent& event);
 
         /**
-         * Sets the format of log lines handled by this
-         * PatternLayout. By default, set to "%%m%%n".<br>
-         * Format characters are as follows:<br>
-         * <li><b>%%</b> - a single percent sign</li>
-         * <li><b>%%c</b> - the category</li>
-         * <li><b>%%d</b> - the date\n
-         *  Date format: The date format character may be followed by a date format 
-         *  specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}.
-         *  If no date format specifier is given then the following format is used:
-         *  "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax 
-         *  as the ANSI C function strftime, with 1 addition. The addition is the specifier
-         *  %%l for milliseconds, padded with zeros to make 3 digits.</li>
-         * <li><b>%%m</b> - the message</li>
-         * <li><b>%%n</b> - the platform specific line separator</li>
-         * <li><b>%%p</b> - the priority</li>
-         * <li><b>%%r</b> - milliseconds since this layout was created.</li>
-         * <li><b>%%R</b> - seconds since Jan 1, 1970</li>
-         * <li><b>%%u</b> - clock ticks since process start</li>
-         * <li><b>%%x</b> - the NDC</li>
-         * @param conversionPattern the conversion pattern
-         * @exception ConfigureFailure if the pattern is invalid
+           Sets the format of log lines handled by this
+           PatternLayout. By default, set to "%m%n".
+           Format characters are as follows:
+           - <b>%%</b> - a single percent sign
+           - <b>%%c</b> - the category
+           - <b>%%d</b> - the date\n
+            Date format: The date format character may be followed by a date format
+            specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}.
+            If no date format specifier is given then the following format is used:
+            "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax
+            as the ANSI C function strftime, with 1 addition. The addition is the specifier
+            %%l for milliseconds, padded with zeros to make 3 digits.
+           - <b>%%m</b> - the message
+           - <b>%%n</b> - the platform specific line separator
+           - <b>%%p</b> - the priority
+           - <b>%%r</b> - milliseconds since this layout was created
+           - <b>%%R</b> - seconds since Jan 1, 1970
+           - <b>%%u</b> - clock ticks since process start
+           - <b>%%x</b> - the NDC
+ 
+           @param conversionPattern the conversion pattern
+           @exception ConfigureFailure if the pattern is invalid
          **/
         virtual void setConversionPattern(const std::string& conversionPattern)
             throw(ConfigureFailure);

log4shib.pc.in

@@ -7,4 +7,4 @@ Name: @PACKAGE@
 Description: C++ library for flexible logging, modeled after Log4j
 Version: @VERSION@
 Libs: -L${libdir} @log4shib_libs@
-Cflags: -I${includedir} @log4shib_cflags@
+Cflags: -I${includedir}