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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   21-Jul-2007 20:37:03
  Branch: HEAD                             Handle: 2007072119370201

  Modified files:
    rpm                     configure.ac
    rpm/rpmconstant         rpmh2tbl

  Log:
    /usr/bin/perl is not a generically available program path, so locate
    the Perl interpreter dynamically during configure-time

  Summary:
    Revision    Changes     Path
    2.210       +7  -0      rpm/configure.ac
    1.2         +1  -3      rpm/rpmconstant/rpmh2tbl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.209 -r2.210 configure.ac
  --- rpm/configure.ac  21 Jul 2007 17:28:19 -0000      2.209
  +++ rpm/configure.ac  21 Jul 2007 18:37:02 -0000      2.210
  @@ -315,6 +315,13 @@
   AC_SUBST(__CHOWN_RHF)
   AC_SUBST(__CHGRP_RHF)
   
  +dnl # find the Perl interpreter
  +AC_PATH_PROG(PERL, perl perl5)
  +if test ".$PERL" = .; then
  +    AC_MSG_WARN([Perl required in PATH for building rpmconstant/])
  +fi
  +AC_SUBST(PERL)
  +
   dnl # find some common programs
   if test "$cross_compiling" = "yes"; then
       MYPATH=":"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmconstant/rpmh2tbl
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 rpmh2tbl
  --- rpm/rpmconstant/rpmh2tbl  21 Jul 2007 17:28:19 -0000      1.1
  +++ rpm/rpmconstant/rpmh2tbl  21 Jul 2007 18:37:03 -0000      1.2
  @@ -1,5 +1,3 @@
  -#!/usr/bin/perl
  -
   ##- Nanar <[EMAIL PROTECTED]>
   ##-
   ##- This program is free software; you can redistribute it and/or modify
  @@ -16,7 +14,7 @@
   ##- along with this program; if not, write to the Free Software
   ##- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
USA.
   #
  -# $Id: rpmh2tbl,v 1.1 2007/07/21 17:28:19 nanardon Exp $
  +# $Id: rpmh2tbl,v 1.2 2007/07/21 18:37:03 rse Exp $
   
   use strict;
   use warnings;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to