* This the last piece of the new configuration module. You can now save your configuration options (only from the gtk/gnome interface for now). The config file will be saved as ~/.VideoLan/vlc It's not quite yet finished (well there are a few small details to sort out), but I'm going away for the week-end and I wanted to commit this before so you can all have a play with it :)

278bc72e · Gildas Bazin · dffb93e1 · 278bc72e · 278bc72e · 278bc72e
Commit 278bc72e authored Mar 16, 2002 by Gildas Bazin
10 changed files
--- a/configure
+++ b/configure
@@ -3915,15 +3915,70 @@ else
 fi
 done
+for ac_func in getpwuid_r getpwuid
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3922: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3927 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 NEED_GETOPT=0
 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:3922: checking for getopt_long" >&5
+echo "configure:3977: checking for getopt_long" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 3927 "configure"
+#line 3982 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getopt_long(); below.  */
@@ -3946,7 +4001,7 @@ getopt_long();
 ; return 0; }
 EOF
-if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_getopt_long=yes"
 else
@@ -3968,7 +4023,7 @@ else
  echo "$ac_t""no" 1>&6
 # FreeBSD has a gnugetopt library for this:
  echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6
-echo "configure:3972: checking for getopt_long in -lgnugetopt" >&5
+echo "configure:4027: checking for getopt_long in -lgnugetopt" >&5
 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3976,7 +4031,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lgnugetopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3980 "configure"
+#line 4035 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3987,7 +4042,7 @@ int main() {
 getopt_long()
 ; return 0; }
 EOF
-if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4015,12 +4070,12 @@ fi
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4019: checking return type of signal handlers" >&5
+echo "configure:4074: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4024 "configure"
+#line 4079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4037,7 +4092,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_type_signal=void
 else
@@ -4056,7 +4111,7 @@ EOF
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4060: checking for dlopen in -ldl" >&5
+echo "configure:4115: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4064,7 +4119,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4068 "configure"
+#line 4123 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4075,7 +4130,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4096,7 +4151,7 @@ else
 fi
 echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6
-echo "configure:4100: checking for cos in -lm" >&5
+echo "configure:4155: checking for cos in -lm" >&5
 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4104,7 +4159,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4108 "configure"
+#line 4163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4115,7 +4170,7 @@ int main() {
 cos()
 ; return 0; }
 EOF
-if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4137,7 +4192,7 @@ else
 fi
 echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-echo "configure:4141: checking for pow in -lm" >&5
+echo "configure:4196: checking for pow in -lm" >&5
 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4145,7 +4200,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4149 "configure"
+#line 4204 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4156,7 +4211,7 @@ int main() {
 pow()
 ; return 0; }
 EOF
-if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4183,7 +4238,7 @@ fi
 THREAD_LIB=error
 if test "x${THREAD_LIB}" = xerror; then
  echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:4187: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:4242: checking for pthread_attr_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4191,7 +4246,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4195 "configure"
+#line 4250 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4202,7 +4257,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4225,7 +4280,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
  echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:4229: checking for pthread_attr_init in -lpthreads" >&5
+echo "configure:4284: checking for pthread_attr_init in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4233,7 +4288,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4237 "configure"
+#line 4292 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4244,7 +4299,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4267,7 +4322,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
  echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-echo "configure:4271: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:4326: checking for pthread_attr_init in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4275,7 +4330,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+#line 4334 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4286,7 +4341,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4309,12 +4364,12 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
  echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-echo "configure:4313: checking for pthread_attr_init" >&5
+echo "configure:4368: checking for pthread_attr_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4318 "configure"
+#line 4373 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char pthread_attr_init(); below.  */
@@ -4337,7 +4392,7 @@ pthread_attr_init();
 ; return 0; }
 EOF
-if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_pthread_attr_init=yes"
 else
@@ -4360,7 +4415,7 @@ fi
 fi
 echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6
-echo "configure:4364: checking for cthread_fork in -lthreads" >&5
+echo "configure:4419: checking for cthread_fork in -lthreads" >&5
 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4368,7 +4423,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4427 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4379,7 +4434,7 @@ int main() {
 cthread_fork()
 ; return 0; }
 EOF
-if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4401,7 +4456,7 @@ fi
 cat > conftest.$ac_ext <<EOF
-#line 4405 "configure"
+#line 4460 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
@@ -4417,7 +4472,7 @@ fi
 rm -f conftest*
 cat > conftest.$ac_ext <<EOF
-#line 4421 "configure"
+#line 4476 "configure"
 #include "confdefs.h"
 #include <strings.h>
 EOF
@@ -4437,17 +4492,17 @@ for ac_hdr in getopt.h strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4441: checking for $ac_hdr" >&5
+echo "configure:4496: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4446 "configure"
+#line 4501 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4477,17 +4532,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4481: checking for $ac_hdr" >&5
+echo "configure:4536: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4486 "configure"
+#line 4541 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4517,17 +4572,17 @@ for ac_hdr in dlfcn.h image.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4521: checking for $ac_hdr" >&5
+echo "configure:4576: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4526 "configure"
+#line 4581 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4557,17 +4612,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4561: checking for $ac_hdr" >&5
+echo "configure:4616: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4566 "configure"
+#line 4621 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4597,17 +4652,17 @@ for ac_hdr in machine/param.h sys/shm.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4601: checking for $ac_hdr" >&5
+echo "configure:4656: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4606 "configure"
+#line 4661 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4635,12 +4690,12 @@ done
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4639: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4694: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4644 "configure"
+#line 4699 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4649,7 +4704,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_time=yes
 else
@@ -4674,17 +4729,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4678: checking for $ac_hdr" >&5
+echo "configure:4733: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4683 "configure"
+#line 4738 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4725,17 +4780,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4729: checking for $ac_hdr" >&5
+echo "configure:4784: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4734 "configure"
+#line 4789 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4757,7 +4812,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 EOF
    cat > conftest.$ac_ext <<EOF
-#line 4761 "configure"
+#line 4816 "configure"
 #include "confdefs.h"
 #include <X11/extensions/dpms.h>
 EOF
@@ -4783,20 +4838,20 @@ done
 fi
 echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
-echo "configure:4787: checking for ntohl in sys/param.h" >&5
+echo "configure:4842: checking for ntohl in sys/param.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -Wall -Werror"
     cat > conftest.$ac_ext <<EOF
-#line 4793 "configure"
+#line 4848 "configure"
 #include "confdefs.h"
 #include <sys/param.h>
 int main() {
 void foo() { int meuh; ntohl(meuh); }
 ; return 0; }
 EOF
-if { (eval echo configure:4800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_ntohl_sys_param_h=yes
 else
@@ -4817,20 +4872,20 @@ EOF
 fi
 echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6
-echo "configure:4821: checking if \$CC accepts -finline-limit" >&5
+echo "configure:4876: checking if \$CC accepts -finline-limit" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -finline-limit-30000"
     cat > conftest.$ac_ext <<EOF
-#line 4827 "configure"
+#line 4882 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_inline_limit=yes
 else
@@ -4848,20 +4903,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6
-echo "configure:4852: checking if \$CC accepts -Wall -Winline" >&5
+echo "configure:4907: checking if \$CC accepts -Wall -Winline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_Wall_Winline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -Wall -Winline"
     cat > conftest.$ac_ext <<EOF
-#line 4858 "configure"
+#line 4913 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_Wall_Winline=yes
 else
@@ -4878,20 +4933,20 @@ if test x"$ac_cv_c_Wall_Winline" != x"no"; then
    save_CFLAGS="${save_CFLAGS} -Wall -Winline"
 else
    echo $ac_n "checking if \$CC accepts -wall -winline""... $ac_c" 1>&6
-echo "configure:4882: checking if \$CC accepts -wall -winline" >&5
+echo "configure:4937: checking if \$CC accepts -wall -winline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -wall -winline"
         cat > conftest.$ac_ext <<EOF
-#line 4888 "configure"
+#line 4943 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_wall_winline=yes
 else
@@ -4910,20 +4965,20 @@ echo "$ac_t""$ac_cv_c_wall_winline" 1>&6
 fi
 echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6
-echo "configure:4914: checking if \$CC accepts -pipe" >&5
+echo "configure:4969: checking if \$CC accepts -pipe" >&5
 if eval "test \"`echo '$''{'ac_cv_c_pipe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -pipe"
     cat > conftest.$ac_ext <<EOF
-#line 4920 "configure"
+#line 4975 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_pipe=yes
 else
@@ -4941,20 +4996,20 @@ if test x"$ac_cv_c_pipe" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6
-echo "configure:4945: checking if \$CC accepts -O3" >&5
+echo "configure:5000: checking if \$CC accepts -O3" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o3'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -O3"
     cat > conftest.$ac_ext <<EOF
-#line 4951 "configure"
+#line 5006 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_o3=yes
 else
@@ -4971,20 +5026,20 @@ if test x"$ac_cv_c_o3" != x"no"; then
    CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
 else
    echo $ac_n "checking if \$CC accepts -O2""... $ac_c" 1>&6
-echo "configure:4975: checking if \$CC accepts -O2" >&5
+echo "configure:5030: checking if \$CC accepts -O2" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -O2"
         cat > conftest.$ac_ext <<EOF
-#line 4981 "configure"
+#line 5036 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_o2=yes
 else
@@ -5001,20 +5056,20 @@ echo "$ac_t""$ac_cv_c_o2" 1>&6
        CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
    else
        echo $ac_n "checking if \$CC accepts -O""... $ac_c" 1>&6
-echo "configure:5005: checking if \$CC accepts -O" >&5
+echo "configure:5060: checking if \$CC accepts -O" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -O"
             cat > conftest.$ac_ext <<EOF
-#line 5011 "configure"
+#line 5066 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_o=yes
 else
@@ -5034,20 +5089,20 @@ echo "$ac_t""$ac_cv_c_o" 1>&6
 fi
 echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6
-echo "configure:5038: checking if \$CC accepts -ffast-math" >&5
+echo "configure:5093: checking if \$CC accepts -ffast-math" >&5
 if eval "test \"`echo '$''{'ac_cv_c_fast_math'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -ffast-math"
     cat > conftest.$ac_ext <<EOF
-#line 5044 "configure"
+#line 5099 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_fast_math=yes
 else
@@ -5065,20 +5120,20 @@ if test x"$ac_cv_c_fast_math" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6
-echo "configure:5069: checking if \$CC accepts -funroll-loops" >&5
+echo "configure:5124: checking if \$CC accepts -funroll-loops" >&5
 if eval "test \"`echo '$''{'ac_cv_c_unroll_loops'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -funroll-loops"
     cat > conftest.$ac_ext <<EOF
-#line 5075 "configure"
+#line 5130 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_unroll_loops=yes
 else
@@ -5096,20 +5151,20 @@ if test x"$ac_cv_c_unroll_loops" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -fomit-frame-pointer""... $ac_c" 1>&6
-echo "configure:5100: checking if \$CC accepts -fomit-frame-pointer" >&5
+echo "configure:5155: checking if \$CC accepts -fomit-frame-pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -fomit-frame-pointer"
     cat > conftest.$ac_ext <<EOF
-#line 5106 "configure"
+#line 5161 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_omit_frame_pointer=yes
 else
@@ -5127,20 +5182,20 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6
-echo "configure:5131: checking if \$CC accepts -bundle -undefined error" >&5
+echo "configure:5186: checking if \$CC accepts -bundle -undefined error" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -bundle -undefined error"
     cat > conftest.$ac_ext <<EOF
-#line 5137 "configure"
+#line 5192 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_ld_darwin=yes
 else
@@ -5158,20 +5213,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then
 fi
 echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6
-echo "configure:5162: checking if \$CC accepts -shared" >&5
+echo "configure:5217: checking if \$CC accepts -shared" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  CFLAGS="${save_CFLAGS} -shared"
     cat > conftest.$ac_ext <<EOF
-#line 5168 "configure"
+#line 5223 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_ld_plugins=yes
 else
@@ -5190,7 +5245,7 @@ fi
 if test x"${SOFLAGS}" = x; then
    echo $ac_n "checking for soname setting""... $ac_c" 1>&6
-echo "configure:5194: checking for soname setting" >&5
+echo "configure:5249: checking for soname setting" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_soname'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5199,14 +5254,14 @@ else
        try_SOFLAGS="-Wl,-soname -Wl,"
        LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
        cat > conftest.$ac_ext <<EOF
-#line 5203 "configure"
+#line 5258 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_ld_soname="${try_SOFLAGS}"
 else
@@ -5218,14 +5273,14 @@ else
            try_SOFLAGS="-Wl,-h -Wl,"
            LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
            cat > conftest.$ac_ext <<EOF
-#line 5222 "configure"
+#line 5277 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_ld_soname="${try_SOFLAGS}"
 else
@@ -5254,7 +5309,7 @@ have problems using libdvdcss.
 fi
 echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6
-echo "configure:5258: checking __attribute__ ((aligned ())) support" >&5
+echo "configure:5313: checking __attribute__ ((aligned ())) support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5262,14 +5317,14 @@ else
        CFLAGS="${save_CFLAGS} -Werror"
    for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
        cat > conftest.$ac_ext <<EOF
-#line 5266 "configure"
+#line 5321 "configure"
 #include "confdefs.h"
 int main() {
 static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
 ; return 0; }
 EOF
-if { (eval echo configure:5273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
 else
@@ -5292,19 +5347,19 @@ CFLAGS="${save_CFLAGS}"
 LDFLAGS="${save_LDFLAGS}"
 echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:5296: checking for boolean_t in sys/types.h" >&5
+echo "configure:5351: checking for boolean_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5301 "configure"
+#line 5356 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_boolean_t_sys_types_h=yes
 else
@@ -5325,19 +5380,19 @@ EOF
 fi
 echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
-echo "configure:5329: checking for boolean_t in pthread.h" >&5
+echo "configure:5384: checking for boolean_t in pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5334 "configure"
+#line 5389 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_boolean_t_pthread_h=yes
 else
@@ -5358,19 +5413,19 @@ EOF
 fi
 echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6
-echo "configure:5362: checking for boolean_t in cthreads.h" >&5
+echo "configure:5417: checking for boolean_t in cthreads.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5367 "configure"
+#line 5422 "configure"
 #include "confdefs.h"
 #include <cthreads.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_boolean_t_cthreads_h=yes
 else
@@ -5409,19 +5464,19 @@ SSE_MODULES="imdctsse downmixsse"
 ALTIVEC_MODULES="idctaltivec motionaltivec"
 echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6
-echo "configure:5413: checking if \$CC groks MMX inline assembly" >&5
+echo "configure:5468: checking if \$CC groks MMX inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5418 "configure"
+#line 5473 "configure"
 #include "confdefs.h"
 int main() {
 void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_mmx_inline=yes
 else
@@ -5439,19 +5494,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then
 fi
 echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6
-echo "configure:5443: checking if \$CC groks MMX EXT inline assembly" >&5
+echo "configure:5498: checking if \$CC groks MMX EXT inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5448 "configure"
+#line 5503 "configure"
 #include "confdefs.h"
 int main() {
 void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_mmxext_inline=yes
 else
@@ -5469,19 +5524,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then
 fi
 echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6
-echo "configure:5473: checking if \$CC groks 3D Now! inline assembly" >&5
+echo "configure:5528: checking if \$CC groks 3D Now! inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5478 "configure"
+#line 5533 "configure"
 #include "confdefs.h"
 int main() {
 void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_3dnow_inline=yes
 else
@@ -5503,19 +5558,19 @@ EOF
 fi
 echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6
-echo "configure:5507: checking if \$CC groks SSE inline assembly" >&5
+echo "configure:5562: checking if \$CC groks SSE inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5512 "configure"
+#line 5567 "configure"
 #include "confdefs.h"
 int main() {
 void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_sse_inline=yes
 else
@@ -5540,19 +5595,19 @@ fi
 # we should be able to remove this test with future versions of mingw32
 if test x$SYS != xmingw32; then
 echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6
-echo "configure:5544: checking if \$CC groks Altivec inline assembly" >&5
+echo "configure:5599: checking if \$CC groks Altivec inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5549 "configure"
+#line 5604 "configure"
 #include "confdefs.h"
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_altivec_inline=yes
 else
@@ -5562,14 +5617,14 @@ else
  save_CFLAGS=$CFLAGS
          CFLAGS="$CFLAGS -Wa,-m7400"
          cat > conftest.$ac_ext <<EOF
-#line 5566 "configure"
+#line 5621 "configure"
 #include "confdefs.h"
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_altivec_inline="-Wa,-m7400"
 else
@@ -5600,7 +5655,7 @@ EOF
 fi
 echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6
-echo "configure:5604: checking if \$CC groks Altivec C extensions" >&5
+echo "configure:5659: checking if \$CC groks Altivec C extensions" >&5
 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5608,14 +5663,14 @@ else
     CFLAGS="$CFLAGS -faltivec"
     # Darwin test
     cat > conftest.$ac_ext <<EOF
-#line 5612 "configure"
+#line 5667 "configure"
 #include "confdefs.h"
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_altivec=-faltivec
 else
@@ -5626,14 +5681,14 @@ else
        # Linux/PPC test
        CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec"
        cat > conftest.$ac_ext <<EOF
-#line 5630 "configure"
+#line 5685 "configure"
 #include "confdefs.h"
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_altivec="-fvec"
 else
@@ -5663,21 +5718,21 @@ EOF
 fi
 echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6
-echo "configure:5667: checking if linker needs -framework vecLib" >&5
+echo "configure:5722: checking if linker needs -framework vecLib" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  save_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -framework vecLib"
     cat > conftest.$ac_ext <<EOF
-#line 5674 "configure"
+#line 5729 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_ld_altivec=yes
 else
@@ -5727,17 +5782,17 @@ for ac_hdr in winioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5731: checking for $ac_hdr" >&5
+echo "configure:5786: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5736 "configure"
+#line 5791 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5770,17 +5825,17 @@ for ac_hdr in sys/ioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5774: checking for $ac_hdr" >&5
+echo "configure:5829: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5779 "configure"
+#line 5834 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5806,17 +5861,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5810: checking for $ac_hdr" >&5
+echo "configure:5865: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5815 "configure"
+#line 5870 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5846,7 +5901,7 @@ done
  LINUX_DVD_STRUCT=0
  OPENBSD_DVD_STRUCT=0
        cat > conftest.$ac_ext <<EOF
-#line 5850 "configure"
+#line 5905 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -5859,7 +5914,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
    cat > conftest.$ac_ext <<EOF
-#line 5863 "configure"
+#line 5918 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -5879,7 +5934,7 @@ fi
 rm -f conftest*
        cat > conftest.$ac_ext <<EOF
-#line 5883 "configure"
+#line 5938 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -5892,7 +5947,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
    cat > conftest.$ac_ext <<EOF
-#line 5896 "configure"
+#line 5951 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -5912,7 +5967,7 @@ fi
 rm -f conftest*
        cat > conftest.$ac_ext <<EOF
-#line 5916 "configure"
+#line 5971 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -5931,7 +5986,7 @@ rm -f conftest*
        NEED_BSDI_LIBDVD=0
  cat > conftest.$ac_ext <<EOF
-#line 5935 "configure"
+#line 5990 "configure"
 #include "confdefs.h"
 #include <dvd.h>
 EOF
@@ -5953,17 +6008,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5957: checking for $ac_hdr" >&5
+echo "configure:6012: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5962 "configure"
+#line 6017 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6003,17 +6058,17 @@ rm -f conftest*
        ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6
-echo "configure:6007: checking for sys/scsi/scsi_types.h" >&5
+echo "configure:6062: checking for sys/scsi/scsi_types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6012 "configure"
+#line 6067 "configure"
 #include "confdefs.h"
 #include <sys/scsi/scsi_types.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6032,17 +6087,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6
-echo "configure:6036: checking for sys/scsi/impl/uscsi.h" >&5
+echo "configure:6091: checking for sys/scsi/impl/uscsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6041 "configure"
+#line 6096 "configure"
 #include "confdefs.h"
 #include <sys/scsi/impl/uscsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6075,17 +6130,17 @@ fi
        ac_safe=`echo "sys/scsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi.h""... $ac_c" 1>&6
-echo "configure:6079: checking for sys/scsi.h" >&5
+echo "configure:6134: checking for sys/scsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6084 "configure"
+#line 6139 "configure"
 #include "confdefs.h"
 #include <sys/scsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6103,7 +6158,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  echo "$ac_t""yes" 1>&6
    cat > conftest.$ac_ext <<EOF
-#line 6107 "configure"
+#line 6162 "configure"
 #include "confdefs.h"
 #include <sys/scsi.h>
 EOF
@@ -6235,7 +6290,7 @@ if test "${enable_pth+set}" = set; then
  enableval="$enable_pth"
   if test x$enableval = xyes; then
    echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:6239: checking for pth_init in -lpth" >&5
+echo "configure:6294: checking for pth_init in -lpth" >&5
 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6243,7 +6298,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6247 "configure"
+#line 6302 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6254,7 +6309,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6282,7 +6337,7 @@ else
 fi
    cat > conftest.$ac_ext <<EOF
-#line 6286 "configure"
+#line 6341 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -6308,7 +6363,7 @@ if test "${enable_st+set}" = set; then
  enableval="$enable_st"
   if test x$enableval = xyes; then
    echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6
-echo "configure:6312: checking for st_init in -lst" >&5
+echo "configure:6367: checking for st_init in -lst" >&5
 ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6316,7 +6371,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lst  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6320 "configure"
+#line 6375 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6327,7 +6382,7 @@ int main() {
 st_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6355,7 +6410,7 @@ else
 fi
    cat > conftest.$ac_ext <<EOF
-#line 6359 "configure"
+#line 6414 "configure"
 #include "confdefs.h"
 #include <st.h>
 EOF
@@ -6513,7 +6568,7 @@ fi
 if test x$enable_vcd != xno
 then
  cat > conftest.$ac_ext <<EOF
-#line 6517 "configure"
+#line 6572 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -6576,7 +6631,7 @@ then
 fi
 cat > conftest.$ac_ext <<EOF
-#line 6580 "configure"
+#line 6635 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
@@ -6619,17 +6674,17 @@ if test "${with_mad+set}" = set; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6623: checking for $ac_hdr" >&5
+echo "configure:6678: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6628 "configure"
+#line 6683 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6659,7 +6714,7 @@ fi
 done
      echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6663: checking for mad_bit_init in -lmad" >&5
+echo "configure:6718: checking for mad_bit_init in -lmad" >&5
 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6667,7 +6722,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lmad  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6671 "configure"
+#line 6726 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6678,7 +6733,7 @@ int main() {
 mad_bit_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6735,17 +6790,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6739: checking for $ac_hdr" >&5
+echo "configure:6794: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6744 "configure"
+#line 6799 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6768,7 +6823,7 @@ EOF
    PLUGINS="${PLUGINS} dsp"
    echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-echo "configure:6772: checking for main in -lossaudio" >&5
+echo "configure:6827: checking for main in -lossaudio" >&5
 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6776,14 +6831,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lossaudio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6780 "configure"
+#line 6835 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6819,7 +6874,7 @@ if test "${enable_esd+set}" = set; then
     # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6823: checking for $ac_word" >&5
+echo "configure:6878: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6870,7 +6925,7 @@ if test "${enable_arts+set}" = set; then
     # Extract the first word of "artsc-config", so it can be a program name with args.
 set dummy artsc-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6874: checking for $ac_word" >&5
+echo "configure:6929: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6928,17 +6983,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6932: checking for $ac_hdr" >&5
+echo "configure:6987: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6937 "configure"
+#line 6992 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6983,17 +7038,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6987: checking for $ac_hdr" >&5
+echo "configure:7042: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6992 "configure"
+#line 7047 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7036,17 +7091,17 @@ if test "x$enableval" != "xno" -a x$SYS != xmingw32
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7040: checking for $ac_hdr" >&5
+echo "configure:7095: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7045 "configure"
+#line 7100 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7134,7 +7189,7 @@ fi
  # Extract the first word of "sdl12-config", so it can be a program name with args.
 set dummy sdl12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7138: checking for $ac_word" >&5
+echo "configure:7193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7174,7 +7229,7 @@ fi
    # Extract the first word of "sdl11-config", so it can be a program name with args.
 set dummy sdl11-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7178: checking for $ac_word" >&5
+echo "configure:7233: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7215,7 +7270,7 @@ fi
    # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7219: checking for $ac_word" >&5
+echo "configure:7274: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7261,17 +7316,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7265: checking for $ac_hdr" >&5
+echo "configure:7320: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7270 "configure"
+#line 7325 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7341,17 +7396,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7345: checking for $ac_hdr" >&5
+echo "configure:7400: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7350 "configure"
+#line 7405 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7380,7 +7435,7 @@ done
    else
      echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
-echo "configure:7384: checking for directX headers in ${withval}" >&5
+echo "configure:7439: checking for directX headers in ${withval}" >&5
      if test -f ${withval}/ddraw.h
      then
        PLUGINS="${PLUGINS} directx"
@@ -7489,7 +7544,7 @@ if test "${enable_gnome+set}" = set; then
    # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7493: checking for $ac_word" >&5
+echo "configure:7548: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7534,17 +7589,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7538: checking for $ac_hdr" >&5
+echo "configure:7593: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7543 "configure"
+#line 7598 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7604,7 +7659,7 @@ fi
  # Extract the first word of "gtk12-config", so it can be a program name with args.
 set dummy gtk12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7608: checking for $ac_word" >&5
+echo "configure:7663: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7643,7 +7698,7 @@ fi
    # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7647: checking for $ac_word" >&5
+echo "configure:7702: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7693,17 +7748,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7697: checking for $ac_hdr" >&5
+echo "configure:7752: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7702 "configure"
+#line 7757 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7761,17 +7816,17 @@ if test x$enable_x11 != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7765: checking for $ac_hdr" >&5
+echo "configure:7820: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7770 "configure"
+#line 7825 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7824,17 +7879,17 @@ if test x$enable_xvideo != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7828: checking for $ac_hdr" >&5
+echo "configure:7883: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7833 "configure"
+#line 7888 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7858,7 +7913,7 @@ EOF
    saved_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
    echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-echo "configure:7862: checking for XvSetPortAttribute in -lXv_pic" >&5
+echo "configure:7917: checking for XvSetPortAttribute in -lXv_pic" >&5
 ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7866,7 +7921,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lXv_pic  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7870 "configure"
+#line 7925 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7877,7 +7932,7 @@ int main() {
 XvSetPortAttribute()
 ; return 0; }
 EOF
-if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7924,17 +7979,17 @@ if test x$enable_lirc = xyes
 then
  ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
-echo "configure:7928: checking for lirc/lirc_client.h" >&5
+echo "configure:7983: checking for lirc/lirc_client.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 7933 "configure"
+#line 7988 "configure"
 #include "confdefs.h"
 #include <lirc/lirc_client.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -7951,7 +8006,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
-echo "configure:7955: checking for lirc_init in -llirc_client" >&5
+echo "configure:8010: checking for lirc_init in -llirc_client" >&5
 ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7959,7 +8014,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-llirc_client  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7963 "configure"
+#line 8018 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7970,7 +8025,7 @@ int main() {
 lirc_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8010,17 +8065,17 @@ if test "${enable_alsa+set}" = set; then
   then
     ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-echo "configure:8014: checking for alsa/asoundlib.h" >&5
+echo "configure:8069: checking for alsa/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 8019 "configure"
+#line 8074 "configure"
 #include "confdefs.h"
 #include <alsa/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -8037,7 +8092,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:8041: checking for main in -lasound" >&5
+echo "configure:8096: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -8045,14 +8100,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8049 "configure"
+#line 8104 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else

--- a/configure.in
+++ b/configure.in
@@ -162,6 +162,7 @@ AC_CHECK_FUNCS(swab)
 AC_CHECK_FUNCS([memalign valloc])
 AC_CHECK_FUNCS(sigrelse)
+AC_CHECK_FUNCS(getpwuid_r getpwuid)
 dnl Check for getopt
 NEED_GETOPT=0

--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
 * Collection of useful common types and macros definitions
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.85 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: common.h,v 1.86 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@via.ecp.fr>
 *          Vincent Seguin <seguin@via.ecp.fr>
@@ -472,6 +472,8 @@ typedef struct module_symbols_s
    char * ( * config_GetPszVariable ) ( const char * );
    void   ( * config_PutIntVariable ) ( const char *, int );
    void   ( * config_PutPszVariable ) ( const char *, char * );
+    int    ( * config_LoadConfigFile ) ( const char * );
+    int    ( * config_SaveConfigFile ) ( const char * );
    struct module_config_s * ( * config_FindConfig ) ( const char * );
    struct module_config_s * ( * config_Duplicate ) ( struct module_s * );

--- a/include/configuration.h
+++ b/include/configuration.h
@@ -4,7 +4,7 @@
 * It includes functions allowing to declare, get or set configuration options.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: configuration.h,v 1.2 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: configuration.h,v 1.3 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -69,8 +69,11 @@ char * config_GetPszVariable( const char *psz_name );
 void   config_PutIntVariable( const char *psz_name, int i_value );
 void   config_PutPszVariable( const char *psz_name, char *psz_value );
+int config_LoadConfigFile( const char *psz_module_name );
+int config_SaveConfigFile( const char *psz_module_name );
 module_config_t *config_FindConfig( const char *psz_name );
 module_config_t *config_Duplicate ( module_t *p_module );
 #else
 #   define config_GetIntVariable p_symbols->config_GetIntVariable
 #   define config_PutIntVariable p_symbols->config_PutIntVariable
@@ -78,6 +81,8 @@ module_config_t *config_Duplicate ( module_t *p_module );
 #   define config_PutPszVariable p_symbols->config_PutPszVariable
 #   define config_Duplicate      p_symbols->config_Duplicate
 #   define config_FindConfig     p_symbols->config_FindConfig
+#   define config_LoadConfigFile p_symbols->config_LoadConfigFile
+#   define config_SaveConfigFile p_symbols->config_SaveConfigFile
 #endif
 /*****************************************************************************

--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -121,6 +121,12 @@
 /* Define if you have the sigrelse function.  */
 #undef HAVE_SIGRELSE
+/* Define if you have the getpwuid_r function.  */
+#undef HAVE_GETPWUID_R
+/* Define if you have the getpwuid function.  */
+#undef HAVE_GETPWUID
 /* Define if you have the stpcpy function.  */
 #undef HAVE_STPCPY

--- a/include/main.h
+++ b/include/main.h
@@ -3,7 +3,7 @@
 * Declaration and extern access to global program object.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.31 2002/03/12 18:37:46 stef Exp $
+ * $Id: main.h,v 1.32 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *
@@ -63,6 +63,9 @@ typedef struct main_s
    p_playlist_t           p_playlist;                           /* playlist */
    p_intf_msg_t           p_msg;                 /* messages interface data */
    p_input_channel_t      p_channel;                /* channel library data */
+    /* Locks */
+    vlc_mutex_t            config_lock;          /* lock for the config file */
 } main_t;
 #ifndef PLUGIN

--- a/plugins/gtk/gtk_preferences.c
+++ b/plugins/gtk/gtk_preferences.c
@@ -2,7 +2,7 @@
 * gtk_preferences.c: functions to handle the preferences dialog box.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.13 2002/03/11 20:14:16 gbazin Exp $
+ * $Id: gtk_preferences.c,v 1.14 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *      
@@ -55,6 +55,7 @@ static void GtkCreateConfigDialog( char *, intf_thread_t * );
 static void GtkConfigOk          ( GtkButton *, gpointer );
 static void GtkConfigApply       ( GtkButton *, gpointer );
 static void GtkConfigCancel      ( GtkButton *, gpointer );
+static void GtkConfigSave        ( GtkButton *, gpointer );
 static void GtkConfigDialogDestroyed ( GtkObject *, gpointer );
@@ -102,6 +103,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
    GtkWidget *dialog_action_area;
    GtkWidget *ok_button;
    GtkWidget *apply_button;
+    GtkWidget *save_button;
    GtkWidget *cancel_button;
    GtkWidget *item_frame;
@@ -483,6 +485,11 @@ static void GtkCreateConfigDialog( char *psz_module_name,
    gtk_box_pack_start( GTK_BOX(dialog_action_area), apply_button,
                        TRUE, TRUE, 0 );
+    save_button = gtk_button_new_with_label( _("Save") );
+    gtk_widget_show( save_button );
+    gtk_box_pack_start( GTK_BOX(dialog_action_area), save_button,
+                        TRUE, TRUE, 0 );
    cancel_button = gtk_button_new_with_label( _("Cancel") );
    gtk_widget_show( cancel_button );
    gtk_box_pack_start( GTK_BOX(dialog_action_area), cancel_button,
@@ -494,6 +501,9 @@ static void GtkCreateConfigDialog( char *psz_module_name,
    gtk_signal_connect( GTK_OBJECT(apply_button), "clicked",
                        GTK_SIGNAL_FUNC(GtkConfigApply),
                        config_dialog );
+    gtk_signal_connect( GTK_OBJECT(save_button), "clicked",
+                        GTK_SIGNAL_FUNC(GtkConfigSave),
+                        config_dialog );
    gtk_signal_connect( GTK_OBJECT(cancel_button), "clicked",
                        GTK_SIGNAL_FUNC(GtkConfigCancel),
                        config_dialog );
@@ -522,7 +532,6 @@ void GtkConfigApply( GtkButton * button, gpointer user_data )
    hash_table = (GHashTable *)gtk_object_get_data( GTK_OBJECT(user_data),
                                                    "config_hash_table" );
    g_hash_table_foreach( hash_table, GtkSaveHashValue, NULL );
 }
 void GtkConfigOk( GtkButton * button, gpointer user_data )
@@ -531,12 +540,17 @@ void GtkConfigOk( GtkButton * button, gpointer user_data )
    gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
 }
 void GtkConfigCancel( GtkButton * button, gpointer user_data )
 {
    gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
 }
+void GtkConfigSave( GtkButton * button, gpointer user_data )
+{
+    GtkConfigApply( button, user_data );
+    config_SaveConfigFile( NULL );
+}
 /****************************************************************************
 * GtkPluginHighlighted: display plugin description when an entry is selected
 *   in the clist, and activate the configure button if necessary.

--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
 * and spawn threads.
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.163 2002/03/12 18:37:46 stef Exp $
+ * $Id: main.c,v 1.164 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *          Samuel Hocevar <sam@zoy.org>
@@ -401,7 +401,6 @@ vout_bank_t   *p_vout_bank;
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/
-static int  GetConfigurationFromFile    ( void ){return 0;};
 static int  GetConfigurationFromCmdLine ( int *pi_argc, char *ppsz_argv[],
                                          boolean_t b_ignore_errors );
 static int  GetFilenames                ( int i_argc, char *ppsz_argv[] );
@@ -604,11 +603,8 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
    /*
     * Override default configuration with config file settings
     */
-    if( GetConfigurationFromFile() )
+    vlc_mutex_init( &p_main->config_lock );
-    {
+    config_LoadConfigFile( NULL );
-        intf_MsgDestroy();
-        return( errno );
-    }
    /*
     * Override configuration with command line settings
@@ -619,6 +615,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
        return( errno );
    }
    /* p_main inititalization. FIXME ? */
    p_main->i_desync = (mtime_t)config_GetIntVariable( "desync" )
      * (mtime_t)1000;

--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
 * configuration.c management of the modules configuration
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.3 2002/03/11 07:23:10 gbazin Exp $
+ * $Id: configuration.c,v 1.4 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -20,13 +20,22 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
-#include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                              /* sprintf() */
+#include <stdlib.h>                                      /* free(), strtol() */
 #include <string.h>                                              /* strdup() */
+#include <unistd.h>                                              /* getuid() */
 #include <videolan/vlc.h>
+#if defined(HAVE_GETPWUID) || defined(HAVE_GETPWUID_R)
+#include <pwd.h>                                               /* getpwuid() */
+#endif
+#include <sys/stat.h>
+#include <sys/types.h>
+static char *config_GetHomeDir(void);
 /*****************************************************************************
 * config_GetIntVariable: get the value of an int variable
 *****************************************************************************
@@ -252,3 +261,423 @@ module_config_t *config_Duplicate( module_t *p_module )
    return p_config;
 }
+/*****************************************************************************
+ * config_LoadConfigFile: loads the configuration file.
+ *****************************************************************************
+ * This function is called to load the config options stored in the config
+ * file.
+ *****************************************************************************/
+int config_LoadConfigFile( const char *psz_module_name )
+{
+    module_t *p_module;
+    FILE *file;
+    char line[1024];
+    char *p_index, *psz_option_name, *psz_option_value;
+    int i;
+    char *psz_filename, *psz_homedir;
+    /* Acquire config file lock */
+    vlc_mutex_lock( &p_main->config_lock );
+    psz_homedir = config_GetHomeDir();
+    if( !psz_homedir )
+    {
+        intf_ErrMsg( "config_LoadConfigFile: GetHomeDir failed" );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    psz_filename = (char *)malloc( strlen("/.VideoLan/vlc") +
+                                   strlen(psz_homedir) + 1 );
+    if( !psz_filename )
+    {
+        intf_ErrMsg( "config err: couldn't malloc psz_filename" );
+        free( psz_homedir );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    sprintf( psz_filename, "%s/.VideoLan/vlc", psz_homedir );
+    free( psz_homedir );
+    intf_WarnMsg( 5, "config_SaveConfigFile: opening config file %s",
+                  psz_filename );
+    file = fopen( psz_filename, "r" );
+    if( !file )
+    {
+        intf_WarnMsg( 1, "config_LoadConfigFile: couldn't open config file %s "
+                      "for reading", psz_filename );
+        free( psz_filename );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    /* Look for the selected module, if NULL then save everything */
+    for( p_module = p_module_bank->first ; p_module != NULL ;
+         p_module = p_module->next )
+    {
+        if( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) )
+            continue;
+        /* The config file is organized in sections, one per module. Look for
+         * the interesting section ( a section is of the form [foo] ) */
+        rewind( file );
+        while( fgets( line, 1024, file ) )
+        {
+            if( (line[0] == '[') && (p_index = strchr(line,']')) &&
+                (p_index - &line[1] == strlen(p_module->psz_name) ) &&
+                !memcmp( &line[1], p_module->psz_name,
+                         strlen(p_module->psz_name) ) )
+            {
+                intf_WarnMsg( 5, "config_LoadConfigFile: loading config for "
+                              "module <%s>", p_module->psz_name );
+                break;
+            }
+        }
+        /* either we found the section or we're at the EOF */
+        /* Now try to load the options in this section */
+        while( fgets( line, 1024, file ) )
+        {
+            if( line[0] == '[' ) break; /* end of section */
+            /* ignore comments or empty lines */
+            if( (line[0] == '#') || (line[0] == (char)0) ) continue;
+            /* get rid of line feed */
+            if( line[strlen(line)-1] == '\n' )
+                line[strlen(line)-1] = (char)0;
+            /* look for option name */
+            psz_option_name = line;
+            psz_option_value = NULL;
+            p_index = strchr( line, '=' );
+            if( !p_index ) break; /* this ain't an option!!! */
+            *p_index = (char)0;
+            psz_option_value = p_index + 1;
+            /* try to match this option with one of the module's options */
+            for( i = 0; i < p_module->i_config_lines; i++ )
+            {
+                if( p_module->p_config[i].i_type & MODULE_CONFIG_HINT )
+                    /* ignore hints */
+                    continue;
+                if( !strcmp( p_module->p_config[i].psz_name,
+                             psz_option_name ) )
+                {
+                    /* We found it */
+                    switch( p_module->p_config[i].i_type )
+                    {
+                    case MODULE_CONFIG_ITEM_BOOL:
+                    case MODULE_CONFIG_ITEM_INTEGER:
+                        p_module->p_config[i].i_value =
+                            atoi( psz_option_value);
+                        intf_WarnMsg( 7, "config_LoadConfigFile: found <%s> "
+                                      "option %s=%i",
+                                      p_module->psz_name,
+                                      p_module->p_config[i].psz_name,
+                                      p_module->p_config[i].i_value );
+                        break;
+                    default:
+                        vlc_mutex_lock( p_module->p_config[i].p_lock );
+                        /* free old string */
+                        if( p_module->p_config[i].psz_value )
+                            free( p_module->p_config[i].psz_value );
+                        p_module->p_config[i].psz_value =
+                            strdup( psz_option_value );
+                        vlc_mutex_unlock( p_module->p_config[i].p_lock );
+                        intf_WarnMsg( 7, "config_LoadConfigFile: found <%s> "
+                                      "option %s=%s",
+                                      p_module->psz_name,
+                                      p_module->p_config[i].psz_name,
+                                      p_module->p_config[i].psz_value );
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    fclose( file );
+    free( psz_filename );
+    vlc_mutex_unlock( &p_main->config_lock );
+    return 0;
+}
+/*****************************************************************************
+ * config_SaveConfigFile: Save a module's config options.
+ *****************************************************************************
+ * This will save the specified module's config options to the config file.
+ * If psz_module_name is NULL then we save all the modules config options.
+ * It's no use to save the config options that kept their default values, so
+ * we'll try to be a bit clever here.
+ *
+ * When we save we mustn't delete the config options of the plugins that
+ * haven't been loaded. So we cannot just create a new config file with the
+ * config structures we've got in memory. 
+ * I don't really know how to deal with this nicely, so I will use a completly
+ * dumb method ;-)
+ * I will load the config file in memory, but skipping all the sections of the
+ * modules we want to save. Then I will create a brand new file, dump the file
+ * loaded in memory and then append the sections of the modules we want to
+ * save.
+ * Really stupid no ?
+ *****************************************************************************/
+int config_SaveConfigFile( const char *psz_module_name )
+{
+    module_t *p_module;
+    FILE *file;
+    char p_line[1024], *p_index2;
+    int i, i_sizebuf = 0;
+    char *p_bigbuffer, *p_index;
+    boolean_t b_backup;
+    char *psz_filename, *psz_homedir;
+    /* Acquire config file lock */
+    vlc_mutex_lock( &p_main->config_lock );
+    psz_homedir = config_GetHomeDir();
+    if( !psz_homedir )
+    {
+        intf_ErrMsg( "config_SaveConfigFile: GetHomeDir failed" );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    psz_filename = (char *)malloc( strlen("/.VideoLan/vlc") +
+                                   strlen(psz_homedir) + 1 );
+    if( !psz_filename )
+    {
+        intf_ErrMsg( "config err: couldn't malloc psz_filename" );
+        free( psz_homedir );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    sprintf( psz_filename, "%s/.VideoLan", psz_homedir );
+    free( psz_homedir );
+#ifndef WIN32
+    mkdir( psz_filename, 0755 );
+#else
+    mkdir( psz_filename );
+#endif
+    strcat( psz_filename, "/vlc" );
+    intf_WarnMsg( 5, "config_SaveConfigFile: opening config file %s",
+                  psz_filename );
+    file = fopen( psz_filename, "r" );
+    if( !file )
+    {
+        intf_WarnMsg( 1, "config_SaveConfigFile: couldn't open config file %s "
+                      "for reading", psz_filename );
+    }
+    else
+    {
+        /* look for file size */
+        fseek( file, 0, SEEK_END );
+        i_sizebuf = ftell( file );
+        rewind( file );
+    }
+    p_bigbuffer = p_index = malloc( i_sizebuf+1 );
+    if( !p_bigbuffer )
+    {
+        intf_ErrMsg( "config err: couldn't malloc bigbuffer" );
+        if( file ) fclose( file );
+        free( psz_filename );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    p_bigbuffer[0] = 0;
+    /* backup file into memory, we only need to backup the sections we won't
+     * save later on */
+    b_backup = 0;
+    while( file && fgets( p_line, 1024, file ) )
+    {
+        if( (p_line[0] == '[') && (p_index2 = strchr(p_line,']')))
+        {
+            /* we found a section, check if we need to do a backup */
+            for( p_module = p_module_bank->first; p_module != NULL;
+                 p_module = p_module->next )
+            {
+                if( ((p_index2 - &p_line[1]) == strlen(p_module->psz_name) ) &&
+                    !memcmp( &p_line[1], p_module->psz_name,
+                             strlen(p_module->psz_name) ) )
+                {
+                    if( !psz_module_name )
+                        break;
+                    else if( !strcmp( psz_module_name, p_module->psz_name ) )
+                        break;
+                }
+            }
+            if( !p_module )
+            {
+                /* we don't have this section in our list so we need to back
+                 * it up */
+                *p_index2 = 0;
+                intf_WarnMsg( 5, "config_SaveConfigFile: backing up config for"
+                              " unknown module <%s>", &p_line[1] );
+                *p_index2 = ']';
+                b_backup = 1;
+            }
+            else
+            {
+                b_backup = 0;
+            }
+        }
+        /* save line if requested and line is valid (doesn't begin with a
+         * space, tab, or eol) */
+        if( b_backup && (p_line[0] != '\n') && (p_line[0] != ' ')
+            && (p_line[0] != '\t') )
+        {
+            strcpy( p_index, p_line );
+            p_index += strlen( p_line );
+        }
+    }
+    if( file ) fclose( file );
+    /*
+     * Save module config in file
+     */
+    file = fopen( psz_filename, "w" );
+    if( !file )
+    {
+        intf_WarnMsg( 1, "config_SaveConfigFile: couldn't open config file %s "
+                      "for writing", psz_filename );
+        free( psz_filename );
+        vlc_mutex_unlock( &p_main->config_lock );
+        return -1;
+    }
+    fprintf( file, "#\n# "COPYRIGHT_MESSAGE"\n#\n\n" );
+    /* Look for the selected module, if NULL then save everything */
+    for( p_module = p_module_bank->first ; p_module != NULL ;
+         p_module = p_module->next )
+    {
+        if( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) )
+            continue;
+        if( !p_module->i_config_items )
+            continue;
+        intf_WarnMsg( 5, "config_SaveConfigFile: saving config for "
+                      "module <%s>", p_module->psz_name );
+        fprintf( file, "[%s]\n", p_module->psz_name );
+        if( p_module->psz_longname )
+            fprintf( file, "# %s\n#\n", p_module->psz_longname );
+        for( i = 0; i < p_module->i_config_lines; i++ )
+        {
+            if( p_module->p_config[i].i_type & MODULE_CONFIG_HINT )
+                /* ignore hints */
+                continue;
+            switch( p_module->p_config[i].i_type )
+            {
+            case MODULE_CONFIG_ITEM_BOOL:
+            case MODULE_CONFIG_ITEM_INTEGER:
+                if( p_module->p_config[i].psz_text )
+                    fprintf( file, "# %s\n", p_module->p_config[i].psz_text );
+                fprintf( file, "%s=%i\n", p_module->p_config[i].psz_name,
+                         p_module->p_config[i].i_value );
+                break;
+            default:
+                if( p_module->p_config[i].psz_value )
+                {
+                    if( p_module->p_config[i].psz_text )
+                        fprintf( file, "# %s\n",
+                                 p_module->p_config[i].psz_text );
+                    fprintf( file, "%s=%s\n", p_module->p_config[i].psz_name,
+                             p_module->p_config[i].psz_value );
+                }
+            }
+        }
+        fprintf( file, "\n" );
+    }
+    /*
+     * Restore old settings from the config in file
+     */
+    fputs( p_bigbuffer, file );
+    free( p_bigbuffer );
+    fclose( file );
+    free( psz_filename );
+    vlc_mutex_unlock( &p_main->config_lock );
+    return 0;
+}
+/*****************************************************************************
+ * config_GetHomeDir: find the user's home directory.
+ *****************************************************************************
+ * This function will try by different ways to find the user's home path.
+ *****************************************************************************/
+static char *config_GetHomeDir(void)
+{
+    char *p_tmp, *p_homedir = NULL;
+#if defined(HAVE_GETPWUID_R) || defined(HAVE_GETPWUID)
+    struct passwd *p_pw = NULL;
+#endif
+#if defined(HAVE_GETPWUID_R)
+    int ret;
+    struct passwd pwd;
+    char *p_buffer = NULL;
+    int bufsize = 128;
+    p_buffer = (char *)malloc( bufsize );
+    if( ( ret = getpwuid_r( getuid(), &pwd, p_buffer, bufsize, &p_pw ) ) < 0 )
+    {
+#elif defined(HAVE_GETPWUID)
+    if( ( p_pw = getpwuid( getuid() ) ) == NULL )
+    {
+#endif
+        if( ( p_tmp = getenv( "HOME" ) ) == NULL )
+        {
+            intf_ErrMsg( "Unable to get home directory, set it to /tmp" );
+            p_homedir = strdup( "/tmp" );
+        }
+        else p_homedir = strdup( p_tmp );
+#if defined(HAVE_GETPWUID_R) || defined(HAVE_GETPWUID)
+    }
+    else
+    {
+        if( p_pw ) p_homedir = strdup( p_pw->pw_dir );
+    }
+#endif
+#if defined(HAVE_GETPWUID_R)
+    if( p_buffer ) free( p_buffer );
+#endif
+    return p_homedir;
+}
--- a/src/misc/modules_plugin.h
+++ b/src/misc/modules_plugin.h
@@ -2,7 +2,7 @@
 * modules_plugin.h : Plugin management functions used by the core application.
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: modules_plugin.h,v 1.15 2002/03/11 07:23:10 gbazin Exp $
+ * $Id: modules_plugin.h,v 1.16 2002/03/16 01:40:58 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -162,6 +162,8 @@ module_error( void )
    (p_symbols)->config_GetPszVariable = config_GetPszVariable; \
    (p_symbols)->config_PutIntVariable = config_PutIntVariable; \
    (p_symbols)->config_PutPszVariable = config_PutPszVariable; \
+    (p_symbols)->config_LoadConfigFile = config_LoadConfigFile; \
+    (p_symbols)->config_SaveConfigFile = config_SaveConfigFile; \
    (p_symbols)->config_Duplicate = config_Duplicate; \
    (p_symbols)->config_FindConfig = config_FindConfig; \
    (p_symbols)->intf_MsgSub = intf_MsgSub; \