- Call dgettext directly with shared libvlc and libtool

- Remove vlc_dcgettext in those cases

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b3561e6ad7fc87597b268e6e1c7b8eb80a5a7b74..2c54cdba09b743d8fe404f4ce8f6c058b9f6e236 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1099,7 +1099,9 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
+#ifndef HAVE_SHARED_LIBVLC
 VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
+#endif
 
 #if defined( ENABLE_NLS ) && \
      (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\
@@ -1113,7 +1115,11 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #       include <libintl.h>
 #   endif
 #   undef _
-#   define _(String) vlc_dgettext (PACKAGE_NAME, String)
+#   ifdef HAVE_SHARED_LIBVLC
+#       define _(String) dgettext (PACKAGE_NAME, String)
+#   else
+#       define _(String) vlc_dgettext(PACKAGE_NAME, String)
+#   endif
 #   define N_(String) ((char*)(String))
 #else
 #   define _(String) ((char*)(String))

diff --git a/src/extras/libc.c b/src/extras/libc.c
index e1b6a174f827dcd5a73891fb3345a95c4b08ba07..19fd2a384c66839098e26d97877dca364b140144 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -498,6 +498,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
 }
 #endif
 
+#ifndef HAVE_SHARED_LIBVLC
 /*****************************************************************************
  * dgettext: gettext for plugins.
  *****************************************************************************/
@@ -510,6 +511,7 @@ char *vlc_dgettext( const char *package, const char *msgid )
     return (char *)msgid;
 #endif
 }
+#endif
 
 /*****************************************************************************
  * count_utf8_string: returns the number of characters in the string.