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:   01-Nov-2007 20:19:21
  Branch: HEAD                             Handle: 2007110119192001

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/lib                 rpmsx.h
    rpm/rpmio               mire.h

  Log:
    fix linking of RPM against PCRE's POSIX API under --with-pcre

  Summary:
    Revision    Changes     Path
    1.1761      +1  -0      rpm/CHANGES
    2.244       +6  -8      rpm/configure.ac
    2.13        +1  -1      rpm/lib/rpmsx.h
    1.7         +1  -1      rpm/rpmio/mire.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1760 -r1.1761 CHANGES
  --- rpm/CHANGES	1 Nov 2007 03:37:05 -0000	1.1760
  +++ rpm/CHANGES	1 Nov 2007 19:19:20 -0000	1.1761
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: fix linking of RPM against PCRE's POSIX API under --with-pcre
       - jbj: upgrade to F8 & fix rpm-python. i18n tags w hdr_subscript are b0rked.
       - jbj: update loader maps for python lazy loads. rpm-python fixing to do.
       - jbj: insturment headerNextIterator() statistics.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.243 -r2.244 configure.ac
  --- rpm/configure.ac	1 Nov 2007 13:56:18 -0000	2.243
  +++ rpm/configure.ac	1 Nov 2007 19:19:20 -0000	2.244
  @@ -973,19 +973,17 @@
       [PCRE], [pcre],
       [pcre], [pcre_compile], [pcre.h],
       [no,external:none], [],
  -    [
  +    [ AC_CHECK_HEADERS(pcreposix.h, [
  +          AC_CHECK_LIB(pcreposix, regcomp, [
  +              AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available])
  +              LIBS="-lpcreposix $LIBS"
  +          ])
  +      ])
         if test ".$WITH_LUA" = .yes; then
             WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_PCRE"
         fi
       ], [])
   
  -RPM_CHECK_LIB(
  -    [PCREPOSIX], [pcreposix],
  -    [pcreposix], [regcomp], [pcreposix.h],
  -    [no,external:none], [],
  -    [], [])
  -
  -
   dnl # DMalloc
   RPM_CHECK_LIB(
       [DMalloc], [dmalloc],
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmsx.h
  ============================================================================
  $ cvs diff -u -r2.12 -r2.13 rpmsx.h
  --- rpm/lib/rpmsx.h	6 Oct 2007 21:33:48 -0000	2.12
  +++ rpm/lib/rpmsx.h	1 Nov 2007 19:19:21 -0000	2.13
  @@ -6,7 +6,7 @@
    * Structure(s) used for file security context pattern handling
    */
   
  -#if defined(WITH_PCRE) && defined(HAVE_PCREPOSIX_H)
  +#if defined(WITH_PCRE) && defined(WITH_PCRE_POSIX)
   #include <pcreposix.h>
   #else
   #include <regex.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mire.h
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 mire.h
  --- rpm/rpmio/mire.h	6 Oct 2007 21:33:50 -0000	1.6
  +++ rpm/rpmio/mire.h	1 Nov 2007 19:19:21 -0000	1.7
  @@ -16,7 +16,7 @@
   /*@=declundef =exportheader =redecl @*/
   #endif
   
  -#if defined(WITH_PCRE) && defined(HAVE_PCREPOSIX_H)
  +#if defined(WITH_PCRE) && defined(WITH_PCRE_POSIX)
   #include <pcreposix.h>
   #else
   #include <regex.h>
  @@ .