tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/build tcnative.m4
Date Mon, 23 May 2005 12:23:10 GMT
mturk       2005/05/23 05:23:10

  Modified:    jni/native/build tcnative.m4
  Log:
  First scheck for /lib64, then for /lib if determining the openssl library location.
  
  Revision  Changes    Path
  1.4       +6 -4      jakarta-tomcat-connectors/jni/native/build/tcnative.m4
  
  Index: tcnative.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tcnative.m4	23 May 2005 11:49:25 -0000	1.3
  +++ tcnative.m4	23 May 2005 12:23:10 -0000	1.4
  @@ -280,10 +280,12 @@
     saved_LDFLAGS=$LDFLAGS
     saved_LIBS=$LIBS
     if test "x$tcn_ssltk_base" != "x"; then
  -    if test -d "$tcn_ssltk_base/lib"; then
  -      ap_ssltk_lib="$tcn_ssltk_base/lib"
  +    if test -d "$tcn_ssltk_base/lib64"; then
  +      tcn_ssltk_lib="$tcn_ssltk_base/lib64"
  +    elif test -d "$tcn_ssltk_base/lib"; then
  +      tcn_ssltk_lib="$tcn_ssltk_base/lib"
       else
  -      ap_ssltk_lib="$tcn_ssltk_base"
  +      tcn_ssltk_lib="$tcn_ssltk_base"
       fi
       LDFLAGS="$LDFLAGS -L$tcn_ssltk_lib"
     fi
  @@ -314,7 +316,7 @@
     fi
     dnl (c) hook up linker paths
     if test "x$tcn_ssltk_lib" != "x"; then
  -    APR_ADDTO(LDFLAGS, ["-L$tcn_ssltk_lib"])
  +    APR_ADDTO(TCNATIVE_LDFLAGS, ["-L$tcn_ssltk_lib"])
     fi
   
     dnl Adjust configuration based on what we found above.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message