update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105321 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/man/apxs.8 b/docs/man/apxs.8
index 55decb92b7d1dc791267c8399a9a23fb78027791..13df607084709a0ec71561153b0df095d3d4355d 100644 (file)
--- a/docs/man/apxs.8
+++ b/docs/man/apxs.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "APXS" 8 "2003-11-25" "Apache HTTP Server" "apxs"
+.TH "APXS" 8 "2004-09-28" "Apache HTTP Server" "apxs"
 
 .SH NAME
 apxs \- APache eXtenSion tool
@@ -96,7 +96,7 @@ This explicitly sets the module name for the -i (install) and -g (template gener
  
 .TP
 -q
-Performs a query for apxs's knowledge about certain settings\&. The \fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS, CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB, SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining settings\&. For instance use .nf INC=-I`apxs -q INCLUDEDIR` .fi .PP inside your own Makefiles if you need manual access to Apache's C header files\&.  
+Performs a query for apxs's knowledge about certain settings\&. The \fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS, CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB, SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining settings\&. For instance use INC=-I`apxs -q INCLUDEDIR` .PP inside your own Makefiles if you need manual access to Apache's C header files\&.  
   
 .SS "Configuration Options"
  
@@ -135,10 +135,10 @@ This option is directly passed through to the linker command\&. Use this to add
 This option is directly passed through to the linker command\&. Use this to add your own libraries to search to the build process\&.  
 .TP
 -Wc,\fIcompiler-flags\fR
-This option passes \fIcompiler-flags\fR as additional flags to the compiler command\&. Use this to add local compiler-specific options\&.  
+This option passes \fIcompiler-flags\fR as additional flags to the libtool --mode=compile command\&. Use this to add local compiler-specific options\&.  
 .TP
 -Wl,\fIlinker-flags\fR
-This option passes \fIlinker-flags\fR as additional flags to the linker command\&. Use this to add local linker-specific options\&.  
+This option passes \fIlinker-flags\fR as additional flags to the libtool --mode=link command\&. Use this to add local linker-specific options\&.  
   
 .SS "DSO Installation and Configuration Options"
   
@@ -164,8 +164,8 @@ Assume you have an Apache module named mod_foo\&.c available which should extend
 .nf
 
       $ apxs -c mod_foo\&.c
-      gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
-      ld -Bshareable -o mod_foo\&.so mod_foo\&.o
+      /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+      /path/to/libtool --mode=link -o mod_foo\&.la mod_foo\&.slo
       $ _
     
 .fi
@@ -175,10 +175,12 @@ Then you have to update the Apache configuration by making sure a LoadModule dir
  
 .nf
 
-      $ apxs -i -a mod_foo\&.c
-      cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
+      $ apxs -i -a mod_foo\&.la
+      /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+      /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+      \&.\&.\&.
       chmod 755 /path/to/apache/modules/mod_foo\&.so
-      [activating module `foo' in /path/to/apache/etc/httpd\&.conf]
+      [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
       $ _
     
 .fi
@@ -209,7 +211,9 @@ For a quick test of the apxs mechanism you can create a sample Apache module tem
       $ apxs -g -n foo
       Creating [DIR]  foo
       Creating [FILE] foo/Makefile
+      Creating [FILE] foo/modules\&.mk
       Creating [FILE] foo/mod_foo\&.c
+      Creating [FILE] foo/\&.deps
       $ _
     
 .fi
@@ -222,12 +226,14 @@ Then you can immediately compile this sample module into a shared object and loa
       $ cd foo
       $ make all reload
       apxs -c mod_foo\&.c
-      gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
-      ld -Bshareable -o mod_foo\&.so mod_foo\&.o
-      apxs -i -a -n "foo" mod_foo\&.so
-      cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
+      /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+      /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
+      apxs -i -a -n "foo" mod_foo\&.la
+      /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+      /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+      \&.\&.\&.
       chmod 755 /path/to/apache/modules/mod_foo\&.so
-      [activating module `foo' in /path/to/apache/etc/httpd\&.conf]
+      [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
       apachectl restart
       /path/to/apache/sbin/apachectl restart: httpd not running, trying to start
       [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module foo_module
@@ -236,20 +242,3 @@ Then you can immediately compile this sample module into a shared object and loa
     
 .fi
  
-.PP
-You can even use apxs to compile complex modules outside the Apache source tree, like PHP3:
- 
-.nf
-
-      $ cd php3
-      $ \&./configure --with-shared-apache=\&.\&./apache-1\&.3
-      $ apxs -c -o libphp3\&.so mod_php3\&.c libmodphp3-so\&.a
-      gcc -fpic -DSHARED_MODULE -I/tmp/apache/include  -c mod_php3\&.c
-      ld -Bshareable -o libphp3\&.so mod_php3\&.o libmodphp3-so\&.a
-      $ _
-    
-.fi
- 
-.PP
-because apxs automatically recognized C source files and object files\&. Only C source files are compiled while remaining object files are used for the linking phase\&.
- 

diff --git a/docs/manual/programs/apxs.html.en b/docs/manual/programs/apxs.html.en
index efeabc7c2aa4d90311c79d67ec2b8961fc4236b3..64e30fdba4104a9451f8f899ac455d7312ea61b7 100644 (file)
--- a/docs/manual/programs/apxs.html.en
+++ b/docs/manual/programs/apxs.html.en
@@ -203,11 +203,13 @@
 
       <dt><code>-Wc,<var>compiler-flags</var></code></dt>
       <dd>This option passes <var>compiler-flags</var> as additional flags to
-      the compiler command. Use this to add local compiler-specific options.</dd>
+      the <code>libtool --mode=compile</code> command. Use this to add local
+      compiler-specific options.</dd>
 
       <dt><code>-Wl,<var>linker-flags</var></code></dt>
-      <dd>This option passes <var>linker-flags</var> as additional flags to
-      the linker command. Use this to add local linker-specific options.</dd>
+      <dd>This option passes <var>linker-flags</var> as additional
+      flags to the <code>libtool --mode=link</code> command. Use this
+      to add local linker-specific options.</dd>
       </dl>
     
 
@@ -247,8 +249,8 @@
 
     <div class="example"><p><code>
       $ apxs -c mod_foo.c<br />
-      gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo.c<br />
-      ld -Bshareable -o mod_foo.so mod_foo.o<br />
+      /path/to/libtool --mode=compile gcc ... -c mod_foo.c<br />
+      /path/to/libtool --mode=link -o mod_foo.la mod_foo.slo<br />
       $ _
     </code></p></div>
 
@@ -260,10 +262,12 @@
     achieved by running:</p>
 
     <div class="example"><p><code>
-      $ apxs -i -a mod_foo.c<br />
-      cp mod_foo.so /path/to/apache/modules/mod_foo.so<br />
+      $ apxs -i -a mod_foo.la<br />
+      /path/to/instdso.sh mod_foo.la /path/to/apache/modules<br />
+      /path/to/libtool --mode=install cp mod_foo.la /path/to/apache/modules
+      ...
       chmod 755 /path/to/apache/modules/mod_foo.so<br />
-      [activating module `foo' in /path/to/apache/etc/httpd.conf]<br />
+      [activating module `foo' in /path/to/apache/conf/httpd.conf]<br />
       $ _
     </code></p></div>
 
@@ -288,7 +292,9 @@
       $ apxs -g -n foo<br />
       Creating [DIR]  foo<br />
       Creating [FILE] foo/Makefile<br />
+      Creating [FILE] foo/modules.mk<br />
       Creating [FILE] foo/mod_foo.c<br />
+      Creating [FILE] foo/.deps<br />
       $ _
     </code></p></div>
 
@@ -299,12 +305,14 @@
       $ cd foo<br />
       $ make all reload<br />
       apxs -c mod_foo.c<br />
-      gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo.c<br />
-      ld -Bshareable -o mod_foo.so mod_foo.o<br />
-      apxs -i -a -n "foo" mod_foo.so<br />
-      cp mod_foo.so /path/to/apache/modules/mod_foo.so<br />
+      /path/to/libtool --mode=compile gcc ... -c mod_foo.c<br />
+      /path/to/libtool --mode=link gcc ... -o mod_foo.la mod_foo.slo<br />
+      apxs -i -a -n "foo" mod_foo.la<br />
+      /path/to/instdso.sh mod_foo.la /path/to/apache/modules<br />
+      /path/to/libtool --mode=install cp mod_foo.la /path/to/apache/modules
+      ...
       chmod 755 /path/to/apache/modules/mod_foo.so<br />
-      [activating module `foo' in /path/to/apache/etc/httpd.conf]<br />
+      [activating module `foo' in /path/to/apache/conf/httpd.conf]<br />
       apachectl restart<br />
       /path/to/apache/sbin/apachectl restart: httpd not running, trying to start<br />
       [Tue Mar 31 11:27:55 1998] [debug] mod_so.c(303): loaded module foo_module<br />
@@ -312,21 +320,6 @@
       $ _
     </code></p></div>
 
-    <p>You can even use <code>apxs</code> to compile complex modules outside the
-    Apache source tree, like PHP3:</p>
-
-    <div class="example"><p><code>
-      $ cd php3<br />
-      $ ./configure --with-shared-apache=../apache-1.3<br />
-      $ apxs -c -o libphp3.so mod_php3.c libmodphp3-so.a<br />
-      gcc -fpic -DSHARED_MODULE -I/tmp/apache/include  -c mod_php3.c<br />
-      ld -Bshareable -o libphp3.so mod_php3.o libmodphp3-so.a<br />
-      $ _
-    </code></p></div>
-
-    <p>because <code>apxs</code> automatically recognized C source files and
-    object files. Only C source files are compiled while remaining object
-    files are used for the linking phase.</p>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/programs/apxs.html" title="English">&nbsp;en&nbsp;</a> |

diff --git a/docs/manual/programs/apxs.html.ko.euc-kr b/docs/manual/programs/apxs.html.ko.euc-kr
index 0a7d41c29e55f698d5b57c865166f7215d22fe91..80d79d8194e8276f1fd164ebec7a19d26285738a 100644 (file)
--- a/docs/manual/programs/apxs.html.ko.euc-kr
+++ b/docs/manual/programs/apxs.html.ko.euc-kr
@@ -21,6 +21,8 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/apxs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/apxs.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 
     <p><code>apxs</code>´Â ¾ÆÆÄÄ¡ ÇÏÀÌÆÛÅؽºÆ® Àü¼Û ÇÁ·ÎÅäÄÝ
     (HTTP) ¼­¹öÀÇ È®Àå¸ðµâÀ» ÄÄÆÄÀÏÇÏ°í ¼³Ä¡ÇÏ´Â µµ±¸ÀÌ´Ù. ÀÌ

diff --git a/docs/manual/programs/apxs.xml.ko b/docs/manual/programs/apxs.xml.ko
index 367502b294323b914e1b8d9b78e4dbca0763a22b..97bd22b3290acf20e1527cf3fec372f6645c5b56 100644 (file)
--- a/docs/manual/programs/apxs.xml.ko
+++ b/docs/manual/programs/apxs.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1.4 -->
+<!-- English Revision: 1.4 (outdated: 1.5) -->
 
 <!--
  Copyright 2004 The Apache Software Foundation

diff --git a/docs/manual/programs/apxs.xml.meta b/docs/manual/programs/apxs.xml.meta
index b3c7b6c8f623311bfa0a5af24e28b4fb3d7789d6..886c2b4f1fcd19c9b7f58f9e28b9a50db33a9cc9 100644 (file)
--- a/docs/manual/programs/apxs.xml.meta
+++ b/docs/manual/programs/apxs.xml.meta
@@ -7,6 +7,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>