vlc_Log: allow NULL vlc_object_t parameter

[vlc] / extras / analyser / zsh_completion.sh

diff --git a/extras/analyser/zsh_completion.sh b/extras/analyser/zsh_completion.sh
index f10f4bf0a2dd9b6db7522e8a683d856c460454c1..fbfa78292356c650f4155e814133a85ee3290b65 100755 (executable)
--- a/extras/analyser/zsh_completion.sh
+++ b/extras/analyser/zsh_completion.sh
@@ -27,7 +27,7 @@ export VLC_PLUGIN_PATH
 
 function find_libvlc {
     [ -z "$SUFFIX" ] && return 0 # linking will fail if lib isn't found
-    for i in $BUILDDIR/src/.libs/libvlc.$SUFFIX $BUILDDIR/src/libvlc.$SUFFIX; do
+    for i in $BUILDDIR/lib/.libs/libvlc.$SUFFIX $BUILDDIR/lib/libvlc.$SUFFIX; do
         [ -e $i ] && LIBVLC=$i && return 0
     done
     return 1
@@ -54,6 +54,7 @@ if ! find_libvlccore; then
 fi
 
 export LD_LIBRARY_PATH=$BUILDDIR/src/.libs
+CXXFLAGS="$CXXFLAGS -g -O0"
 
 if [ -e ../../extras/contrib/config.mak -a ! "`grep HOST ../../extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "$HOST" ]; then
     CXXFLAGS="-I../../extras/contrib/include"
@@ -61,7 +62,7 @@ fi
 
 [ -z "$CXX" ] && CXX=g++
 
-ZSH_BUILD="$CXX $CXXFLAGS -D__LIBVLC__ -DHAVE_CONFIG_H -I$BUILDDIR -I$BUILDDIR/include -I../../include zsh.cpp $LIBVLC $LIBVLCCORE -o zsh_gen"
+ZSH_BUILD="$CXX $CXXFLAGS -DHAVE_CONFIG_H -I$BUILDDIR -I$BUILDDIR/include -I../../include zsh.cpp $LIBVLC $LIBVLCCORE -o zsh_gen"
 
 echo $ZSH_BUILD
 echo
@@ -69,6 +70,7 @@ eval $ZSH_BUILD || exit 1
 
 printf "Generating zsh completion in _vlc ... "
 
+VLC_PLUGIN_PATH=$BUILDDIR/modules
 if ! ./zsh_gen >_vlc 2>/dev/null; then
     echo "
 ERROR: the generation failed.... :(
@@ -77,9 +79,9 @@ Please press enter to verify that all the VLC modules are shown"
     ./zsh_gen -vv --list
     echo "
 If they are shown, press enter to see if you can debug the problem
-It will be reproduced by running \"./zsh_gen -vvv\""
+It will be reproduced by running \"./zsh_gen -vv\""
     read i
-    ./zsh_gen --plugin-path=$BUILDDIR -vv
+    ./zsh_gen -vv
     exit 1
 fi