[CVS] RPM: rpm-5_1: rpm/ configure.ac

2011-03-19 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   19-Mar-2011 19:51:35
  Branch: rpm-5_1  Handle: 2011031918513500

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

  Log:
- autofu: adjust for bit rot.

  Summary:
RevisionChanges Path
2.289.2.25  +2  -2  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.24 -r2.289.2.25 configure.ac
  --- rpm/configure.ac  20 Aug 2010 16:34:42 -  2.289.2.24
  +++ rpm/configure.ac  19 Mar 2011 18:51:35 -  2.289.2.25
  @@ -6,8 +6,8 @@
   dnl ##  REQUIREMENTS  INITIALIZATION 
   dnl ##
   
  -AC_PREREQ(2.60)
  -AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  +AC_PREREQ(2.63)
  +m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
   AC_INIT(rpm, [5.1.10], [PACKAGE_BUGREPORT_DEFAULT])
   PACKAGE_TIMESTAMP=2008 dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_1: rpm/ configure.ac

2009-04-13 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   13-Apr-2009 17:19:06
  Branch: rpm-5_1  Handle: 2009041315190500

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

  Log:
Try to fix and better document PCRE Autoconf stuff. First, we should not
check for pcreposix first, because for the internal case we know that
it is available and for the external case the check is done manually
afterwards anyway. That we replace -lpcre with _just_ -lpcreposix for
the internal case is now better documented.

  Summary:
RevisionChanges Path
2.289.2.22  +10 -3  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.21 -r2.289.2.22 configure.ac
  --- rpm/configure.ac  2 Apr 2009 14:21:19 -   2.289.2.21
  +++ rpm/configure.ac  13 Apr 2009 15:19:05 -  2.289.2.22
  @@ -1135,18 +1135,25 @@
   AM_CONDITIONAL(USE_LUA_CHKCONFIG, [ test .$USE_LUA_CHKCONFIG = .yes ])
   
   dnl # PCRE
  +dnl # use cases:
  +dnl # - RPM under WITH_PCRE uses pcre.h+libpcre in addition to regex.h
  +dnl # - RPM under WITH_PCRE+WITH_PCRE_POSIX uses pcreposix.h+libpcreposix 
instead of regex.h
  +dnl # - RPM/Lua under LUA_USE_PCRE uses pcre.h+libpcre in addition to 
regex.h
  +dnl # attention:
  +dnl # - In the locally bundled PCRE all libpcre objects are embedded into 
libpcreposix
  +dnl #   because of s/lib/noinst/ changes in pcre/Makefile.am. Here we have 
to link
  +dnl #   against libpcreposix only!
   WITH_PCRE_INTERNAL=false
   RPM_CHECK_LIB(
   [PCRE], [pcre],
  -[pcreposix pcre], [pcre_compile], [pcre.h],
  +[pcre], [pcre_compile], [pcre.h],
   [yes,internal:external:none], [pcre],
   [ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
 WITH_PCRE_INTERNAL=true
 AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have pcre.h])
  -   dnl XXX why isn't this set by RPM_CHECK_LIB?!?
  AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the 'pcre' 
library (-lpcre).])
 AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is 
available])
  -   WITH_PCRE_LIBS=-lpcreposix
  +   WITH_PCRE_LIBS=-lpcreposix # override, not prepend! (see attention 
above)
  AC_SUBST(WITH_PCRE_LIBS)
 else
dnl # make sure PCRE POSIX API can be really _USED_ by RPM
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_1: rpm/ configure.ac

2008-10-14 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   14-Oct-2008 21:39:01
  Branch: rpm-5_1  Handle: 2008101419390100

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

  Log:
- jbj: and no need to test for functions from libz any more.

  Summary:
RevisionChanges Path
2.289.2.14  +0  -2  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.13 -r2.289.2.14 configure.ac
  --- rpm/configure.ac  28 Sep 2008 20:13:21 -  2.289.2.13
  +++ rpm/configure.ac  14 Oct 2008 19:39:01 -  2.289.2.14
  @@ -972,8 +972,6 @@
   [rpmz z gz], [gzread], [zlib.h],
   [yes,external:none], [zlib],
   [ AC_CHECK_FUNC(gzseek)
  -  AC_CHECK_FUNC(crc32_combine, AC_DEFINE(HAVE_ZLIB_CRC32_COMBINE, 1, 
[Define as 1 if you have crc32_combine() in zlib]))
  -  AC_CHECK_FUNC(adler32_combine, AC_DEFINE(HAVE_ZLIB_ADLER32_COMBINE, 1, 
[Define as 1 if you have adler32_combine() in zlib]))
 if test .$RPM_CHECK_LIB_LOCATION = .internal; then
 AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have zlib.h])
 fi
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_1: rpm/ configure.ac

2008-08-20 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   21-Aug-2008 04:15:36
  Branch: rpm-5_1  Handle: 2008082102153600

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

  Log:
- adopt AM_PATH_PYTHON AutoFu variables. AM_PATH_PYTHON will be used
eventually.

  Summary:
RevisionChanges Path
2.289.2.11  +48 -22 rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.10 -r2.289.2.11 configure.ac
  --- rpm/configure.ac  19 Aug 2008 15:31:41 -  2.289.2.10
  +++ rpm/configure.ac  21 Aug 2008 02:15:36 -  2.289.2.11
  @@ -825,10 +825,18 @@
   dnl # optional Python language bindings
   WITH_PYTHON_SUBDIR=
   WITH_PYTHON_SUBPACKAGE=0
  -WITH_PYTHON_VERSION=
   WITH_PYTHON_INCDIR=
  -WITH_PYTHON_LIBDIR=
  -WITH_PYTHON_PREFIX=\${prefix}
  +
  +PYTHON=
  +PYTHON_VERSION=
  +PYTHON_PREFIX=
  +PYTHON_EXEC_PREFIX=
  +#PYTHON_PLATFORM=
  +pythondir=
  +pkgpythondir=
  +pyexecdir=
  +pkgpyexecdir=
  +
   AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python 
language bindings]), [
   if test .$withval != .no; then
   case $withval in
  @@ -846,47 +854,47 @@
for python_ver in $python_version ; do
if test $python_ver != 2.x ; then
 AC_MSG_CHECKING([for Python ${python_ver} API])
  -  OLD_CFLAGS=${CFLAGS}
  +  save_CFLAGS=${CFLAGS}
 for i in $prefix /usr/local /usr; do
  -  CFLAGS=${OLD_CFLAGS} -I$i/include/python${python_ver}
  +  CFLAGS=${save_CFLAGS} -I$i/include/python${python_ver}
 AC_RUN_IFELSE([AC_LANG_SOURCE(
 [[#include Python.h
main() { exit(strncmp(${python_ver}, PY_VERSION, 3)); 
} ]])
 ], [
  - WITH_PYTHON_VERSION=${python_ver}
  + PYTHON_VERSION=${python_ver}
AC_MSG_RESULT(yes)
  - WITH_PYTHON_PREFIX=${i}
  + PYTHON_PREFIX=${i}
break
 ], [ 
 ], [
dnl if we're cross compiling, assume the user has a clue
if test $withval = $python_ver; then
  - WITH_PYTHON_VERSION=${python_ver}
  + PYTHON_VERSION=${python_ver}
AC_MSG_RESULT(yes)
break
fi
 ])
 done
  -  CFLAGS=${OLD_CFLAGS}
  -  if test .$WITH_PYTHON_VERSION == .; then
  +  CFLAGS=${save_CFLAGS}
  +  if test .$PYTHON_VERSION == .; then
dnl check Mac OS X framework
  - OLD_CFLAGS=${CFLAGS}
  + save_CFLAGS=${CFLAGS}
for f in ~  /System /Network; do
  - CFLAGS=${OLD_CFLAGS} 
-I$f/Library/Frameworks/Python.framework/Versions/${python_ver}/include/python${python_ver}
  + CFLAGS=${save_CFLAGS} 
-I$f/Library/Frameworks/Python.framework/Versions/${python_ver}/include/python${python_ver}
AC_RUN_IFELSE([AC_LANG_SOURCE(
[[#include Python.h
   main() { exit(strncmp(${python_ver}, PY_VERSION, 
3)); } ]])
], [
  -WITH_PYTHON_VERSION=${python_ver}
  +PYTHON_VERSION=${python_ver}
   AC_MSG_RESULT([yes (using Python.framework)])
  -
WITH_PYTHON_PREFIX=$f/Library/Frameworks/Python.framework/Versions/${python_ver}
  +
PYTHON_PREFIX=$f/Library/Frameworks/Python.framework/Versions/${python_ver}
   break
], [
])
done
  - CFLAGS=${OLD_CFLAGS}
  + CFLAGS=${save_CFLAGS}
 fi
  -  if test .$WITH_PYTHON_VERSION == .; then
  +  if test .$PYTHON_VERSION == .; then
AC_MSG_RESULT(no)
 fi
else
  @@ -895,21 +903,21 @@
 [[#include python/Python.h
main() { exit(strncmp(2., PY_VERSION, 2)); } ]])
 ], [
  - 

[CVS] RPM: rpm-5_1: rpm/ configure.ac

2008-07-29 Thread Arkadiusz Miskiewicz
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   29-Jul-2008 18:00:41
  Branch: rpm-5_1  Handle: 2008072916004100

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

  Log:
Explictly use AC_PROG_CXX to get @CXX@ subsitution in macros.in.

  Summary:
RevisionChanges Path
2.289.2.6   +1  -0  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.5 -r2.289.2.6 configure.ac
  --- rpm/configure.ac  18 Jul 2008 09:29:14 -  2.289.2.5
  +++ rpm/configure.ac  29 Jul 2008 16:00:41 -  2.289.2.6
  @@ -107,6 +107,7 @@
   
   AC_PROG_CC
   AC_PROG_CPP
  +AC_PROG_CXX
   
   AC_USE_SYSTEM_EXTENSIONS
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_1: rpm/ configure.ac

2008-06-14 Thread Ralf S. Engelschall
  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:   14-Jun-2008 17:40:55
  Branch: rpm-5_1  Handle: 2008061415405400

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

  Log:
add missing Autoconf glue code for LZMA Utils stuff

  Summary:
RevisionChanges Path
2.289.2.4   +7  -0  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.3 -r2.289.2.4 configure.ac
  --- rpm/configure.ac  31 May 2008 22:11:01 -  2.289.2.3
  +++ rpm/configure.ac  14 Jun 2008 15:40:54 -  2.289.2.4
  @@ -957,6 +957,13 @@
   [no,external:none], [],
   [], [])
   
  +dnl # LZMA Utils
  +RPM_CHECK_LIB(
  +[LZMA Utils], [lzma],
  +[lzma], [lzma_init], [lzma.h],
  +[no,external:none], [],
  +[], [])
  +
   dnl # BeeCrypt
   RPM_CHECK_LIB(
   [BeeCrypt], [beecrypt],
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org