apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apr/build apr_common.m4 apr_hints.m4
Date Fri, 11 May 2001 03:59:04 GMT
fielding    01/05/10 20:59:04

  Modified:    .        APRVARS.in
               build    apr_common.m4 apr_hints.m4
  Log:
  Remove useless cruft and make it unnecessary for clients of APR
  to call APR_PRELOAD.
  
  Revision  Changes    Path
  1.7       +2 -0      apr/APRVARS.in
  
  Index: APRVARS.in
  ===================================================================
  RCS file: /home/cvs/apr/APRVARS.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- APRVARS.in	2001/04/29 05:22:15	1.6
  +++ APRVARS.in	2001/05/11 03:59:02	1.7
  @@ -1,3 +1,5 @@
  +CC="@CC@"
  +SHELL="@SHELL@"
   EXTRA_CPPFLAGS="@EXTRA_CPPFLAGS@"
   EXTRA_CFLAGS="@EXTRA_CFLAGS@"
   EXTRA_LDFLAGS="@EXTRA_LDFLAGS@"
  
  
  
  1.18      +0 -3      apr/build/apr_common.m4
  
  Index: apr_common.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_common.m4,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- apr_common.m4	2001/04/29 05:22:15	1.17
  +++ apr_common.m4	2001/05/11 03:59:03	1.18
  @@ -14,9 +14,6 @@
   # Created by configure
   
   EOF
  -  if test -n "$MAKE"; then
  -    echo "MAKE=\"$MAKE\"; export MAKE" >> $1
  -  fi
     if test -n "$CFLAGS"; then
       echo "CFLAGS=\"$CFLAGS\"; export CFLAGS" >> $1
     fi
  
  
  
  1.12      +2 -8      apr/build/apr_hints.m4
  
  Index: apr_hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_hints.m4,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_hints.m4	2001/05/09 12:13:27	1.11
  +++ apr_hints.m4	2001/05/11 03:59:03	1.12
  @@ -20,14 +20,10 @@
   dnl  to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. 
   dnl
   AC_DEFUN(APR_PRELOAD, [
  -if test "$DID_APR_PRELOAD" = "yes" ; then
  +if test "x$apr_preload_done" != "xyes" ; then
   
  -  echo "APR hints file rules for $host already applied"
  +  apr_preload_done="yes"
   
  -else
  -
  -  DID_APR_PRELOAD="yes"; export DID_APR_PRELOAD
  -
     echo "Applying APR hints file rules for $host"
   
     case "$host" in
  @@ -39,7 +35,6 @@
   	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
   	APR_ADDTO(LIBS, [-lsocket -lsvipc -lcurses])
   	APR_ADDTO(LDFLAGS, [-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"])
  -	APR_SETVAR(CAT, [/bin/cat])
   	;;
       *-apple-aux3*)
           APR_SETVAR(CC, [gcc])
  @@ -347,7 +342,6 @@
       *-riscix)
   	APR_ADDTO(CPPFLAGS, [-DRISCIX])
   	APR_SETIFNULL(CFLAGS, [-O])
  -	APR_SETIFNULL(MAKE, [make])
   	;;
       *-irix*)
   	APR_ADDTO(CPPFLAGS, [-D_POSIX_THREAD_SAFE_FUNCTIONS])
  
  
  

Mime
View raw message