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:   29-Jan-2008 15:09:35
  Branch: rpm-5_0                          Handle: 2008012914093400

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES configure.ac

  Log:
    Merge: fix Autoconf procedure by running python(1) based checks only
    under --with-python

  Summary:
    Revision    Changes     Path
    1.2054.2.26 +1  -0      rpm/CHANGES
    2.269.2.6   +6  -5      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.25 -r1.2054.2.26 CHANGES
  --- rpm/CHANGES	29 Jan 2008 13:42:58 -0000	1.2054.2.25
  +++ rpm/CHANGES	29 Jan 2008 14:09:34 -0000	1.2054.2.26
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.0.1:
  +    - rse: fix Autoconf procedure by running python(1) based checks only under --with-python
       - jbj: fix: rpmtsCheck() needs to return 1 when problems exist.
       - jbj: use RPM_OS_NTOQNX as manifest constant.
       - jbj: updated nl.po (Translation Project).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.269.2.5 -r2.269.2.6 configure.ac
  --- rpm/configure.ac	17 Jan 2008 13:15:34 -0000	2.269.2.5
  +++ rpm/configure.ac	29 Jan 2008 14:09:34 -0000	2.269.2.6
  @@ -801,6 +801,8 @@
   WITH_PYTHON_SUBDIR=""
   WITH_PYTHON_SUBPACKAGE=0
   WITH_PYTHON_VERSION=""
  +WITH_PYTHON_INCDIR=""
  +WITH_PYTHON_LIBDIR=""
   WITH_PYTHON_PREFIX="\${prefix}"
   AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [
       if test ".$withval" != .no; then
  @@ -889,15 +891,14 @@
                fi
   	done
       fi
  +    AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
  +	    [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
  +    AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
  +	    [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
   ])
   AC_SUBST(WITH_PYTHON_SUBDIR)
   AC_SUBST(WITH_PYTHON_SUBPACKAGE)
   AC_SUBST(WITH_PYTHON_VERSION)
  -
  -AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
  -	[WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
  -AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
  -	[WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
   AC_SUBST(WITH_PYTHON_INCDIR)
   AC_SUBST(WITH_PYTHON_LIBDIR)
   
  @@ .