Patch config.hin, not extern-inline.m4

var/spack/repos/builtin/packages/m4/inline-pgi.patch

@@ -1,22 +0,0 @@
---- a/m4/extern-inline.m4
-+++ b/m4/extern-inline.m4
-@@ -34,6 +34,7 @@
-       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-       : (199901L <= __STDC_VERSION__ \
-          && !defined __HP_cc \
-+         && !defined __PGI \
-          && !(defined __SUNPRO_C && __STDC__))) \
-      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
- # define _GL_INLINE inline
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@
-   [bug-m4@gnu.org])
- AC_CONFIG_AUX_DIR([build-aux])
- 
--AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests
-+AM_INIT_AUTOMAKE([dist-bzip2 dist-xz color-tests parallel-tests
- silent-rules subdir-objects gnu])
- 
- m4_pattern_forbid([^M4_[A-Z]])
-

var/spack/repos/builtin/packages/m4/package.py

@@ -7,17 +7,13 @@ class M4(Package):
 
     version('1.4.17', 'a5e9954b1dae036762f7b13673a2cf76')
 
-    patch('inline-pgi.patch', when='@1.4.17')
+    patch('pgi.patch', when='@1.4.17')
 
     variant('sigsegv', default=True, description="Build the libsigsegv dependency")
 
     depends_on('libsigsegv', when='+sigsegv')
 
     def install(self, spec, prefix):
-        # After patch, update generated configuration files that depend on extern-inline.m4
-        autoreconf = which('autoreconf')
-        autoreconf()
-
         configure_args = []
         if 'libsigsegv' in spec:
             configure_args.append('--with-libsigsegv-prefix=%s' % spec['libsigsegv'].prefix)

var/spack/repos/builtin/packages/m4/pgi.patch

@@ -0,0 +1,10 @@
+--- a/lib/config.hin
++++ b/lib/config.hin
+@@ -1510,6 +1510,7 @@
+       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+       : (199901L <= __STDC_VERSION__ \
+          && !defined __HP_cc \
++         && !defined __PGI \
+          && !(defined __SUNPRO_C && __STDC__))) \
+      && !defined _GL_EXTERN_INLINE_APPLE_BUG)
+ # define _GL_INLINE inline