RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   21-Jun-2007 10:25:54
  Branch: HEAD                             Handle: 2007062109255400

  Modified files:
    rpm                     acinclude.m4

  Log:
    Apply some additional bandage to ensure that we do not explicitly pass
    in the standard Unix locations for headers and libraries. It might not
    harm in general, but on some platforms (where third-party stuff lives
    there) this certainly can make trouble.

  Summary:
    Revision    Changes     Path
    2.3         +15 -5      rpm/acinclude.m4
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  ============================================================================
  $ cvs diff -u -r2.2 -r2.3 acinclude.m4
  --- rpm/acinclude.m4	21 Jun 2007 08:15:48 -0000	2.2
  +++ rpm/acinclude.m4	21 Jun 2007 08:25:54 -0000	2.3
  @@ -203,7 +203,9 @@
                       if test ".${__rcl_found}" = .no; then
                           for __rcl_dir in ${__rcl_location}/include/$2 ${__rcl_location}/include ${__rcl_location}; do
                               if test -f "${__rcl_dir}/$5"; then
  -                                CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +                                if test ".${__rcl_dir}" != "./usr/include"; then
  +                                    CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +                                fi
                                   __rcl_found=yes
                                   break
                               fi
  @@ -214,7 +216,9 @@
                                   m4_foreach_w([__rcl_lib], [$3], [
                                       if  test -f "${__rcl_dir}/lib[]m4_defn([__rcl_lib]).la" && \
                                           test -d "${__rcl_dir}/.libs"; then
  -                                        LDFLAGS="${LDFLAGS} -L${__rcl_dir} -L${__rcl_dir}/.libs"
  +                                        if test ".${__rcl_dir}" != "./usr/lib"; then
  +                                            LDFLAGS="${LDFLAGS} -L${__rcl_dir} -L${__rcl_dir}/.libs"
  +                                        fi
                                           __rcl_found=yes
                                           break
                                       fi
  @@ -222,7 +226,9 @@
                                           test -f "${__rcl_dir}/lib[]m4_defn([__rcl_lib]).so" || \
                                           test -f "${__rcl_dir}/lib[]m4_defn([__rcl_lib]).sl" || \
                                           test -f "${__rcl_dir}/lib[]m4_defn([__rcl_lib]).dylib"; then
  -                                        LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +                                        if test ".${__rcl_dir}" != "./usr/lib"; then
  +                                            LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +                                        fi
                                           __rcl_found=yes
                                           break
                                       fi
  @@ -238,7 +244,9 @@
                           for __rcl_file in _ `find ${__rcl_location} -name "$5" -type f -print`; do
                               test .${__rcl_file} = ._ && continue
                               __rcl_dir=`echo ${__rcl_file} | sed -e 's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
  -                            CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +                            if test ".${__rcl_dir}" != "./usr/include"; then
  +                                CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +                            fi
                               __rcl_found=yes
                               break
                           done
  @@ -249,7 +257,9 @@
                                       egrep '\.(a|so|sl|dylib)$'`; do
                                       test .${__rcl_file} = ._ && continue
                                       __rcl_dir=`echo ${__rcl_file} | sed -e 's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
  -                                    LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +                                    if test ".${__rcl_dir}" != "./usr/lib"; then
  +                                        LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +                                    fi
                                       __rcl_found=yes
                                       break
                                   done
  @@ .