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:   26-Jun-2007 21:21:13
  Branch: HEAD                             Handle: 2007062620211300

  Modified files:
    rpm                     Makefile.am configure.ac

  Log:
    there is no need for an internal Neon (no modifications necessary) and
    RPM should be able to (hopefully) build without zlib, too. BeeCrypt is
    external already external only, so remove glue code

  Summary:
    Revision    Changes     Path
    2.178       +0  -2      rpm/Makefile.am
    2.142       +7  -12     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.177 -r2.178 Makefile.am
  --- rpm/Makefile.am	26 Jun 2007 18:19:08 -0000	2.177
  +++ rpm/Makefile.am	26 Jun 2007 19:21:13 -0000	2.178
  @@ -25,8 +25,6 @@
   	@WITH_ZLIB_SUBDIR@ \
   	@WITH_LUA_SUBDIR@ \
   	@WITH_FILE_SUBDIR@ \
  -	@WITH_NEON_SUBDIR@ \
  -	@WITH_BEECRYPT_SUBDIR@ \
   	rpmio \
   	rpmdb \
   	lib \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.141 -r2.142 configure.ac
  --- rpm/configure.ac	26 Jun 2007 18:47:21 -0000	2.141
  +++ rpm/configure.ac	26 Jun 2007 19:21:13 -0000	2.142
  @@ -688,7 +688,7 @@
   RPM_CHECK_LIB(
       [ZLib], [zlib],
       [z gz], [gzread], [zlib.h],
  -    [yes,internal], [zlib],
  +    [yes,internal:none], [zlib],
       [ AC_CHECK_FUNC(gzseek)
         if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
             AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have <zlib.h>])
  @@ -713,18 +713,13 @@
   RPM_CHECK_LIB(
       [Neon], [neon],
       [neon], [ne_session_create], [ne_session.h],
  -    [yes,external:internal], [neon:src:src],
  -    [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
  +    [yes,external], [],
  +    [ AC_CHECK_LIB(neon, ne_get_response_header, [
             AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1,
  -                    [Define to 1 if you have ne_get_response_header() in libneon.])
  -      else
  -          AC_CHECK_LIB(neon, ne_get_response_header, [
  -              AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1,
  -                        [Define to 1 if you have ne_get_response_header() in libneon.]) ])
  -          AC_CHECK_LIB(neon, ne_send_request_chunk, [
  -              AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1,
  -                        [Define to 1 if you have ne_send_request_chunk() in libneon.]) ])
  -      fi
  +                    [Define to 1 if you have ne_get_response_header() in libneon.]) ])
  +      AC_CHECK_LIB(neon, ne_send_request_chunk, [
  +          AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1,
  +                    [Define to 1 if you have ne_send_request_chunk() in libneon.]) ])
       ], [ AC_ERROR([mandatory Neon library not found]) ])
   
   dnl # File (magic)
  @@ .