summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-06-02 00:53:01 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-06-02 00:53:01 +0200
commit66f247a2fb7aa6a09ee1d8281bf43d973cf26140 (patch)
tree9197968f5f2574f9401e749b4cfa0dbf7110366e
parentb3aca845c0cec7e39d98d57d06a76aa295926f5a (diff)
downloadgnutls-66f247a2fb7aa6a09ee1d8281bf43d973cf26140.tar.gz
Revert "This patch fixes following kind of issue with automake 1.12"
This reverts commit 77670476814c078bbad56ce8772b192a3b5736b6.
-rw-r--r--configure.ac3
-rw-r--r--lib/configure.ac3
-rw-r--r--libextra/configure.ac3
3 files changed, 0 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 94eac4b681..6d44bee66d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,6 @@ 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 dd0325f9bc..25f68d7adb 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -31,9 +31,6 @@ 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 44a6067b82..c293507d30 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -31,9 +31,6 @@ 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