diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-02-10 23:07:39 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-02-10 23:07:39 +0000 |
| commit | 412c1562011ffc687378d5f3f7da4cb3f427ddbb (patch) | |
| tree | 7eb10ef8a96adcde82c1fbc524a3260d483a5b9e | |
| parent | d5697779971ac7d7daaac12bc9d8388973f58a4b (diff) | |
| download | ffmpeg-412c1562011ffc687378d5f3f7da4cb3f427ddbb.tar.gz | |
check for gnu make
Originally committed as revision 7915 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -808,7 +808,6 @@ case $targetos in fi ;; SunOS) dv1394="no" - make="gmake" FFLDFLAGS="" FFSERVERLDFLAGS="" SHFLAGS="-shared -Wl,-h,\$@" @@ -816,13 +815,11 @@ case $targetos in ;; NetBSD) dv1394="no" - make="gmake" add_extralibs "-lossaudio" ;; OpenBSD) dv1394="no" need_memalign="no" - make="gmake" LIBOBJFLAGS="\$(PIC)" LDCONFIG="ldconfig -m \$(shlibdir)" SHFLAGS='-shared' @@ -833,7 +830,6 @@ case $targetos in ;; FreeBSD) dv1394="no" - make="gmake" need_memalign="no" add_cflags "-pthread" ;; @@ -844,7 +840,6 @@ case $targetos in BSD/OS) dv1394="no" extralibs="-lpoll -lgnugetopt -lm" - make="gmake" strip="strip -d" ;; Darwin) @@ -886,7 +881,6 @@ case $targetos in IRIX*) targetos=IRIX ranlib="echo ignoring ranlib" - make="gmake" ;; OS/2) TMPE=$TMPE".exe" @@ -1357,6 +1351,14 @@ if test $cpu != "generic"; then esac fi +gnu_make(){ + $1 --version 2>&1 | grep -q GNU +} + +if ! gnu_make $make; then + gnu_make gmake && make=gmake || die "GNU make not found." +fi + # make sure we can execute files in $TMPDIR cat >$TMPE 2>>$logfile <<EOF #! /bin/sh |