Skip to content

Commit

Permalink
Merge branch 'PHP-5.6'
Browse files Browse the repository at this point in the history 
* PHP-5.6:
  make buildconf work as expected; autoconf really needs some help with all those external m4s

Conflicts:
	build/build2.mk
  • Loading branch information
@m6w6
m6w6 committed Feb 4, 2015
2 parents 118ed49 + 4c3b4dc commit afcaa52
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/build2.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ aclocal.m4: configure.in acinclude.m4
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
@rm -f $@
$(PHP_AUTOCONF) $(SUPPRESS_WARNINGS)
$(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS)

0 comments on commit afcaa52

Please sign in to comment.