apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suss...@apache.org
Subject cvs commit: apr/build find_apr.m4
Date Tue, 05 Nov 2002 22:09:19 GMT
sussman     2002/11/05 14:09:19

  Modified:    build    find_apr.m4
  Log:
  * find_apr.m4:  backport a change from svn; favor in-tree over installed apr
  
  Revision  Changes    Path
  1.14      +11 -20    apr/build/find_apr.m4
  
  Index: find_apr.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/find_apr.m4,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- find_apr.m4	16 May 2002 23:06:30 -0000	1.13
  +++ find_apr.m4	5 Nov 2002 22:09:19 -0000	1.14
  @@ -73,7 +73,17 @@
   build directory, or an apr-config file.])
       fi
     ],[
  -    if test -n "$3" && test "$3" = "1"; then
  +    dnl if we have a bundled source directory, use it
  +    if test -d "$1"; then
  +      apr_temp_abs_srcdir="`cd $1 && pwd`"
  +      apr_found="reconfig"
  +      if test -n "$2"; then
  +        apr_config="$2/apr-config"
  +      else
  +        apr_config="$1/apr-config"
  +      fi
  +    fi
  +    if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
         if apr-config --help > /dev/null 2>&1 ; then
           apr_found="yes"
           apr_config="apr-config"
  @@ -86,25 +96,6 @@
               break
             fi
           done
  -      fi
  -    fi
  -    dnl if we have a bundled source directory, then we may have more work
  -    if test -d "$1"; then
  -      apr_temp_abs_srcdir="`cd $1 && pwd`"
  -      if test "$apr_found" = "yes" \
  -         && test "`$apr_config --srcdir`" = "$apr_temp_abs_srcdir"; then
  -        dnl the installed apr-config represents our source directory, so
  -        dnl pretend we didn't see it and just use our bundled source
  -        apr_found="no"
  -      fi
  -      dnl We could not find an apr-config; use the bundled one
  -      if test "$apr_found" = "no"; then
  -        apr_found="reconfig"
  -        if test -n "$2"; then
  -          apr_config="$2/apr-config"
  -        else
  -          apr_config="$1/apr-config"
  -        fi
         fi
       fi
     ])
  
  
  

Mime
View raw message