Simon Josefsson <[email protected]> on Thu, 2013/01/10 15:04:
> Christian Hesse <[email protected]> writes:
>
> > Hello everybody,
> >
> > I need these changes to build from git with latest automake.
>
> Hi. This was dicussed on the automake list some time ago:
>
> http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
>
> Can you check whether 'm4_ifdef([AM_PROG_AR], [AM_PROG_AR])' alone is
> sufficient? I think it should be.
Looks good. My updated and tested patch is attached.
--
main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH"
"CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];)
putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}
diff --git a/liboath/configure.ac b/liboath/configure.ac
index 417fb85..620ad0c 100644
--- a/liboath/configure.ac
+++ b/liboath/configure.ac
@@ -37,6 +37,8 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_SILENT_RULES([yes])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
AC_LIBTOOL_WIN32_DLL
AC_PROG_CC
gl_EARLY
diff --git a/libpskc/configure.ac b/libpskc/configure.ac
index afcd698..40c48c8 100644
--- a/libpskc/configure.ac
+++ b/libpskc/configure.ac
@@ -37,6 +37,8 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_SILENT_RULES([yes])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
AC_LIBTOOL_WIN32_DLL
AC_PROG_CC
gl_EARLY
diff --git a/libpskc/gtk-doc/Makefile.am b/libpskc/gtk-doc/Makefile.am
index b210c43..5c948cf 100644
--- a/libpskc/gtk-doc/Makefile.am
+++ b/libpskc/gtk-doc/Makefile.am
@@ -1,7 +1,10 @@
## Process this file with automake to produce Makefile.in
# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
+# no-portability allows us to use GNU make variable assignments
+# without automake complaining.
+AUTOMAKE_OPTIONS = 1.6 -Wno-portability
+
# This is a blank Makefile.am for using gtk-doc.
# Copy this to your project's API docs directory and modify the variables to
diff --git a/oathtool/configure.ac b/oathtool/configure.ac
index d5895ad..a4abbab 100644
--- a/oathtool/configure.ac
+++ b/oathtool/configure.ac
@@ -26,6 +26,8 @@ AM_SILENT_RULES([yes])
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
AC_LIBTOOL_WIN32_DLL
AC_PROG_CC
gl_EARLY
diff --git a/pam_oath/configure.ac b/pam_oath/configure.ac
index 644cf42..30a4d4d 100644
--- a/pam_oath/configure.ac
+++ b/pam_oath/configure.ac
@@ -24,6 +24,8 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_SILENT_RULES([yes])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
AC_PROG_CC
AC_LIBTOOL_WIN32_DLL
AC_DISABLE_STATIC
diff --git a/pskctool/configure.ac b/pskctool/configure.ac
index 3c9d877..b910025 100644
--- a/pskctool/configure.ac
+++ b/pskctool/configure.ac
@@ -26,6 +26,8 @@ AM_SILENT_RULES([yes])
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
AC_LIBTOOL_WIN32_DLL
AC_PROG_CC
gl_EARLY
