vlc | branch: master | Rafaël Carré <[email protected]> | Thu Jan 5 21:42:27 2012 -0500| [468e5ea3ff71fd453a2c0b05e4f5f90597226f27] | committer: Rafaël Carré
Simplify MAKE detection and ./compile creation Clarify what ./compile does > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=468e5ea3ff71fd453a2c0b05e4f5f90597226f27 --- configure.ac | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index ea65dfa..48e5809 100644 --- a/configure.ac +++ b/configure.ac @@ -4233,21 +4233,27 @@ dnl Generate makefiles AC_OUTPUT dnl Do we have to use make or gmake ? -USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac` +if make --version 2>&1|grep -q GNU +then + # GNU make, all seems good + MAKE=make +else + # Known GNU make alias (on BSD) + MAKE=gmake +fi dnl Shortcut to nice compile message -rm -f compile if test -n $SHELL; then SHELL=${CONFIG_SHELL-/bin/sh} fi -echo '#! '$SHELL >compile -echo rm -f .error\$\$ >>compile -echo ERROR=0 >>compile -echo export PATH=$PATH LANG=C >>compile -echo "($USE_MAKE_OR_GMAKE V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile -echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile -echo test -f .error\$\$ \&\& ERROR=1 >>compile -echo rm -f .error\$\$ >>compile -echo exit \$ERROR >>compile +rm -f compile +echo "#! $SHELL +rm -f .error\$\$ +ERROR=0 +export PATH=\"$PATH\" LANG=C +($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl +test -f .error\$\$ \&\& ERROR=1 +rm -f .error\$\$ +exit \$ERROR" >compile chmod a+x compile echo " @@ -4263,4 +4269,4 @@ else echo "build vlc executable : no" fi echo " -To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'." +To build vlc and its plugins, type \`$MAKE', or \`./compile' if you like nice colors." _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
