You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/03/08 18:30:30 UTC

svn commit: r635025 - in /logging/log4cxx/trunk: build.xml find_apr.m4 find_apu.m4 pom.xml src/assembly/source.xml src/site/apt/building/ant.apt src/site/apt/building/autotools.apt

Author: carnold
Date: Sat Mar  8 09:30:28 2008
New Revision: 635025

URL: http://svn.apache.org/viewvc?rev=635025&view=rev
Log:
LOGCXX-62: Include configure in distribution

Modified:
    logging/log4cxx/trunk/build.xml
    logging/log4cxx/trunk/find_apr.m4
    logging/log4cxx/trunk/find_apu.m4
    logging/log4cxx/trunk/pom.xml
    logging/log4cxx/trunk/src/assembly/source.xml
    logging/log4cxx/trunk/src/site/apt/building/ant.apt
    logging/log4cxx/trunk/src/site/apt/building/autotools.apt

Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Sat Mar  8 09:30:28 2008
@@ -1234,7 +1234,11 @@
       </exec>
    </target>
 
-
+   <target name="autogen" depends="init" if="is-unix">
+	<exec executable="sh">
+		<arg value="autogen.sh"/>
+	</exec>
+   </target>
 
 
 </project>

Modified: logging/log4cxx/trunk/find_apr.m4
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/find_apr.m4?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/find_apr.m4 (original)
+++ logging/log4cxx/trunk/find_apr.m4 Sat Mar  8 09:30:28 2008
@@ -1,3 +1,4 @@
+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.
@@ -5,14 +6,14 @@
 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     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
 dnl find_apr.m4 : locate the APR include files and libraries
 dnl
@@ -21,7 +22,8 @@
 dnl embedding APR into the application source, or locating an installed
 dnl copy of APR.
 dnl
-dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APR source directory, or
 dnl   empty if source is not bundled.
@@ -38,6 +40,14 @@
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APR found, with the apr_config variable set appropriately.
+dnl   Only installed copies of APR which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apr_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apr_found : "yes", "no", "reconfig"
@@ -61,7 +71,7 @@
 AC_DEFUN([APR_FIND_APR], [
   apr_found="no"
 
-  if test "$ac_cv_emxos2" = "yes"; then
+  if test "$target_os" = "os2-emx"; then
     # Scripts don't pass test -x on OS/2
     TEST_X="test -f"
   else
@@ -88,8 +98,8 @@
 
   AC_MSG_CHECKING(for APR)
   AC_ARG_WITH(apr,
-  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config],
+  [  --with-apr=PATH         prefix for installed APR or the full path to 
+                             apr-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
@@ -100,16 +110,28 @@
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+            continue
+          fi])
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      ifelse([$5], [], [apr_found="yes"], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" = "yes"; then
+                apr_found="yes"
+          fi])
     fi
 
     dnl if --with-apr is used, it is a fatal error for its argument
@@ -118,8 +140,42 @@
       AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
     fi
   ],[
-    dnl if we have a bundled source directory, use it
-    if test -d "$1"; then
+    dnl If we allow installed copies, check those before using bundled copy.
+    if test -n "$3" && test "$3" = "1"; then
+      for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+      do
+        if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+          apr_config="$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+            continue
+          fi])
+          apr_found="yes"
+          break
+        else
+          dnl look in some standard places
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+            if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+              apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              ifelse([$5], [], [], [
+              apr_acceptable="yes"
+              $5
+              if test "$apr_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+                continue
+              fi])
+              apr_found="yes"
+              break 2
+            fi
+          done
+        fi
+      done
+    fi
+    dnl if we have not found anything yet and have bundled source, use that
+    if test "$apr_found" = "no" && test -d "$1"; then
       apr_temp_abs_srcdir="`cd $1 && pwd`"
       apr_found="reconfig"
       apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
@@ -139,25 +195,6 @@
       else
         apr_config="$1/$apr_temp_apr_config_file"
       fi
-    fi
-    if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
-      for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
-      do
-        if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
-          apr_config="$apr_temp_apr_config_file"
-          break
-        else
-          dnl look in some standard places (apparently not in builtin/default)
-          for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
-            if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
-              apr_config="$lookdir/bin/$apr_temp_apr_config_file"
-              break 2
-            fi
-          done
-        fi
-      done
     fi
   ])
 

Modified: logging/log4cxx/trunk/find_apu.m4
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/find_apu.m4?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/find_apu.m4 (original)
+++ logging/log4cxx/trunk/find_apu.m4 Sat Mar  8 09:30:28 2008
@@ -1,18 +1,19 @@
-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 -------------------------------------------------------- -*- autoconf -*-
+dnl Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+dnl applicable.
+dnl
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
 dnl
-dnl      http://www.apache.org/licenses/LICENSE-2.0
+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
 dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
 dnl
@@ -21,7 +22,8 @@
 dnl embedding APU into the application source, or locating an installed
 dnl copy of APU.
 dnl
-dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APU source directory, or
 dnl   empty if source is not bundled.
@@ -38,6 +40,14 @@
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apu_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APU found, with the apu_config variable set appropriately.
+dnl   Only installed copies of APU which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apu_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apu_found : "yes", "no", "reconfig"
@@ -70,7 +80,7 @@
 AC_DEFUN([APR_FIND_APU], [
   apu_found="no"
 
-  if test "$ac_cv_emxos2" = "yes"; then
+  if test "$target_os" = "os2-emx"; then
     # Scripts don't pass test -x on OS/2
     TEST_X="test -f"
   else
@@ -98,8 +108,8 @@
 
   AC_MSG_CHECKING(for APR-util)
   AC_ARG_WITH(apr-util,
-  [  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
-                          or the full path to apu-config],
+  [  --with-apr-util=PATH    prefix for installed APU or the full path to 
+                             apu-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
@@ -110,16 +120,28 @@
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
-          apu_found="yes"
           apu_config="$lookdir/$apu_temp_apu_config_file"
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
+            continue
+          fi])
+          apu_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apu_found="yes"
       apu_config="$withval"
+      ifelse([$5], [], [apu_found="yes"], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" = "yes"; then
+                apu_found="yes"
+          fi])
     fi
 
     dnl if --with-apr-util is used, it is a fatal error for its argument
@@ -128,8 +150,41 @@
       AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])
     fi
   ],[
-    dnl if we have a bundled source directory, use it
-    if test -d "$1"; then
+    if test -n "$3" && test "$3" = "1"; then
+      for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+      do
+        if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+          apu_config="$apu_temp_apu_config_file" 
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+            continue
+          fi])
+          apu_found="yes"
+          break
+        else
+          dnl look in some standard places (apparently not in builtin/default)
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+            if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+              apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+              ifelse([$5], [], [], [
+              apu_acceptable="yes"
+              $5
+              if test "$apu_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+                continue
+              fi])
+              apu_found="yes"
+              break 2
+            fi
+          done
+        fi
+      done
+    fi
+    dnl if we have not found anything yet and have bundled source, use that
+    if test "$apu_found" = "no" && test -d "$1"; then
       apu_temp_abs_srcdir="`cd $1 && pwd`"
       apu_found="reconfig"
       apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
@@ -149,25 +204,6 @@
       else
         apu_config="$1/$apu_temp_apu_config_file"
       fi
-    fi
-    if test "$apu_found" = "no" && test -n "$3" && test "$3" = "1"; then
-      for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
-      do
-        if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
-          apu_found="yes"
-          apu_config="$apu_temp_apu_config_file"
-          break
-        else
-          dnl look in some standard places (apparently not in builtin/default)
-          for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
-            if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-              apu_found="yes"
-              apu_config="$lookdir/bin/$apu_temp_apu_config_file"
-              break 2
-            fi
-          done
-        fi
-      done
     fi
   ])
 

Modified: logging/log4cxx/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/pom.xml?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/pom.xml (original)
+++ logging/log4cxx/trunk/pom.xml Sat Mar  8 09:30:28 2008
@@ -3,7 +3,7 @@
   <groupId>log4cxx</groupId>
   <artifactId>apache-log4cxx</artifactId>
   <packaging>pom</packaging>
-  <version>0.10.1-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <name>Apache log4cxx</name>
   <description>Logging framework for C++.</description>
   <url>http://logging.apache.org:80/log4cxx</url>
@@ -88,6 +88,18 @@
             <configuration>
                 <tasks>
                     <ant target="check" />
+                </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>package</phase>
+            <id>autogen</id>
+            <configuration>
+                <tasks>
+                   <ant target="autogen" />
                 </tasks>
             </configuration>
             <goals>

Modified: logging/log4cxx/trunk/src/assembly/source.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/assembly/source.xml?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/assembly/source.xml (original)
+++ logging/log4cxx/trunk/src/assembly/source.xml Sat Mar  8 09:30:28 2008
@@ -30,6 +30,11 @@
                <include>autogen.sh</include>
                <include>configure.bat</include>
                <include>configure-aprutil.bat</include>
+               <include>configure</include>
+	       <include>install-sh</include>
+               <include>missing</include>
+               <include>ltmain.sh</include>
+	       <include>depcomp</include>
            </includes>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -46,6 +51,10 @@
                <include>find_apu.m4</include>
                <include>liblog4cxx.pc.in</include>
 				<include>pom.xml</include>
+				<include>Makefile.in</include>
+                                <include>config.sub</include>
+                                <include>config.guess</include>
+                                <include>aclocal.m4</include>
                 <include>src/**</include>
             </includes>
             <excludes>
@@ -57,7 +66,6 @@
                 <exclude>src/examples/cpp/stream</exclude>
                 <exclude>src/examples/cpp/trivial</exclude>
                 <exclude>**/Makefile</exclude>
-                <exclude>**/Makefile.in</exclude>
                 <exclude>**/*.o</exclude>
                 <exclude>**/*.Po</exclude>
                 <exclude>**/*.lo</exclude>

Modified: logging/log4cxx/trunk/src/site/apt/building/ant.apt
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/ant.apt?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Sat Mar  8 09:30:28 2008
@@ -39,44 +39,41 @@
   sibling to the log4cxx directory.
   
   *Install gzip and zip (used for compression by RollingFileAppender) and 
-   sed (used to normalize output files for comparison in unit tests). 
+   sed (used to normalize output files for comparison in unit tests).
+
+  * Install log4j 1.2.  Used in testing of SocketAppender. 
         
    Building and testing log4cxx on a Unix platform with packaged APR and APR-Util.  
 
 +----+
- sudo apt-get install libapr1.0-dev libaprutil1.0-dev \
-      ant ant-optional liblog4j1.2-java
- export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar: \
-      ~/ant-contrib/ant-contrib-1.0b3.jar
- cd apache-log4cxx-0.10.0
- ant
+$ export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar
+$ cd apache-log4cxx-0.10.0
+$ ant
 +----+  
 
    Building and testing log4cxx on a Unix platform with APR and APR-Util built from source.  
 
 +----+
- sudo apt-get install ant ant-optional liblog4j1.2-java
- export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar: \
-     ~/ant-contrib/ant-contrib-1.0b3.jar
- tar -xvzf apr-1.2.12.tar.gz
- mv apr-1.2.12 apr
- tar -xvzf apr-util-1.2.12.tar.gz
- mv apr-util-1.2.12 apr-util
- cd apache-log4cxx-0.10.0
- ant
+$ export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar
+$ tar -xvzf apr-1.2.12.tar.gz
+$ mv apr-1.2.12 apr
+$ tar -xvzf apr-util-1.2.12.tar.gz
+$ mv apr-util-1.2.12 apr-util
+$ cd apache-log4cxx-0.10.0
+$ ant
 +----+  
 
    Building and testing log4cxx on a Microsoft Windows with APR and APR-Util built from source.  
 
 +----+
- set PATH=\apache-ant-1.7.0\bin;%PATH%
- set CLASSPATH=\cpptasks\cpptasks-1.0b5.jar;\ant-contrib\ant-contrib-1.0b3.jar
- tar -xvzf apr-1.2.12.tar.gz
- rename apr-1.2.12 apr
- tar -xvzf apr-util-1.2.12.tar.gz
- rename apr-util-1.2.12 apr-util
- cd apache-log4cxx-0.10.0
- ant -Dfind=false
+set PATH=\apache-ant-1.7.0\bin;%PATH%
+set CLASSPATH=\cpptasks\cpptasks-1.0b5.jar
+tar -xvzf apr-1.2.12.tar.gz
+rename apr-1.2.12 apr
+tar -xvzf apr-util-1.2.12.tar.gz
+rename apr-util-1.2.12 apr-util
+cd apache-log4cxx-0.10.0
+ant -Dfind=false
 +----+  
 
 
@@ -180,8 +177,10 @@
   The Win32 path to the APR libraries need to be provided (CYGWIN_HOME/lib) if compiling against an installed APR and APR-Util.
   
 +-----+
-cd apache-log4cxx-0.10.0
-ant -Dos.family=cygwin -Dwith-apr=/cygwin/lib -Dwith-apr-util=/cygwin/lib \
+$ cd apache-log4cxx-0.10.0
+$ ant -Dos.family=cygwin \
+   -Dwith-apr=/cygwin/lib \
+   -Dwith-apr-util=/cygwin/lib \
    -Denable-wchar_t=0
 +-----+  
     
@@ -189,22 +188,31 @@
   *** MinGW:
 
 +----+
-cd apache-log4cxx-0.10.0
-path c:\mingw\bin;%PATH%
-ant -Dcompiler=gcc -Dfind=false build-all
-cd src\test\resources
-set TOTO=wonderful
-set key1=value1
-set key2=value2
-..\..\..\target\debug\shared\testsuite -v 
-..\..\..\target\debug\shared\trivial
-..\..\..\target\debug\shared\stream 
+$ cd apache-log4cxx-0.10.0
+$ path c:\mingw\bin;%PATH%
+$ ant -Dcompiler=gcc -Dfind=false build-all
+$ cd src\test\resources
+$ set TOTO=wonderful
+$ set key1=value1
+$ set key2=value2
+$ ..\..\..\target\debug\shared\testsuite -v 
+$ ..\..\..\target\debug\shared\trivial
+$ ..\..\..\target\debug\shared\stream 
 +----+
 
    Running "ant check" was observed to fail with unexpected exceptions
    in streamtestcase and datetimedateformattestcase.
    See {{{http://issues.apache.org/jira/browse/LOGCXX-244}LOGCXX-244}}.
 
+  ** Debian:
+  
+  Apache APR, APR-Util, Ant and log4j and zip may be installed using:
+
++----+
+$ sudo apt-get install libapr1.0-dev libaprutil1.0-dev \
+      ant ant-optional liblog4j1.2-java zip
++----+
+
 
   ** Mac OS/X:
   
@@ -214,6 +222,6 @@
   by installing Doxygen.app and then setting the path like:
   
 +---+
-setenv PATH /Applications/Doxygen.app/Contents/Resources:$PATH
+$ setenv PATH /Applications/Doxygen.app/Contents/Resources:$PATH
 +---+
   

Modified: logging/log4cxx/trunk/src/site/apt/building/autotools.apt
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/autotools.apt?rev=635025&r1=635024&r2=635025&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/autotools.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/autotools.apt Sat Mar  8 09:30:28 2008
@@ -22,14 +22,14 @@
 
 * Quick start:
 
+  Install or build apr 1.x, apr-util 1.x, gzip and zip.
+
 +------------+
- sudo apt-get install libapr1.0-dev libaprutil1.0-dev
- cd apache-log4cxx-0.10.0
- ./autogen.sh
- ./configure
- make
- make check
- sudo make install
+$ cd apache-log4cxx-0.10.0
+$ ./configure
+$ make
+$ make check
+$ sudo make install
 +------------+
 
 
@@ -68,6 +68,27 @@
 ** Mac OS/X:
   
   APR and APR-Util are provided by the platform in Mac OS/X 10.5 and iODBC in 10.4.
+
+** Debian:
+
+  APR, APR-Util and zip may be installed by:
+
++----+
+$ sudo apt-get install libapr1.0-dev libaprutil1.0-dev zip
++----+
+
+** FreeBSD:
+
+  APR, APR-Util and zip may be installed from the ports collection by:
+
++----+
+# cd /usr/ports/archivers/zip
+# make
+# make install
+# cd /usr/ports/devel/apr
+# make
+# make install
++----+
   
 ** Cygwin:
   
@@ -87,26 +108,27 @@
    sequence worked with MSYS (with Python on Path):
 
 +----+
-cd expat-2.0.1
-./configure
-make install
-cd ..
-svn co https://svn.apache.org/repos/asf/apr/apr/trunk apr
-cd apr
-./buildconf.sh
-./configure 
-make install
-cd ..
-svn co https://svn.apache.org/repos/asf/apr/apr-util/trunk apr-util
-cd apr-util
-./buildconf.sh
-./configure --with-apr=/usr/local --with-expat=/usr/local
-make install
-cd ../apache-log4cxx-0.10.0
-./autogen.sh
-./configure --with-apr=/usr/local \
+$ cd expat-2.0.1
+$ ./configure
+$ make install
+$ cd ..
+$ svn co https://svn.apache.org/repos/asf/apr/apr/trunk apr
+$ cd apr
+$ ./buildconf.sh
+$ ./configure 
+$ make install
+$ cd ..
+$ svn co \
+   https://svn.apache.org/repos/asf/apr/apr-util/trunk \
+   apr-util
+$ cd apr-util
+$ ./buildconf.sh
+$ ./configure --with-apr=/usr/local --with-expat=/usr/local
+$ make install
+$ cd ../apache-log4cxx-0.10.0
+$ ./configure --with-apr=/usr/local \
    --with-apr-util=/usr/local --with-logchar=wchar_t
-make install
+$ make install
 +----+
 
    Running "make check" was observed to fail with unexpected exceptions