- Return of the automake requirement.

foobar · foobar · commit 0576cdc942a3 · 2005-01-25T12:53:43.000Z
# Unfortunately we can't control what macros are used by the 3rd party
# extensions so..
diff --git a/scripts/phpize.in b/scripts/phpize.in
@@ -90,6 +90,7 @@ phpize_copy_files()
  
   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
   (cd "$phpdir" && cp $FILES "$builddir")
+  (cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4)
 }
 
 phpize_replace_prefix()
@@ -101,7 +102,7 @@ phpize_replace_prefix()
 
 phpize_autotools()
 {
-  cat acinclude.m4 ./build/libtool.m4 > aclocal.m4 || exit 1
+  aclocal    || exit 1
   autoconf   || exit 1
   autoheader || exit 1
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ phpize_copy_files()`
`90`	`90`
`91`	`91`	`(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)`
`92`	`92`	`(cd "$phpdir" && cp $FILES "$builddir")`
	`93`	`+ (cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4)`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`phpize_replace_prefix()`
`@@ -101,7 +102,7 @@ phpize_replace_prefix()`
`101`	`102`
`102`	`103`	`phpize_autotools()`
`103`	`104`	`{`
`104`		`- cat acinclude.m4 ./build/libtool.m4 > aclocal.m4 \|\| exit 1`
	`105`	`+ aclocal \|\| exit 1`
`105`	`106`	`autoconf \|\| exit 1`
`106`	`107`	`autoheader \|\| exit 1`
`107`	`108`	`}`