From ae2c370375a9893b4d85710868ea643412700986 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 19 May 2009 08:56:23 +0000 Subject: Set XVR100 make variable. Fixes compilation when support for xvr100 was detected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29315 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index 5c579624df..eeea16266a 100755 --- a/configure +++ b/configure @@ -8333,6 +8333,7 @@ XV = $_xv XVID4 = $_xvid XVIDIX = $xvidix XVMC = $_xvmc +XVR100 = $_xvr100 YUV4MPEG = $_yuv4mpeg ZR = $_zr -- cgit v1.2.3 From b8f1cf16db12d596993b3748adbdfb992eb77cd5 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 1 Jun 2009 09:20:22 +0000 Subject: Add some missing FFmpeg archs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29334 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index eeea16266a..3744502788 100755 --- a/configure +++ b/configure @@ -1710,7 +1710,7 @@ fi def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' -_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' +_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' -- cgit v1.2.3 From f4da0f9ec195b5fdc105a79de82864fcfe2dda9c Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 1 Jun 2009 09:25:20 +0000 Subject: Use target_arch and target_subarch which is more similar to what FFmpeg uses and makes more sense when adding proper PPC64 or MIPS64 support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29335 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3744502788..5892fc72b2 100755 --- a/configure +++ b/configure @@ -1714,8 +1714,8 @@ _arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_M case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' - _target_arch_x86="ARCH_X86 = yes" - _target_arch="ARCH_X86_32 = yes" + _target_arch="ARCH_X86 = yes" + _target_subarch="ARCH_X86_32 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc=486 proc=i486 @@ -1954,8 +1954,8 @@ EOF x86_64|amd64) _arch='X86 X86_64' - _target_arch='ARCH_X86_64 = yes' - _target_arch_x86="ARCH_X86 = yes" + _target_subarch='ARCH_X86_64 = yes' + _target_arch="ARCH_X86 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' @@ -8164,7 +8164,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe $_target_arch -$_target_arch_x86 +$_target_subarch $(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') MENCODER = $_mencoder -- cgit v1.2.3 From 3cd6ded7ea17b49524a2d2a949cc074c905a3df3 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 1 Jun 2009 09:35:16 +0000 Subject: Add actually working support for PPC64 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29336 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5892fc72b2..4c6818d5a8 100755 --- a/configure +++ b/configure @@ -1381,7 +1381,8 @@ if test -z "$_target" ; then host_arch=i386 fi ;; - macppc|ppc|ppc64) host_arch=ppc ;; + macppc|ppc) host_arch=ppc ;; + ppc64) host_arch=ppc64 ;; alpha) host_arch=alpha ;; sparc) host_arch=sparc ;; sparc64) host_arch=sparc64 ;; @@ -2085,14 +2086,14 @@ EOF ppc|ppc64|powerpc|powerpc64) _arch='PPC' def_dcbzl='#define HAVE_DCBZL 0' - def_ppc64='#define HAVE_PPC64 0' _target_arch='ARCH_PPC = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then + _arch='PPC PPC64' + _target_subarch='ARCH_PPC64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' - def_ppc64='#define HAVE_PPC64 1' fi echocheck "CPU type" case $system_name in @@ -8818,7 +8819,6 @@ $def_memalign_hack $def_mlib $def_mkstemp $def_posix_memalign -$def_ppc64 $def_pthreads $def_ten_operands $def_threads -- cgit v1.2.3 From 166ffef96b1b243b19ddd2f63774ae34ca7350d5 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 2 Jun 2009 18:37:31 +0000 Subject: Configure needs AS to be set for the Makefiles. Note that this may not be a pure assembler (i.e. AS=as is wrong), it must be a gcc-compatible assembler with preprocessor (e.g. AS=gcc). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29344 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index 4c6818d5a8..821bd76262 100755 --- a/configure +++ b/configure @@ -8124,6 +8124,7 @@ MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir AR = $_ar +AS = $_cc CC = $_cc CXX = $_cc HOST_CC = $_host_cc -- cgit v1.2.3 From d2a3ba44e8a4c2759a637ae56c311978a66c2787 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 12:31:35 +0000 Subject: Drop redundant setting of message language to English when all languages are enabled. This is the default anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29360 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 821bd76262..5e11dd0a59 100755 --- a/configure +++ b/configure @@ -2795,7 +2795,6 @@ _language=$(echo $_language | tr , " ") if $(echo $_language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all - msg_lang=en else for lang in $_language ; do if test -d DOCS/man/$lang ; then -- cgit v1.2.3 From 4a034d1f80662c6661fe1f850f52c31e54e6c84e Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 12:42:06 +0000 Subject: Allow setting message language separately from documentation language. patch by Steve Dibb, steve.dibb gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29361 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5e11dd0a59..1d8490d016 100755 --- a/configure +++ b/configure @@ -439,9 +439,9 @@ Miscellaneous options: --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary --charset=charset convert the console messages to this character set + --language-msg=LINGUA language used for messages and the GUI [en] --language=list a white space or comma separated list of languages for - translated man pages, the first language is used for - messages and the GUI (the environment variable + translated man pages (the environment variable \$LINGUAS is also honored) [en] (Available: all $msg_lang_all) --with-install=PATH path to a custom install program @@ -849,6 +849,9 @@ for ac_option do --charset=*) _charset=$(echo $ac_option | cut -d '=' -f 2) ;; + --language-msg=*) + _language_msg=$(echo $ac_option | cut -d '=' -f 2) + ;; --language=*) _language=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -2791,7 +2794,9 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS +test -z "$_language_msg" && _language_msg=$LINGUAS _language=$(echo $_language | tr , " ") +_language_msg=$(echo $_language_msg | tr , " ") if $(echo $_language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all @@ -2806,13 +2811,13 @@ else done man_langs=$tmp_man_langs doc_langs=$tmp_man_langs - for lang in $_language ; do + for lang in $_language_msg ; do if test -f "help/help_mp-${lang}.h" ; then msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" - _language=$(echo $_language | sed "s/$lang *//") + _language_msg=$(echo $_language_msg | sed "s/$lang *//") fi done fi -- cgit v1.2.3 From ee57be5389f92bee9e37916d6bae005d440a008a Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 13:25:54 +0000 Subject: cosmetics: Drop leading underscore from _language* variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29362 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1d8490d016..cdffec3e48 100755 --- a/configure +++ b/configure @@ -694,7 +694,7 @@ _directfb=auto _zr=auto _bl=no _largefiles=yes -#_language=en +#language=en _shm=auto _linux_devfs=no _charset="UTF-8" @@ -850,10 +850,10 @@ for ac_option do _charset=$(echo $ac_option | cut -d '=' -f 2) ;; --language-msg=*) - _language_msg=$(echo $ac_option | cut -d '=' -f 2) + language_msg=$(echo $ac_option | cut -d '=' -f 2) ;; --language=*) - _language=$(echo $ac_option | cut -d '=' -f 2) + language=$(echo $ac_option | cut -d '=' -f 2) ;; --enable-static) @@ -2793,15 +2793,15 @@ echores "$_langinfo" echocheck "language" -test -z "$_language" && _language=$LINGUAS -test -z "$_language_msg" && _language_msg=$LINGUAS -_language=$(echo $_language | tr , " ") -_language_msg=$(echo $_language_msg | tr , " ") -if $(echo $_language | grep -q all) ; then +test -z "$language" && language=$LINGUAS +test -z "$language_msg" && language_msg=$LINGUAS +language=$(echo $language | tr , " ") +language_msg=$(echo $language_msg | tr , " ") +if $(echo $language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all else - for lang in $_language ; do + for lang in $language ; do if test -d DOCS/man/$lang ; then tmp_man_langs="$tmp_man_langs $lang" fi @@ -2811,13 +2811,13 @@ else done man_langs=$tmp_man_langs doc_langs=$tmp_man_langs - for lang in $_language_msg ; do + for lang in $language_msg ; do if test -f "help/help_mp-${lang}.h" ; then msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" - _language_msg=$(echo $_language_msg | sed "s/$lang *//") + language_msg=$(echo $language_msg | sed "s/$lang *//") fi done fi -- cgit v1.2.3 From 2b7877910050b42ee82cf5d10c1fb44f71741024 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 14:55:01 +0000 Subject: Overhaul translation handling completely and add options to install specific documentation and man page translations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29363 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 98 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 43 deletions(-) (limited to 'configure') diff --git a/configure b/configure index cdffec3e48..8cb8d00224 100755 --- a/configure +++ b/configure @@ -425,6 +425,20 @@ Audio output: --disable-coreaudio disable CoreAudio audio output [autodetect] --disable-select disable using select() on the audio device [enable] +Language options: + --charset=charset convert the console messages to this character set + --language-doc=lang language to use for the documentation [en] + --language-man=lang language to use for the man pages [en] + --language-msg=lang language to use for the messages and the GUI [en] + --language=lang default language to use [en] +Specific options override --language. You can pass a list of languages separated +by whitespace or commas instead of a single language. Nonexisting translations +will be dropped from each list. All documentation and man page translations +available in the list will be installed, for the messages the first available +translation will be used. The value "all" will activate all translations. The +LINGUAS environment variable is honored. In all cases the fallback is English. +Available values are: all $msg_lang_all + Miscellaneous options: --enable-runtime-cpudetection enable runtime CPU detection [disable] --enable-cross-compile enable cross-compilation [autodetect] @@ -438,12 +452,6 @@ Miscellaneous options: --windres=WINDRES windres to build MPlayer [windres] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary - --charset=charset convert the console messages to this character set - --language-msg=LINGUA language used for messages and the GUI [en] - --language=list a white space or comma separated list of languages for - translated man pages (the environment variable - \$LINGUAS is also honored) [en] - (Available: all $msg_lang_all) --with-install=PATH path to a custom install program Advanced options: @@ -849,6 +857,12 @@ for ac_option do --charset=*) _charset=$(echo $ac_option | cut -d '=' -f 2) ;; + --language-doc=*) + language_doc=$(echo $ac_option | cut -d '=' -f 2) + ;; + --language-man=*) + language_man=$(echo $ac_option | cut -d '=' -f 2) + ;; --language-msg=*) language_msg=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -2793,41 +2807,40 @@ echores "$_langinfo" echocheck "language" +# Set preferred languages, "all" uses English as main language. test -z "$language" && language=$LINGUAS -test -z "$language_msg" && language_msg=$LINGUAS -language=$(echo $language | tr , " ") +test -z "$language_doc" && language_doc=$language +test -z "$language_man" && language_man=$language +test -z "$language_msg" && language_msg=$language +language_doc=$(echo $language_doc | tr , " ") +language_man=$(echo $language_man | tr , " ") language_msg=$(echo $language_msg | tr , " ") -if $(echo $language | grep -q all) ; then - doc_lang=en ; doc_langs=$doc_lang_all - man_lang=en ; man_langs=$man_lang_all -else - for lang in $language ; do - if test -d DOCS/man/$lang ; then - tmp_man_langs="$tmp_man_langs $lang" - fi - if test -d DOCS/xml/$lang ; then - tmp_doc_langs="$tmp_doc_langs $lang" - fi - done - man_langs=$tmp_man_langs - doc_langs=$tmp_man_langs - for lang in $language_msg ; do - if test -f "help/help_mp-${lang}.h" ; then - msg_lang=$lang - break - else - echo ${_echo_n} "$lang not found, ${_echo_c}" - language_msg=$(echo $language_msg | sed "s/$lang *//") - fi - done -fi -test -z "$doc_langs" && doc_langs=en -test -z "$man_langs" && man_langs=en -test -z "$doc_lang" && doc_lang=$(echo $doc_langs | cut -f1 -d" ") -test -z "$man_lang" && man_lang=$(echo $man_langs | cut -f1 -d" ") -test -z "$msg_lang" && msg_lang=en -_mp_help="help/help_mp-${msg_lang}.h" -echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs" + +test "$language_doc" = "all" && language_doc=$doc_lang_all +test "$language_man" = "all" && language_man=$man_lang_all +test "$language_msg" = "all" && language_msg=en + +# Prune non-existing translations from language lists. +# Set message translation to the first available language. +# Fall back on English. +for lang in $language_doc ; do + test -d DOCS/xml/$lang && tmp_language_doc="$tmp_language_doc $lang" +done +language_doc=$tmp_language_doc +test -z "language_doc" && language_doc=en + +for lang in $language_man ; do + test -d DOCS/man/$lang && tmp_language_man="$tmp_language_man $lang" +done +language_man=$tmp_language_man +test -z "language_man" && language_man=en + +for lang in $language_msg ; do + test -f "help/help_mp-${lang}.h" && language_msg=$lang && break +done +test -z "language_msg" && language_msg=en +_mp_help="help/help_mp-${language_msg}.h" +echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" echocheck "enable sighandler" @@ -8113,10 +8126,8 @@ export LC_ALL = C CONFIGURATION = $_configuration CHARSET = $_charset -DOC_LANG = $doc_lang DOC_LANGS = $doc_langs DOC_LANG_ALL = $doc_lang_all -MAN_LANG = $man_lang MAN_LANGS = $man_langs MAN_LANG_ALL = $man_lang_all @@ -8910,8 +8921,9 @@ Config files successfully generated by ./configure $_configuration ! Optimizing for: $_optimizing Languages: - Messages/GUI: $msg_lang - Manual pages: $man_langs + Messages/GUI: $language_msg + Manual pages: $language_man + Documentation: $language_doc Enabled optional drivers: Input: $_inputmodules -- cgit v1.2.3 From 961ef5497785912ee5c88de75116387e8c89e1ca Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 18:51:36 +0000 Subject: 100l: Add missing $s to default language variable checks, which prevented fallback language settings from taking effect. patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29364 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8cb8d00224..7e3e51181d 100755 --- a/configure +++ b/configure @@ -2827,18 +2827,18 @@ for lang in $language_doc ; do test -d DOCS/xml/$lang && tmp_language_doc="$tmp_language_doc $lang" done language_doc=$tmp_language_doc -test -z "language_doc" && language_doc=en +test -z "$language_doc" && language_doc=en for lang in $language_man ; do test -d DOCS/man/$lang && tmp_language_man="$tmp_language_man $lang" done language_man=$tmp_language_man -test -z "language_man" && language_man=en +test -z "$language_man" && language_man=en for lang in $language_msg ; do test -f "help/help_mp-${lang}.h" && language_msg=$lang && break done -test -z "language_msg" && language_msg=en +test -z "$language_msg" && language_msg=en _mp_help="help/help_mp-${language_msg}.h" echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" -- cgit v1.2.3 From 53d273ec22c2e662e2974c6e8cd1a7895ca06549 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jun 2009 21:09:35 +0000 Subject: Rename LIBVORBIS Makefile variable to VORBIS. The latter is more clear as it can represent either Tremor or libvorbis. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 7e3e51181d..b934017f9c 100755 --- a/configure +++ b/configure @@ -8265,7 +8265,6 @@ LIBNEMESI = $_nemesi LIBNUT = $_libnut LIBSMBCLIENT = $_smb LIBTHEORA = $_theora -LIBVORBIS = $_vorbis LIRC = $_lirc LIVE555 = $_live MACOSX_BUNDLE = $_macosx_bundle @@ -8335,6 +8334,7 @@ VIDIX_S3=$_vidix_drv_s3 VIDIX_SH_VEU=$_vidix_drv_sh_veu VIDIX_SIS=$_vidix_drv_sis VIDIX_UNICHROME=$_vidix_drv_unichrome +VORBIS = $_vorbis VSTREAM = $_vstream WII = $_wii WIN32DLL = $_win32dll -- cgit v1.2.3 From 811779d33736b26ffabf6986de662988183ba2db Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 16 Jun 2009 13:32:51 +0000 Subject: Do not auto-detect old libnut installations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29366 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index b934017f9c..d25e42a9a2 100755 --- a/configure +++ b/configure @@ -7287,6 +7287,7 @@ if test "$_libnut" = auto ; then #include #include #include +nut_context_tt * nut; int main(void) { (void)nut_error(0); return 0; } EOF _libnut=no -- cgit v1.2.3 From 08a14cf5a47f56e188a195bea6c5d077dd46af35 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 19 Jun 2009 15:20:59 +0000 Subject: Fix setting of DOC_LANGS and MAN_LANGS, the wrong variables were being used. This makes XML documentation generation work again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29372 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d25e42a9a2..657b308e36 100755 --- a/configure +++ b/configure @@ -8127,9 +8127,9 @@ export LC_ALL = C CONFIGURATION = $_configuration CHARSET = $_charset -DOC_LANGS = $doc_langs +DOC_LANGS = $language_doc DOC_LANG_ALL = $doc_lang_all -MAN_LANGS = $man_langs +MAN_LANGS = $language_man MAN_LANG_ALL = $man_lang_all prefix = \$(DESTDIR)$_prefix -- cgit v1.2.3 From de592450d5e7579d4965c554351b0c65eb7d50fd Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Jun 2009 23:35:13 +0000 Subject: Do not use -rdynamic on Solaris, where the flag is unsupported. patch by Niklas Edmundsson, nikke acc.umu se, Bugzilla #1496 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29379 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 657b308e36..46353fde5f 100755 --- a/configure +++ b/configure @@ -7954,7 +7954,7 @@ fi # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) _ld_dl_dynamic='' freebsd || netbsd || openbsd || dragonfly || bsdos && _ld_dl_dynamic='-rdynamic' -if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 ; then +if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 && ! sunos; then _ld_dl_dynamic='-rdynamic' fi -- cgit v1.2.3 From 63b0136feadd711bbaf2cd8f884cce7bc1986a2b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 24 Jun 2009 23:31:17 +0000 Subject: Modern Solaris versions have different default CD-ROM devices. patch by Pawel Tecza, ptecza uw.edu pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29387 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 46353fde5f..b459a0a1c9 100755 --- a/configure +++ b/configure @@ -5770,6 +5770,9 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0a" elif sunos ; then default_cdrom_device="/vol/dev/aliases/cdrom0" + # Modern Solaris versions use HAL instead of the vold daemon, the volfs + # file system and the volfs service. + test -r "/cdrom/cdrom0" && default_cdrom_device="/cdrom/cdrom0" elif amigaos ; then default_cdrom_device="a1ide.device:2" else -- cgit v1.2.3