RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Eric Veith
  Root:   /v/rpm/cvs                       Email:  eveith@rpm5.org
  Module: rpm                              Date:   10-Sep-2010 19:39:17
  Branch: HEAD                             Handle: 2010091017391601

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/rpmio               Makefile.am
    rpm/ruby                Makefile.am

  Log:
    Fixed ruby include paths

  Summary:
    Revision    Changes     Path
    1.3440      +1  -0      rpm/CHANGES
    2.450       +7  -2      rpm/configure.ac
    1.286       +2  -1      rpm/rpmio/Makefile.am
    1.7         +2  -1      rpm/ruby/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3439 -r1.3440 CHANGES
  --- rpm/CHANGES	7 Sep 2010 22:02:07 -0000	1.3439
  +++ rpm/CHANGES	10 Sep 2010 17:39:16 -0000	1.3440
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.4a1:
  +    - eveith: Fix ruby include paths
       - rpm.org: git-v1:339f31face44d877c3a6e2fc780e740e7e236eae.
       - jbj: rpmrepo: refactor the methods that don't need/use a header.
       - jbj: rpmrepo: handle all CLI argv processing in rpmrepoNew().
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.449 -r2.450 configure.ac
  --- rpm/configure.ac	1 Sep 2010 08:26:36 -0000	2.449
  +++ rpm/configure.ac	10 Sep 2010 17:39:16 -0000	2.450
  @@ -1497,14 +1497,19 @@
   
   dnl # Ruby
   WITH_RUBY_SUBDIR=""
  +WITH_RUBY_CPPFLAGS=""
   RPM_CHECK_LIB(
       [Ruby], [ruby],
       [ruby], [ruby_init], [ruby.h],
       [no,external:none], [],
  -    [ AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby])
  -      WITH_RUBY_SUBDIR=ruby
  +    [
  +        AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby])
  +        WITH_RUBY_SUBDIR=ruby
  +
  +        WITH_RUBY_CPPFLAGS="-I`ruby -rrbconfig -e 'puts RbConfig::expand(RbConfig::CONFIG[[\"rubyhdrdir\"]])'` -I`ruby -rrbconfig -e 'puts RbConfig::expand(\"#{RbConfig::CONFIG[\"rubyhdrdir\"]}/$(arch)\")'`"
       ], [])
   AC_SUBST(WITH_RUBY_SUBDIR)
  +AC_SUBST(WITH_RUBY_CPPFLAGS)
   
   dnl # Squirrel
   RPM_CHECK_LIB(
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.285 -r1.286 Makefile.am
  --- rpm/rpmio/Makefile.am	31 Aug 2010 16:34:01 -0000	1.285
  +++ rpm/rpmio/Makefile.am	10 Sep 2010 17:39:17 -0000	1.286
  @@ -54,7 +54,8 @@
   	@WITH_SYCK_CPPFLAGS@ \
   	@WITH_XAR_CPPFLAGS@ \
   	@WITH_XZ_CPPFLAGS@ \
  -	@WITH_ZLIB_CPPFLAGS@
  +	@WITH_ZLIB_CPPFLAGS@ \
  +	@WITH_RUBY_CPPFLAGS@
   
   AM_CFLAGS = $(OPENMP_CFLAGS)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/ruby/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 Makefile.am
  --- rpm/ruby/Makefile.am	26 Dec 2009 16:23:44 -0000	1.6
  +++ rpm/ruby/Makefile.am	10 Sep 2010 17:39:17 -0000	1.7
  @@ -18,7 +18,8 @@
   	@WITH_LUA_CPPFLAGS@ \
   	@WITH_SYCK_CPPFLAGS@ \
   	@WITH_XAR_CPPFLAGS@ \
  -	@WITH_ZLIB_CPPFLAGS@
  +	@WITH_ZLIB_CPPFLAGS@ \
  +  @WITH_RUBY_CPPFLAGS@
   
   EXTRA_DIST = \
   	tscripts
  @@ .