* Additional fixes for OSes with no gettext (thanks to ej0).
  * Fixed a potential BeOS linking issue.
  * Fixed a minor bug in input.c.

acconfig.h

-#undef ENABLE_NLS
-#undef HAVE_LC_MESSAGES
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_STPCPY
 #undef PACKAGE
 #undef VERSION

configure.in

@@ -813,8 +813,9 @@ AC_ARG_WITH(mad,
 dnl special case for BeOS
 if test x$SYS = xbeos
 then
+    LIB="${LIB} -lbe"
     BUILTINS="${BUILTINS} beos"
-    LIB_BEOS="-lbe -lgame -lroot -ltracker"
+    LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
     PLCFLAGS="${PLCFLAGS} -nostart"
 
 dnl default case

extras/libdvdread/Makefile

@@ -52,7 +52,7 @@ $(BUILTIN_OBJ): DVDREAD_%.o: %.c
 all: ../../lib/$(BASE_A)
 
 libdvdcss:
-	cd ../../ && $(MAKE) libdvdcss
+	@cd ../../ && $(MAKE) libdvdcss
 
 #install:
 #	mkdir -p $(DESTDIR)$(includedir)/videolan

include/common.h

@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.56 2001/12/11 23:53:20 sam Exp $
+ * $Id: common.h,v 1.57 2001/12/12 02:13:50 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -416,7 +416,7 @@ typedef __int64 off_t;
 #   define _(String) (String)
 #   define N_(String) (String)
 #   define textdomain(Domain)
-#   define bindtextdomain(Package, Directory)
+#   define bindtextdomain(Package, Directory) 1
 #endif
 
 /*****************************************************************************

include/defs.h.in

@@ -50,11 +50,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-#undef ENABLE_NLS
-#undef HAVE_LC_MESSAGES
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_STPCPY
 #undef PACKAGE
 #undef VERSION
 

plugins/dvd/Makefile

@@ -47,5 +47,5 @@ else
 endif
 
 libdvdcss:
-	cd ../../ && $(MAKE) libdvdcss
+	@cd ../../ && $(MAKE) libdvdcss
 

plugins/dvdread/Makefile

@@ -47,7 +47,7 @@ else
 endif
 
 libdvdcss:
-	cd ../../ && $(MAKE) libdvdcss
+	@cd ../../ && $(MAKE) libdvdcss
 
 libdvdread:
-	cd ../../ && $(MAKE) libdvdread
+	@cd ../../ && $(MAKE) libdvdread

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.164 2001/12/10 16:16:51 massiot Exp $
+ * $Id: input.c,v 1.165 2001/12/12 02:13:50 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -604,6 +604,12 @@ static void CloseThread( input_thread_t * p_input )
     {
         f.pf_close( p_input );
     }
+    else if( ( ( strlen( p_input->p_source ) > 8 )
+                 && !strncasecmp( p_input->p_source, "dvdread:", 8 ) )
+             || TestMethod( INPUT_METHOD_VAR, "dvdread" ) )
+    {
+        f.pf_close( p_input );
+    }
     else if( ( strlen( p_input->p_source ) > 4 )
                && !strncasecmp( p_input->p_source, "vlc:", 4 ) )
     {

src/interface/main.c

@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.135 2001/12/10 13:17:35 sam Exp $
+ * $Id: main.c,v 1.136 2001/12/12 02:13:50 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -58,6 +58,10 @@
 #   include <io.h>
 #endif
 
+#ifdef HAVE_LOCALE_H
+#    include <locale.h>
+#endif
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                  /* getenv(), strtol(),  */
 #include <string.h>                                            /* strerror() */
@@ -286,10 +290,12 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     /* 
      * Support for getext
      */
+#ifdef HAVE_LOCALE_H
     if( ! setlocale(LC_MESSAGES, "") )
     {
         fprintf( stderr, "warning: unsupported locale.\n" );
     }
+#endif
 
     if( ! bindtextdomain(PACKAGE, LOCALEDIR) )
     {