You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/06/01 02:41:24 UTC
svn commit: r780540 - in /httpd/mod_ftp/trunk: NWGNUmakefile
build/mkconfNW-ftp.awk configure.apxs
Author: wrowe
Date: Mon Jun 1 00:41:24 2009
New Revision: 780540
URL: http://svn.apache.org/viewvc?rev=780540&view=rev
Log:
fix eol style for netware (crlf flavor)
Modified:
httpd/mod_ftp/trunk/NWGNUmakefile (contents, props changed)
httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk
httpd/mod_ftp/trunk/configure.apxs
Modified: httpd/mod_ftp/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/NWGNUmakefile?rev=780540&r1=780539&r2=780540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NWGNUmakefile (original)
+++ httpd/mod_ftp/trunk/NWGNUmakefile Mon Jun 1 00:41:24 2009
@@ -1,50 +1,50 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
- modules\ftp \
- $(EOLIST)
-
-#
-# Get the 'head' of the build environment. This includes default targets and
-# paths to tools
-#
-
-include $(AP_WORK)\build\NWGNUhead.inc
-
-#
-# Make sure all needed macro's are defined
-#
-
-ifndef FTPPORT
-FTPPORT = 8021
-endif
-ifndef FTPROOT
-FTPROOT = ftproot
-endif
-ifndef BASEDIR
-BASEDIR = apache2
-endif
-ifndef BASEVOL
-BASEVOL = SYS:
-endif
-SOEXT = nlm
-
-#
-# build this level's files
-
-#
-# You can use this target if all that is needed is to copy files to the
-# installation area
-#
-install :: nlms FORCE
- $(CHKNOT) $(INSTALL)\$(BASEDIR)\$(FTPROOT)\nul mkdir $(INSTALL)\$(BASEDIR)\$(FTPROOT)
- xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual
-ifeq "$(wildcard $(INSTALL)\$(BASEDIR)\conf\extra)" "$(INSTALL)\$(BASEDIR)\conf\extra"
- -$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT) -f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
-else
- -$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT) -f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
-endif
-
-
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+ modules\ftp \
+ $(EOLIST)
+
+#
+# Get the 'head' of the build environment. This includes default targets and
+# paths to tools
+#
+
+include $(AP_WORK)\build\NWGNUhead.inc
+
+#
+# Make sure all needed macro's are defined
+#
+
+ifndef FTPPORT
+FTPPORT = 8021
+endif
+ifndef FTPROOT
+FTPROOT = ftproot
+endif
+ifndef BASEDIR
+BASEDIR = apache2
+endif
+ifndef BASEVOL
+BASEVOL = SYS:
+endif
+SOEXT = nlm
+
+#
+# build this level's files
+
+#
+# You can use this target if all that is needed is to copy files to the
+# installation area
+#
+install :: nlms FORCE
+ $(CHKNOT) $(INSTALL)\$(BASEDIR)\$(FTPROOT)\nul mkdir $(INSTALL)\$(BASEDIR)\$(FTPROOT)
+ xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual
+ifeq "$(wildcard $(INSTALL)\$(BASEDIR)\conf\extra)" "$(INSTALL)\$(BASEDIR)\conf\extra"
+ -$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT) -f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
+else
+ -$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT) -f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
+endif
+
+
Propchange: httpd/mod_ftp/trunk/NWGNUmakefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk?rev=780540&r1=780539&r2=780540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk (original)
+++ httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk Mon Jun 1 00:41:24 2009
@@ -1,76 +1,76 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-BEGIN {
-
- A["ServerRoot"] = BDIR
- A["FTPPort"] = FTPPORT
- A["ftpdocsdir"] = FTPROOT
- A["logfiledir"] = "logs"
- A["runtimedir"] = "logs"
- A["sysconfdir"] = "conf"
-
- B["ftpdocsdir"] = A["ServerRoot"]"/"A["ftpdocsdir"]
- B["sysconfdir"] = A["ServerRoot"]"/"A["sysconfdir"]
- B["runtimedir"] = A["ServerRoot"]"/"A["runtimedir"]
-}
-
-/#@@LoadFtpModules@@/ {
- print "LoadModule ftp_module modules/mod_ftp."SOEXT
- next
-}
-
-match ($0,/^#SSLSessionCache +"dbm:/) {
- sub(/^#/, "")
-}
-
-match ($0,/^SSLSessionCache +"shmcb:/) {
- sub(/^SSLSessionCache/, "#SSLSessionCache")
-}
-
-match ($0,/SSLMutex +"file:@exp_runtimedir@\/ssl_mutex"/) {
- sub(/"file:@exp_runtimedir@\/ssl_mutex"/, "default")
-}
-
-match ($0,/@@.*@@/) {
- s=substr($0,RSTART+2,RLENGTH-4)
- sub(/@@.*@@/,A[s],$0)
-}
-
-match ($0,/@rel_.*@/) {
- s=substr($0,RSTART+5,RLENGTH-6)
- sub(/@rel_.*@/,A[s],$0)
-}
-
-match ($0,/@exp_.*@/) {
- s=substr($0,RSTART+5,RLENGTH-6)
- sub(/@exp_.*@/,B[s],$0)
-}
-
-match ($0,/@nonssl_.*@/) {
- s=substr($0,RSTART+8,RLENGTH-9)
- sub(/@nonssl_.*@/,B[s],$0)
-}
-
-{
- print
-}
-
-
-END {
- print ""
-}
-
-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+BEGIN {
+
+ A["ServerRoot"] = BDIR
+ A["FTPPort"] = FTPPORT
+ A["ftpdocsdir"] = FTPROOT
+ A["logfiledir"] = "logs"
+ A["runtimedir"] = "logs"
+ A["sysconfdir"] = "conf"
+
+ B["ftpdocsdir"] = A["ServerRoot"]"/"A["ftpdocsdir"]
+ B["sysconfdir"] = A["ServerRoot"]"/"A["sysconfdir"]
+ B["runtimedir"] = A["ServerRoot"]"/"A["runtimedir"]
+}
+
+/#@@LoadFtpModules@@/ {
+ print "LoadModule ftp_module modules/mod_ftp."SOEXT
+ next
+}
+
+match ($0,/^#SSLSessionCache +"dbm:/) {
+ sub(/^#/, "")
+}
+
+match ($0,/^SSLSessionCache +"shmcb:/) {
+ sub(/^SSLSessionCache/, "#SSLSessionCache")
+}
+
+match ($0,/SSLMutex +"file:@exp_runtimedir@\/ssl_mutex"/) {
+ sub(/"file:@exp_runtimedir@\/ssl_mutex"/, "default")
+}
+
+match ($0,/@@.*@@/) {
+ s=substr($0,RSTART+2,RLENGTH-4)
+ sub(/@@.*@@/,A[s],$0)
+}
+
+match ($0,/@rel_.*@/) {
+ s=substr($0,RSTART+5,RLENGTH-6)
+ sub(/@rel_.*@/,A[s],$0)
+}
+
+match ($0,/@exp_.*@/) {
+ s=substr($0,RSTART+5,RLENGTH-6)
+ sub(/@exp_.*@/,B[s],$0)
+}
+
+match ($0,/@nonssl_.*@/) {
+ s=substr($0,RSTART+8,RLENGTH-9)
+ sub(/@nonssl_.*@/,B[s],$0)
+}
+
+{
+ print
+}
+
+
+END {
+ print ""
+}
+
+
Modified: httpd/mod_ftp/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/configure.apxs?rev=780540&r1=780539&r2=780540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_ftp/trunk/configure.apxs Mon Jun 1 00:41:24 2009
@@ -68,38 +68,40 @@
cd build
found_features=""
+echo "Detecting features"
+echo "Detecting features" > ../config.apxs.log
-if make local-clean conftest_arpa_ftp_h; then
+if make local-clean conftest_arpa_ftp_h >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_ARPA_FTP_H\)[ \t]*/#define \1/;\""
fi
-if make local-clean conftest_fchmod; then
+if make local-clean conftest_fchmod >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_FCHMOD\)[ \t]*/#define \1/;\""
fi
-if make local-clean conftest_netinet_ip_h; then
+if make local-clean conftest_netinet_ip_h >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_NETINET_IP_H\)[ \t]*/#define \1/;\""
- if make local-clean conftest_SOL_IP; then
+ if make local-clean conftest_SOL_IP >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_SOL_IP\)[ \t]*/#define \1/;\""
fi
fi
-if make conftest_struct_msghdr_msg_control; then
+if make conftest_struct_msghdr_msg_control >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_STRUCT_MSGHDR_MSG_CONTROL\)[ \t]*/#define \1/;\""
fi
-if make conftest_struct_msghdr_msg_accrights; then
+if make conftest_struct_msghdr_msg_accrights >>../config.apxs.log 2>&1; then
found_features="$found_features \
-e \"s/^#undef \(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS\)[ \t]*/#define \1/;\""
fi
-make local-distclean
+make local-distclean >>../config.apxs.log 2>&1
cd ..
if test "x$found_features" = "x"; then