apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/build find_apu.m4
Date Thu, 16 May 2002 23:06:30 GMT
jerenkrantz    02/05/16 16:06:30

  Modified:    build    find_apr.m4
               build    find_apu.m4
  Log:
  Make it so that the installed programs must explicitly set a value in
  the APR_FIND_APR, APR_FIND_APU macros to allow searching in the "default"
  locations when no --with-apr{-util} value is specified.
  
  Searching for default locations arbitrarily may result in locations
  being used that are out-of-date.  (A variation on this may be to ignore
  directories that are equivalent to our prefix, but this seems safer.)
  
  Revision  Changes    Path
  1.13      +17 -14    apr/build/find_apr.m4
  
  Index: find_apr.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/find_apr.m4,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- find_apr.m4	10 May 2002 03:11:17 -0000	1.12
  +++ find_apr.m4	16 May 2002 23:06:30 -0000	1.13
  @@ -6,7 +6,7 @@
   dnl embedding APR into the application source, or locating an installed
   dnl copy of APR.
   dnl
  -dnl APR_FIND_APR([srcdir [, builddir]])
  +dnl APR_FIND_APR([srcdir [, builddir, implicit-install-check]])
   dnl
   dnl   where srcdir is the location of the bundled APR source directory, or
   dnl   empty if source is not bundled.
  @@ -14,6 +14,8 @@
   dnl   where blddir is the location where the bundled APR will will be built,
   dnl   or empty if the build will occur in the srcdir.
   dnl
  +dnl   where implicit-install-check set to 1 indicates if there is no
  +dnl   --with-apr option specified, we will look for installed copies.
   dnl
   dnl Sets the following variables on exit:
   dnl
  @@ -71,19 +73,20 @@
   build directory, or an apr-config file.])
       fi
     ],[
  -    dnl always look in the builtin/default places
  -    if apr-config --help > /dev/null 2>&1 ; then
  -      apr_found="yes"
  -      apr_config="apr-config"
  -    else
  -      dnl look in some standard places (apparently not in builtin/default)
  -      for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  -        if $TEST_X "$lookdir/bin/apr-config"; then
  -          apr_found="yes"
  -          apr_config="$lookdir/bin/apr-config"
  -          break
  -        fi
  -      done
  +    if test -n "$3" && test "$3" = "1"; then
  +      if apr-config --help > /dev/null 2>&1 ; then
  +        apr_found="yes"
  +        apr_config="apr-config"
  +      else
  +        dnl look in some standard places (apparently not in builtin/default)
  +        for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  +          if $TEST_X "$lookdir/bin/apr-config"; then
  +            apr_found="yes"
  +            apr_config="$lookdir/bin/apr-config"
  +            break
  +          fi
  +        done
  +      fi
       fi
       dnl if we have a bundled source directory, then we may have more work
       if test -d "$1"; then
  
  
  
  1.6       +17 -13    apr-util/build/find_apu.m4
  
  Index: find_apu.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/find_apu.m4,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- find_apu.m4	10 May 2002 03:11:17 -0000	1.5
  +++ find_apu.m4	16 May 2002 23:06:30 -0000	1.6
  @@ -6,12 +6,14 @@
   dnl embedding APU into the application source, or locating an installed
   dnl copy of APU.
   dnl
  -dnl APR_FIND_APU([srcdir, path])
  +dnl APR_FIND_APU([srcdir, path, implicit-install-check])
   dnl
   dnl   where srcdir is the location of the bundled APU source directory, or
   dnl   empty if source is not bundled.
   dnl   where path is the prefix to the location where the bundled APU will
   dnl   will be built.
  +dnl   where implicit-install-check set to 1 indicates if there is no
  +dnl   --with-apr option specified, we will look for installed copies.
   dnl
   dnl Sets the following variables on exit:
   dnl
  @@ -70,18 +72,20 @@
   installed APU, nor an APR-util build directory.])
       fi
     ],[
  -    if apu-config --help > /dev/null 2>&1 ; then
  -      apu_found="yes"
  -      apu_config="apu-config"
  -    else
  -      dnl look in the some standard places (apparently not in builtin/default)
  -      for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  -        if test -x "$lookdir/bin/apu-config"; then
  -          apu_found="yes"
  -          apu_config="$lookdir/bin/apu-config"
  -          break
  -        fi
  -      done
  +    if test -n "$3" && test "$3" = "1"; then
  +      if apu-config --help > /dev/null 2>&1 ; then
  +        apu_found="yes"
  +        apu_config="apu-config"
  +      else
  +        dnl look in the some standard places (apparently not in builtin/default)
  +        for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  +          if test -x "$lookdir/bin/apu-config"; then
  +            apu_found="yes"
  +            apu_config="$lookdir/bin/apu-config"
  +            break
  +          fi
  +        done
  +      fi
       fi
       dnl if we have a bundled source directory, then we may have more work
       if test -d "$1"; then
  
  
  

Mime
View raw message