diff options
| author |   Eray Aslan <eras@gentoo.org> | 2012-07-11 09:11:47 +0000 |
|---|---|---|
| committer | Eray Aslan <eras@gentoo.org> | 2012-07-11 09:11:47 +0000 |
| commit | 32a2635d91f028bfce5ee00f82e5877f00cd89bf (patch) | |
| tree | 5b5f2cafb1c33b235e3e38146c22a80bab154a4f /app-crypt/shishi/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-32a2635d91f028bfce5ee00f82e5877f00cd89bf.tar.gz gentoo-2-32a2635d91f028bfce5ee00f82e5877f00cd89bf.tar.bz2 gentoo-2-32a2635d91f028bfce5ee00f82e5877f00cd89bf.zip | |
Fix building with automake-1.12. Thanks to Brennan Shacklett
(Portage version: 2.1.11.5/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/shishi/files')
| -rw-r--r-- | app-crypt/shishi/files/shishi_automake-1.12.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/app-crypt/shishi/files/shishi_automake-1.12.patch b/app-crypt/shishi/files/shishi_automake-1.12.patch new file mode 100644 index 000000000000..484906d3c865 --- /dev/null +++ b/app-crypt/shishi/files/shishi_automake-1.12.patch @@ -0,0 +1,35 @@ +bug #424095 +diff -urN shishi-1.0.1-orig/configure.ac shishi-1.0.1/configure.ac +--- shishi-1.0.1-orig/configure.ac 2012-03-12 11:18:21.000000000 -0700 ++++ shishi-1.0.1/configure.ac 2012-07-08 15:43:18.597050382 -0700 +@@ -24,7 +24,7 @@ + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS(config.h) +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + AM_SILENT_RULES([yes]) + + # Library code modified: REVISION++ +@@ -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) +diff -urN shishi-1.0.1-orig/m4/po.m4 shishi-1.0.1/m4/po.m4 +--- shishi-1.0.1-orig/m4/po.m4 2012-03-12 11:18:53.000000000 -0700 ++++ shishi-1.0.1/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 |