Mercurial > mplayer.hg
changeset 7254:fed038dd80ea
Enable dvdkit on solaris
solaris has iconv() in libc.so, a separate libiconv.so library does not
exist. Only add a -liconv library when we were succesful compiling a
test program with the -liconv option.
--enable-debug does not work on solaris, because test "-g" in configure
script fails with a test error message "test: argument expected". Use
string comparision to test for a non empty $_debug / $_profile
| author | jkeil |
|---|---|
| date | Tue, 03 Sep 2002 17:13:08 +0000 |
| parents | cb1ed89029e7 |
| children | 34b5a0b12558 |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Sep 03 15:18:39 2002 +0000 +++ b/configure Tue Sep 03 17:13:08 2002 +0000 @@ -3069,7 +3069,7 @@ echocheck "DVD support (libmpdvdkit)" if test "$_dvdkit" = auto ; then _dvdkit=no - if linux || freebsd || netbsd || darwin || cygwin || openbsd; then + if linux || freebsd || netbsd || darwin || cygwin || openbsd || sunos; then test -f "./libmpdvdkit2/Makefile" && _dvdkit=yes test -f "./libmpdvdkit/Makefile" && _dvdkit=yes fi @@ -3623,13 +3623,13 @@ _iconv=no if cc_check -lm -liconv ; then _iconv=yes + _ld_iconv='-liconv' else cc_check -lm && _iconv=yes fi fi if test "$_iconv" = yes ; then _def_iconv='#define USE_ICONV 1' - linux || _ld_iconv='-liconv' else _def_iconv='#undef USE_ICONV' fi @@ -4124,7 +4124,7 @@ # Checking for CFLAGS _stripbinaries=yes -if test "$_profile" || test "$_debug" ; then +if test "$_profile" != "" || test "$_debug" != "" ; then CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile" _stripbinaries=no elif test -z "$CFLAGS" ; then @@ -4215,7 +4215,7 @@ fi _def_debug='#undef MP_DEBUG' -test "$_debug" && _def_debug='#define MP_DEBUG 1' +test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' _def_linux='#undef TARGET_LINUX' linux && _def_linux='#define TARGET_LINUX 1'