comparison configure @ 19395:fa53ace863b9

support for dvdnav is now auto-detected; removed support for dvdnav-dir
author nicodvb
date Mon, 14 Aug 2006 21:48:20 +0000
parents 6ad0d5247fee
children c31ca009077a
comparison
equal deleted inserted replaced
19394:70cb301e94f0 19395:fa53ace863b9
431 --with-fribidi-config=PATH path to fribidi-config 431 --with-fribidi-config=PATH path to fribidi-config
432 (e.g. /opt/bin/fribidi-config) 432 (e.g. /opt/bin/fribidi-config)
433 --with-glib-config=PATH path to glib*-config (e.g. /opt/bin/glib-config) 433 --with-glib-config=PATH path to glib*-config (e.g. /opt/bin/glib-config)
434 --with-gtk-config=PATH path to gtk*-config (e.g. /opt/bin/gtk-config) 434 --with-gtk-config=PATH path to gtk*-config (e.g. /opt/bin/gtk-config)
435 --with-sdl-config=PATH path to sdl*-config (e.g. /opt/bin/sdl-config) 435 --with-sdl-config=PATH path to sdl*-config (e.g. /opt/bin/sdl-config)
436 --with-dvdnav-config=PATH path to dvdnav-config (e.g. /opt/bin/dvdnav-config)
436 437
437 This configure script is NOT autoconf-based, even though its output is similar. 438 This configure script is NOT autoconf-based, even though its output is similar.
438 It will try to autodetect all configuration options. If you --enable an option 439 It will try to autodetect all configuration options. If you --enable an option
439 it will be forcefully turned on, skipping autodetection. This can break 440 it will be forcefully turned on, skipping autodetection. This can break
440 compilation, so you need to know what you are doing. 441 compilation, so you need to know what you are doing.
1622 _faad_external=auto 1623 _faad_external=auto
1623 _faac=auto 1624 _faac=auto
1624 _ladspa=auto 1625 _ladspa=auto
1625 _xmms=no 1626 _xmms=no
1626 _have_dvd=no 1627 _have_dvd=no
1627 _dvdnav=no 1628 _dvdnav=auto
1629 _dvdnavconfig=dvdnav-config
1628 _dvdread=auto 1630 _dvdread=auto
1629 _mpdvdkit=auto 1631 _mpdvdkit=auto
1630 _xanim=auto 1632 _xanim=auto
1631 _real=auto 1633 _real=auto
1632 _live=auto 1634 _live=auto
2037 _charset=`echo $ac_option | cut -d '=' -f 2` 2039 _charset=`echo $ac_option | cut -d '=' -f 2`
2038 ;; 2040 ;;
2039 --language=*) 2041 --language=*)
2040 _language=`echo $ac_option | cut -d '=' -f 2` 2042 _language=`echo $ac_option | cut -d '=' -f 2`
2041 ;; 2043 ;;
2042 --with-dvdnavdir=*)
2043 _dvdnavdir=`echo $ac_option | cut -d '=' -f 2`
2044 ;;
2045 2044
2046 --with-codecsdir=*) 2045 --with-codecsdir=*)
2047 _win32libdir=`echo $ac_option | cut -d '=' -f 2` 2046 _win32libdir=`echo $ac_option | cut -d '=' -f 2`
2048 _xanimlibdir=`echo $ac_option | cut -d '=' -f 2` 2047 _xanimlibdir=`echo $ac_option | cut -d '=' -f 2`
2049 _reallibdir=`echo $ac_option | cut -d '=' -f 2` 2048 _reallibdir=`echo $ac_option | cut -d '=' -f 2`
5159 else 5158 else
5160 _def_have_dvd='#undef HAVE_DVD' 5159 _def_have_dvd='#undef HAVE_DVD'
5161 fi 5160 fi
5162 5161
5163 echocheck "DVD support (libdvdnav)" 5162 echocheck "DVD support (libdvdnav)"
5164 if test "$_dvdnav" = yes ; then 5163 if test "$_dvdnav" = auto ; then
5165 cat > $TMPC <<EOF 5164 cat > $TMPC <<EOF
5166 #include <dvdnav.h> 5165 #include <dvdnav.h>
5167 int main(void) { dvdnav_t *dvd=0; return 0; } 5166 int main(void) { dvdnav_t *dvd=0; return 0; }
5168 EOF 5167 EOF
5169 _dvdnav=no 5168 _dvdnav=no
5170 test -n "$_dvdnavdir" && _legal_dvdnavdir=-L$_dvdnavdir/.libs 5169 _dvdnavdir=`$_dvdnavconfig --cflags`
5171 if test -z "$_dvdnavconfig" ; then 5170 _dvdnavlibs=`$_dvdnavconfig --libs`
5172 if ( dvdnav-config --version ) >/dev/null 2>&1 ; then 5171 _dvdnavvsn=`$_dvdnavconfig --version | sed "s/\.//g"`
5173 _dvdnavconfig="dvdnav-config"
5174 fi
5175 fi
5176 test -z "$_dvdnavdir" && test -n "$_dvdnavconfig" && _dvdnavdir=`$_dvdnavconfig --cflags`
5177 _used_css= 5172 _used_css=
5178 #test "$_mpdvdkit" = no && _used_css=$_ld_css 5173 test "$_dvdnavvsn" -ge 0110 && cc_check -I$_dvdnavdir $_dvdnavlibs $_used_css $_ld_dl $_ld_pthread && _dvdnav=yes
5179 cc_check -I$_dvdnavdir $_legal_dvdnavdir -ldvdnav $_used_css $_ld_dl $_ld_pthread && _dvdnav=yes
5180 fi 5174 fi
5181 if test "$_dvdnav" = yes ; then 5175 if test "$_dvdnav" = yes ; then
5182 _largefiles=yes 5176 _largefiles=yes
5183 _def_dvdnav='#define USE_DVDNAV 1' 5177 _def_dvdnav='#define USE_DVDNAV 1'
5184 _ld_dvdnav= 5178 _ld_dvdnav=`$_dvdnavconfig --libs`
5185 if test -n "$_legal_dvdnavdir" ; then 5179 _dvdnav_version=`$_dvdnavconfig --version | sed "s/\.//g"`
5186 #_ld_css="$_ld_css $_legal_dvdnavdir -ldvdnav" 5180 _def_dvdnav_version="#define DVDNAVVERSION $_dvdnav_version"
5187 _ld_dvdnav="$_legal_dvdnavdir -ldvdnav" 5181 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
5188 elif test -n "$_dvdnavconfig" ; then
5189 #_ld_css="$_ld_css `$_dvdnavconfig --libs`"
5190 _ld_dvdnav="`$_dvdnavconfig --libs`"
5191 else
5192 #_ld_css="$_ld_css -ldvdnav"
5193 _ld_dvdnav="-ldvdnav"
5194 fi
5195 if test -n "$_dvdnavconfig" ; then
5196 _dvdnav_version=`$_dvdnavconfig --version | sed "s/\.//g"`
5197 _def_dvdnav_version="#define DVDNAVVERSION $_dvdnav_version"
5198 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
5199 fi
5200 if test -n "$_dvdnavdir" ; then
5201 _inc_extra="$_inc_extra -I$_dvdnavdir"
5202 fi
5203 _inputmodules="dvdnav $_inputmodules" 5182 _inputmodules="dvdnav $_inputmodules"
5204 else 5183 else
5205 _def_dvdnav='#undef USE_DVDNAV' 5184 _def_dvdnav='#undef USE_DVDNAV'
5206 _noinputmodules="dvdnav $_noinputmodules" 5185 _noinputmodules="dvdnav $_noinputmodules"
5207 fi 5186 fi