subject:"\[CVS\] RPM\: rpm\/ acinclude.m4"

[CVS] RPM: rpm/ acinclude.m4

2010-10-25 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:   26-Oct-2010 05:14:06
  Branch: HEAD Handle: 2010102603140600

  Modified files:
rpm acinclude.m4

  Log:
- eliminate AutoFu nags.

  Summary:
RevisionChanges Path
2.31+1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.30 -r2.31 acinclude.m4
  --- rpm/acinclude.m4  15 Apr 2009 12:37:57 -  2.30
  +++ rpm/acinclude.m4  26 Oct 2010 03:14:06 -  2.31
  @@ -596,7 +596,7 @@
   [/* Predefined possible va_copy() implementation (id: $1) */
   #define __VA_COPY_USE_$1(d, s) $2])
   if test ".$ac_cv_va_copy" = .; then
  -
AC_RUN_IFELSE(AC_LANG_SOURCE([[__va_copy_test($2)]]),[ac_cv_va_copy="$1"],[],[])
  +
AC_RUN_IFELSE([AC_LANG_SOURCE(AC_LANG_SOURCE([[__va_copy_test($2)]]))],[ac_cv_va_copy="$1"],[],[])
   fi
   ])
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2009-04-15 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:   15-Apr-2009 14:37:57
  Branch: HEAD Handle: 2009041512375700

  Modified files:
rpm acinclude.m4

  Log:
RPM_CHECK_LIB: correctly handle library names like "libpython2.6" and
"libdb-4.7"

  Summary:
RevisionChanges Path
2.30+1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.29 -r2.30 acinclude.m4
  --- rpm/acinclude.m4  15 Apr 2009 12:06:46 -  2.29
  +++ rpm/acinclude.m4  15 Apr 2009 12:37:57 -  2.30
  @@ -472,7 +472,7 @@
   AC_CHECK_LIB(m4_defn([__rcl_lib]), [$4])
   dnl # manually check for success (do not use third 
argument to AC_CHECK_LIB
   dnl # here as this would no longer set the LIBS variable 
(the default action)
  -test ".${ac_cv_lib_[]m4_defn([__rcl_lib])_$4}" = .yes && 
__rcl_found_lib=yes
  +test 
".${m4_translit(ac_cv_lib_[]m4_defn([__rcl_lib])_$4,[.-,],[___])}" = .yes && 
__rcl_found_lib=yes
   ])
   test ".${__rcl_found_lib}" = .no && __rcl_found="no"
   dnl # determine final results
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2009-04-15 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:   15-Apr-2009 14:06:46
  Branch: HEAD Handle: 2009041512064600

  Modified files:
rpm acinclude.m4

  Log:
ops, I forgot to finish the error handling

  Summary:
RevisionChanges Path
2.29+1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.28 -r2.29 acinclude.m4
  --- rpm/acinclude.m4  15 Apr 2009 11:49:40 -  2.28
  +++ rpm/acinclude.m4  15 Apr 2009 12:06:46 -  2.29
  @@ -447,7 +447,7 @@
   break
   fi
   else
  -AC_MSG_ERROR(
  +AC_MSG_ERROR([Unknown location specification 
$__rcl_location])
   fi
   done
   IFS="${__rcl_IFS}"
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2009-04-07 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:   07-Apr-2009 18:41:39
  Branch: HEAD Handle: 2009040716413900

  Modified files:
rpm acinclude.m4

  Log:
- jbj: fix: AC_LANG_SOURCE() shouldn't be bracketed.

  Summary:
RevisionChanges Path
2.27+1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.26 -r2.27 acinclude.m4
  --- rpm/acinclude.m4  7 Apr 2009 14:39:42 -   2.26
  +++ rpm/acinclude.m4  7 Apr 2009 16:41:39 -   2.27
  @@ -576,7 +576,7 @@
   [/* Predefined possible va_copy() implementation (id: $1) */
   #define __VA_COPY_USE_$1(d, s) $2])
   if test ".$ac_cv_va_copy" = .; then
  -
AC_RUN_IFELSE([AC_LANG_SOURCE([[__va_copy_test($2)]])],[ac_cv_va_copy="$1"],[],[])
  +
AC_RUN_IFELSE(AC_LANG_SOURCE([[__va_copy_test($2)]]),[ac_cv_va_copy="$1"],[],[])
   fi
   ])
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-11-08 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:   09-Nov-2007 08:17:26
  Branch: HEAD Handle: 2007110907172500

  Modified files:
rpm acinclude.m4

  Log:
give a hint that one can specify extra subdirs for includes and
library

  Summary:
RevisionChanges Path
2.22+1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.21 -r2.22 acinclude.m4
  --- rpm/acinclude.m4  12 Oct 2007 21:06:57 -  2.21
  +++ rpm/acinclude.m4  9 Nov 2007 07:17:25 -   2.22
  @@ -73,7 +73,7 @@
   dnl ##,-- [$4] e.g. BZ2_bzlibVersion
   dnl ##,  -- [$5] e.g. bzlib.h
   dnl ##[,-- [$6] e.g. yes,external:internal:none
  -dnl ##[, -- [$7] e.g. lib/bzip2
  +dnl ##[, -- [$7] e.g. lib/bzip2:include:src
   dnl ##[,  -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1, 
[...])
   dnl ##-- [$9] e.g. AC_MSG_ERROR([...])
   dnl ##]]])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-07-24 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:   24-Jul-2007 09:40:00
  Branch: HEAD Handle: 200707240840

  Modified files:
rpm acinclude.m4

  Log:
fix output by intentionally not using additional quotes

  Summary:
RevisionChanges Path
2.19+2  -2  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.18 -r2.19 acinclude.m4
  --- rpm/acinclude.m4  18 Jul 2007 12:21:40 -  2.18
  +++ rpm/acinclude.m4  24 Jul 2007 07:40:00 -  2.19
  @@ -233,7 +233,7 @@
   m4_define([__rcl_query_config], [
   __rcl_flags="`($][1 --$][2) 2>/dev/null`"
   if test ".${__rcl_flags}" != .; then
  -AC_MSG_VERBOSE([-- extending $][3: 
${__rcl_flags}])
  +AC_MSG_VERBOSE(-- extending $][3: 
${__rcl_flags})
   $][3="${$][3} ${__rcl_flags}"
   fi
   ])
  @@ -248,7 +248,7 @@
   m4_define([__rcl_query_pkgconfig], [
   __rcl_flags="`($][1 --$][2) 2>/dev/null`"
   if test ".${__rcl_flags}" != .; then
  -AC_MSG_VERBOSE([-- extending $][3: 
${__rcl_flags}])
  +AC_MSG_VERBOSE(-- extending $][3: 
${__rcl_flags})
   $][3="${$][3} ${__rcl_flags}"
   fi
   ])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4 configure.ac

2007-07-18 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:   18-Jul-2007 14:21:40
  Branch: HEAD Handle: 2007071813214000

  Modified files:
rpm acinclude.m4 configure.ac

  Log:
display the version during configure-time, too

  Summary:
RevisionChanges Path
2.18+12 -0  rpm/acinclude.m4
2.203   +3  -0  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.17 -r2.18 acinclude.m4
  --- rpm/acinclude.m4  17 Jul 2007 19:13:24 -  2.17
  +++ rpm/acinclude.m4  18 Jul 2007 12:21:40 -  2.18
  @@ -4,6 +4,18 @@
   
   dnl ##
   dnl ##  NAME:
  +dnl ##AC_MSG_TITLE -- Display a configuration title
  +dnl ##
  +dnl ##  USAGE:
  +dnl ##AC_MSG_TITLE(, )
  +dnl ##
  +
  +AC_DEFUN([AC_MSG_TITLE],[
  +_AS_ECHO([Configuring $1, Version $2])
  +])
  +
  +dnl ##
  +dnl ##  NAME:
   dnl ##AC_MSG_HEADER -- Display a configuration header
   dnl ##
   dnl ##  USAGE:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.202 -r2.203 configure.ac
  --- rpm/configure.ac  18 Jul 2007 10:03:01 -  2.202
  +++ rpm/configure.ac  18 Jul 2007 12:21:40 -  2.203
  @@ -9,6 +9,9 @@
   AC_PREREQ(2.60)
   AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [EMAIL PROTECTED])
   AC_INIT(rpm, [5.0.DEVEL], [PACKAGE_BUGREPORT_DEFAULT])
  +AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  +
  +AC_MSG_HEADER([INITIALIZATION])
   AC_CONFIG_SRCDIR([rpmqv.c])
   AC_CONFIG_HEADERS([config.h])
   AC_CANONICAL_TARGET
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-07-17 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:   17-Jul-2007 21:13:24
  Branch: HEAD Handle: 2007071720132400

  Modified files:
rpm acinclude.m4

  Log:
during recursive searching of , ignore any warnings on stderr
resulting from system directories the configure/build user usually has
no permission on

  Summary:
RevisionChanges Path
2.17+2  -2  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.16 -r2.17 acinclude.m4
  --- rpm/acinclude.m4  29 Jun 2007 15:57:53 -  2.16
  +++ rpm/acinclude.m4  17 Jul 2007 19:13:24 -  2.17
  @@ -342,7 +342,7 @@
   fi
   dnl # in any sub-area
   if test ".${__rcl_found}" = .no; then
  -for __rcl_file in _ `find ${__rcl_location} -name 
"$5" -type f -print`; do
  +for __rcl_file in _ `find ${__rcl_location} -name 
"$5" -type f -print 2>/dev/null`; do
   test .${__rcl_file} = ._ && continue
   __rcl_dir=`echo ${__rcl_file} | sed -e 
's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
   if test ".${__rcl_dir}" != "./usr/include"; then
  @@ -355,7 +355,7 @@
   if test ".${__rcl_found}" = .yes; then
   __rcl_found=no
   m4_foreach_w([__rcl_lib], [$3], [
  -for __rcl_file in _ `find ${__rcl_location} 
-name "lib[]m4_defn([__rcl_lib]).*" -type f -print | \
  +for __rcl_file in _ `find ${__rcl_location} 
-name "lib[]m4_defn([__rcl_lib]).*" -type f -print 2>/dev/null | \
   egrep '\.(a|so|sl|dylib)$'`; do
   test .${__rcl_file} = ._ && continue
   __rcl_dir=`echo ${__rcl_file} | sed -e 
's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-06-29 Thread Mark Hatle

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Mark Hatle
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   29-Jun-2007 17:57:53
  Branch: HEAD Handle: 2007062916575300

  Modified files:
rpm acinclude.m4

  Log:
Fix acinclude.m4 to allow you to run configure in a build directory instead
of the src directory.  This fixes some comparisons for internal/external
items.  (Note, the internal items need to be in the 'src' location!)

  Summary:
RevisionChanges Path
2.16+16 -11 rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.15 -r2.16 acinclude.m4
  --- rpm/acinclude.m4  28 Jun 2007 06:12:33 -  2.15
  +++ rpm/acinclude.m4  29 Jun 2007 15:57:53 -  2.16
  @@ -146,9 +146,9 @@
   m4_define([__rcl_subdir],
 [m4_if(m4_index([$7], [:]), -1, [$7],
m4_substr([$7], 0, m4_index([$7], 
[:])))])
  -if test -d __rcl_subdir; then
  +if test -d ${srcdir}/__rcl_subdir; then
   AC_MSG_VERBOSE([-- activating local sub-directory: 
__rcl_subdir])
  -if test -f __rcl_subdir/configure; then
  +if test -f ${srcdir}/__rcl_subdir/configure; then
   AC_CONFIG_SUBDIRS(__rcl_subdir)
   fi
   dnl # NOTICE: an internal copy of the third-party 
library is a tricky thing
  @@ -175,32 +175,37 @@
   AC_MSG_VERBOSE([++ post-adjustments for --with-$2 
(${__rcl_location_$2})])
   __rcl_dirs_inc=`echo '$7' | sed -e 's/^[[^:]]*://' 
-e 's/:[[^:]]*[$]//'`
   __rcl_dirs_lib=`echo '$7' | sed -e 
's/^[[^:]]*:[[^:]]*://'`
  -
__rcl_basedir="\[$](top_srcdir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)"
  +
__rcl_srcdir="\[$](top_srcdir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)"
  +
__rcl_builddir="\[$](top_builddir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)"
   __rcl_firstlib="m4_if(m4_index([$3], [ ]), -1, [$3], 
m4_substr([$3], 0, m4_index([$3], [ ])))"
   if test ".${__rcl_dirs_inc}" != ".$7"; then
   __rcl_IFS="${IFS}"; IFS=","
   for __rcl_dir in ${__rcl_dirs_inc}; do
   IFS="${__rcl_IFS}"
   test ".${__rcl_dir}" = . && continue
  -AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_basedir}/${__rcl_dir}])
  -
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_basedir}/${__rcl_dir}"
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_srcdir}/${__rcl_dir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_srcdir}/${__rcl_dir}"
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_builddir}/${__rcl_dir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_builddir}/${__rcl_dir}"
   done
   IFS="${__rcl_IFS}"
   fi
  -AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_basedir}])
  -
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_basedir}"
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_srcdir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_srcdir}"
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_builddir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS="${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_builddir}"
   if test ".${__rcl

[CVS] RPM: rpm/ acinclude.m4 configure.ac

2007-06-27 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:   28-Jun-2007 08:12:33
  Branch: HEAD Handle: 2007062807123300

  Modified files:
rpm acinclude.m4 configure.ac

  Log:
consistently use canonical AC_MSG_ERROR instead of old name AC_ERROR

  Summary:
RevisionChanges Path
2.15+4  -4  rpm/acinclude.m4
2.152   +6  -6  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.14 -r2.15 acinclude.m4
  --- rpm/acinclude.m4  27 Jun 2007 21:10:22 -  2.14
  +++ rpm/acinclude.m4  28 Jun 2007 06:12:33 -  2.15
  @@ -63,7 +63,7 @@
   dnl ##[,-- [$6] e.g. yes,external:internal:none
   dnl ##[, -- [$7] e.g. lib/bzip2
   dnl ##[,  -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1, 
[...])
  -dnl ##-- [$9] e.g. AC_ERROR([...])
  +dnl ##-- [$9] e.g. AC_MSG_ERROR([...])
   dnl ##]]])
   dnl ##
   dnl ##  - Makefile.in:
  @@ -380,7 +380,7 @@
   dnl # cannot be checked (and usually has not to be checked 
anyway)
   with_$2=yes
   if test ".${__rcl_location_$2}" != .internal; then
  -AC_ERROR([unable to find internal $1 library])
  +AC_MSG_ERROR([unable to find internal $1 library])
   fi
   else ])
   dnl # regular case: use standard Autoconf facilities
  @@ -447,7 +447,7 @@
   m4_if([$9],, [
   if  test ".${RPM_CHECK_LIB_LOCATION}" != . && \
   test ".${RPM_CHECK_LIB_LOCATION}" != .none; then
  -AC_ERROR([unable to find usable $1 library])
  +AC_MSG_ERROR([unable to find usable $1 library])
   fi
   ], [$9])
   fi
  @@ -546,7 +546,7 @@
   dnl #   8. check for memory copying approach (assuming va_list is a 
pointer)
   __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
   if test ".$ac_cv_va_copy" = .; then
  -AC_ERROR([no working implementation found])
  +AC_MSG_ERROR([no working implementation found])
   fi
 ])
 dnl #   optionally activate the fallback implementation
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.151 -r2.152 configure.ac
  --- rpm/configure.ac  28 Jun 2007 06:05:29 -  2.151
  +++ rpm/configure.ac  28 Jun 2007 06:12:33 -  2.152
  @@ -20,7 +20,7 @@
   AS_HELP_STRING([--with-bugreport=ADDRESS], [set packager bugreport Email 
address (PACKAGE_BUGREPORT_DEFAULT)]), [dnl
   case "$withval" in
   [EMAIL PROTECTED] ) PACKAGE_BUGREPORT="$withval" ;;
  -*   ) AC_ERROR([invalid bugreport Email address]) ;;
  +*   ) AC_MSG_ERROR([invalid bugreport Email address]) ;;
   esac
   ])
   
  @@ -599,7 +599,7 @@
   LIBS="$LIBS -lelf"
   ])
   else
  -AC_ERROR([libelf/gelf API requested but not found or not usable])
  +AC_MSG_ERROR([libelf/gelf API requested but not found or not 
usable])
   fi
   else
   AC_MSG_RESULT(no)
  @@ -708,7 +708,7 @@
   [BeeCrypt], [beecrypt],
   [beecrypt], [mpfprintln], [beecrypt/api.h],
   [yes,external], [beecrypt],
  -[], [ AC_ERROR([mandatory BeeCrypt library not found]) ])
  +[], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ])
   
   dnl # Neon
   RPM_CHECK_LIB(
  @@ -721,7 +721,7 @@
 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]) ])
  +], [ AC_MSG_ERROR([mandatory Neon library not found]) ])
   
   dnl # File (magic)
   RPM_CHECK_LIB(
  @@ -735,7 +735,7 @@
   [POPT], [popt],
   [popt], [poptGetContext], [popt.h],
   [yes,external], [],
  -[], [AC_ERROR([mandatory POPT library not found])])
  +[], [AC_MSG_ERROR([mandatory POPT library not found])])
   
   dnl # Berkeley-DB & SQLite
   DBLIBSRCS=""
  @@ -753,7 +753,7 @@
 AC_MSG_ERROR([using external Berkeley-DB not supported (without 
packager taking responsibility first)])
 fi
   ],
  -[ AC_ERROR([mandatory Berkeley-DB library not found]) ])
  +[ AC_MSG_ERROR([mandatory Berkeley-DB library not found]) ])
   RPM_CHECK_

[CVS] RPM: rpm/ acinclude.m4

2007-06-27 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:   27-Jun-2007 23:10:22
  Branch: HEAD Handle: 2007062722102200

  Modified files:
rpm acinclude.m4

  Log:
Avoid warnings during "configure" by not trying to configure subdirs
which do not actually have an own "configure" script (which for instance
is the case for lua/).

  Summary:
RevisionChanges Path
2.14+3  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.13 -r2.14 acinclude.m4
  --- rpm/acinclude.m4  27 Jun 2007 20:20:26 -  2.13
  +++ rpm/acinclude.m4  27 Jun 2007 21:10:22 -  2.14
  @@ -148,7 +148,9 @@
m4_substr([$7], 0, m4_index([$7], 
[:])))])
   if test -d __rcl_subdir; then
   AC_MSG_VERBOSE([-- activating local sub-directory: 
__rcl_subdir])
  -AC_CONFIG_SUBDIRS(__rcl_subdir)
  +if test -f __rcl_subdir/configure; then
  +AC_CONFIG_SUBDIRS(__rcl_subdir)
  +fi
   dnl # NOTICE: an internal copy of the third-party 
library is a tricky thing
   dnl # because for the following two major reasons we 
cannot just extend
   dnl # CPPFLAGS, LDFLAGS and LIBS in this case:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4 configure.ac

2007-06-25 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:   25-Jun-2007 13:27:34
  Branch: HEAD Handle: 2007062512273400

  Modified files:
rpm acinclude.m4 configure.ac

  Log:
add AC_MSG_HEADER and AC_MSG_VERBOSE macros and use them for
displaying the configure parts and verbose messages

  Summary:
RevisionChanges Path
2.12+49 -30 rpm/acinclude.m4
2.136   +46 -15 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.11 -r2.12 acinclude.m4
  --- rpm/acinclude.m4  25 Jun 2007 10:49:41 -  2.11
  +++ rpm/acinclude.m4  25 Jun 2007 11:27:34 -  2.12
  @@ -4,6 +4,33 @@
   
   dnl ##
   dnl ##  NAME:
  +dnl ##AC_MSG_HEADER -- Display a configuration header
  +dnl ##
  +dnl ##  USAGE:
  +dnl ##AC_MSG_HEADER()
  +dnl ##
  +
  +AC_DEFUN([AC_MSG_HEADER],[
  +_AS_ECHO([])
  +_AS_ECHO([=== $1 ===])
  +])
  +
  +dnl ##
  +dnl ##  NAME:
  +dnl ##AC_MSG_VERBOSE -- Display a message under --verbose
  +dnl ##
  +dnl ##  USAGE:
  +dnl ##AC_MSG_VERBOSE()
  +dnl ##
  +
  +AC_DEFUN([AC_MSG_VERBOSE], [
  +if test ".$verbose" = .yes; then
  +_AS_ECHO([$1])
  +fi
  +])
  +
  +dnl ##
  +dnl ##  NAME:
   dnl ##RPM_CHECK_LIB -- Check for third-party libraries
   dnl ##
   dnl ##  COPYRIGHT
  @@ -67,14 +94,6 @@
   dnl ##
   dnl ##
   
  -dnl # internal helper macro
  -m4_define([__rcl_verbose], [
  -dnl # printing of verbose message
  -if test ".$verbose" = .yes; then
  -_AS_ECHO([$1])
  -fi
  -])
  -
   dnl # public API macro
   AC_DEFUN([RPM_CHECK_LIB], [
   dnl ##
  @@ -89,12 +108,12 @@
   if test ".${with_$2+set}" != .set; then
   dnl # initialize to default enable mode
   with_$2="__rcl_default_enable"
  -__rcl_verbose([++ assuming --with-$2=$with_$2])
  +AC_MSG_VERBOSE([++ assuming --with-$2=$with_$2])
   fi
   if test ".${with_$2}" = .yes; then
   dnl # map simple "--with-foo=yes" to an enabled default location path
   with_$2="__rcl_default_locations"
  -__rcl_verbose([++ mapping --with-$2=yes to --with-$2="$with_$2"])
  +AC_MSG_VERBOSE([++ mapping --with-$2=yes to --with-$2="$with_$2"])
   fi
   
   dnl ##
  @@ -113,17 +132,17 @@
   for __rcl_location in ${with_$2}; do
   IFS="${__rcl_IFS}"
   __rcl_location_last="${__rcl_location}"
  -__rcl_verbose([++ searching location: ${__rcl_location}])
  +AC_MSG_VERBOSE([++ searching location: ${__rcl_location}])
   if test ".${__rcl_location}" = .none; then
   dnl # no operation in loop, ignore failure later, too.
  -__rcl_verbose([-- no operation])
  +AC_MSG_VERBOSE([-- no operation])
   m4_if([$7],,, [ elif test ".${__rcl_location}" = .internal; 
then
   dnl # optional support for  feature
   m4_define([__rcl_subdir],
 [m4_if(m4_index([$7], [:]), -1, [$7],
m4_substr([$7], 0, m4_index([$7], 
[:])))])
   if test -d __rcl_subdir; then
  -__rcl_verbose([-- activating local sub-directory: 
__rcl_subdir])
  +AC_MSG_VERBOSE([-- activating local sub-directory: 
__rcl_subdir])
   AC_CONFIG_SUBDIRS(__rcl_subdir)
   
WITH_]m4_translit([$2],[a-z],[A-Z])[_SUBDIR="__rcl_subdir"
   dnl # divert deferred flags handling because in the 
"internal"
  @@ -132,7 +151,7 @@
   __rcl_location_$2=internal
   AC_CONFIG_COMMANDS_PRE([
   if test ".${__rcl_location_$2}" = .internal; then
  -__rcl_verbose([++ post-adjustments for 
--with-$2 (${__rcl_location_$2})])
  +AC_MSG_VERBOSE([++ post-adjustments for 
--with-$2 (${__rcl_location_$2})])
   __rcl_dirs_inc=`echo '$7' | sed -e 
's/^[[^:]]*://' -e 's/:[[^:]]*[$]//'`
   __rcl_dirs_lib=`echo '$7' | sed -e 
's/^[[^:]]*:[[^:]]*://'`
   
__rcl_basedir="\[$](top_srcdir)/\[$](WITH_]m4_translit([$2],[a-z],[A-Z])[_SUBDIR)"
  @@ -142,33 +161,33 @@
   for __rcl_dir in ${__rcl

[CVS] RPM: rpm/ acinclude.m4 configure.ac

2007-06-25 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:   25-Jun-2007 12:49:41
  Branch: HEAD Handle: 2007062511494100

  Modified files:
rpm acinclude.m4 configure.ac

  Log:
cleanup complex statfs Autoconf glue and move it to acinclude.m4 in
order to make configure.ac more clear

  Summary:
RevisionChanges Path
2.11+150 -0 rpm/acinclude.m4
2.135   +1  -100rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.10 -r2.11 acinclude.m4
  --- rpm/acinclude.m4  24 Jun 2007 18:32:03 -  2.10
  +++ rpm/acinclude.m4  25 Jun 2007 10:49:41 -  2.11
  @@ -528,3 +528,153 @@
 fi
   ])
   
  +dnl ##
  +dnl ##  NAME:
  +dnl ##AC_CHECK_STATFS -- Check for "struct statfs" and friends
  +dnl ##
  +
  +AC_DEFUN([AC_CHECK_STATFS], [
  +dnl # 1. search for struct statfs
  +AC_MSG_CHECKING(for struct statfs)
  +found_struct_statfs=no
  +if test ".$found_struct_statfs" = .no; then
  +dnl # Solaris 2.6+ wants to use "statvfs"
  +AC_COMPILE_IFELSE([
  +AC_LANG_PROGRAM([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#include 
  +]], [[
  +struct statvfs sfs;
  +]])
  +], [
  +AC_MSG_RESULT(in )
  +AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, [statfs in  
(for Solaris 2.6+ systems)])
  +found_struct_statfs=yes
  +], [])
  +fi
  +if test ".$found_struct_statfs" = .no; then
  +dnl # Linux: first try including 
  +AC_COMPILE_IFELSE([
  +AC_LANG_PROGRAM([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#include 
  +]], [[
  +struct statfs sfs;
  +]])
  +],[
  +AC_MSG_RESULT(in )
  +AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in  (for 
Linux systems)])
  +found_struct_statfs=yes
  +], [])
  +fi
  +if test ".$found_struct_statfs" = .no; then
  +dnl # ...next try including 
  +AC_COMPILE_IFELSE([
  +AC_LANG_PROGRAM([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#ifdef HAVE_SYS_PARAM_H
  +#include 
  +#endif
  +#include 
  +]], [[
  +struct statfs sfs;
  +]])
  +],[
  +AC_MSG_RESULT(in )
  +AC_DEFINE(STATFS_IN_SYS_MOUNT, 1, [statfs in  (for 
Digital Unix 4.0D systems)])
  +found_struct_statfs=yes
  +], [])
  +fi
  +if test ".$found_struct_statfs" = Xno; then
  +dnl ...still no joy. Try 
  +AC_COMPILE_IFELSE([
  +AC_LANG_PROGRAM([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#include 
  +]], [[
  +struct statfs sfs;
  +]])
  +], [
  +AC_MSG_RESULT(in )
  +AC_DEFINE(STATFS_IN_SYS_STATFS, 1, [statfs in  
(for IRIX 6.4 systems)])
  +found_struct_statfs=yes
  +], [])
  +fi
  +if test ".$found_struct_statfs" = .no; then
  +dnl # ...no luck. Warn the user of impending doom.
  +AC_MSG_RESULT([not found])
  +AC_MSG_WARN([struct statfs not found])
  +fi
  +
  +dnl # 2. search for f_bavail member of struct statfs
  +if test ".$found_struct_statfs" = .yes; then
  +AC_MSG_CHECKING(for f_bavail member in struct statfs)
  +AC_COMPILE_IFELSE([
  +AC_LANG_PROGRAM([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#if STATFS_IN_SYS_STATVFS
  +#include 
  +  typedef struct statvfs STATFS_t;
  +#else
  +  typedef struct statfs STATFS_t;
  +#if STATFS_IN_SYS_VFS
  +#include 
  +#elif STATFS_IN_SYS_MOUNT
  +#include 
  +#elif STATFS_IN_SYS_STATFS
  +#include 
  +#endif
  +#endif 
  +]], [[
  +STATFS_t sfs;
  +sfs.f_bavail = 0;
  +]])
  +],[
  +AC_MSG_RESULT(yes)
  +AC_DEFINE(STATFS_HAS_F_BAVAIL, 1, [Define if struct statfs has 
the f_bavail member])
  +],[
  +AC_MSG_RESULT(no)
  +])
  +fi
  +
  +dnl # 3. check to see if we have the 4-argument variant of statfs(2)
  +if test ".$found_struct_statfs" = .yes; then
  +AC_MSG_CHECKING([if statfs(2) requires 4 arguments])
  +AC_RUN_IFELSE([
  +AC_LANG_SOURCE([[
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#ifdef STATFS_IN_SYS_VFS
  +#include 
  +#elif STATFS_IN_SYS_MOUNT
  +#inclu

[CVS] RPM: rpm/ acinclude.m4 devtool.conf

2007-06-24 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:   24-Jun-2007 14:22:05
  Branch: HEAD Handle: 2007062413220500

  Modified files:
rpm acinclude.m4 devtool.conf

  Log:
print a bunch of verbose messages in RPM_CHECK_LIB for diagnostic
purposes

  Summary:
RevisionChanges Path
2.9 +32 -1  rpm/acinclude.m4
2.15+2  -0  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.8 -r2.9 acinclude.m4
  --- rpm/acinclude.m4  24 Jun 2007 11:59:02 -  2.8
  +++ rpm/acinclude.m4  24 Jun 2007 12:22:05 -  2.9
  @@ -67,6 +67,15 @@
   dnl ##
   dnl ##
   
  +dnl # internal helper macro
  +m4_define([__rcl_verbose], [
  +dnl # printing of verbose message
  +if test ".$verbose" = .yes; then
  +_AS_ECHO([$1])
  +fi
  +])
  +
  +dnl # public API macro
   AC_DEFUN([RPM_CHECK_LIB], [
   dnl ##
   dnl ## PROLOG
  @@ -80,10 +89,12 @@
   if test ".${with_$2+set}" != .set; then
   dnl # initialize to default enable mode
   with_$2="__rcl_default_enable"
  +__rcl_verbose([++ assuming --with-$2=$with_$2])
   fi
   if test ".${with_$2}" = .yes; then
   dnl # map simple "--with-foo=yes" to an enabled default location path
   with_$2="__rcl_default_locations"
  +__rcl_verbose([++ mapping --with-$2=yes to --with-$2="$with_$2"])
   fi
   
   dnl ##
  @@ -102,15 +113,17 @@
   for __rcl_location in ${with_$2}; do
   IFS="${__rcl_IFS}"
   __rcl_location_last="${__rcl_location}"
  +__rcl_verbose([++ searching location: ${__rcl_location}])
   if test ".${__rcl_location}" = .none; then
   dnl # no operation in loop, ignore failure later, too.
  -:
  +__rcl_verbose([-- no operation])
   m4_if([$7],,, [ elif test ".${__rcl_location}" = .internal; 
then
   dnl # optional support for  feature
   m4_define([__rcl_subdir],
 [m4_if(m4_index([$7], [:]), -1, [$7],
m4_substr([$7], 0, m4_index([$7], 
[:])))])
   if test -d __rcl_subdir; then
  +__rcl_verbose([-- activating local sub-directory: 
__rcl_subdir])
   AC_CONFIG_SUBDIRS(__rcl_subdir)
   
WITH_]m4_translit([$2],[a-z],[A-Z])[_SUBDIR="__rcl_subdir"
   dnl # divert deferred flags handling because in the 
"internal"
  @@ -119,6 +132,7 @@
   __rcl_location_$2=internal
   AC_CONFIG_COMMANDS_PRE([
   if test ".${__rcl_location_$2}" = .internal; then
  +__rcl_verbose([++ post-adjustments for 
--with-$2 (${__rcl_location_$2})])
   __rcl_dirs_inc=`echo '$7' | sed -e 
's/^[[^:]]*://' -e 's/:[[^:]]*[$]//'`
   __rcl_dirs_lib=`echo '$7' | sed -e 
's/^[[^:]]*:[[^:]]*://'`
   
__rcl_basedir="\[$](top_srcdir)/\[$](WITH_]m4_translit([$2],[a-z],[A-Z])[_SUBDIR)"
  @@ -128,26 +142,33 @@
   for __rcl_dir in ${__rcl_dirs_inc}; do
   IFS="${__rcl_IFS}"
   test ".${__rcl_dir}" = . && continue
  +__rcl_verbose([-- extending 
CPPFLAGS: -I${__rcl_basedir}/${__rcl_dir}])
   CPPFLAGS="${CPPFLAGS} 
-I${__rcl_basedir}/${__rcl_dir}"
   done
   IFS="${__rcl_IFS}"
   fi
  +__rcl_verbose([-- extending CPPFLAGS: 
-I${__rcl_basedir}])
   CPPFLAGS="${CPPFLAGS} -I${__rcl_basedir}"
   if test ".${__rcl_dirs_lib}" != ".$7"; then
   __rcl_IFS="${IFS}"; IFS=","
   for __rcl_dir in ${__rcl_dirs_lib}; do
   IFS="${__rcl_IFS}"
   test ".${__rcl_dir}" = . && continue
  +__rcl_verbose([-- extending LDFLAGS: 
-L${__rcl_basedir}

[CVS] RPM: rpm/ acinclude.m4

2007-06-24 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:   24-Jun-2007 13:59:03
  Branch: HEAD Handle: 2007062412590200

  Modified files:
rpm acinclude.m4

  Log:
In preparation of adding granular verbose messages, use two M4 macros to
generate the "foo-config" and "pkg-config foo" related code.

  Summary:
RevisionChanges Path
2.8 +30 -20 rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.7 -r2.8 acinclude.m4
  --- rpm/acinclude.m4  24 Jun 2007 09:54:50 -  2.7
  +++ rpm/acinclude.m4  24 Jun 2007 11:59:02 -  2.8
  @@ -152,21 +152,32 @@
   ])
   elif test ".${__rcl_location}" = .external; then
   dnl # detection of library in arbitrary external location
  -__rcl_$2_version=`($2-config --version) 2>/dev/null`
  -if test ".${__rcl_$2_version}" != .; then
  +if test ".`($2-config --version) 2>/dev/null`" != .; then
   dnl # via config script in PATH
  -__rcl_flags="`($2-config --cppflags) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then CPPFLAGS="${CPPFLAGS} ${__rcl_flags}"; fi
  -__rcl_flags="`($2-config --cflags  ) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then CFLAGS="${CFLAGS} ${__rcl_flags}"; fi
  -__rcl_flags="`($2-config --ldflags ) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then LDFLAGS="${LDFLAGS} ${__rcl_flags}"; fi
  -__rcl_flags="`($2-config --libs) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then LIBS="${LIBS} ${__rcl_flags}"; fi
  +m4_define([__rcl_query_config], [
  +__rcl_flags="`($][1 --$][2) 2>/dev/null`"
  +if test ".${__rcl_flags}" != .; then
  +$][3="${$][3} ${__rcl_flags}"
  +fi
  +])
  +__rcl_query_config([$2-config], [cppflags], 
[CPPFLAGS])
  +__rcl_query_config([$2-config], [cflags],   [CFLAGS])
  +__rcl_query_config([$2-config], [ldflags],  
[LDFLAGS])
  +__rcl_query_config([$2-config], [libs], [LIBS])
   __rcl_result_hint="external: via $2-config"
   break
   elif (pkg-config --exists $2) 2>/dev/null; then
   dnl # via pkg-config(1) script in PATH
  -CPPFLAGS="${CPPFLAGS} `pkg-config $2 
--cflags-only-I`"
  -CFLAGS="${CFLAGS} `pkg-config $2 
--cflags-only-other`"
  -LDFLAGS="${LDFLAGS} `pkg-config $2 
--libs-only-other`"
  -LIBS="${LDFLAGS} `pkg-config $2 --libs-only-l`"
  +m4_define([__rcl_query_pkgconfig], [
  +__rcl_flags="`($][1 --$][2) 2>/dev/null`"
  +if test ".${__rcl_flags}" != .; then
  +$][3="${$][3} ${__rcl_flags}"
  +fi
  +])
  +__rcl_query_pkgconfig([pkg-config $2], 
[cflags-only-I], [CPPFLAGS])
  +__rcl_query_pkgconfig([pkg-config $2], 
[cflags-only-other], [CFLAGS])
  +__rcl_query_pkgconfig([pkg-config $2], 
[libs-only-other],   [LDFLAGS])
  +__rcl_query_pkgconfig([pkg-config $2], 
[libs-only-l],   [LIBS])
   __rcl_result_hint="external: via pkg-config $2"
   break
   elif test ".${__rcl_found}" = .no; then
  @@ -192,12 +203,11 @@
   dnl # via config script
   for __rcl_dir in ${__rcl_location}/bin 
${__rcl_location}; do
   if test -f "${__rcl_dir}/$2-config" && test ! -f 
"${__rcl_dir}/$2-config.in"; then
  -__rcl_$2_version=`(${__rcl_dir}/$2-config 
--version) 2>/dev/null`
  -if test ".${__rcl_$2_version}" != .; then
  -__rcl_flags="`(${__rcl_dir}/$2-config 
--cppflags) 2>/dev/null`"; if test ".${__rcl_flags}" != .; then 
CPPFLAGS="${CPPFLAGS} ${__rcl_flags}"; fi
  -__rcl_flags="`(${__rcl_dir}/$2-config

[CVS] RPM: rpm/ acinclude.m4

2007-06-24 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:   24-Jun-2007 11:54:50
  Branch: HEAD Handle: 2007062410545000

  Modified files:
rpm acinclude.m4

  Log:
fix comment

  Summary:
RevisionChanges Path
2.7 +1  -1  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.6 -r2.7 acinclude.m4
  --- rpm/acinclude.m4  24 Jun 2007 09:53:57 -  2.6
  +++ rpm/acinclude.m4  24 Jun 2007 09:54:50 -  2.7
  @@ -300,7 +300,7 @@
   dnl # check for actual availability of library
   m4_if([$7],,, [ if test ".${__rcl_location_last}" = .internal; 
then
   dnl # special case: still not existing "internal" library
  -dnl # cannot be checked (and usually has not be checked 
anyway)
  +dnl # cannot be checked (and usually has not to be checked 
anyway)
   with_$2=yes
   if test ".${__rcl_location_$2}" != .internal; then
   AC_ERROR([unable to find internal $1 library])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-06-24 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:   24-Jun-2007 11:53:57
  Branch: HEAD Handle: 2007062410535700

  Modified files:
rpm acinclude.m4

  Log:
fix indent

  Summary:
RevisionChanges Path
2.6 +2  -2  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.5 -r2.6 acinclude.m4
  --- rpm/acinclude.m4  24 Jun 2007 09:53:33 -  2.5
  +++ rpm/acinclude.m4  24 Jun 2007 09:53:57 -  2.6
  @@ -154,7 +154,7 @@
   dnl # detection of library in arbitrary external location
   __rcl_$2_version=`($2-config --version) 2>/dev/null`
   if test ".${__rcl_$2_version}" != .; then
  -dnl #   via config script in PATH
  +dnl # via config script in PATH
   __rcl_flags="`($2-config --cppflags) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then CPPFLAGS="${CPPFLAGS} ${__rcl_flags}"; fi
   __rcl_flags="`($2-config --cflags  ) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then CFLAGS="${CFLAGS} ${__rcl_flags}"; fi
   __rcl_flags="`($2-config --ldflags ) 2>/dev/null`"; 
if test ".${__rcl_flags}" != .; then LDFLAGS="${LDFLAGS} ${__rcl_flags}"; fi
  @@ -162,7 +162,7 @@
   __rcl_result_hint="external: via $2-config"
   break
   elif (pkg-config --exists $2) 2>/dev/null; then
  -dnl #   via pkg-config(1) script in PATH
  +dnl # via pkg-config(1) script in PATH
   CPPFLAGS="${CPPFLAGS} `pkg-config $2 
--cflags-only-I`"
   CFLAGS="${CFLAGS} `pkg-config $2 
--cflags-only-other`"
   LDFLAGS="${LDFLAGS} `pkg-config $2 
--libs-only-other`"
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-06-24 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:   24-Jun-2007 11:53:33
  Branch: HEAD Handle: 2007062410533300

  Modified files:
rpm acinclude.m4

  Log:
do an explicit pre-check for the system locations in order to be able
to stop the searching. This way we no longer continue searching and
hence assume incorrect results for the system location afterwards

  Summary:
RevisionChanges Path
2.5 +16 -0  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.4 -r2.5 acinclude.m4
  --- rpm/acinclude.m4  21 Jun 2007 08:35:53 -  2.4
  +++ rpm/acinclude.m4  24 Jun 2007 09:53:33 -  2.5
  @@ -169,6 +169,22 @@
   LIBS="${LDFLAGS} `pkg-config $2 --libs-only-l`"
   __rcl_result_hint="external: via pkg-config $2"
   break
  +elif test ".${__rcl_found}" = .no; then
  +dnl # via implicit flags attribution of previous 
checks or
  +dnl # in standard system locations (usually 
/usr/include and /usr/lib)
  +__rcl_found_hdr=no
  +__rcl_found_lib=no
  +AC_PREPROC_IFELSE([AC_LANG_SOURCE([EMAIL 
PROTECTED]:@include <$5>])], [ __rcl_found_hdr=yes ])
  +m4_foreach_w([__rcl_lib], [$3], [
  +__rcl_safe_LIBS="${LIBS}"
  +LIBS="-l[]m4_defn([__rcl_lib]) ${LIBS}"
  +AC_LINK_IFELSE([AC_LANG_CALL([], [$4])], [ 
__rcl_found_lib=yes ])
  +LIBS="${__rcl_safe_LIBS}"
  +])
  +if test ".${__rcl_found_hdr}:${__rcl_found_lib}" = 
".yes:yes"; then
  +__rcl_result_hint="external: implicit or default 
location"
  +break
  +fi
   fi
   elif test -d "${__rcl_location}"; then
   dnl # detection of library in particular external 
location
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-06-21 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:   21-Jun-2007 10:35:53
  Branch: HEAD Handle: 2007062109355300

  Modified files:
rpm acinclude.m4

  Log:
improve macro documentation

  Summary:
RevisionChanges Path
2.4 +19 -14 rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.3 -r2.4 acinclude.m4
  --- rpm/acinclude.m4  21 Jun 2007 08:25:54 -  2.3
  +++ rpm/acinclude.m4  21 Jun 2007 08:35:53 -  2.4
  @@ -35,8 +35,8 @@
   dnl ##,  -- [$5] e.g. bzlib.h
   dnl ##[,-- [$6] e.g. yes,external:internal:none
   dnl ##[, -- [$7] e.g. lib/bzip2
  -dnl ##[,  -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1, 
[...])
  -dnl ##-- [$9] e.g. AC_ERROR([...])
  +dnl ##[,  -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1, 
[...])
  +dnl ##-- [$9] e.g. AC_ERROR([...])
   dnl ##]]])
   dnl ##
   dnl ##  - Makefile.in:
  @@ -50,16 +50,21 @@
   dnl ##LIBS   = @LIBS@
   dnl ##
   dnl ##  - CLI:
  -dnl ##$ ./configure --with-[=] [...]
  -dnl ##::= "no"
  -dnl ##   | "yes"
  -dnl ##   | 
  -dnl ##  ::= 
  -dnl ##   |  ":" 
  -dnl ##   | "external"   /* arbitrary system path */
  -dnl ##   | "internal"   /*  only */
  -dnl ##   | "none"   /* no default error action if 
library not found */
  -dnl ## ::= [...]/* valid argument for test(1) 
option "-d" */
  +dnl ##$ ./configure \
  +dnl ##  --with-[=]
  +dnl ##  [...]
  +dnl ##
  +dnl ##  SYNTAX:
  +dnl ##   ::=  |   
  +dnl ##   ::=  "," 
  +dnl ##  ::= "yes" | "no"
  +dnl ##  ::=  ":" 

  +dnl ##   | 
  +dnl ##   | "external"
  +dnl ##   | "internal"
  +dnl ##   | "none"
  +dnl ## ::= [...] /* valid arg for test(1) option 
"-d" */
  +dnl ##
   dnl ##
   
   AC_DEFUN([RPM_CHECK_LIB], [
  @@ -335,10 +340,10 @@
   RPM_CHECK_LIB_LOCATION="${__rcl_location_last}"
   if test ".${with_$2}" = .yes; then
   AC_DEFINE([WITH_]m4_translit([$2],[a-z],[A-Z]), 1, [Define as 1 if 
building with $1 library])
  -dnl # support optional 
  +dnl # support optional 
   m4_if([$8],, :, [$8])
   else
  -dnl # support optional 
  +dnl # support optional 
   m4_if([$9],, [
   if  test ".${RPM_CHECK_LIB_LOCATION}" != . && \
   test ".${RPM_CHECK_LIB_LOCATION}" != .none; then
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ acinclude.m4

2007-06-21 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:   21-Jun-2007 10:25:54
  Branch: HEAD Handle: 2007062109255400

  Modified files:
rpm acinclude.m4

  Log:
Apply some additional bandage to ensure that we do not explicitly pass
in the standard Unix locations for headers and libraries. It might not
harm in general, but on some platforms (where third-party stuff lives
there) this certainly can make trouble.

  Summary:
RevisionChanges Path
2.3 +15 -5  rpm/acinclude.m4
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.2 -r2.3 acinclude.m4
  --- rpm/acinclude.m4  21 Jun 2007 08:15:48 -  2.2
  +++ rpm/acinclude.m4  21 Jun 2007 08:25:54 -  2.3
  @@ -203,7 +203,9 @@
   if test ".${__rcl_found}" = .no; then
   for __rcl_dir in ${__rcl_location}/include/$2 
${__rcl_location}/include ${__rcl_location}; do
   if test -f "${__rcl_dir}/$5"; then
  -CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +if test ".${__rcl_dir}" != "./usr/include"; 
then
  +CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +fi
   __rcl_found=yes
   break
   fi
  @@ -214,7 +216,9 @@
   m4_foreach_w([__rcl_lib], [$3], [
   if  test -f 
"${__rcl_dir}/lib[]m4_defn([__rcl_lib]).la" && \
   test -d "${__rcl_dir}/.libs"; then
  -LDFLAGS="${LDFLAGS} -L${__rcl_dir} 
-L${__rcl_dir}/.libs"
  +if test ".${__rcl_dir}" != 
"./usr/lib"; then
  +LDFLAGS="${LDFLAGS} 
-L${__rcl_dir} -L${__rcl_dir}/.libs"
  +fi
   __rcl_found=yes
   break
   fi
  @@ -222,7 +226,9 @@
   test -f 
"${__rcl_dir}/lib[]m4_defn([__rcl_lib]).so" || \
   test -f 
"${__rcl_dir}/lib[]m4_defn([__rcl_lib]).sl" || \
   test -f 
"${__rcl_dir}/lib[]m4_defn([__rcl_lib]).dylib"; then
  -LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +if test ".${__rcl_dir}" != 
"./usr/lib"; then
  +LDFLAGS="${LDFLAGS} 
-L${__rcl_dir}"
  +fi
   __rcl_found=yes
   break
   fi
  @@ -238,7 +244,9 @@
   for __rcl_file in _ `find ${__rcl_location} -name 
"$5" -type f -print`; do
   test .${__rcl_file} = ._ && continue
   __rcl_dir=`echo ${__rcl_file} | sed -e 
's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
  -CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +if test ".${__rcl_dir}" != "./usr/include"; then
  +CPPFLAGS="${CPPFLAGS} -I${__rcl_dir}"
  +fi
   __rcl_found=yes
   break
   done
  @@ -249,7 +257,9 @@
   egrep '\.(a|so|sl|dylib)$'`; do
   test .${__rcl_file} = ._ && continue
   __rcl_dir=`echo ${__rcl_file} | sed -e 
's;[[^/]]*[$];;' -e 's;\(.\)/[$];\1;'`
  -LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +if test ".${__rcl_dir}" != "./usr/lib"; 
then
  +LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
  +fi
   __rcl_found=yes
   break
   done
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repository

[CVS] RPM: rpm/ acinclude.m4 configure.ac

2007-06-21 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:   21-Jun-2007 10:15:48
  Branch: HEAD Handle: 2007062109154800

  Modified files:
rpm acinclude.m4 configure.ac

  Log:
Improve RPM_CHECK_LIB in order to better support building against
third-party libraries in default system locations:

- split default --with-foo argument into default enable mode ("yes" and
  "no") and default locations (for "yes" enable mode).

- assemble all abort error handlings directly at the action clause
  to even permit locating libraries fully implicitly (either because
  they are under default locations the compiler seaches anyway or
  because the user passed in the necessary CPPFLAGS and LDFLAGS
  himself).

- an explicit "abort" is now explicitly handled by either not having
  "none" as the last location or by explicitly using AC_ERROR in the
  .

  Summary:
RevisionChanges Path
2.2 +20 -25 rpm/acinclude.m4
2.102   +14 -14 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.1 -r2.2 acinclude.m4
  --- rpm/acinclude.m4  20 Jun 2007 21:10:19 -  2.1
  +++ rpm/acinclude.m4  21 Jun 2007 08:15:48 -  2.2
  @@ -33,7 +33,7 @@
   dnl ##,-- [$3] e.g. bz2
   dnl ##,-- [$4] e.g. BZ2_bzlibVersion
   dnl ##,  -- [$5] e.g. bzlib.h
  -dnl ##[,-- [$6] e.g. external:internal:none
  +dnl ##[,-- [$6] e.g. yes,external:internal:none
   dnl ##[, -- [$7] e.g. lib/bzip2
   dnl ##[,  -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1, 
[...])
   dnl ##-- [$9] e.g. AC_ERROR([...])
  @@ -58,8 +58,7 @@
   dnl ##   |  ":" 
   dnl ##   | "external"   /* arbitrary system path */
   dnl ##   | "internal"   /*  only */
  -dnl ##   | "abort"  /* explicit error if library not 
found */
  -dnl ##   | "none"   /* no error if library not found 
*/
  +dnl ##   | "none"   /* no default error action if 
library not found */
   dnl ## ::= [...]/* valid argument for test(1) 
option "-d" */
   dnl ##
   
  @@ -68,19 +67,18 @@
   dnl ## PROLOG
   dnl ##
   
  +dnl # parse  into default enable mode and default 
locations
  +m4_define([__rcl_default_enable], [m4_substr([$6], 0, m4_index([$6], 
[,]))])
  +m4_define([__rcl_default_locations], [m4_substr([$6], 
m4_eval(m4_index([$6], [,]) + 1))])
  +
  +dnl # provide defaults
   if test ".${with_$2+set}" != .set; then
  -dnl # neither "--with-foo[=]" nor "--without-foo" given
  -dnl # on command line so just assume "--with-foo="
  -with_$2="$6"
  -fi
  -if test ".${with_$2}" = .yes; then
  -dnl # map "--with-foo=yes" onto "--with-foo="
  -dnl # unless  is a destructive "no"
  -with_$2="m4_if([$6], no, yes, [$6])"
  +dnl # initialize to default enable mode
  +with_$2="__rcl_default_enable"
   fi
   if test ".${with_$2}" = .yes; then
  -dnl # map a final "--with-foo=yes" onto a hard-coded default
  -with_$2="internal:external:abort"
  +dnl # map simple "--with-foo=yes" to an enabled default location path
  +with_$2="__rcl_default_locations"
   fi
   
   dnl ##
  @@ -89,22 +87,19 @@
   
   __rcl_result_hint=""
   __rcl_location_$2=""
  +__rcl_location_last=""
   WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR=""
   AC_ARG_WITH($2,
  -AS_HELP_STRING([--with-$2=ARG], [build with $1 library [[$6]]]), [dnl
  +AS_HELP_STRING([--with-$2=ARG], [build with $1 library 
(__rcl_default_enable) (location path: "__rcl_default_locations")]), [dnl
   if test ".${with_$2}" != .no; then
   dnl # iterate over location path specification for searching 
purposes
  -__rcl_location_last=""
   __rcl_IFS="${IFS}"; IFS=":"
   for __rcl_location in ${with_$2}; do
   IFS="${__rcl_IFS}"
   __rcl_location_last="${__rcl_location}"
   if test ".${__rcl_location}" = .none; then
  -dnl # no operation in loop, ignore search failure later, 
too.
  +dnl # no operation in loop, ignore failure later, too.
   :
  -elif test ".${__rcl_location}" = .abort; then
  -

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4 configure.ac

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4 configure.ac

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4 configure.ac

[CVS] RPM: rpm/ acinclude.m4 configure.ac

[CVS] RPM: rpm/ acinclude.m4 devtool.conf

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4

[CVS] RPM: rpm/ acinclude.m4 configure.ac

21 matches

Site Navigation

Mail list logo

Footer information