apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Tue, 30 Jul 2002 19:34:19 GMT
trawick     2002/07/30 12:34:19

  Modified:    build    apu-conf.m4
  Log:
  remember what the user said when they tell us where the ldap includes and/or
  library are; previously these preferences were stored in CPPFLAGS and LDFLAGS
  and didn't help when we started building apr-util
  
  make sure we don't pollute CPPFLAGS and LDFLAGS with the ldap include and
  library paths... we'll set them temporarily and restore after using them for
  some configure tests
  
  Revision  Changes    Path
  1.44      +9 -3      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- apu-conf.m4	16 Jul 2002 18:18:41 -0000	1.43
  +++ apu-conf.m4	30 Jul 2002 19:34:19 -0000	1.44
  @@ -575,7 +575,6 @@
       unset ac_cv_lib_${ldaplib}_ldap_init
       AC_CHECK_LIB(${ldaplib}, ldap_init, 
         [
  -dnl        APR_ADDTO(CPPFLAGS,[-DAPU_HAS_LDAP])
           APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib} ${extralib}])
           APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
           AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, apu_has_ldap_netscape_ssl="define",
, ${extralib})
  @@ -601,11 +600,15 @@
   AC_ARG_WITH(ldap-lib,[  --with-ldap-lib=path    path to ldap lib file])
   AC_ARG_WITH(ldap,[  --with-ldap=library     ldap library to use],
     [
  +    save_cppflags="$CPPFLAGS"
  +    save_ldflags="$LDFLAGS"
       if test -n "$with_ldap_include"; then
  -      APR_ADDTO(CPPFLAGS, [-I$with_ldap_include])
  +      CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
  +      APR_ADDTO(APRUTIL_INCLUDES, [-I$with_ldap_include])
       fi
       if test -n "$with_ldap_lib"; then
  -      APR_ADDTO(LDFLAGS, [-L$with_ldap_lib])
  +      LDFLAGS="$LDFLAGS -L$with_ldap_lib"
  +      APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
       fi
   
       LIBLDAP="$withval"
  @@ -629,6 +632,9 @@
       AC_CHECK_HEADERS(ldap.h, ldap_h=["#include <ldap.h>"])
       AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
       AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"])
  +
  +    CPPFLAGS=$save_cppflags
  +    LDFLAGS=$save_ldflags
     ])
   
   AC_SUBST(ldap_h)
  
  
  

Mime
View raw message