[Mplayer-cvslog] CVS: main configure,1.557,1.558

[Jürgen Keil]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv10983

Modified Files:
	configure 
Log Message:
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 



Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- configure	2 Sep 2002 19:51:00 -0000	1.557
+++ configure	3 Sep 2002 17:13:08 -0000	1.558
@@ -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'