summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-05-09 08:14:48 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-05-09 08:14:48 +0200
commit77670476814c078bbad56ce8772b192a3b5736b6 (patch)
tree0a3a935675df6d0867a94bb1a97f3d6ccd1d1974
parent7ffaf771d9b3e46d6ffe0944e69230fe4f16713f (diff)
downloadgnutls-77670476814c078bbad56ce8772b192a3b5736b6.tar.gz
This patch fixes following kind of issue with automake 1.12
| automake: warnings are treated as errors | /.../automake-1.12/am/ltlibrary.am: warning: 'libgnutls.la': linking libtool libraries using a non-POSIX | /.../automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' Patch by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--configure.ac3
-rw-r--r--lib/configure.ac3
-rw-r--r--libextra/configure.ac3
3 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 6d44bee66d..94eac4b681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,9 @@ AC_MSG_RESULT([***
dnl Checks for programs.
AC_PROG_CC
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
AC_PROG_LN_S
GTK_DOC_CHECK(1.1)
AC_PATH_PROG([GAA], [gaa])
diff --git a/lib/configure.ac b/lib/configure.ac
index 25f68d7adb..dd0325f9bc 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -31,6 +31,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
lgl_EARLY
AC_LIBTOOL_WIN32_DLL
diff --git a/libextra/configure.ac b/libextra/configure.ac
index c293507d30..44a6067b82 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -31,6 +31,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
xgl_EARLY
AC_LIBTOOL_WIN32_DLL