RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm file Date: 07-Apr-2009 16:39:43
Branch: HEAD Handle: 2009040714394201
Modified files:
file mkinstalldirs
rpm acinclude.m4 configure.ac
Log:
devzero2000: Update autoconf version in AC_PREREQ in configure.ac - use the
same as in autoconf. Replace
via autoupdate the obsolete macros AC_TRY_RUN and AC_HELP_STRING. Do the
same on acinclude.m4.
Summary:
Revision Changes Path
1.6 +34 -31 file/mkinstalldirs
2.26 +1 -1 rpm/acinclude.m4
2.355 +9 -19 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/mkinstalldirs
============================================================================
$ cvs diff -u -r1.5 -r1.6 mkinstalldirs
--- file/mkinstalldirs 25 May 2007 17:35:59 -0000 1.5
+++ file/mkinstalldirs 7 Apr 2009 14:39:43 -0000 1.6
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
# Original author: Noah Friedman <fried...@prep.ai.mit.edu>
# Created: 1993-05-16
@@ -11,6 +11,9 @@
# bugs to <bug-autom...@gnu.org> or send patches to
# <automake-patc...@gnu.org>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
dirmode=
@@ -25,12 +28,12 @@
# process command line arguments
while test $# -gt 0 ; do
case $1 in
- -h | --help | --h* ) # -h for help
+ -h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
- -m ) # -m PERM arg
- shift
+ -m) # -m PERM arg
+ shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
@@ -50,7 +53,7 @@
*) # first non-opt arg
break
;;
- esac
+ esac
done
for file
@@ -63,7 +66,7 @@
done
case $# in
-0) exit 0 ;;
+ 0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
@@ -73,10 +76,10 @@
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
-'')
+ '')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
@@ -86,11 +89,11 @@
test -d ./--version && rmdir ./--version
fi
;;
-*)
+ *)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
@@ -110,40 +113,40 @@
oIFS=$IFS
IFS=/
set fnord $file
- shift
+ shift
IFS=$oIFS
- for d
- do
+ for d
+ do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
- -* ) pathcomp=./$pathcomp ;;
- esac
+ -*) pathcomp=./$pathcomp ;;
+ esac
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
- mkdir "$pathcomp" || lasterr=$?
+ mkdir "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
fi
fi
- fi
+ fi
+ fi
pathcomp=$pathcomp/
- done
+ done
done
exit $errstatus
@@ .
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
============================================================================
$ cvs diff -u -r2.25 -r2.26 acinclude.m4
--- rpm/acinclude.m4 23 Mar 2009 17:25:21 -0000 2.25
+++ rpm/acinclude.m4 7 Apr 2009 14:39:42 -0000 2.26
@@ -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_TRY_RUN(__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
])
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.354 -r2.355 configure.ac
--- rpm/configure.ac 6 Apr 2009 20:34:09 -0000 2.354
+++ rpm/configure.ac 7 Apr 2009 14:39:42 -0000 2.355
@@ -6,9 +6,9 @@
dnl ## ==== REQUIREMENTS & INITIALIZATION ====
dnl ##
-AC_PREREQ(2.60)
+AC_PREREQ(2.63)
AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT(rpm, [5.2.DEVEL], [PACKAGE_BUGREPORT_DEFAULT])
+AC_INIT([rpm],[5.2.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
PACKAGE_TIMESTAMP="2008" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
@@ -276,9 +276,7 @@
esac
AC_ARG_ENABLE(
[build-versionscript],
- AC_HELP_STRING(
- [--enable-build-versionscript],
- [enable/disable use of GNU ld(1) version script (default is system
dependent)]),
+ AS_HELP_STRING([--enable-build-versionscript],[enable/disable use of GNU
ld(1) version script (default is system dependent)]),
[have_ld_version_script=$enableval], [:])
AM_CONDITIONAL(
[HAVE_LD_VERSION_SCRIPT],
@@ -287,9 +285,7 @@
dnl # support implicit internal library dependencies
AC_ARG_ENABLE(
[build-intlibdep],
- AC_HELP_STRING(
- [--disable-build-intlibdep],
- [disable use of implicit internal library dependencies]),
+ AS_HELP_STRING([--disable-build-intlibdep],[disable use of implicit
internal library dependencies]),
[ do_build_intlibdep=$enableval ],
[ do_build_intlibdep=yes ])
AM_CONDITIONAL(
@@ -299,9 +295,7 @@
dnl # support implicit external library dependencies
AC_ARG_ENABLE(
[build-extlibdep],
- AC_HELP_STRING(
- [--disable-build-extlibdep],
- [disable use of implicit external library dependencies]),
+ AS_HELP_STRING([--disable-build-extlibdep],[disable use of implicit
external library dependencies]),
[ do_build_extlibdep=$enableval ],
[ do_build_extlibdep=yes ])
AM_CONDITIONAL(
@@ -311,9 +305,7 @@
dnl # support implicit maximum external library dependencies
AC_ARG_ENABLE(
[build-maxextlibdep],
- AC_HELP_STRING(
- [--disable-build-maxextlibdep],
- [disable use of implicit maximum external library dependencies]),
+ AS_HELP_STRING([--disable-build-maxextlibdep],[disable use of implicit
maximum external library dependencies]),
[ do_build_maxextlibdep=$enableval ],
[ do_build_maxextlibdep=yes ])
AM_CONDITIONAL(
@@ -323,9 +315,7 @@
dnl # support removal of GNU libtool *.la files
AC_ARG_ENABLE(
[build-lafiles],
- AC_HELP_STRING(
- [--disable-build-lafiles],
- [disable the removal of GNU libtool *.la files on installation]),
+ AS_HELP_STRING([--disable-build-lafiles],[disable the removal of GNU
libtool *.la files on installation]),
[ do_build_lafiles=$enableval ],
[ do_build_lafiles=yes ])
AM_CONDITIONAL(
@@ -528,7 +518,7 @@
AC_MSG_HEADER([API CHECKS])
dnl # platform specific checks
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
dnl # standard checks
AM_C_PROTOTYPES
@@ -1540,7 +1530,7 @@
dnl # support for versioned installation paths
AC_ARG_WITH(
[path-versioned],
- AC_HELP_STRING([--with-path-versioned], [install with versioned paths]),
+ AS_HELP_STRING([--with-path-versioned],[install with versioned paths]),
[WITH_PATH_VERSIONED=$withval],
[WITH_PATH_VERSIONED=no])
AM_CONDITIONAL(
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
