apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Wed, 06 Feb 2002 08:42:13 GMT
jerenkrantz    02/02/06 00:42:12

  Modified:    build    apu-conf.m4
  Log:
  Add appropriate autoconf magic to detect FreeBSD's variant of the
  Berkeley DB headers and libraries.
  
  Revision  Changes    Path
  1.31      +18 -2     apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- apu-conf.m4	3 Feb 2002 15:19:20 -0000	1.30
  +++ apu-conf.m4	6 Feb 2002 08:42:12 -0000	1.31
  @@ -70,7 +70,21 @@
     apu_db_header=db1/db.h
     apu_db_lib=db1
     apu_db_version=1
  +  ])])
  +if test "$apu_db_version" != "1"; then
  +AC_CHECK_HEADER(db.h, [
  +  AC_CHECK_LIB(c, dbopen, [
  +  apu_db_header=db.h
  +  apu_db_lib=
  +  apu_db_version=1
  +  ], [
  +  AC_CHECK_LIB(db1, dbopen, [
  +  apu_db_header=db.h
  +  apu_db_lib=db1
  +  apu_db_version=1
     ])])])
  +fi
  +])
   
   dnl
   dnl APU_CHECK_DB185: is DB1.85 present?
  @@ -387,8 +401,10 @@
   fi
   
   if test "$apu_db_version" != "0"; then
  -  APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_db_lib])
  -  APR_ADDTO(LIBS,[-l$apu_db_lib])
  +  if test -n "$apu_db_lib"; then
  +    APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_db_lib])
  +    APR_ADDTO(LIBS,[-l$apu_db_lib])
  +  fi
   fi
   
   ])
  
  
  

Mime
View raw message