forked from pool/gnutls
76249fc4ae
- merge am-1.12 patches into 1 - fix 12.2 builds. * replace depreciated am_prog_mkdir_p with ac_prog_mkdir_p. OBS-URL: https://build.opensuse.org/request/show/126824 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=51
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
Index: gnutls-3.0.20/configure.ac
|
|
===================================================================
|
|
--- gnutls-3.0.20.orig/configure.ac 2012-07-01 21:50:17.000000000 +0200
|
|
+++ gnutls-3.0.20/configure.ac 2012-07-01 21:50:17.977499968 +0200
|
|
@@ -37,6 +37,7 @@ dnl Checks for programs.
|
|
AC_PROG_CC
|
|
AM_PROG_AS
|
|
AC_PROG_CXX
|
|
+AM_PROG_AR
|
|
gl_EARLY
|
|
|
|
# For includes/gnutls/gnutls.h.in.
|
|
Index: gnutls-3.0.20/aclocal.m4
|
|
===================================================================
|
|
--- gnutls-3.0.20.orig/aclocal.m4 2012-06-05 19:10:14.000000000 +0200
|
|
+++ gnutls-3.0.20/aclocal.m4 2012-07-01 21:53:42.821893323 +0200
|
|
@@ -529,7 +529,7 @@ AM_MISSING_PROG(AUTOHEADER, autoheader)
|
|
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
|
|
@@ -773,10 +773,10 @@ fi
|
|
|
|
# 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,
|
|
Index: gnutls-3.0.20/gl/m4/gnulib-common.m4
|
|
===================================================================
|
|
--- gnutls-3.0.20.orig/gl/m4/gnulib-common.m4 2012-06-05 19:07:51.000000000 +0200
|
|
+++ gnutls-3.0.20/gl/m4/gnulib-common.m4 2012-07-01 21:53:42.821893323 +0200
|
|
@@ -301,7 +301,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [
|
|
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])])])
|
|
|
|
Index: gnutls-3.0.20/m4/po.m4
|
|
===================================================================
|
|
--- gnutls-3.0.20.orig/m4/po.m4 2011-11-08 22:07:12.000000000 +0100
|
|
+++ gnutls-3.0.20/m4/po.m4 2012-07-01 21:53:42.822893277 +0200
|
|
@@ -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
|