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:
Revision Changes 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 -0000 2.14
+++ rpm/acinclude.m4 28 Jun 2007 06:12:33 -0000 2.15
@@ -63,7 +63,7 @@
dnl ## <with-arg-default>[, -- [$6] e.g. yes,external:internal:none
dnl ## <internal-subdir>[, -- [$7] e.g. lib/bzip2
dnl ## <action-success>[, -- [$8] e.g. AC_DEFINE(USE_BZIP2, 1,
[...])
-dnl ## <action-failure> -- [$9] e.g. AC_ERROR([...])
+dnl ## <action-failure> -- [$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 -0000 2.151
+++ rpm/configure.ac 28 Jun 2007 06:12:33 -0000 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_LIB(
[SQLite], [sqlite],
[sqlite3], [sqlite3_open], [sqlite3.h],
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
