dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.183 2004/02/22 00:15:33 gbazin Exp $
+dnl $Id: configure.ac,v 1.184 2004/02/22 15:03:33 gbazin Exp $
AC_INIT(vlc,0.7.1-test2)
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
+AC_ARG_ENABLE(utf8,
+ [ --enable-utf8 unicode utf8 support (default enabled on darwin/beos/win32)])
+if test "${enable_utf8}" = "yes" || (test "${enable_utf8}" != "no" && (test "${SYS}" = "mingw32" || test "${SYS}" = "beos" || test "${SYS}" = "darwin" ) )
+then
+ AC_DEFINE(ENABLE_UTF8, 1,
+ Define if you want utf8 support)
+fi
+
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
- * $Id: wxwindows.h,v 1.89 2004/02/16 17:14:39 zorglub Exp $
+ * $Id: wxwindows.h,v 1.90 2004/02/22 15:03:33 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#define SLIDER_MAX_POS 10000
/* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
-#if defined( ENABLE_NLS ) && defined( HAVE_GETTEXT ) && \
- defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT )
+#if defined( ENABLE_NLS ) && defined( ENABLE_UTF8 )
#if wxUSE_UNICODE
# define wxU(utf8) wxString(utf8, wxConvUTF8)
#else
#endif
#define ISUTF8 1
-#else // ENABLE_NLS && HAVE_GETTEXT && WIN32 && !HAVE_INCLUDED_GETTEXT
+#else // ENABLE_NLS && ENABLE_UTF8
#if wxUSE_UNICODE
# define wxU(ansi) wxString(ansi, *wxConvCurrent)
#else
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2004 VideoLAN
- * $Id: libvlc.c,v 1.115 2004/01/29 17:51:08 zorglub Exp $
+ * $Id: libvlc.c,v 1.116 2004/02/22 15:03:33 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
- ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
- /* BeOS only support UTF8 strings */
- /* Mac OS X prefers UTF8 */
+#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#endif
/* Set the default domain */
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
- ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
- /* BeOS only support UTF8 strings */
- /* Mac OS X prefers UTF8 */
+#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#endif