You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2001/04/27 10:41:03 UTC

cvs commit: httpd-2.0/modules/tls config.m4

martin      01/04/27 01:41:02

  Modified:    modules/tls config.m4
  Log:
  Search for OpenSSL in the "standard locations" .../include and .../lib
  which are ubiquitous after openSSL's "make install". The old logic relied
  on a common directory for both include files and libraries (very non-standard).
  
  Submitted by:	Clere Jean-Frederic <JF...@fujitsu-siemens.com>
  
  Revision  Changes    Path
  1.4       +8 -1      httpd-2.0/modules/tls/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/tls/config.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- config.m4	2001/02/12 16:50:21	1.3
  +++ config.m4	2001/04/27 08:41:01	1.4
  @@ -24,7 +24,14 @@
                     LIBS="$LIBS -L$withval -lssl -lcrypto"
                     ssl_lib="OpenSSL"
                 else
  -                  AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
  +                  searchfile="$withval/include/openssl/ssl.h"
  +                  if test -f $searchfile ; then
  +                      INCLUDES="$INCLUDES -I$withval/include"
  +                      LIBS="$LIBS -L$withval/lib -lssl -lcrypto"
  +                      ssl_lib="OpenSSL"
  +                  else
  +                      AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
  +                  fi
                 fi
             fi
         fi