dgaudet 97/06/30 14:42:34
Modified: htdocs/manual install.html
htdocs/manual/misc FAQ.html known_bugs.html
htdocs/manual/mod mod_proxy.html
src CHANGES Configuration.tmpl Configure INSTALL
Makefile.tmpl PORTING
Log:
PR#372: EXTRA_LFLAGS was changed to EXTRA_LDFLAGS (and LFLAGS was changed
to LDFLAGS) to avoid complications with lex rules in make files.
Revision Changes Path
1.10 +1 -1 apache/htdocs/manual/install.html
Index: install.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/install.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** install.html 1997/06/04 11:07:49 1.9
--- install.html 1997/06/30 21:42:25 1.10
***************
*** 72,78 ****
an additional library required by an optional module) you might need
to edit one or more of the following options in the
<CODE>Configuration</CODE> file:
! <CODE>EXTRA_CFLAGS, LIBS, LFLAGS, INCLUDES</CODE>.
<P>
Run the <CODE>Configure</CODE> script:
--- 72,78 ----
an additional library required by an optional module) you might need
to edit one or more of the following options in the
<CODE>Configuration</CODE> file:
! <CODE>EXTRA_CFLAGS, LIBS, LDFLAGS, INCLUDES</CODE>.
<P>
Run the <CODE>Configure</CODE> script:
1.77 +4 -4 apache/htdocs/manual/misc/FAQ.html
Index: FAQ.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v
retrieving revision 1.76
retrieving revision 1.77
diff -C3 -r1.76 -r1.77
*** FAQ.html 1997/06/28 21:05:31 1.76
--- FAQ.html 1997/06/30 21:42:26 1.77
***************
*** 15,21 ****
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
! $Revision: 1.76 $ ($Date: 1997/06/28 21:05:31 $)
</P>
<P>
The latest version of this FAQ is always available from the main
--- 15,21 ----
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
! $Revision: 1.77 $ ($Date: 1997/06/30 21:42:26 $)
</P>
<P>
The latest version of this FAQ is always available from the main
***************
*** 1481,1489 ****
To resolve this, you can either make sure you use the include files
and libraries that came with your system or make sure to use the
new include files and libraries. Adding <CODE>-lbind</CODE> to the
! <CODE>EXTRA_LFLAGS</CODE> line in your <CODE>Configuration</CODE>
file, then re-running <CODE>Configure</CODE>, should resolve the
! problem.
</P>
<p><b>Note:</b> As of BIND 8.1.1, the bind libraries and files are
installed under <code>/usr/local/bind</code> by default. So you
--- 1481,1489 ----
To resolve this, you can either make sure you use the include files
and libraries that came with your system or make sure to use the
new include files and libraries. Adding <CODE>-lbind</CODE> to the
! <CODE>EXTRA_LDFLAGS</CODE> line in your <CODE>Configuration</CODE>
file, then re-running <CODE>Configure</CODE>, should resolve the
! problem. (Pre 1.3 Apache uses <CODE>EXTRA_LFLAGS</CODE> instead.)
</P>
<p><b>Note:</b> As of BIND 8.1.1, the bind libraries and files are
installed under <code>/usr/local/bind</code> by default. So you
***************
*** 1491,1497 ****
resolvers you'll have to add the following to the respective lines:
<blockquote><pre>
EXTRA_CFLAGS=-I/usr/local/bind/include
! EXTRA_LFLAGS=-L/usr/local/bind/lib
EXTRA_LIBS=-lbind
</pre></blockquote>
<HR>
--- 1491,1497 ----
resolvers you'll have to add the following to the respective lines:
<blockquote><pre>
EXTRA_CFLAGS=-I/usr/local/bind/include
! EXTRA_LDFLAGS=-L/usr/local/bind/lib
EXTRA_LIBS=-lbind
</pre></blockquote>
<HR>
1.21 +1 -1 apache/htdocs/manual/misc/known_bugs.html
Index: known_bugs.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/known_bugs.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** known_bugs.html 1997/06/28 21:05:32 1.20
--- known_bugs.html 1997/06/30 21:42:27 1.21
***************
*** 81,87 ****
<LI>If compilation fails complaining about "unknown symbol
__inet_ntoa()"
then you have probably installed version 8 of bind. You will need to
explicitly link with the bind library by adding <CODE>-lbind</CODE>
! to <CODE>EXTRA_LFLAGS</CODE> in <CODE>Configuration</CODE>. See
<A HREF="http://www.apache.org/bugdb.cgi/full/616";>PR#616</A>
and the
<A HREF="FAQ.html#bind8.1">Apache FAQ</A>.
--- 81,87 ----
<LI>If compilation fails complaining about "unknown symbol
__inet_ntoa()"
then you have probably installed version 8 of bind. You will need to
explicitly link with the bind library by adding <CODE>-lbind</CODE>
! to <CODE>EXTRA_LDFLAGS</CODE> in <CODE>Configuration</CODE>. See
<A HREF="http://www.apache.org/bugdb.cgi/full/616";>PR#616</A>
and the
<A HREF="FAQ.html#bind8.1">Apache FAQ</A>.
1.24 +1 -1 apache/htdocs/manual/mod/mod_proxy.html
Index: mod_proxy.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_proxy.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** mod_proxy.html 1997/06/24 18:39:38 1.23
--- mod_proxy.html 1997/06/30 21:42:28 1.24
***************
*** 349,355 ****
Yes. Just build Apache with the rule <code>SOCKS4=yes</code> in your
<i>Configuration</i> file, and follow the instructions there. SOCKS5
capability can be added in a similar way (there's no <code>SOCKS5</code>
! rule yet), so use the <code>EXTRA_LFLAGS</code> definition, or build Apache
normally and run it with the <i>runsocks</i> wrapper provided with SOCKS5,
if your OS supports dynamically linked libraries.<p>
--- 349,355 ----
Yes. Just build Apache with the rule <code>SOCKS4=yes</code> in your
<i>Configuration</i> file, and follow the instructions there. SOCKS5
capability can be added in a similar way (there's no <code>SOCKS5</code>
! rule yet), so use the <code>EXTRA_LDFLAGS</code> definition, or build Apache
normally and run it with the <i>runsocks</i> wrapper provided with SOCKS5,
if your OS supports dynamically linked libraries.<p>
1.315 +5 -1 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.314
retrieving revision 1.315
diff -C3 -r1.314 -r1.315
*** CHANGES 1997/06/30 21:18:10 1.314
--- CHANGES 1997/06/30 21:42:29 1.315
***************
*** 1,5 ****
Changes with Apache 1.3
!
*) run_method optimized to avoid needless scanning over NULLs in the
module list. [Dean Gaudet]
--- 1,9 ----
Changes with Apache 1.3
!
! *) EXTRA_LFLAGS was changed to EXTRA_LDFLAGS (and LFLAGS was changed
! to LDFLAGS) to avoid complications with lex rules in make files.
! [Dean Gaudet] PR#372
!
*) run_method optimized to avoid needless scanning over NULLs in the
module list. [Dean Gaudet]
1.64 +1 -1 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.63
retrieving revision 1.64
diff -C3 -r1.63 -r1.64
*** Configuration.tmpl 1997/05/10 17:14:36 1.63
--- Configuration.tmpl 1997/06/30 21:42:30 1.64
***************
*** 42,48 ****
# the C compiler, and set OPTIM to '-O2'
#
EXTRA_CFLAGS=
! EXTRA_LFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
--- 42,48 ----
# the C compiler, and set OPTIM to '-O2'
#
EXTRA_CFLAGS=
! EXTRA_LDFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
1.103 +9 -9 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.102
retrieving revision 1.103
diff -C3 -r1.102 -r1.103
*** Configure 1997/06/29 18:26:55 1.102
--- Configure 1997/06/30 21:42:30 1.103
***************
*** 143,149 ****
# Now we determine the OS/Platform automagically, thanks to
# GuessOS, a home-brewed OS-determiner ala config.guess
#
! # We adjust CFLAGS, LIBS, LFLAGS and INCLUDES (and other Makefile
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
--- 143,149 ----
# Now we determine the OS/Platform automagically, thanks to
# GuessOS, a home-brewed OS-determiner ala config.guess
#
! # We adjust CFLAGS, LIBS, LDFLAGS and INCLUDES (and other Makefile
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
***************
*** 191,203 ****
OS='MPE/iX'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
LIBS="$LIBS -lsocket"
! LFLAGS="$LFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
! LFLAGS="$LFLAGS -s"
DEF_WANTHSREGEX=no
;;
i386-ibm-aix*)
--- 191,203 ----
OS='MPE/iX'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
LIBS="$LIBS -lsocket"
! LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
! LDFLAGS="$LDFLAGS -s"
DEF_WANTHSREGEX=no
;;
i386-ibm-aix*)
***************
*** 256,262 ****
echo "You are running 64-bit Irix. For now, we will compile 32-bit"
echo "but if you would care to port to 64-bit, send us the patches."
CFLAGS="$CFLAGS -n32"
! LFLAGS="$LFLAGS -n32"
DEF_WANTHSREGEX=yes
DBM_LIB=""
if [ "$RULE_IRIXNIS" = "yes" ]; then
--- 256,262 ----
echo "You are running 64-bit Irix. For now, we will compile 32-bit"
echo "but if you would care to port to 64-bit, send us the patches."
CFLAGS="$CFLAGS -n32"
! LDFLAGS="$LDFLAGS -n32"
DEF_WANTHSREGEX=yes
DBM_LIB=""
if [ "$RULE_IRIXNIS" = "yes" ]; then
***************
*** 357,363 ****
OS='ISC 4'
CC='gcc'
CFLAGS="$CFLAGS -posix -DISC"
! LFLAGS="$LFLAGS -posix"
LIBS="$LIBS -linet"
DEF_WANTHSREGEX=yes
;;
--- 357,363 ----
OS='ISC 4'
CC='gcc'
CFLAGS="$CFLAGS -posix -DISC"
! LDFLAGS="$LDFLAGS -posix"
LIBS="$LIBS -linet"
DEF_WANTHSREGEX=yes
;;
***************
*** 454,464 ****
;;
*powerpc-tenon-machten*)
OS='MachTen PPC'
! LFLAGS="$LFLAGS -Xlstack=0x14000 -Xldelcsect"
;;
*-machten*)
OS='MachTen 68K'
! LFLAGS="$LFLAGS -stack 0x14000"
DEF_WANTHSREGEX=yes
;;
*convex-v11*)
--- 454,464 ----
;;
*powerpc-tenon-machten*)
OS='MachTen PPC'
! LDFLAGS="$LDFLAGS -Xlstack=0x14000 -Xldelcsect"
;;
*-machten*)
OS='MachTen 68K'
! LDFLAGS="$LDFLAGS -stack 0x14000"
DEF_WANTHSREGEX=yes
;;
*convex-v11*)
***************
*** 585,591 ****
#
# Now SOCKS4.
# NOTE: We assume that if they are using SOCKS4, then they've
! # adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
#
if [ "$RULE_SOCKS4" = "yes" ]; then
--- 585,591 ----
#
# Now SOCKS4.
# NOTE: We assume that if they are using SOCKS4, then they've
! # adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
#
if [ "$RULE_SOCKS4" = "yes" ]; then
***************
*** 614,620 ****
echo "CFLAGS1=$CFLAGS">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
echo "LIBS1=$LIBS">> Makefile.config
! echo "LFLAGS1=$LFLAGS">> Makefile.config
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
echo "REGLIB=$REGLIB">> Makefile.config
echo "RANLIB=$RANLIB">> Makefile.config
--- 614,620 ----
echo "CFLAGS1=$CFLAGS">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
echo "LIBS1=$LIBS">> Makefile.config
! echo "LDFLAGS1=$LDFLAGS">> Makefile.config
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
echo "REGLIB=$REGLIB">> Makefile.config
echo "RANLIB=$RANLIB">> Makefile.config
1.15 +1 -1 apache/src/INSTALL
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache/src/INSTALL,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** INSTALL 1997/04/14 12:45:03 1.14
--- INSTALL 1997/06/30 21:42:31 1.15
***************
*** 13,19 ****
lists the modules which have been compiled in, and also names the
files containing them. You will need to:
! a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LFLAGS|INCLUDES if
you feel so inclined.
b) Uncomment lines corresponding to those optional modules you wish
--- 13,19 ----
lists the modules which have been compiled in, and also names the
files containing them. You will need to:
! a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LDFLAGS|INCLUDES if
you feel so inclined.
b) Uncomment lines corresponding to those optional modules you wish
1.49 +2 -2 apache/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.48
retrieving revision 1.49
diff -C3 -r1.48 -r1.49
*** Makefile.tmpl 1997/06/24 17:57:50 1.48
--- Makefile.tmpl 1997/06/30 21:42:31 1.49
***************
*** 6,12 ****
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
! LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o
buff.o\
--- 6,12 ----
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
! LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o
buff.o\
***************
*** 26,32 ****
@false
httpd: $(REGLIB) $(OBJS)
! $(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
--- 26,32 ----
@false
httpd: $(REGLIB) $(OBJS)
! $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
1.6 +2 -2 apache/src/PORTING
Index: PORTING
===================================================================
RCS file: /export/home/cvs/apache/src/PORTING,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** PORTING 1997/06/23 23:56:15 1.5
--- PORTING 1997/06/30 21:42:31 1.6
***************
*** 104,110 ****
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
! LFLAGS="$LFLAGS -s"
DEF_WANTHSREGEX=no
;;
--- 104,110 ----
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
! LDFLAGS="$LDFLAGS -s"
DEF_WANTHSREGEX=no
;;
***************
*** 114,120 ****
below]) to handle OS-specific code. Each code that has and requires
such OS-specific code will require a unique "system cookie" defined
in 'CFLAGS'. You will also note that Configure also goes ahead and
! predefines the LIBS and LFLAGS Makefile variables (DEF_WANTHSREGEX is
explained below).
conf.h:
--- 114,120 ----
below]) to handle OS-specific code. Each code that has and requires
such OS-specific code will require a unique "system cookie" defined
in 'CFLAGS'. You will also note that Configure also goes ahead and
! predefines the LIBS and LDFLAGS Makefile variables (DEF_WANTHSREGEX is
explained below).
conf.h:
