comparison configure @ 19196:78631002ba90

Unify include path handling in the build system, part II.
author diego
date Thu, 27 Jul 2006 17:43:21 +0000
parents e4b614cc7093
children 7472697bef28
comparison
equal deleted inserted replaced
19195:e4b614cc7093 19196:78631002ba90
44 # uniform, i.e. if the option is named 'feature': 44 # uniform, i.e. if the option is named 'feature':
45 # 45 #
46 # _feature : should have a value of yes/no/auto 46 # _feature : should have a value of yes/no/auto
47 # _def_feature : '#define ... 1' or '#undef ...' for conditional compilation 47 # _def_feature : '#define ... 1' or '#undef ...' for conditional compilation
48 # _ld_feature : '-L/path/dir -lfeature' GCC options 48 # _ld_feature : '-L/path/dir -lfeature' GCC options
49 # _inc_feature : '-I/path/dir/include' extra include paths
50 # 49 #
51 ############################################################################# 50 #############################################################################
52 51
53 # Prevent locale nonsense from breaking basic text processing utils 52 # Prevent locale nonsense from breaking basic text processing utils
54 LC_ALL=C 53 LC_ALL=C
414 --with-codecsdir=DIR Binary codec files in DIR 413 --with-codecsdir=DIR Binary codec files in DIR
415 --with-win32libdir=DIR W*ndows DLL files in DIR 414 --with-win32libdir=DIR W*ndows DLL files in DIR
416 --with-xanimlibdir=DIR XAnim DLL files in DIR 415 --with-xanimlibdir=DIR XAnim DLL files in DIR
417 --with-reallibdir=DIR RealPlayer DLL files in DIR 416 --with-reallibdir=DIR RealPlayer DLL files in DIR
418 --with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*) 417 --with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*)
419 --with-xvidincdir=DIR XviD header in DIR (*)
420 --with-x264libdir=DIR libx264 in DIR 418 --with-x264libdir=DIR libx264 in DIR
421 --with-x264incdir=DIR x264 header in DIR
422 --with-libdtslibdir=DIR libdts library in DIR (*) 419 --with-libdtslibdir=DIR libdts library in DIR (*)
423 --with-libdtsincdir=DIR libdts header in DIR (*)
424 --with-livelibdir=DIR LIVE555 Streaming Media libraries in DIR 420 --with-livelibdir=DIR LIVE555 Streaming Media libraries in DIR
425 --with-toolamedir=DIR path to Toolame library and include file 421 --with-toolamedir=DIR path to Toolame library and include file
426 --with-xmmsplugindir=DIR XMMS plugins in DIR 422 --with-xmmsplugindir=DIR XMMS plugins in DIR
427 --with-xmmslibdir=DIR libxmms.so.1 in DIR 423 --with-xmmslibdir=DIR libxmms.so.1 in DIR
428 --with-cdparanoiaincdir=DIR cdparanoia headers in DIR (*) 424 --with-cdparanoiaincdir=DIR cdparanoia headers in DIR (*)
2124 _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` 2120 _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2125 ;; 2121 ;;
2126 --with-xvidlibdir=*) 2122 --with-xvidlibdir=*)
2127 _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2123 _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2128 ;; 2124 ;;
2129 --with-xvidincdir=*)
2130 _inc_xvid=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2131 ;;
2132 --with-libdtslibdir=*) 2125 --with-libdtslibdir=*)
2133 _ld_libdts=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2126 _ld_libdts=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2134 ;; 2127 ;;
2135 --with-libdtsincdir=*)
2136 _inc_libdts=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
2137 ;;
2138 --with-x264libdir=*) 2128 --with-x264libdir=*)
2139 _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` 2129 _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
2140 ;;
2141 --with-x264incdir=*)
2142 _inc_x264=-I`echo $ac_option | cut -d '=' -f 2 |sed 's,:, -I,g'`
2143 ;; 2130 ;;
2144 --with-sdl-config=*) 2131 --with-sdl-config=*)
2145 _sdlconfig=`echo $ac_option | cut -d '=' -f 2` 2132 _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
2146 ;; 2133 ;;
2147 --with-freetype-config=*) 2134 --with-freetype-config=*)
4179 cc_check `caca-config --libs` && _caca=yes 4166 cc_check `caca-config --libs` && _caca=yes
4180 fi 4167 fi
4181 fi 4168 fi
4182 if test "$_caca" = yes ; then 4169 if test "$_caca" = yes ; then
4183 _def_caca='#define HAVE_CACA 1' 4170 _def_caca='#define HAVE_CACA 1'
4184 _inc_caca=`caca-config --cflags` 4171 _inc_extra="$inc_extra `caca-config --cflags`"
4185 _ld_caca=`caca-config --libs` 4172 _ld_caca=`caca-config --libs`
4186 _vosrc="$_vosrc vo_caca.c" 4173 _vosrc="$_vosrc vo_caca.c"
4187 _vomodules="caca $_vomodules" 4174 _vomodules="caca $_vomodules"
4188 else 4175 else
4189 _def_caca='#undef HAVE_CACA' 4176 _def_caca='#undef HAVE_CACA'
4555 fi 4542 fi
4556 if test "$_sdl" = yes ; then 4543 if test "$_sdl" = yes ; then
4557 _def_sdl='#define HAVE_SDL 1' 4544 _def_sdl='#define HAVE_SDL 1'
4558 if cygwin ; then 4545 if cygwin ; then
4559 _ld_sdl=`$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/` 4546 _ld_sdl=`$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`
4560 _inc_sdl=`$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/` 4547 _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`"
4561 elif mingw32 ; then 4548 elif mingw32 ; then
4562 _ld_sdl=`$_sdlconfig --libs | sed s/-mwindows//` 4549 _ld_sdl=`$_sdlconfig --libs | sed s/-mwindows//`
4563 _inc_sdl=`$_sdlconfig --cflags | sed s/-Dmain=SDL_main//` 4550 _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
4564 else 4551 else
4565 _ld_sdl=`$_sdlconfig --libs` 4552 _ld_sdl=`$_sdlconfig --libs`
4566 _inc_sdl=`$_sdlconfig --cflags` 4553 _inc_extra="$_inc_extra `$_sdlconfig --cflags`"
4567 fi 4554 fi
4568 _vosrc="$_vosrc vo_sdl.c" 4555 _vosrc="$_vosrc vo_sdl.c"
4569 _vomodules="sdl $_vomodules" 4556 _vomodules="sdl $_vomodules"
4570 _aosrc="$_aosrc ao_sdl.c" 4557 _aosrc="$_aosrc ao_sdl.c"
4571 _aomodules="sdl $_aomodules" 4558 _aomodules="sdl $_aomodules"
4816 if test "$_arts" = yes ; then 4803 if test "$_arts" = yes ; then
4817 _def_arts='#define USE_ARTS 1' 4804 _def_arts='#define USE_ARTS 1'
4818 _aosrc="$_aosrc ao_arts.c" 4805 _aosrc="$_aosrc ao_arts.c"
4819 _aomodules="arts $_aomodules" 4806 _aomodules="arts $_aomodules"
4820 _ld_arts=`artsc-config --libs` 4807 _ld_arts=`artsc-config --libs`
4821 _inc_arts=`artsc-config --cflags` 4808 _inc_extra="$_inc_extra `artsc-config --cflags`"
4822 else 4809 else
4823 _noaomodules="arts $_noaomodules" 4810 _noaomodules="arts $_noaomodules"
4824 fi 4811 fi
4825 echores "$_arts" 4812 echores "$_arts"
4826 4813
4843 if test "$_esd" = yes ; then 4830 if test "$_esd" = yes ; then
4844 _def_esd='#define USE_ESD 1' 4831 _def_esd='#define USE_ESD 1'
4845 _aosrc="$_aosrc ao_esd.c" 4832 _aosrc="$_aosrc ao_esd.c"
4846 _aomodules="esd $_aomodules" 4833 _aomodules="esd $_aomodules"
4847 _ld_esd=`esd-config --libs` 4834 _ld_esd=`esd-config --libs`
4848 _inc_esd=`esd-config --cflags` 4835 _inc_extra="$_inc_extra `esd-config --cflags`"
4849 4836
4850 echocheck "esd_get_latency()" 4837 echocheck "esd_get_latency()"
4851 cat > $TMPC << EOF 4838 cat > $TMPC << EOF
4852 #include <esd.h> 4839 #include <esd.h>
4853 int main(void) { return esd_get_latency(0); } 4840 int main(void) { return esd_get_latency(0); }
4880 if test "$_polyp" = yes ; then 4867 if test "$_polyp" = yes ; then
4881 _def_polyp='#define USE_POLYP 1' 4868 _def_polyp='#define USE_POLYP 1'
4882 _aosrc="$_aosrc ao_polyp.c" 4869 _aosrc="$_aosrc ao_polyp.c"
4883 _aomodules="polyp $_aomodules" 4870 _aomodules="polyp $_aomodules"
4884 _ld_polyp=`pkg-config --libs polyplib polyplib-error polyplib-mainloop` 4871 _ld_polyp=`pkg-config --libs polyplib polyplib-error polyplib-mainloop`
4885 _inc_polyp=`pkg-config --cflags polyplib polyplib-error polyplib-mainloop` 4872 _inc_extra="$_inc_extra `pkg-config --cflags polyplib polyplib-error polyplib-mainloop`"
4886 else 4873 else
4887 _def_polyp='#undef USE_POLYP' 4874 _def_polyp='#undef USE_POLYP'
4888 _noaomodules="polyp $_noaomodules" 4875 _noaomodules="polyp $_noaomodules"
4889 fi 4876 fi
4890 4877
4899 EOF 4886 EOF
4900 if cc_check -ljack ; then 4887 if cc_check -ljack ; then
4901 _ld_jack="-ljack" 4888 _ld_jack="-ljack"
4902 elif cc_check `pkg-config --libs --cflags --silence-errors jack` ; then 4889 elif cc_check `pkg-config --libs --cflags --silence-errors jack` ; then
4903 _ld_jack="`pkg-config --libs jack`" 4890 _ld_jack="`pkg-config --libs jack`"
4904 _inc_jack="`pkg-config --cflags jack`" 4891 _inc_extra="$_inc_extra "`pkg-config --cflags jack`""
4905 else 4892 else
4906 _jack=no 4893 _jack=no
4907 fi 4894 fi
4908 fi 4895 fi
4909 4896
5072 EOF 5059 EOF
5073 cc_check -I${_mlibdir}/include -L${_mlibdir}/lib -lmlib && _mlib=yes 5060 cc_check -I${_mlibdir}/include -L${_mlibdir}/lib -lmlib && _mlib=yes
5074 fi 5061 fi
5075 if test "$_mlib" = yes ; then 5062 if test "$_mlib" = yes ; then
5076 _def_mlib='#define HAVE_MLIB 1' 5063 _def_mlib='#define HAVE_MLIB 1'
5077 _inc_mlib=" -I${_mlibdir}/include " 5064 _inc_extra="$_inc_extra -I${_mlibdir}/include"
5078 _ld_mlib=" -L${_mlibdir}/lib -R${_mlibdir}/lib -lmlib " 5065 _ld_mlib=" -L${_mlibdir}/lib -R${_mlibdir}/lib -lmlib "
5079 else 5066 else
5080 _def_mlib='#undef HAVE_MLIB' 5067 _def_mlib='#undef HAVE_MLIB'
5081 fi 5068 fi
5082 echores "$_mlib" 5069 echores "$_mlib"
5294 return 0; 5281 return 0;
5295 5282
5296 } 5283 }
5297 EOF 5284 EOF
5298 _libcdio=no 5285 _libcdio=no
5299 for _inc_tmp in "$_inc_libcdio" "-I/usr/include/cdio" "-I/usr/local/include/cdio" ; do 5286 for _inc_tmp in "$_inc_extra" "-I/usr/include/cdio" "-I/usr/local/include/cdio" ; do
5300 cc_check `pkg-config --cflags --libs libcdio_paranoia` $_inc_tmp $_ld_lm \ 5287 cc_check `pkg-config --cflags --libs libcdio_paranoia` $_inc_tmp $_ld_lm \
5301 && tmp_run && _libcdio=yes && break 5288 && tmp_run && _libcdio=yes && break
5302 done 5289 done
5303 else 5290 else
5304 _libcdio=no 5291 _libcdio=no
5308 _cdda='yes' 5295 _cdda='yes'
5309 _def_libcdio='#define HAVE_LIBCDIO' 5296 _def_libcdio='#define HAVE_LIBCDIO'
5310 _def_cdparanoia='#define HAVE_CDDA' 5297 _def_cdparanoia='#define HAVE_CDDA'
5311 _def_havelibcdio='yes' 5298 _def_havelibcdio='yes'
5312 _inputmodules="cdda $_inputmodules" 5299 _inputmodules="cdda $_inputmodules"
5313 _inc_libcdio=`pkg-config --cflags libcdio` 5300 _inc_extra="$_inc_extra `pkg-config --cflags libcdio`"
5314 _ld_libcdio=`pkg-config --libs libcdio_paranoia` 5301 _ld_libcdio=`pkg-config --libs libcdio_paranoia`
5315 else 5302 else
5316 if test "$_cdparanoia" = yes ; then 5303 if test "$_cdparanoia" = yes ; then
5317 _res_comment="using cdparanoia" 5304 _res_comment="using cdparanoia"
5318 fi 5305 fi
5365 _freetype=no 5352 _freetype=no
5366 fi 5353 fi
5367 fi 5354 fi
5368 if test "$_freetype" = yes ; then 5355 if test "$_freetype" = yes ; then
5369 _def_freetype='#define HAVE_FREETYPE' 5356 _def_freetype='#define HAVE_FREETYPE'
5370 _inc_freetype=`$_freetypeconfig --cflags` 5357 _inc_extra="$_inc_extra `$_freetypeconfig --cflags`"
5371 _ld_freetype=`$_freetypeconfig --libs` 5358 _ld_freetype=`$_freetypeconfig --libs`
5372 else 5359 else
5373 _def_freetype='#undef HAVE_FREETYPE' 5360 _def_freetype='#undef HAVE_FREETYPE'
5374 fi 5361 fi
5375 echores "$_freetype" 5362 echores "$_freetype"
5396 EOF 5383 EOF
5397 _fontconfig=yes 5384 _fontconfig=yes
5398 if cc_check -lfontconfig ; then 5385 if cc_check -lfontconfig ; then
5399 _ld_fontconfig="-lfontconfig" 5386 _ld_fontconfig="-lfontconfig"
5400 elif cc_check `pkg-config --silence-errors --cflags --libs fontconfig` ; then 5387 elif cc_check `pkg-config --silence-errors --cflags --libs fontconfig` ; then
5401 _inc_fontconfig=`pkg-config --cflags fontconfig` 5388 _inc_extra="$_inc_extra `pkg-config --cflags fontconfig`"
5402 _ld_fontconfig=`pkg-config --libs fontconfig` 5389 _ld_fontconfig=`pkg-config --libs fontconfig`
5403 else 5390 else
5404 _fontconfig=no 5391 _fontconfig=no
5405 fi 5392 fi
5406 fi 5393 fi
5465 _fribidi=no 5452 _fribidi=no
5466 fi 5453 fi
5467 fi 5454 fi
5468 if test "$_fribidi" = yes ; then 5455 if test "$_fribidi" = yes ; then
5469 _def_fribidi='#define USE_FRIBIDI' 5456 _def_fribidi='#define USE_FRIBIDI'
5470 _inc_fribidi=`$_fribidiconfig --cflags` 5457 _inc_extra="$_inc_extra `$_fribidiconfig --cflags`"
5471 _ld_fribidi=`$_fribidiconfig --libs` 5458 _ld_fribidi=`$_fribidiconfig --libs`
5472 else 5459 else
5473 _def_fribidi='#undef USE_FRIBIDI' 5460 _def_fribidi='#undef USE_FRIBIDI'
5474 fi 5461 fi
5475 echores "$_fribidi" 5462 echores "$_fribidi"
5779 cat > $TMPC << EOF 5766 cat > $TMPC << EOF
5780 #include <inttypes.h> 5767 #include <inttypes.h>
5781 #include <dts.h> 5768 #include <dts.h>
5782 int main(void) { dts_init (0); return 0; } 5769 int main(void) { dts_init (0); return 0; }
5783 EOF 5770 EOF
5784 cc_check $_inc_libdts $_ld_libdts -ldts $_ld_lm && _libdts=yes 5771 cc_check $_ld_libdts -ldts $_ld_lm && _libdts=yes
5785 fi 5772 fi
5786 if test "$_libdts" = yes ; then 5773 if test "$_libdts" = yes ; then
5787 _def_libdts='#define CONFIG_DTS 1' 5774 _def_libdts='#define CONFIG_DTS 1'
5788 _ld_libdts="$_ld_libdts -ldts" 5775 _ld_libdts="$_ld_libdts -ldts"
5789 _codecmodules="libdts $_codecmodules" 5776 _codecmodules="libdts $_codecmodules"
5866 else 5853 else
5867 _faad_internal=yes 5854 _faad_internal=yes
5868 fi 5855 fi
5869 elif test "$_faad_external" = auto ; then 5856 elif test "$_faad_external" = auto ; then
5870 _ld_faad='-lfaad' 5857 _ld_faad='-lfaad'
5871 _inc_faad="$_inc_extra"
5872 # external faad: check if it's really faad2 :) 5858 # external faad: check if it's really faad2 :)
5873 if test "$_faad_external" = auto ; then 5859 if test "$_faad_external" = auto ; then
5874 _faad_external=no 5860 _faad_external=no
5875 cat > $TMPC << EOF 5861 cat > $TMPC << EOF
5876 #include <faad.h> 5862 #include <faad.h>
5877 #ifndef FAAD_MIN_STREAMSIZE 5863 #ifndef FAAD_MIN_STREAMSIZE
5878 #error Too old version 5864 #error Too old version
5879 #endif 5865 #endif
5880 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; } 5866 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; }
5881 EOF 5867 EOF
5882 cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes 5868 cc_check $_ld_faad $_ld_lm && _faad_external=yes
5883 fi 5869 fi
5884 fi 5870 fi
5885 5871
5886 if test "$_faad_internal" = yes ; then 5872 if test "$_faad_internal" = yes ; then
5887 _def_faad_internal="#define USE_INTERNAL_FAAD 1" 5873 _def_faad_internal="#define USE_INTERNAL_FAAD 1"
5898 _codecmodules="faad2 $_codecmodules" 5884 _codecmodules="faad2 $_codecmodules"
5899 else 5885 else
5900 _def_faad='#undef HAVE_FAAD' 5886 _def_faad='#undef HAVE_FAAD'
5901 _nocodecmodules="faad2 $_nocodecmodules" 5887 _nocodecmodules="faad2 $_nocodecmodules"
5902 _ld_faad= 5888 _ld_faad=
5903 _inc_faad=
5904 fi 5889 fi
5905 echores "$_faad" 5890 echores "$_faad"
5906 5891
5907 5892
5908 echocheck "LADSPA plugin support" 5893 echocheck "LADSPA plugin support"
6474 #include <xvid.h> 6459 #include <xvid.h>
6475 int main(void) { xvid_init(0, 0, 0, 0); return 0; } 6460 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
6476 EOF 6461 EOF
6477 _ld_xvid="$_ld_xvid -lxvidcore" 6462 _ld_xvid="$_ld_xvid -lxvidcore"
6478 _xvid4=no 6463 _xvid4=no
6479 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then 6464 if test "$_xvid" != no && cc_check $_ld_xvid $_ld_lm ; then
6480 _xvid=yes 6465 _xvid=yes
6481 _def_xvid3='#define HAVE_XVID3 1' 6466 _def_xvid3='#define HAVE_XVID3 1'
6482 _def_xvid4='#undef HAVE_XVID4' 6467 _def_xvid4='#undef HAVE_XVID4'
6483 _codecmodules="xvid $_codecmodules" 6468 _codecmodules="xvid $_codecmodules"
6484 else 6469 else
6485 cat > $TMPC << EOF 6470 cat > $TMPC << EOF
6486 #include <xvid.h> 6471 #include <xvid.h>
6487 int main(void) { xvid_global(0, 0, 0, 0); return 0; } 6472 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
6488 EOF 6473 EOF
6489 if test "$_xvid" != no ;then 6474 if test "$_xvid" != no ;then
6490 if cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then 6475 if cc_check $_ld_xvid $_ld_lm ; then
6491 _xvid4=yes 6476 _xvid4=yes
6492 elif cc_check $_inc_xvid $_ld_xvid $_ld_lm $_ld_pthread ; then 6477 elif cc_check $_ld_xvid $_ld_lm $_ld_pthread ; then
6493 _xvid4=yes; 6478 _xvid4=yes;
6494 _ld_xvid="$_ld_xvid $_ld_pthread" 6479 _ld_xvid="$_ld_xvid $_ld_pthread"
6495 fi 6480 fi
6496 fi 6481 fi
6497 6482
6515 echocheck "XviD two pass plugin" 6500 echocheck "XviD two pass plugin"
6516 cat > $TMPC << EOF 6501 cat > $TMPC << EOF
6517 #include <xvid.h> 6502 #include <xvid.h>
6518 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } 6503 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
6519 EOF 6504 EOF
6520 if cc_check $_inc_xvid $_ld_xvid $_ld_lb ; then 6505 if cc_check $_ld_xvid $_ld_lb ; then
6521 _lavc_xvid=yes 6506 _lavc_xvid=yes
6522 _def_lavc_xvid='#define CONFIG_XVID 1' 6507 _def_lavc_xvid='#define CONFIG_XVID 1'
6523 else 6508 else
6524 _lavc_xvid=no 6509 _lavc_xvid=no
6525 _def_lavc_xvid='#undef CONFIG_XVID' 6510 _def_lavc_xvid='#undef CONFIG_XVID'
6550 int main(void) { x264_encoder_open((void*)0); return 0; } 6535 int main(void) { x264_encoder_open((void*)0); return 0; }
6551 EOF 6536 EOF
6552 _ld_x264="$_ld_x264 -lx264 $_ld_pthread" 6537 _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
6553 if test "$_x264" != no ; then 6538 if test "$_x264" != no ; then
6554 _x264=no 6539 _x264=no
6555 if cc_check $_inc_x264 $_ld_x264 $_ld_lm ; then 6540 if cc_check $_ld_x264 $_ld_lm ; then
6556 _x264=yes 6541 _x264=yes
6557 elif test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm ; then 6542 elif test "$_x11" = yes && cc_check $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm ; then
6558 _x264=yes 6543 _x264=yes
6559 _ld_x264="$_ld_x264 $_ld_x11" 6544 _ld_x264="$_ld_x264 $_ld_x11"
6560 fi 6545 fi
6561 fi 6546 fi
6562 6547
6983 #Check for GTK2 : 6968 #Check for GTK2 :
6984 echocheck "GTK+ version" 6969 echocheck "GTK+ version"
6985 6970
6986 if pkg-config gtk+-2.0 --exists ; then 6971 if pkg-config gtk+-2.0 --exists ; then
6987 _gtk=`pkg-config gtk+-2.0 --modversion 2>/dev/null` 6972 _gtk=`pkg-config gtk+-2.0 --modversion 2>/dev/null`
6988 _inc_gtk=`pkg-config gtk+-2.0 --cflags 2>/dev/null` 6973 _inc_extra="$_inc_extra `pkg-config gtk+-2.0 --cflags 2>/dev/null`"
6989 _ld_gtk=`pkg-config gtk+-2.0 --libs 2>/dev/null` 6974 _ld_gtk=`pkg-config gtk+-2.0 --libs 2>/dev/null`
6990 echores "$_gtk" 6975 echores "$_gtk"
6991 6976
6992 # Check for GLIB2 6977 # Check for GLIB2
6993 if pkg-config glib-2.0 --exists ; then 6978 if pkg-config glib-2.0 --exists ; then
7019 else 7004 else
7020 die "The GUI requires GTK devel packages (which were not found)." 7005 die "The GUI requires GTK devel packages (which were not found)."
7021 fi 7006 fi
7022 fi 7007 fi
7023 _gtk=`$_gtkconfig --version 2>&1` 7008 _gtk=`$_gtkconfig --version 2>&1`
7024 _inc_gtk=`$_gtkconfig --cflags 2>&1` 7009 _inc_extra="$_inc_extra `$_gtkconfig --cflags 2>&1`"
7025 _ld_gtk=`$_gtkconfig --libs 2>&1` 7010 _ld_gtk=`$_gtkconfig --libs 2>&1`
7026 echores "$_gtk (using $_gtkconfig)" 7011 echores "$_gtk (using $_gtkconfig)"
7027 7012
7028 # Check for GLIB 7013 # Check for GLIB
7029 echocheck "glib version" 7014 echocheck "glib version"
7330 CC = $_cc 7315 CC = $_cc
7331 HOST_CC = $_host_cc 7316 HOST_CC = $_host_cc
7332 AWK = $_awk 7317 AWK = $_awk
7333 RANLIB = $_ranlib 7318 RANLIB = $_ranlib
7334 INSTALL = $_install 7319 INSTALL = $_install
7335 # FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir. 7320 # FIXME: Should only be $_inc_extra eventually.
7336 EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib $_inc_x11 $_inc_dxr2 $_inc_dvb \ 7321 EXTRA_INC = $_inc_extra $_inc_x11 $inc_dxr2 $_inc_dvb $_inc_directfb $_inc_cdparanoia
7337 $_inc_caca $_inc_arts $_inc_esd $_inc_polyp $_inc_jack $_inc_openal\
7338 $_inc_sdl $_inc_xvid $_inc_x264 $_inc_directfb $_inc_cdparanoia \
7339 $_inc_freetype $_inc_fontconfig $_inc_fribidi $_inc_libcdio $_inc_gtk
7340 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC) 7322 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
7341 STRIPBINARIES = $_stripbinaries 7323 STRIPBINARIES = $_stripbinaries
7342 CHARSET = $_charset 7324 CHARSET = $_charset
7343 HELP_FILE = $_mp_help 7325 HELP_FILE = $_mp_help
7344 7326