rendered paste bodydiff -u parted-1.8.7.org/m4/absolute-header.m4 parted-1.8.7/m4/absolute-header.m4
--- parted-1.8.7.org/m4/absolute-header.m4 2006-07-11 16:02:25.000000000 +0300
+++ parted-1.8.7/m4/absolute-header.m4 2007-07-10 14:54:48.000000000 +0300
@@ -25,7 +25,7 @@
m4_quote(m4_defn([gl_absolute_header])),
[AS_VAR_PUSHDEF([ac_header_exists],
[ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl
- AC_CHECK_HEADERS_ONCE(m4_quote(m4_defn([gl_HEADER_NAME])))dnl
+ AC_CHECK_HEADERS(m4_quote(m4_defn([gl_HEADER_NAME])))dnl
if test AS_VAR_GET(ac_header_exists) = yes; then
AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]])])
dnl eval is necessary to expand ac_cpp.
diff -u parted-1.8.7.org/m4/fpending.m4 parted-1.8.7/m4/fpending.m4
--- parted-1.8.7.org/m4/fpending.m4 2006-09-27 20:59:19.000000000 +0300
+++ parted-1.8.7/m4/fpending.m4 2007-07-10 14:57:41.000000000 +0300
@@ -15,7 +15,7 @@
AC_DEFUN([gl_FUNC_FPENDING],
[
- AC_CHECK_HEADERS_ONCE(stdio_ext.h)
+ AC_CHECK_HEADERS(stdio_ext.h)
AC_REPLACE_FUNCS([__fpending])
fp_headers='
# include <stdio.h>
diff -u parted-1.8.7.org/m4/getopt.m4 parted-1.8.7/m4/getopt.m4
--- parted-1.8.7.org/m4/getopt.m4 2006-07-09 04:35:10.000000000 +0300
+++ parted-1.8.7/m4/getopt.m4 2007-07-10 15:04:08.000000000 +0300
@@ -79,5 +79,5 @@
# Prerequisites of lib/getopt*.
AC_DEFUN([gl_PREREQ_GETOPT],
[
- AC_CHECK_DECLS_ONCE([getenv])
+ AC_CHECK_DECLS([getenv])
])
diff -u parted-1.8.7.org/m4/gettext.m4 parted-1.8.7/m4/gettext.m4
--- parted-1.8.7.org/m4/gettext.m4 2007-05-10 00:01:11.000000000 +0300
+++ parted-1.8.7/m4/gettext.m4 2007-07-10 15:06:25.000000000 +0300
@@ -73,7 +73,7 @@
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
- AC_REQUIRE([AM_INTL_SUBDIR])dnl
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
])
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
diff -u parted-1.8.7.org/m4/inttypes.m4 parted-1.8.7/m4/inttypes.m4
--- parted-1.8.7.org/m4/inttypes.m4 2007-02-18 06:28:27.000000000 +0200
+++ parted-1.8.7/m4/inttypes.m4 2007-07-10 15:04:13.000000000 +0300
@@ -11,10 +11,10 @@
[
AC_REQUIRE([gl_STDINT_H])
AC_REQUIRE([gt_INTTYPES_PRI])
- AC_CHECK_DECLS_ONCE([imaxabs])
- AC_CHECK_DECLS_ONCE([imaxdiv])
- AC_CHECK_DECLS_ONCE([strtoimax])
- AC_CHECK_DECLS_ONCE([strtoumax])
+ AC_CHECK_DECLS([imaxabs])
+ AC_CHECK_DECLS([imaxdiv])
+ AC_CHECK_DECLS([strtoimax])
+ AC_CHECK_DECLS([strtoumax])
dnl Now see if we need a substitute <inttypes.h>.
dnl A complete <inttypes.h> requires
diff -u parted-1.8.7.org/m4/lib-link.m4 parted-1.8.7/m4/lib-link.m4
--- parted-1.8.7.org/m4/lib-link.m4 2007-01-08 22:16:33.000000000 +0200
+++ parted-1.8.7/m4/lib-link.m4 2007-07-10 15:07:09.000000000 +0300
@@ -109,7 +109,7 @@
AC_DEFUN([AC_LIB_RPATH],
[
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ dnl m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
diff -u parted-1.8.7.org/m4/localcharset.m4 parted-1.8.7/m4/localcharset.m4
--- parted-1.8.7.org/m4/localcharset.m4 2006-10-18 15:03:51.000000000 +0300
+++ parted-1.8.7/m4/localcharset.m4 2007-07-10 15:04:21.000000000 +0300
@@ -8,7 +8,7 @@
[
dnl Prerequisites of lib/localcharset.c.
AC_REQUIRE([AM_LANGINFO_CODESET])
- AC_CHECK_DECLS_ONCE(getc_unlocked)
+ AC_CHECK_DECLS(getc_unlocked)
dnl Prerequisites of the lib/Makefile.am snippet.
AC_REQUIRE([AC_CANONICAL_HOST])
diff -u parted-1.8.7.org/m4/quotearg.m4 parted-1.8.7/m4/quotearg.m4
--- parted-1.8.7.org/m4/quotearg.m4 2007-01-16 18:31:23.000000000 +0200
+++ parted-1.8.7/m4/quotearg.m4 2007-07-10 15:05:12.000000000 +0300
@@ -9,7 +9,7 @@
AC_LIBOBJ([quotearg])
dnl Prerequisites of lib/quotearg.c.
- AC_CHECK_FUNCS_ONCE([mbsinit])
+ AC_CHECK_FUNCS([mbsinit])
AC_TYPE_MBSTATE_T
gl_FUNC_MBRTOWC
])
diff -u parted-1.8.7.org/m4/regex.m4 parted-1.8.7/m4/regex.m4
--- parted-1.8.7.org/m4/regex.m4 2007-02-24 13:54:07.000000000 +0200
+++ parted-1.8.7/m4/regex.m4 2007-07-10 15:05:17.000000000 +0300
@@ -14,7 +14,7 @@
AC_DEFUN([gl_REGEX],
[
- AC_CHECK_HEADERS_ONCE([locale.h])
+ AC_CHECK_HEADERS([locale.h])
AC_ARG_WITH([included-regex],
[AC_HELP_STRING([--without-included-regex],
@@ -206,6 +206,6 @@
[
AC_REQUIRE([AC_GNU_SOURCE])
AC_REQUIRE([AC_C_RESTRICT])
- AC_CHECK_FUNCS_ONCE([iswctype mbrtowc wcrtomb wcscoll])
+ AC_CHECK_FUNCS([iswctype mbrtowc wcrtomb wcscoll])
AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
])
diff -u parted-1.8.7.org/m4/stdint.m4 parted-1.8.7/m4/stdint.m4
--- parted-1.8.7.org/m4/stdint.m4 2007-04-28 21:05:58.000000000 +0300
+++ parted-1.8.7/m4/stdint.m4 2007-07-10 14:52:42.000000000 +0300
@@ -19,7 +19,7 @@
HAVE_LONG_LONG_INT=0
fi
AC_SUBST([HAVE_LONG_LONG_INT])
- AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+ dnl AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
if test $ac_cv_type_unsigned_long_long_int = yes; then
HAVE_UNSIGNED_LONG_LONG_INT=1
else
diff -u parted-1.8.7.org/m4/strndup.m4 parted-1.8.7/m4/strndup.m4
--- parted-1.8.7.org/m4/strndup.m4 2007-01-27 16:43:17.000000000 +0200
+++ parted-1.8.7/m4/strndup.m4 2007-07-10 15:04:24.000000000 +0300
@@ -10,7 +10,7 @@
AC_REQUIRE([AC_GNU_SOURCE])
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
- AC_CHECK_DECLS_ONCE([strndup])
+ AC_CHECK_DECLS([strndup])
if test $ac_cv_have_decl_strndup = no; then
HAVE_DECL_STRNDUP=0
fi
diff -u parted-1.8.7.org/m4/strnlen.m4 parted-1.8.7/m4/strnlen.m4
--- parted-1.8.7.org/m4/strnlen.m4 2007-01-27 16:43:17.000000000 +0200
+++ parted-1.8.7/m4/strnlen.m4 2007-07-10 15:01:23.000000000 +0300
@@ -10,7 +10,7 @@
AC_REQUIRE([AC_GNU_SOURCE])
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
- AC_CHECK_DECLS_ONCE([strnlen])
+ AC_CHECK_DECLS([strnlen])
if test $ac_cv_have_decl_strnlen = no; then
HAVE_DECL_STRNLEN=0
fi
diff -u parted-1.8.7.org/m4/unistd_h.m4 parted-1.8.7/m4/unistd_h.m4
--- parted-1.8.7.org/m4/unistd_h.m4 2007-05-02 01:15:02.000000000 +0300
+++ parted-1.8.7/m4/unistd_h.m4 2007-07-10 14:57:55.000000000 +0300
@@ -12,7 +12,7 @@
dnl once only, before all statements that occur in other macros.
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- AC_CHECK_HEADERS_ONCE([unistd.h])
+ AC_CHECK_HEADERS([unistd.h])
if test $ac_cv_header_unistd_h = yes; then
HAVE_UNISTD_H=1
gl_ABSOLUTE_HEADER([unistd.h])
diff -u parted-1.8.7.org/m4/utimbuf.m4 parted-1.8.7/m4/utimbuf.m4
--- parted-1.8.7.org/m4/utimbuf.m4 2007-01-18 10:33:35.000000000 +0200
+++ parted-1.8.7/m4/utimbuf.m4 2007-07-10 14:58:00.000000000 +0300
@@ -15,7 +15,7 @@
AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF],
[
- AC_CHECK_HEADERS_ONCE(sys/time.h utime.h)
+ AC_CHECK_HEADERS(sys/time.h utime.h)
AC_CACHE_CHECK([for struct utimbuf], [gl_cv_sys_struct_utimbuf],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
diff -u parted-1.8.7.org/m4/utime.m4 parted-1.8.7/m4/utime.m4
--- parted-1.8.7.org/m4/utime.m4 2005-01-23 10:06:57.000000000 +0200
+++ parted-1.8.7/m4/utime.m4 2007-07-10 14:59:26.000000000 +0300
@@ -24,7 +24,7 @@
# Prerequisites of lib/utime.c.
AC_DEFUN([gl_PREREQ_UTIME],
[
- AC_CHECK_HEADERS_ONCE(utime.h)
+ AC_CHECK_HEADERS(utime.h)
AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
gl_FUNC_UTIMES_NULL
])
diff -u parted-1.8.7.org/m4/wctype.m4 parted-1.8.7/m4/wctype.m4
--- parted-1.8.7.org/m4/wctype.m4 2007-05-01 21:21:31.000000000 +0300
+++ parted-1.8.7/m4/wctype.m4 2007-07-10 15:05:21.000000000 +0300
@@ -9,14 +9,14 @@
AC_DEFUN([gl_WCTYPE_H],
[
- AC_CHECK_FUNCS_ONCE([iswcntrl])
+ AC_CHECK_FUNCS([iswcntrl])
if test $ac_cv_func_iswcntrl = yes; then
HAVE_ISWCNTRL=1
else
HAVE_ISWCNTRL=0
fi
AC_SUBST([HAVE_ISWCNTRL])
- AC_CHECK_HEADERS_ONCE([wctype.h])
+ AC_CHECK_HEADERS([wctype.h])
AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([gt_TYPE_WINT_T])
--- parted-1.8.7.org/configure.ac 2007-05-09 22:19:10.000000000 +0300
+++ parted-1.8.7/configure.ac 2007-07-10 14:40:17.000000000 +0300
@@ -4,7 +4,7 @@
dnl
dnl This file may be modified and/or distributed without restriction.
-AC_PREREQ(2.61)
+AC_PREREQ(2.59)
AC_INIT([GNU parted],[1.8.7],[bug-parted@gnu.org])
AC_CONFIG_SRCDIR(include/parted/parted.h)
@@ -44,7 +44,7 @@
test $PACKAGE_VERSION = $PED_VERSION ||
AC_MSG_ERROR(configure.ac: version mismatch: $PACKAGE_VERSION != $PED_VERSION)
-AM_INIT_AUTOMAKE([1.10 dist-bzip2])
+AM_INIT_AUTOMAKE()
AC_CANONICAL_HOST
case "$host_os" in