trawick at apache
Nov 12, 2009, 12:14 PM
Post #1 of 1
(196 views)
Permalink
|
|
svn commit: r835524 - in /httpd/mod_ftp/trunk: Makefile.apxs configure.apxs
|
|
Author: trawick
Date: Thu Nov 12 20:14:51 2009
New Revision: 835524
URL: http://svn.apache.org/viewvc?rev=835524&view=rev
Log:
pick up r834900 and r834923 from mod_fcgid
Follow up the awk compatibility fix in r834729 by selecting the most
suitable awk, following the AC_PROG_AWK order (gawk, mawk, nawk, awk).
As with AC_PROG_AWK, AWK=foo overrides.
After r834729 a working conf was generated on Solaris when using
/usr/bin/awk, but only by some fluke of command-line processing
(-v was sort-of ignored; see PR for discussion). Also, the LoadModule
wasn't added in the right spot due to awk engine differences.
PR: 48067
Helped by: rjung, Hans Werner Strube <strube physik3.gwdg.de>
/usr/xpg4/bin/awk is a better choice than nawk on Solaris
(one issue: nawk on some Solaris levels is missing toupper/tolower,
breaking addloadmodule.awk)
Submitted by: Hans Werner Strube <strube physik3.gwdg.de>
Modified:
httpd/mod_ftp/trunk/Makefile.apxs
httpd/mod_ftp/trunk/configure.apxs
Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=835524&r1=835523&r2=835524&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Thu Nov 12 20:14:51 2009
@@ -15,6 +15,7 @@
ftp_srcdir=.
builddir=.
srcdir=.
+awk=.
SUBDIRS = modules/ftp
CLEAN_SUBDIRS =
@@ -45,7 +46,7 @@
$(DESTDIR)$(exp_sysconfdir)/original
for i in $(DESTDIR)$(httpd_conffile) $(DESTDIR)$(httpd_origconffile); do \
if test -f $$i; then \
- (awk -f $(ftp_srcdir)/build/addloadexample.awk \
+ ($(awk) -f $(ftp_srcdir)/build/addloadexample.awk \
-v MODULE=ftp -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
-v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
< $$i > $$i.new && \
Modified: httpd/mod_ftp/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/configure.apxs?rev=835524&r1=835523&r2=835524&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_ftp/trunk/configure.apxs Thu Nov 12 20:14:51 2009
@@ -43,6 +43,19 @@
exp_ftpdocsdir=`$APXS -q exp_datadir`/ftpdocs
FTPPORT=21
+echo "Selecting a suitable awk"
+# find the most suitable awk, allowing user to override with AWK
+for a in gawk mawk /usr/xpg4/bin/awk nawk; do
+ if test -z "$AWK"; then
+ if $a '{print}' <$0 >/dev/null 2>&1; then
+ AWK=$a
+ fi
+ fi
+done
+if test -z "$AWK"; then
+ AWK=awk
+fi
+
for i in Makefile build/Makefile modules/ftp/Makefile modules/ftp/modules.mk; do
l_r=`echo $i|sed -e "s#/*[^/]*\\\$##;s#^\(..*\)\\\$#/\1#"`
sed -e "s#^\(exp_installbuilddir\)=.*#\1=$exp_installbuilddir#;" \
@@ -59,6 +72,7 @@
-e "s#^\(httpd_conffile\)=.*#\1=$httpd_conffile#;" \
-e "s#^\(exp_ftpdocsdir\)=.*#\1=$exp_ftpdocsdir#;" \
-e "s#^\(FTPPORT\)=.*#\1=$FTPPORT#;" \
+ -e "s#^\(awk\)=.*#\1=$AWK#;" \
< $i.apxs > $i
done
|
