apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsanc...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4 apu-hints.m4
Date Sun, 15 Dec 2002 19:36:42 GMT
wsanchez    2002/12/15 11:36:42

  Modified:    build    apu-conf.m4 apu-hints.m4
  Log:
  Add $apu_db_xtra_libs state.
  Use it on SCO to add -lsocket to -ldb
  Submitted by: Kean Johnston <jkj@sco.com>
  
  Revision  Changes    Path
  1.47      +13 -0     apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- apu-conf.m4	11 Dec 2002 02:31:04 -0000	1.46
  +++ apu-conf.m4	15 Dec 2002 19:36:41 -0000	1.47
  @@ -196,6 +196,11 @@
   apu_db_header=db.h		# default so apu_select_dbm.h is syntactically correct
   apu_db_version=0
   
  +if test -n "$apu_db_xtra_libs"; then
  +  saveddbxtralibs="$LIBS"
  +  LIBS="$apu_db_xtra_libs $LIBS"
  +fi
  +
   AC_ARG_WITH(dbm,
     [  --with-dbm=DBM          choose the DBM type to use.
                             DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}],[
  @@ -428,6 +433,10 @@
       ;;
   esac
   
  +if test -n "$apu_db_xtra_libs"; then
  +  LIBS="$saveddbxtralibs"
  +fi
  +
   dnl Yes, it'd be nice if we could collate the output in an order
   dnl so that the AC_MSG_CHECKING would be output before the actual
   dnl checks, but it isn't happening now.
  @@ -463,6 +472,10 @@
     if test -n "$apu_db_lib"; then
       APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_db_lib])
       APR_ADDTO(APRUTIL_LIBS,[-l$apu_db_lib])
  +    if test -n "apu_db_xtra_libs"; then
  +      APR_ADDTO(APRUTIL_EXPORT_LIBS,[$apu_db_xtra_libs])
  +      APR_ADDTO(APRUTIL_LIBS,[$apu_db_xtra_libs])
  +    fi
     fi
   fi
   
  
  
  
  1.2       +3 -0      apr-util/build/apu-hints.m4
  
  Index: apu-hints.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-hints.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apu-hints.m4	24 Jul 2002 12:20:24 -0000	1.1
  +++ apu-hints.m4	15 Dec 2002 19:36:41 -0000	1.2
  @@ -24,6 +24,9 @@
       *-solaris2*)
           APR_SETIFNULL(apu_iconv_inbuf_const, [1])
           ;;
  +    *-sco3.2v5*)
  +	APR_SETIFNULL(apu_db_xtra_libs, [-lsocket])
  +	;;
       esac
   
   fi
  
  
  

Mime
View raw message