* ./configure.in: wrote a better test for libdvdread detection. * ./plugins/gtk/gtk.glade: added lines this #@%$! Glade had munched, fixes a segfault in the Gtk+ popup menu when toggling the interface. * ./plugins/motion/motion.c: fixed a compilation issue on compilers which do not accept empty macro arguments.

a0249c48 · Sam Hocevar · b2f75d5c · a0249c48 · a0249c48 · a0249c48
Commit a0249c48 authored Apr 07, 2002 by Sam Hocevar
6 changed files
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,11 @@

 HEAD

-  * Nothing yet.
+  * ./configure.in: wrote a better test for libdvdread detection.
+  * ./plugins/gtk/gtk.glade: added lines this #@%$! Glade had munched, fixes
+    a segfault in the Gtk+ popup menu when toggling the interface.
+  * ./plugins/motion/motion.c: fixed a compilation issue on compilers which
+    do not accept empty macro arguments.

 0.3.0
 Sat,  6 Apr 2002 04:27:50 +0200

--- a/configure
+++ b/configure
@@ -5877,23 +5877,30 @@ if test "${with_dvdread+set}" = set; then
  :
 fi

-  case "x$with_dvdread" in
-  x)
+  if test "x$withval" = x
+  then
+    test_LDFLAGS=""
+    test_CFLAGS=""
+  else
+    test_LDFLAGS="-L${withval}/lib"
+    test_CFLAGS="-I${withval}/include"
+  fi
+  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
  for ac_hdr in dvdread/dvd_reader.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5887: checking for $ac_hdr" >&5
+echo "configure:5894: 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 5892 "configure"
+#line 5899 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5904: \"$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*
@@ -5913,29 +5920,51 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
+ 
+     cat > conftest.$ac_ext <<EOF
+#line 5926 "configure"
+#include "confdefs.h"
+#include <dvdread/dvd_reader.h>
+int main() {
+void foo() { int i=DVD_VIDEO_LB_LEN; }
+; return 0; }
+EOF
+if { (eval echo configure:5933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
          PLUGINS="${PLUGINS} dvdread"
-        dvdread_LDFLAGS="${dvdread_LDFLAGS} -ldvdread" 
+          dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
+          dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
+        
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+          if test "x$enableval" != x
+          then
+            { echo "configure: error: Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later" 1>&2; exit 1; }
+          fi
+        
 fi
-done
+rm -f conftest*
  
-  ;;
-  *)
-    echo $ac_n "checking for dvdread headers in ${withval}""... $ac_c" 1>&6
-echo "configure:5927: checking for dvdread headers in ${withval}" >&5
-    if test -f ${withval}/include/dvdread/dvd_reader.h
+else
+  echo "$ac_t""no" 1>&6
+if test "x$enableval" != x
    then
-      echo "$ac_t""yes" 1>&6
-      PLUGINS="${PLUGINS} dvdread"
-      dvdread_LDFLAGS="${dvdread_LDFLAGS} -L${withval}/lib -ldvdread"
-      dvdread_CFLAGS="${dvdread_CFLAGS} -I${withval}/include"
+      if test "x$withval" != x
+      then
+        { echo "configure: error: Cannot find dvdread/dvd_reader.h in ${withval}/include" 1>&2; exit 1; }
      else
-      echo "$ac_t""no" 1>&6
-      { echo "configure: error: Cannot find ${withval}/dvdread/dvd_reader.h" 1>&2; exit 1; }
+        { echo "configure: error: Cannot find dvdread/dvd_reader.h" 1>&2; exit 1; }
      fi
-  ;;
-  esac
+    fi
+  
+fi
+done
+
+  CPPFLAGS="$save_CPPFLAGS"
 fi

 # Check whether --enable-vcd or --disable-vcd was given.
@@ -5948,7 +5977,7 @@ fi
 if test x$enable_vcd != xno
 then
  cat > conftest.$ac_ext <<EOF
-#line 5952 "configure"
+#line 5981 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -5989,12 +6018,12 @@ fi


 echo $ac_n "checking for inet_pton""... $ac_c" 1>&6
-echo "configure:5993: checking for inet_pton" >&5
+echo "configure:6022: checking for inet_pton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5998 "configure"
+#line 6027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char inet_pton(); below.  */
@@ -6017,7 +6046,7 @@ inet_pton();

 ; return 0; }
 EOF
-if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_inet_pton=yes"
 else
@@ -6073,17 +6102,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6077: checking for $ac_hdr" >&5
+echo "configure:6106: 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 6082 "configure"
+#line 6111 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6116: \"$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*
@@ -6113,7 +6142,7 @@ fi
 done

  echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6117: checking for mad_bit_init in -lmad" >&5
+echo "configure:6146: 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
@@ -6121,7 +6150,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lmad  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6125 "configure"
+#line 6154 "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
@@ -6132,7 +6161,7 @@ int main() {
 mad_bit_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6165: \"$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
@@ -6183,17 +6212,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:6187: checking for $ac_hdr" >&5
+echo "configure:6216: 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 6192 "configure"
+#line 6221 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6226: \"$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*
@@ -6236,17 +6265,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6240: checking for $ac_hdr" >&5
+echo "configure:6269: 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 6245 "configure"
+#line 6274 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6279: \"$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*
@@ -6304,17 +6333,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:6308: checking for $ac_hdr" >&5
+echo "configure:6337: 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 6313 "configure"
+#line 6342 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6347: \"$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*
@@ -6367,17 +6396,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:6371: checking for $ac_hdr" >&5
+echo "configure:6400: 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 6376 "configure"
+#line 6405 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6410: \"$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*
@@ -6401,7 +6430,7 @@ EOF
    save_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
    echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-echo "configure:6405: checking for XvSetPortAttribute in -lXv_pic" >&5
+echo "configure:6434: 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
@@ -6409,7 +6438,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lXv_pic  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6413 "configure"
+#line 6442 "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
@@ -6420,7 +6449,7 @@ int main() {
 XvSetPortAttribute()
 ; return 0; }
 EOF
-if { (eval echo configure:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6453: \"$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
@@ -6478,7 +6507,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:6482: checking for $ac_word" >&5
+echo "configure:6511: 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
@@ -6518,7 +6547,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:6522: checking for $ac_word" >&5
+echo "configure:6551: 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
@@ -6559,7 +6588,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:6563: checking for $ac_word" >&5
+echo "configure:6592: 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
@@ -6604,17 +6633,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6608: checking for $ac_hdr" >&5
+echo "configure:6637: 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 6613 "configure"
+#line 6642 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6647: \"$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*
@@ -6684,17 +6713,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6688: checking for $ac_hdr" >&5
+echo "configure:6717: 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 6693 "configure"
+#line 6722 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6727: \"$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*
@@ -6723,7 +6752,7 @@ done

    else
      echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
-echo "configure:6727: checking for directX headers in ${withval}" >&5
+echo "configure:6756: checking for directX headers in ${withval}" >&5
      if test -f ${withval}/ddraw.h
      then
        PLUGINS="${PLUGINS} directx"
@@ -6750,17 +6779,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6754: checking for $ac_hdr" >&5
+echo "configure:6783: 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 6759 "configure"
+#line 6788 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6793: \"$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*
@@ -6855,17 +6884,17 @@ if test x$enable_aa = xyes
 then
  ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for aalib.h""... $ac_c" 1>&6
-echo "configure:6859: checking for aalib.h" >&5
+echo "configure:6888: checking for aalib.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 6864 "configure"
+#line 6893 "configure"
 #include "confdefs.h"
 #include <aalib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6898: \"$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*
@@ -6916,17 +6945,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6920: checking for $ac_hdr" >&5
+echo "configure:6949: 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 6925 "configure"
+#line 6954 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6959: \"$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*
@@ -6949,7 +6978,7 @@ EOF
 
    PLUGINS="${PLUGINS} dsp"
    echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-echo "configure:6953: checking for main in -lossaudio" >&5
+echo "configure:6982: 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
@@ -6957,14 +6986,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lossaudio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6961 "configure"
+#line 6990 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6997: \"$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
@@ -7000,7 +7029,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:7004: checking for $ac_word" >&5
+echo "configure:7033: 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
@@ -7051,7 +7080,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:7055: checking for $ac_word" >&5
+echo "configure:7084: 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
@@ -7101,17 +7130,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:7105: checking for alsa/asoundlib.h" >&5
+echo "configure:7134: 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 7110 "configure"
+#line 7139 "configure"
 #include "confdefs.h"
 #include <alsa/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7144: \"$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*
@@ -7128,7 +7157,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:7132: checking for main in -lasound" >&5
+echo "configure:7161: 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
@@ -7136,14 +7165,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7140 "configure"
+#line 7169 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7176: \"$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
@@ -7220,7 +7249,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:7224: checking for $ac_word" >&5
+echo "configure:7253: 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
@@ -7259,7 +7288,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:7263: checking for $ac_word" >&5
+echo "configure:7292: 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
@@ -7308,17 +7337,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7312: checking for $ac_hdr" >&5
+echo "configure:7341: 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 7317 "configure"
+#line 7346 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7351: \"$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*
@@ -7364,7 +7393,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:7368: checking for $ac_word" >&5
+echo "configure:7397: 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
@@ -7408,17 +7437,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7412: checking for $ac_hdr" >&5
+echo "configure:7441: 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 7417 "configure"
+#line 7446 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7451: \"$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*
@@ -7507,17 +7536,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7511: checking for $ac_hdr" >&5
+echo "configure:7540: 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 7516 "configure"
+#line 7545 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7550: \"$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*
@@ -7562,17 +7591,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7566: checking for $ac_hdr" >&5
+echo "configure:7595: 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 7571 "configure"
+#line 7600 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7605: \"$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*
@@ -7643,17 +7672,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:7647: checking for lirc/lirc_client.h" >&5
+echo "configure:7676: 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 7652 "configure"
+#line 7681 "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:7657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7686: \"$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*
@@ -7670,7 +7699,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:7674: checking for lirc_init in -llirc_client" >&5
+echo "configure:7703: 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
@@ -7678,7 +7707,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-llirc_client  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7682 "configure"
+#line 7711 "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
@@ -7689,7 +7718,7 @@ int main() {
 lirc_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7722: \"$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
@@ -7744,7 +7773,7 @@ fi
      ;;
    *)
                  echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6
-echo "configure:7748: checking whether the byte order is big-endian" >&5
+echo "configure:7777: checking whether the byte order is big-endian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7818,7 +7847,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:7822: checking for pth_init in -lpth" >&5
+echo "configure:7851: 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
@@ -7826,7 +7855,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7830 "configure"
+#line 7859 "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
@@ -7837,7 +7866,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7870: \"$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
@@ -7865,7 +7894,7 @@ else
 fi

    cat > conftest.$ac_ext <<EOF
-#line 7869 "configure"
+#line 7898 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -7891,7 +7920,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:7895: checking for st_init in -lst" >&5
+echo "configure:7924: 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
@@ -7899,7 +7928,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lst  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7903 "configure"
+#line 7932 "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
@@ -7910,7 +7939,7 @@ int main() {
 st_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7943: \"$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
@@ -7938,7 +7967,7 @@ else
 fi

    cat > conftest.$ac_ext <<EOF
-#line 7942 "configure"
+#line 7971 "configure"
 #include "confdefs.h"
 #include <st.h>
 EOF

--- a/configure.in
+++ b/configure.in
@@ -108,7 +108,7 @@ else
 fi

 dnl The -DSYS_FOO flag
-save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_'`"
+save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"

 dnl Check for system libs needed
 AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign posix_memalign)
@@ -645,26 +645,39 @@ if test "x$enableval" != "xno"
 then
  AC_ARG_WITH(dvdread, 
  [    --with-dvdread=PATH   libdvdread headers and libraries])
-  case "x$with_dvdread" in
-  x)
-    AC_CHECK_HEADERS(dvdread/dvd_reader.h,
-      [ PLUGINS="${PLUGINS} dvdread"
-        dvdread_LDFLAGS="${dvdread_LDFLAGS} -ldvdread" ])
-  ;;
-  *)
-    AC_MSG_CHECKING(for dvdread headers in ${withval})
-    if test -f ${withval}/include/dvdread/dvd_reader.h
+  if test "x$withval" = x
  then
-      AC_MSG_RESULT(yes)
+    test_LDFLAGS=""
+    test_CFLAGS=""
+  else
+    test_LDFLAGS="-L${withval}/lib"
+    test_CFLAGS="-I${withval}/include"
+  fi
+  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+  AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
+     AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
+        [void foo() { int i=DVD_VIDEO_LB_LEN; }],[
          PLUGINS="${PLUGINS} dvdread"
-      dvdread_LDFLAGS="${dvdread_LDFLAGS} -L${withval}/lib -ldvdread"
-      dvdread_CFLAGS="${dvdread_CFLAGS} -I${withval}/include"
+          dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
+          dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
+        ],[
+          if test "x$enableval" != x
+          then
+            AC_MSG_ERROR([Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later])
+          fi
+        ])
+  ],[
+    if test "x$enableval" != x
+    then
+      if test "x$withval" != x
+      then
+        AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${withval}/include])
      else
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([Cannot find ${withval}/dvdread/dvd_reader.h])
+        AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h])
      fi
-  ;;
-  esac
+    fi
+  ])
+  CPPFLAGS="$save_CPPFLAGS"
 fi

 dnl

--- a/plugins/gtk/gtk.glade
+++ b/plugins/gtk/gtk.glade
@@ -1026,6 +1026,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkPlayActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:43 GMT</last_modification_time>
    </signal>
    <label>_Play</label>
@@ -1039,6 +1040,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkPauseActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:37 GMT</last_modification_time>
    </signal>
    <label>Pause</label>
@@ -1051,6 +1053,7 @@
    <signal>
      <name>activate</name>
      <handler>GtKStopActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:29 GMT</last_modification_time>
    </signal>
    <label>Stop</label>
@@ -1064,6 +1067,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkBackActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:21 GMT</last_modification_time>
    </signal>
    <label>Back</label>
@@ -1077,6 +1081,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkSlowActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:15 GMT</last_modification_time>
    </signal>
    <label>Slow</label>
@@ -1090,6 +1095,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkFastActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:07 GMT</last_modification_time>
    </signal>
    <label>Fast</label>
@@ -1108,6 +1114,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkWindowToggleActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:53:00 GMT</last_modification_time>
    </signal>
    <label>Toggle _Interface</label>
@@ -1120,6 +1127,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkFullscreenActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time>
    </signal>
    <label>_Fullscreen</label>
@@ -1138,6 +1146,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkNextActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:52:31 GMT</last_modification_time>
    </signal>
    <label>Next</label>
@@ -1150,6 +1159,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkPrevActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:52:23 GMT</last_modification_time>
    </signal>
    <label>Prev</label>
@@ -1162,6 +1172,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkJumpActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:52:13 GMT</last_modification_time>
    </signal>
    <label>_Jump...</label>
@@ -1217,6 +1228,7 @@
 	<signal>
 	  <name>activate</name>
 	  <handler>GtkFileOpenActivate</handler>
+	  <data>&quot;intf_popup&quot;</data>
 	  <last_modification_time>Mon, 14 May 2001 21:33:55 GMT</last_modification_time>
 	</signal>
 	<label>_Open File...</label>
@@ -1230,6 +1242,7 @@
 	<signal>
 	  <name>activate</name>
 	  <handler>GtkDiscOpenActivate</handler>
+	  <data>&quot;intf_popup&quot;</data>
 	  <last_modification_time>Mon, 14 May 2001 21:34:09 GMT</last_modification_time>
 	</signal>
 	<label>Open _Disc...</label>
@@ -1243,6 +1256,7 @@
 	<signal>
 	  <name>activate</name>
 	  <handler>GtkNetworkOpenActivate</handler>
+	  <data>&quot;intf_popup&quot;</data>
 	  <last_modification_time>Mon, 14 May 2001 21:34:23 GMT</last_modification_time>
 	</signal>
 	<label>_Network Stream...</label>
@@ -1261,6 +1275,7 @@
 	<signal>
 	  <name>activate</name>
 	  <handler>GtkAboutActivate</handler>
+	  <data>&quot;intf_popup&quot;</data>
 	  <last_modification_time>Mon, 14 May 2001 21:34:54 GMT</last_modification_time>
 	</signal>
 	<label>_About...</label>
@@ -1275,6 +1290,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkPlaylistActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:51:55 GMT</last_modification_time>
    </signal>
    <label>Playlist...</label>
@@ -1287,6 +1303,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkPreferencesActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:51:46 GMT</last_modification_time>
    </signal>
    <label>_Preferences...</label>
@@ -1305,6 +1322,7 @@
    <signal>
      <name>activate</name>
      <handler>GtkExitActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
      <last_modification_time>Tue, 15 May 2001 13:52:03 GMT</last_modification_time>
    </signal>
    <label>E_xit</label>

--- a/plugins/gtk/gtk_interface.c
+++ b/plugins/gtk/gtk_interface.c
@@ -1245,58 +1245,58 @@ create_intf_popup (void)

  gtk_signal_connect (GTK_OBJECT (popup_play), "activate",
                      GTK_SIGNAL_FUNC (GtkPlayActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_pause), "activate",
                      GTK_SIGNAL_FUNC (GtkPauseActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_stop), "activate",
                      GTK_SIGNAL_FUNC (GtKStopActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_back), "activate",
                      GTK_SIGNAL_FUNC (GtkBackActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_slow), "activate",
                      GTK_SIGNAL_FUNC (GtkSlowActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_fast), "activate",
                      GTK_SIGNAL_FUNC (GtkFastActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_interface_toggle), "activate",
                      GTK_SIGNAL_FUNC (GtkWindowToggleActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_fullscreen), "activate",
                      GTK_SIGNAL_FUNC (GtkFullscreenActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_next), "activate",
                      GTK_SIGNAL_FUNC (GtkNextActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_prev), "activate",
                      GTK_SIGNAL_FUNC (GtkPrevActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_jump), "activate",
                      GTK_SIGNAL_FUNC (GtkJumpActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_file), "activate",
                      GTK_SIGNAL_FUNC (GtkFileOpenActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_disc), "activate",
                      GTK_SIGNAL_FUNC (GtkDiscOpenActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_network), "activate",
                      GTK_SIGNAL_FUNC (GtkNetworkOpenActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_about), "activate",
                      GTK_SIGNAL_FUNC (GtkAboutActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_playlist), "activate",
                      GTK_SIGNAL_FUNC (GtkPlaylistActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_preferences), "activate",
                      GTK_SIGNAL_FUNC (GtkPreferencesActivate),
-                      NULL);
+                      "intf_popup");
  gtk_signal_connect (GTK_OBJECT (popup_exit), "activate",
                      GTK_SIGNAL_FUNC (GtkExitActivate),
-                      NULL);
+                      "intf_popup");

  gtk_object_set_data (GTK_OBJECT (intf_popup), "tooltips", tooltips);


--- a/plugins/motion/motion.c
+++ b/plugins/motion/motion.c
@@ -2,7 +2,7 @@
 * motion.c : C motion compensation module for vlc
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: motion.c,v 1.14 2002/02/15 13:32:53 sam Exp $
+ * $Id: motion.c,v 1.15 2002/04/07 06:48:48 sam Exp $
 *
 * Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 *          Michel Lespinasse <walken@zoy.org>
@@ -62,7 +62,7 @@ MODULE_DEACTIVATE_STOP
 #define avg2(a,b) ((a+b+1)>>1)
 #define avg4(a,b,c,d) ((a+b+c+d+2)>>2)

-#define predict_(i) (ref[i])
+#define predict_o(i) (ref[i])
 #define predict_x(i) (avg2 (ref[i], ref[i+1]))
 #define predict_y(i) (avg2 (ref[i], (ref+stride)[i]))
 #define predict_xy(i) (avg4 (ref[i], ref[i+1], (ref+stride)[i], (ref+stride)[i+1]))
@@ -116,8 +116,8 @@ static void MC_##op##_##xy##8_c (yuv_data_t * dest, yuv_data_t * ref,       \

 // definitions of the actual mc functions

-MC_FUNC (put,)
-MC_FUNC (avg,)
+MC_FUNC (put,o)
+MC_FUNC (avg,o)
 MC_FUNC (put,x)
 MC_FUNC (avg,x)
 MC_FUNC (put,y)
@@ -138,22 +138,22 @@ static void motion_getfunctions( function_list_t * p_function_list )
            /* Copying functions */
            {
                /* Width == 16 */
-                MC_put_16_c, MC_put_x16_c, MC_put_y16_c, MC_put_xy16_c
+                MC_put_o16_c, MC_put_x16_c, MC_put_y16_c, MC_put_xy16_c
            },
            {
                /* Width == 8 */
-                MC_put_8_c,  MC_put_x8_c,  MC_put_y8_c, MC_put_xy8_c
+                MC_put_o8_c,  MC_put_x8_c,  MC_put_y8_c, MC_put_xy8_c
            }
        },
        {
            /* Averaging functions */
            {
                /* Width == 16 */
-                MC_avg_16_c, MC_avg_x16_c, MC_avg_y16_c, MC_avg_xy16_c
+                MC_avg_o16_c, MC_avg_x16_c, MC_avg_y16_c, MC_avg_xy16_c
            },
            {
                /* Width == 8 */
-                MC_avg_8_c,  MC_avg_x8_c,  MC_avg_y8_c,  MC_avg_xy8_c
+                MC_avg_o8_c,  MC_avg_x8_c,  MC_avg_y8_c,  MC_avg_xy8_c
            }
        }
    };