httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl config.m4
Date Tue, 08 May 2001 04:42:26 GMT
fielding    01/05/07 21:42:26

  Modified:    modules/ssl config.m4
  Log:
  When no specific location of openssl is given, we need to check the
  places where people install upgraded software first, since otherwise
  we will get the older versions installed by the OS distribution.  That's
  very bad for us because we are requiring a version of openssl that is
  more recent than most of the Linux distros.
  
  When finding the openssl helper program, check both the PATH and the default
  install dirs, since openssl isn't normally included on a user's path.
  
  Use APR_ADDTO to add to the make macros in order to avoid duplicates.
  
  Revision  Changes    Path
  1.4       +6 -5      httpd-2.0/modules/ssl/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/config.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config.m4	2001/05/05 15:32:46	1.3
  +++ config.m4	2001/05/08 04:42:26	1.4
  @@ -96,7 +96,7 @@
       AC_MSG_CHECKING(for SSL/TLS toolkit frontend)
       ssltk_frontend=""
       if test ".$ssltk_base" = .SYSTEM; then
  -        for p in . `echo $PATH | sed -e 's/:/ /g'`; do
  +        for p in . `echo $PATH | sed -e 's/:/ /g'` /usr/local/openssl/bin /usr/local/ssl/bin;
do
               if test -f "$p/openssl"; then
                   ssltk_frontend="$p/openssl"
                   break
  @@ -127,7 +127,7 @@
       AC_MSG_CHECKING(for SSL/TLS toolkit includes)
       ssltk_incdir=""
       if test ".$ssltk_base" = .SYSTEM; then
  -        for p in . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl;
do
  +        for p in . /usr/local/openssl/include /usr/local/ssl/include /usr/local/include/ssl
/usr/local/include /usr/include/ssl /usr/include; do
               if test -f "$p/openssl/ssl.h"; then
                   ssltk_incdir="$p"
                   break
  @@ -149,7 +149,7 @@
       AC_MSG_CHECKING(for SSL/TLS toolkit libraries)
       ssltk_libdir=""
       if test ".$ssltk_base" = .SYSTEM; then
  -        for p in . /lib /usr/lib /usr/local/lib; do
  +        for p in . /usr/local/openssl/lib /usr/local/ssl/lib /usr/local/lib/ssl /usr/local/lib
/usr/lib/ssl /usr/lib /lib; do
               if test -f "$p/libssl.a" -o -f "$p/libssl.so"; then
                   ssltk_libdir="$p"
                   break
  @@ -171,11 +171,12 @@
   
       dnl #  annotate the Apache build environment with determined information
       if test ".$ssltk_incdir" != "./usr/include"; then
  -        INCLUDES="$INCLUDES -I$ssltk_incdir"
  +        APR_ADDTO(INCLUDES, [-I$ssltk_incdir])
       fi
       if test ".$ssltk_libdir" != "./usr/lib"; then
  -        LIBS="$LIBS -L$ssltk_libdir -lssl -lcrypto"
  +        APR_ADDTO(LIBS, [-L$ssltk_libdir])
       fi
  +    APR_ADDTO(LIBS, [-lssl -lcrypto])
   ])
   
   dnl #  end of module specific part
  
  
  

Mime
View raw message