httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr configure.in
Date Tue, 13 Jun 2000 13:05:37 GMT
dreid       00/06/13 06:05:34

  Modified:    src/lib/apr configure.in
  Log:
  This small change does the following...
  
  - add a check to allow us to detect BONE (new BeOS networking stack)
  - add checks to detect dso on BeOS
  - reorder some of the threads detection to do fewer checks if they're
    not required.
  
  Revision  Changes    Path
  1.111     +13 -7     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.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- configure.in	2000/06/12 15:46:21	1.110
  +++ configure.in	2000/06/13 13:05:33	1.111
  @@ -96,6 +96,7 @@
          config_subdirs="shmem/unix/mm"
          native_mmap_emul="1"
          USE_MM=yes
  +       AC_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
          ;;
      *)
          OSDIR="unix"
  @@ -405,7 +406,10 @@
       if test "$tempdso" = "no"; then
         AC_CHECK_FUNCS(dlopen, [ tempdso="yes" ], [ tempdso="no" ])
       fi
  -  ] )
  +     if test "$tempdso" = "no"; then
  +        AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no")
  +    fi
  + ] )
   
   if test "$tempdso" = "no"; then
       aprdso="0"
  @@ -426,6 +430,7 @@
                      [ ac_cv_enable_threads="no" ] ) ] ) ] )
   
   if test "$ac_cv_enable_threads" = "no"; then
  +echo "Don't enable threads"
       threads="0"
       pthreadh="0"
   else
  @@ -441,8 +446,8 @@
             threads="0"
             pthreadh="0" ] )
       elif test "$enable_apr_threads" = "system_threads"; then
  -          threads="1"
  -          pthreadh="0"
  +        threads="1"
  +        pthreadh="0"
       else
   # We basically specified that we wanted threads, but not how to implement
   # them.  In this case, just look for pthreads.  In the future, we can check
  @@ -457,14 +462,15 @@
       fi
   fi
   
  -APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
  -APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
  +if test "$pthreads" = "1"; then
  +    APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
  +    APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
  +fi
   
   ac_cv_define_READDIR_IS_THREAD_SAFE=no
  -AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
  -
   if test "$threads" = "1"; then
       echo "APR will use threads"
  +    AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
   else
       echo "APR will be non-threaded"
   fi
  
  
  

Mime
View raw message