* ./configure.in, ./mozilla/Makefile: we link the Mozilla plugin with libXt.

diff --git a/configure b/configure
index 41f55d5f79fb0dbadc23203d2d7b748bcea7d7fc..782b5c1680c1bd12fdaf9f7a5eb96e62ab87bf10 100755 (executable)
--- a/configure
+++ b/configure
@@ -5531,8 +5531,8 @@ case "x${target_cpu}" in
     ;;
 esac
 
-BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec"
-PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
+BUILTINS="${BUILTINS}"
+PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
 
 MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx"
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
@@ -9159,6 +9159,52 @@ fi
 
   if test "x${MOZILLA_CONFIG}" != "xno"
   then
+    if test "x${SYS}" != "xmingw32"; then
+      LDFLAGS="${save_LDFLAGS} -L${x_libraries}"
+      echo $ac_n "checking for XtStrings in -lXt""... $ac_c" 1>&6
+echo "configure:9166: checking for XtStrings in -lXt" >&5
+ac_lib_var=`echo Xt'_'XtStrings | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lXt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9174 "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
+    builtin and then its argument prototype would still apply.  */
+char XtStrings();
+
+int main() {
+XtStrings()
+; return 0; }
+EOF
+if { (eval echo configure:9185: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        mozilla_LDFLAGS="${mozilla_LDFLAGS} -L${x_libraries} -lXt"
+      
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+      LDFLAGS="${save_LDFLAGS}"
+    fi
     MOZILLA=1
     mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
         mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`"

diff --git a/configure.in b/configure.in
index 6244d90c3ac79f8ae82ba67eecdb0e632ac64c93..88ee20577bbd3a4cabcf0612d744b10deb801c33 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -433,8 +433,8 @@ esac
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec"
-PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
+BUILTINS="${BUILTINS}"
+PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
 
 dnl
 dnl  Accelerated modules
@@ -1780,6 +1780,13 @@ then
   AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
   if test "x${MOZILLA_CONFIG}" != "xno"
   then
+    if test "x${SYS}" != "xmingw32"; then
+      LDFLAGS="${save_LDFLAGS} -L${x_libraries}"
+      AC_CHECK_LIB(Xt,XtStrings,[
+        mozilla_LDFLAGS="${mozilla_LDFLAGS} -L${x_libraries} -lXt"
+      ])
+      LDFLAGS="${save_LDFLAGS}"
+    fi
     MOZILLA=1
     mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
     dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490

diff --git a/include/modules_inner.h b/include/modules_inner.h
index dcfe4a408dfc619721b7b6954ffeecb05bbf2851..d9cc19362291830b3f4e34f262bbcdebedb345b9 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.26 2002/08/01 11:04:46 tcastley Exp $
+ * $Id: modules_inner.h,v 1.27 2002/08/04 08:45:35 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -116,22 +116,23 @@
 
 
 #define add_submodule( )                                                      \
-    p_submodule->pp_shortcuts[ i_shortcut ] = NULL;                   \
-    p_submodule = (module_t *)vlc_object_create( p_module, VLC_OBJECT_MODULE );\
+    p_submodule->pp_shortcuts[ i_shortcut ] = NULL;                           \
+    p_submodule =                                                             \
+            (module_t *)vlc_object_create( p_module, VLC_OBJECT_MODULE );     \
     vlc_object_attach( p_submodule, p_module );                               \
     p_submodule->b_submodule = VLC_TRUE;                                      \
     /* Nuahahaha! Heritage! Polymorphism! Ugliness!! */                       \
     for( i_shortcut = 0; p_module->pp_shortcuts[ i_shortcut ]; i_shortcut++ ) \
     {                                                                         \
         p_submodule->pp_shortcuts[ i_shortcut ] =                             \
-                                p_module->pp_shortcuts[ i_shortcut ]; \
+                                p_module->pp_shortcuts[ i_shortcut ];         \
     }                                                                         \
     p_submodule->psz_object_name = p_module->psz_object_name;                 \
     p_submodule->psz_program = p_module->psz_program;                         \
     p_submodule->psz_capability = p_module->psz_capability;                   \
     p_submodule->i_score = p_module->i_score;                                 \
     p_submodule->i_cpu = p_module->i_cpu;                                     \
-    p_submodule->pf_activate = NULL;                         \
+    p_submodule->pf_activate = NULL;                                          \
     p_submodule->pf_deactivate = NULL
     
 #define add_requirement( cap )                                                \

diff --git a/mozilla/Makefile b/mozilla/Makefile
index 6e8005686bbb34d8eaa584381f9bae4b113f1842..7c2ccedc9b4cd26b945fdebc244dd1408bed4cd9 100644 (file)
--- a/mozilla/Makefile
+++ b/mozilla/Makefile
@@ -16,6 +16,8 @@ PLUGIN_OBJ = libvlcplugin.so
 #
 all: $(PLUGIN_OBJ)
 
+distclean: clean
+
 clean:
        rm -f *.o *.so
        rm -Rf .dep
@@ -35,3 +37,6 @@ $(PLUGIN_OBJ): Makefile ../lib/libvlc.a $(BUILTIN_OBJ:%=../%) $(C_OBJ)
 $(C_OBJ): %.o: %.c vlcplugin.h
        $(CC) $(CFLAGS) -I../include $(mozilla_CFLAGS) -c $< -o $@
 
+../%:
+       @cd .. && $(MAKE) $(@:../%=%)
+