You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/07/16 20:33:06 UTC
cvs commit: httpd-2.0 acinclude.m4 CHANGES
jerenkrantz 2002/07/16 11:33:06
Modified: . acinclude.m4 CHANGES
Log:
Look for OpenSSL libraries in /usr/lib64.
Submitted by: Peter Poeml <po...@suse.de>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.126 +1 -1 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- acinclude.m4 14 May 2002 07:51:52 -0000 1.125
+++ acinclude.m4 16 Jul 2002 18:33:05 -0000 1.126
@@ -474,7 +474,7 @@
AC_MSG_CHECKING(for SSL/TLS toolkit libraries)
ap_ssltk_libdir=""
for p in $ap_ssltk_base/lib /usr/local/openssl/lib \
- /usr/local/ssl/lib /usr/local/lib /usr/lib /lib; do
+ /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do
if test -f "$p/libssl.a" -o -f "$p/libssl.so"; then
ap_ssltk_libdir="$p"
break
1.867 +2 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- CHANGES 16 Jul 2002 18:29:59 -0000 1.866
+++ CHANGES 16 Jul 2002 18:33:05 -0000 1.867
@@ -1,5 +1,7 @@
Changes with Apache 2.0.40
+ *) Look for OpenSSL libraries in /usr/lib64. [Peter Poeml <po...@suse.de>]
+
*) Update SuSE layout. [Peter Poeml <po...@suse.de>]
*) Changes to the internationalized error documents:
Re: cvs commit: httpd-2.0 acinclude.m4 CHANGES
Posted by Aaron Bannert <aa...@clove.org>.
On Tue, Jul 16, 2002 at 11:42:13AM -0700, Ryan Bloom wrote:
> That would only work if we looked in those variable for the files. But,
> we don't, so we have to special case this stuff. We should re-write big
> portions of the detection logic so that we don't have ANY hard-coded
> paths, but I am not volunteering for that.
True. I had planned on doing this before, but never got around to it.
I did this for flood, so maybe I can just port it back over.
-aaron
RE: cvs commit: httpd-2.0 acinclude.m4 CHANGES
Posted by Ryan Bloom <rb...@covalent.net>.
> From: Aaron Bannert [mailto:aaron@clove.org]
>
> > Look for OpenSSL libraries in /usr/lib64.
> ...
> > for p in $ap_ssltk_base/lib /usr/local/openssl/lib \
> > - /usr/local/ssl/lib /usr/local/lib /usr/lib /lib; do
> > + /usr/local/ssl/lib /usr/local/lib /usr/lib /lib
> /usr/lib64; do
>
> If we just told people to add the right include and lib paths to their
> CPPFLAGS and LDFLAGS variables, then we wouldn't have to add any
> special case directories to our autoconf routines... *sigh*
That would only work if we looked in those variable for the files. But,
we don't, so we have to special case this stuff. We should re-write big
portions of the detection logic so that we don't have ANY hard-coded
paths, but I am not volunteering for that.
Ryan
Re: cvs commit: httpd-2.0 acinclude.m4 CHANGES
Posted by Aaron Bannert <aa...@clove.org>.
> Look for OpenSSL libraries in /usr/lib64.
...
> for p in $ap_ssltk_base/lib /usr/local/openssl/lib \
> - /usr/local/ssl/lib /usr/local/lib /usr/lib /lib; do
> + /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do
If we just told people to add the right include and lib paths to their
CPPFLAGS and LDFLAGS variables, then we wouldn't have to add any
special case directories to our autoconf routines... *sigh*
-aaron