2013-07-01 13:54:42 +00:00
|
|
|
Index: gnutls-3.2.1/aclocal.m4
|
2012-05-31 15:04:51 +00:00
|
|
|
===================================================================
|
2013-07-01 13:54:42 +00:00
|
|
|
--- gnutls-3.2.1.orig/aclocal.m4
|
|
|
|
+++ gnutls-3.2.1/aclocal.m4
|
|
|
|
@@ -517,7 +517,7 @@ AM_MISSING_PROG(AUTOHEADER, autoheader)
|
2012-07-02 08:52:22 +00:00
|
|
|
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
|
|
|
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
|
|
|
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
|
|
|
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
|
|
|
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
|
|
|
# We need awk for the "check" target. The system "awk" is bad on
|
|
|
|
# some platforms.
|
|
|
|
AC_REQUIRE([AC_PROG_AWK])dnl
|
2013-07-01 13:54:42 +00:00
|
|
|
@@ -761,10 +761,10 @@ fi
|
2012-07-02 08:52:22 +00:00
|
|
|
|
|
|
|
# serial 1
|
|
|
|
|
|
|
|
-# AM_PROG_MKDIR_P
|
|
|
|
+# AC_PROG_MKDIR_P
|
|
|
|
# ---------------
|
|
|
|
# Check for `mkdir -p'.
|
|
|
|
-AC_DEFUN([AM_PROG_MKDIR_P],
|
|
|
|
+AC_DEFUN([AC_PROG_MKDIR_P],
|
|
|
|
[AC_PREREQ([2.60])dnl
|
|
|
|
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
|
|
|
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
|
2013-07-01 13:54:42 +00:00
|
|
|
Index: gnutls-3.2.1/gl/m4/gnulib-common.m4
|
2012-07-02 08:52:22 +00:00
|
|
|
===================================================================
|
2013-07-01 13:54:42 +00:00
|
|
|
--- gnutls-3.2.1.orig/gl/m4/gnulib-common.m4
|
|
|
|
+++ gnutls-3.2.1/gl/m4/gnulib-common.m4
|
|
|
|
@@ -303,7 +303,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [
|
2012-07-02 08:52:22 +00:00
|
|
|
AC_SUBST([MKDIR_P])])], [
|
|
|
|
dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
|
|
|
|
AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
|
|
|
|
- [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
|
|
|
+ [AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
|
|
|
|
MKDIR_P='$(mkdir_p)'
|
|
|
|
AC_SUBST([MKDIR_P])])])
|
2013-07-01 13:54:42 +00:00
|
|
|
])
|
|
|
|
Index: gnutls-3.2.1/m4/po.m4
|
2012-07-02 08:52:22 +00:00
|
|
|
===================================================================
|
2013-07-01 13:54:42 +00:00
|
|
|
--- gnutls-3.2.1.orig/m4/po.m4
|
|
|
|
+++ gnutls-3.2.1/m4/po.m4
|
2012-07-02 08:52:22 +00:00
|
|
|
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
|
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
|
|
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
|
|
|
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
|
|
|
|
AC_REQUIRE([AM_NLS])dnl
|
|
|
|
|
|
|
|
dnl Release version of the gettext macros. This is used to ensure that
|