summaryrefslogtreecommitdiff
blob: a1593c6a57aebd14eba3091dda4779247fd4c454 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
bug #424095
--- a/configure.ac	2012-03-12 11:18:21.000000000 -0700
+++ b/configure.ac	2012-07-08 15:43:18.597050382 -0700
@@ -43,6 +43,9 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS(termios.h pwd.h syslog.h resolv.h arpa/nameser.h netinet/in6.h)
 
+# Defined for >= automake 1.12
+m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
+
 # Used when creating libshishi-XX.def.
 SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
 AC_SUBST(SOVERSION)
--- a/m4/po.m4	2012-03-12 11:18:53.000000000 -0700
+++ b/m4/po.m4	2012-07-08 14:59:00.247043443 -0700
@@ -24,7 +24,7 @@
 [
   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