Attachment #75682 for bug #116800

View | Details | Raw Unified | Return to bug 116800
Collapse All | Expand All




fi

target_system=`uname -s`
#if sdl-config --version >/dev/null 2>/dev/null
#    then
#    echo "SDL appears to be installed"
#else
#    echo "SDL does not appear to be installed - install the SDL development package"
#    echo "You must have sdl-config in your path to continue"
#    exit 1
#fi

allargs="$@"
set -x




PACKAGE_STRING='mpeg4ip 1.4.1'
PACKAGE_BUGREPORT=''

ac_subdirs_all="$ac_subdirs_all lib/SDLAudio"
ac_subdirs_all="$ac_subdirs_all lib/rtp common/video/iso-mpeg4"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>

if test $have_macosx = false; then


subdirs="$subdirs"

fi





subdirs="$subdirs"




fi


#SDL_LIBS="`sdl-config --libs`"

#SDL_LIB_LIBS="`sdl-config --libs | sed /-lSDLmain/s///`"




PLAYER_PLUGIN_DIR=$libdir/mp4player_plugin


#SDL_CFLAGS=`sdl-config --cflags`
CFLAGS="$CFLAGS -DMPEG4IP $SDL_CFLAGS"

CXXFLAGS="$CXXFLAGS -DMPEG4IP $SDL_CFLAGS"

Return to bug 116800

Lines 35-48 Link Here

(-)mpeg4ip-1.4.1/bootstrap (-8 / +8 lines)
35	fi	35	fi
36		36
37	target_system=`uname -s`	37	target_system=`uname -s`
38	if sdl-config --version >/dev/null 2>/dev/null	38	#if sdl-config --version >/dev/null 2>/dev/null
39	then	39	# then
40	echo "SDL appears to be installed"	40	# echo "SDL appears to be installed"
41	else	41	#else
42	echo "SDL does not appear to be installed - install the SDL development package"	42	# echo "SDL does not appear to be installed - install the SDL development package"
43	echo "You must have sdl-config in your path to continue"	43	# echo "You must have sdl-config in your path to continue"
44	exit 1	44	# exit 1
45	fi	45	#fi
46		46
47	allargs="$@"	47	allargs="$@"
48	set -x	48	set -x

Lines 425-432 Link Here

(-)mpeg4ip-1.4.1/configure (-7 / +5 lines)
425	PACKAGE_STRING='mpeg4ip 1.4.1'	425	PACKAGE_STRING='mpeg4ip 1.4.1'
426	PACKAGE_BUGREPORT=''	426	PACKAGE_BUGREPORT=''
427		427
428	ac_subdirs_all="$ac_subdirs_all lib/SDLAudio"
429	ac_subdirs_all="$ac_subdirs_all lib/rtp common/video/iso-mpeg4"
430	# Factoring default headers for most tests.	428	# Factoring default headers for most tests.
431	ac_includes_default="\	429	ac_includes_default="\
432	#include <stdio.h>	430	#include <stdio.h>
Lines 2107-2113 Link Here
2107	if test $have_macosx = false; then	2105	if test $have_macosx = false; then
2108		2106
2109		2107
2110	subdirs="$subdirs lib/SDLAudio"	2108	subdirs="$subdirs"
2111		2109
2112	fi	2110	fi
2113		2111
Lines 2122-2128 Link Here
2122		2120
2123		2121
2124		2122
2125	subdirs="$subdirs lib/rtp common/video/iso-mpeg4"	2123	subdirs="$subdirs"
2126		2124
2127		2125
2128		2126
Lines 28969-28977 Link Here
28969	fi	28967	fi
28970		28968
28971		28969
28972	SDL_LIBS="`sdl-config --libs`"	28970	#SDL_LIBS="`sdl-config --libs`"
28973		28971
28974	SDL_LIB_LIBS="`sdl-config --libs \| sed /-lSDLmain/s///`"	28972	#SDL_LIB_LIBS="`sdl-config --libs \| sed /-lSDLmain/s///`"
28975		28973
28976		28974
28977		28975
Lines 30668-30674 Link Here
30668	PLAYER_PLUGIN_DIR=$libdir/mp4player_plugin	30666	PLAYER_PLUGIN_DIR=$libdir/mp4player_plugin
30669		30667
30670		30668
30671	SDL_CFLAGS=`sdl-config --cflags`	30669	#SDL_CFLAGS=`sdl-config --cflags`
30672	CFLAGS="$CFLAGS -DMPEG4IP $SDL_CFLAGS"	30670	CFLAGS="$CFLAGS -DMPEG4IP $SDL_CFLAGS"
30673		30671
30674	CXXFLAGS="$CXXFLAGS -DMPEG4IP $SDL_CFLAGS"	30672	CXXFLAGS="$CXXFLAGS -DMPEG4IP $SDL_CFLAGS"