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:   25-Jun-2007 09:52:23
  Branch: HEAD                             Handle: 2007062508522300

  Modified files:
    rpm                     configure.ac

  Log:
    move two remaining tool chain hacks to the tool chain area and make
    the style more compact

  Summary:
    Revision    Changes     Path
    2.127       +29 -28     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.126 -r2.127 configure.ac
  --- rpm/configure.ac	25 Jun 2007 07:42:24 -0000	2.126
  +++ rpm/configure.ac	25 Jun 2007 07:52:23 -0000	2.127
  @@ -127,6 +127,35 @@
   ])
   AC_SUBST(LDFLAGS_STATIC)
   
  +dnl # use ld_version scripts on platforms known to support it.
  +have_ld_version_script=no
  +case "${host}" in
  +    *-*-linux* ) have_ld_version_script=yes ;;
  +    *-*-gnu*   ) have_ld_version_script=yes ;;
  +esac
  +AC_ARG_ENABLE(
  +    [ld-version-script],
  +    AC_HELP_STRING(
  +        [--enable-ld-version-script],
  +        [enable/disable use of linker version script. (default is system dependent)]),
  +    [have_ld_version_script=$enableval], [:])
  +AM_CONDITIONAL(
  +    [HAVE_LD_VERSION_SCRIPT],
  +    [test ".$have_ld_version_script" = .yes])
  +
  +dnl # FIXME: Linux hack: choose /usr/lib or /usr/lib64 for library installs and linking
  +MARK64=
  +case "$target" in
  +    *-*-linux* )
  +        if ! echo "${libdir}" | grep -q '64$'; then
  +            case "${target_cpu}" in
  +                x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
  +            esac
  +        fi
  +        ;;
  +esac
  +AC_SUBST(MARK64)
  +
   dnl # FIXME: partly Linux-specific only!?
   dnl # (but at least it usually doesn't harm on other platforms)
   CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
  @@ -1014,34 +1043,6 @@
       ln -s ${srcdir}/autodeps/none ./find-requires
   fi
   
  -dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
  -MARK64=
  -if ! echo "${libdir}" | grep -q '64$' ; then
  -    case "${target_cpu}" in
  -    x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
  -    esac
  -fi
  -AC_SUBST(MARK64)
  -
  -# For some systems we know that we have ld_version scripts.
  -# Use it then as default.
  -have_ld_version_script=no
  -case "${host}" in
  -    *-*-linux*)
  -        have_ld_version_script=yes
  -        ;;
  -    *-*-gnu*)
  -        have_ld_version_script=yes
  -        ;;
  -esac
  -AC_ARG_ENABLE([ld-version-script],
  -              AC_HELP_STRING([--enable-ld-version-script],
  -                             [enable/disable use of linker version script.
  -                              (default is system dependent)]),
  -              [have_ld_version_script=$enableval],
  -              [ : ] )
  -AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
  -
   dnl Determine the canonical arch-vendor-os for the build machine
   autorelocate_path='%{nil}'
   autorelocate_dcolor='0'
  @@ .