components/library/apr/patches/01-apr-config.patch

   1 --- apr-config.in.orig  Thu Aug  3 04:05:27 2006
   2 +++ apr-config.in       Tue Feb 12 02:24:17 2008
   3 @@ -30,6 +30,27 @@
   4  installbuilddir="@installbuilddir@"
   5  includedir="@includedir@"
   6
   7 +# Determine the root directory of the Apache installation using the directory
   8 +# in which this script resides. Use this directory as the base for all the paths
   9 +cur_dir=`pwd`
  10 +install_root=`dirname $0`
  11 +cd $install_root
  12 +install_root=`pwd`
  13 +new_install_root=`echo $install_root | sed -e "s!@bindir@!!"`
  14 +if test "$install_root" != "$new_install_root"; then
  15 +    install_root="$new_install_root"
  16 +else
  17 +    install_root=""
  18 +fi
  19 +cd $cur_dir
  20 +prefix="${install_root}@prefix@"
  21 +exec_prefix="@exec_prefix@"
  22 +bindir="@bindir@"
  23 +libdir="@libdir@"
  24 +datadir="${install_root}@datadir@"
  25 +installbuilddir="${install_root}@installbuilddir@"
  26 +includedir="@includedir@"
  27 +
  28  CC="@CC@"
  29  CPP="@CPP@"
  30  SHELL="@SHELL@"
  31 @@ -199,7 +199,11 @@
  32      --link-ld)
  33      if test "$location" = "installed"; then
  34          ### avoid using -L if libdir is a "standard" location like /usr/lib
  35 -        flags="$flags -L$libdir -l${APR_LIBNAME}"
  36 +        if test -n "$install_root"; then
  37 +            flags="$flags -L$libdir -l${APR_LIBNAME}"
  38 +        else
  39 +            flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
  40 +        fi
  41      elif test "$location" = "crosscompile"; then
  42          flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
  43      else