[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    cvs commit: apache-2.0/src/lib/apr aclocal.m4 configure.in
From:       trawick () locus ! apache ! org
Date:       2000-09-29 19:32:21
[Download RAW message or body]

trawick     00/09/29 12:32:21

  Modified:    src/lib/apr aclocal.m4 configure.in
  Log:
  Avoid a bad shell command in the expansion of AC_CHECK_DEFINE_FILES.
  
  This change to AC_CHECK_DEFINE_FILES allows lib/apr/configure to work
  at all on FreeBSD 3.4 and stops creating silly files AC_FD_MSG and
  AC_FD_CC when /bin/sh is bash 1.14 on Linux.  (Certainly other systems
  and/or other versions of bash are expected to have one of the bad
  symptoms.)
  
  Revision  Changes    Path
  1.27      +10 -6     apache-2.0/src/lib/apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- aclocal.m4	2000/09/29 04:26:24	1.26
  +++ aclocal.m4	2000/09/29 19:32:20	1.27
  @@ -12,12 +12,16 @@
   dnl ##
   AC_DEFUN(AC_CHECK_DEFINE_FILES,[
     AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
  -    AC_EGREP_CPP(YES_IS_DEFINED, [
  -    $2
  -    #ifdef $1
  -    YES_IS_DEFINED
  -    #endif
  -    ], ac_cv_define_$1=yes, ac_cv_define_$1=no)
  +    ac_cv_define_$1=no
  +    for curhdr in $2
  +    do
  +      AC_EGREP_CPP(YES_IS_DEFINED, [
  +      #include <$curhdr>
  +      #ifdef $1
  +      YES_IS_DEFINED
  +      #endif
  +      ], ac_cv_define_$1=yes)
  +    done
     ])
     if test "$ac_cv_define_$1" = "yes"; then
       AC_DEFINE(HAVE_$1)
  
  
  
  1.153     +1 -3      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- configure.in	2000/09/29 04:26:24	1.152
  +++ configure.in	2000/09/29 19:32:20	1.153
  @@ -598,9 +598,7 @@
   AC_CHECK_DEFINE(isascii, ctype.h)
   # We are assuming that if the platform doesn't have POLLIN, it doesn't have
   # any POLL definitions.
  -AC_CHECK_DEFINE_FILES(POLLIN, [
  -#include <poll.h>
  -#include <sys/poll.h> ] )
  +AC_CHECK_DEFINE_FILES(POLLIN, poll.h sys/poll.h)
   
   pthreadser="0"
   if test "$threads" = "1"; then
  
  
  

[prev in list] [next in list] [prev in thread] [next in thread]