Browse Source

check for gnu make

Originally committed as revision 7915 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 19 years ago
parent
commit
412c156201
1 changed files with 8 additions and 6 deletions
  1. +8
    -6
      configure

+ 8
- 6
configure View File

@@ -808,7 +808,6 @@ case $targetos in
fi ;; fi ;;
SunOS) SunOS)
dv1394="no" dv1394="no"
make="gmake"
FFLDFLAGS="" FFLDFLAGS=""
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
SHFLAGS="-shared -Wl,-h,\$@" SHFLAGS="-shared -Wl,-h,\$@"
@@ -816,13 +815,11 @@ case $targetos in
;; ;;
NetBSD) NetBSD)
dv1394="no" dv1394="no"
make="gmake"
add_extralibs "-lossaudio" add_extralibs "-lossaudio"
;; ;;
OpenBSD) OpenBSD)
dv1394="no" dv1394="no"
need_memalign="no" need_memalign="no"
make="gmake"
LIBOBJFLAGS="\$(PIC)" LIBOBJFLAGS="\$(PIC)"
LDCONFIG="ldconfig -m \$(shlibdir)" LDCONFIG="ldconfig -m \$(shlibdir)"
SHFLAGS='-shared' SHFLAGS='-shared'
@@ -833,7 +830,6 @@ case $targetos in
;; ;;
FreeBSD) FreeBSD)
dv1394="no" dv1394="no"
make="gmake"
need_memalign="no" need_memalign="no"
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
@@ -844,7 +840,6 @@ case $targetos in
BSD/OS) BSD/OS)
dv1394="no" dv1394="no"
extralibs="-lpoll -lgnugetopt -lm" extralibs="-lpoll -lgnugetopt -lm"
make="gmake"
strip="strip -d" strip="strip -d"
;; ;;
Darwin) Darwin)
@@ -886,7 +881,6 @@ case $targetos in
IRIX*) IRIX*)
targetos=IRIX targetos=IRIX
ranlib="echo ignoring ranlib" ranlib="echo ignoring ranlib"
make="gmake"
;; ;;
OS/2) OS/2)
TMPE=$TMPE".exe" TMPE=$TMPE".exe"
@@ -1357,6 +1351,14 @@ if test $cpu != "generic"; then
esac esac
fi 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 # make sure we can execute files in $TMPDIR
cat >$TMPE 2>>$logfile <<EOF cat >$TMPE 2>>$logfile <<EOF
#! /bin/sh #! /bin/sh


Loading…
Cancel
Save