Mercurial > mplayer.hg
comparison configure @ 992:a5a3d936b116
Changed to detect sdl in non-standard location, as suggested by Martin Aumueller <lists@reserv.at>.
author | atmosfear |
---|---|
date | Mon, 04 Jun 2001 14:14:28 +0000 |
parents | 21475b2da242 |
children | 57972eb8127a |
comparison
equal
deleted
inserted
replaced
991:dab1e9e67d8c | 992:a5a3d936b116 |
---|---|
124 | 124 |
125 --with-x11libdir=DIR X library files are in DIR | 125 --with-x11libdir=DIR X library files are in DIR |
126 --with-win32libdir=DIR windows codec files | 126 --with-win32libdir=DIR windows codec files |
127 --with-csslibdir=DIR directory contains libcss.so shared library | 127 --with-csslibdir=DIR directory contains libcss.so shared library |
128 --with-cssincdir=DIR directory contains libcss header file (css.h) | 128 --with-cssincdir=DIR directory contains libcss header file (css.h) |
129 (--with-css* only needed, if libCSS autodetect fails) | 129 (--with-css* only needed, if libCSS autodetect fails) |
130 --with-sdl-config=PATH specify location of sdl-config if it's not in your PATH | |
131 (example: --with-sdl-cofig=/usr/sdl/bin/sdl-config) | |
130 | 132 |
131 --size-x=SIZE default screen width | 133 --size-x=SIZE default screen width |
132 --size-y=SIZE default screen height | 134 --size-y=SIZE default screen height |
133 EOF | 135 EOF |
134 exit 0 | 136 exit 0 |
174 _x11libdir=-L/usr/X11/lib | 176 _x11libdir=-L/usr/X11/lib |
175 fi | 177 fi |
176 fi | 178 fi |
177 | 179 |
178 _skip_cc_check=no | 180 _skip_cc_check=no |
181 _sdlconfig='sdl-config' | |
179 | 182 |
180 for ac_option | 183 for ac_option |
181 do | 184 do |
182 case "$ac_option" in | 185 case "$ac_option" in |
183 --cc=*) | 186 --cc=*) |
192 --enable-x11) | 195 --enable-x11) |
193 _x11=yes | 196 _x11=yes |
194 ;; | 197 ;; |
195 --disable-x11) | 198 --disable-x11) |
196 _x11=no | 199 _x11=no |
200 ;; | |
201 --with-sdl-config=*) | |
202 _sdlconfig=`echo $ac_option | cut -d '=' -f 2` | |
197 ;; | 203 ;; |
198 esac | 204 esac |
199 done | 205 done |
200 | 206 |
201 # Checking CC version... what's with egcs, pgcc? - Atmos | 207 # Checking CC version... what's with egcs, pgcc? - Atmos |
467 $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \ | 473 $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \ |
468 { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } | 474 { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; } |
469 | 475 |
470 # Atmosfear: added SDL versioncheck and autodetect; removed warnings. | 476 # Atmosfear: added SDL versioncheck and autodetect; removed warnings. |
471 _sdl=no | 477 _sdl=no |
472 if $_cc $TMPC -o $TMPO -L/usr/lib/ -L/usr/local/lib/ -lSDL -lpthread &> /dev/null ; then | 478 if $_cc $TMPC -o $TMPO `$_sdlconfig --libs` &> /dev/null ; then |
473 if test `sdl-config --version | sed s/[=[:punct:]=]//g` -gt 116 ; then | 479 if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -gt 116 ; then |
474 if test `sdl-config --version | sed s/[=[:punct:]=]//g` -lt 121 ; then | 480 if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -lt 121 ; then |
475 _sdlbuggy='#define BUGGY_SDL' | 481 _sdlbuggy='#define BUGGY_SDL' |
476 else | 482 else |
477 _sdlbuggy='#undef BUGGY_SDL' | 483 _sdlbuggy='#undef BUGGY_SDL' |
478 fi | 484 fi |
479 _sdl=yes | 485 _sdl=yes |
892 if [ $_xv = yes ]; then | 898 if [ $_xv = yes ]; then |
893 _xvlib='-lXv' | 899 _xvlib='-lXv' |
894 fi | 900 fi |
895 | 901 |
896 if [ $_sdl = yes ]; then | 902 if [ $_sdl = yes ]; then |
897 _sdllib='-lSDL -lpthread' | 903 _sdllib=`$_sdlconfig --libs` |
898 fi | 904 fi |
899 | 905 |
900 if [ $_dga = yes ]; then | 906 if [ $_dga = yes ]; then |
901 _dgalib='-lXxf86dga' | 907 _dgalib='-lXxf86dga' |
902 fi | 908 fi |