* ./configure.ac.in: we no longer choke if libdvbpsi headers aren't here.

  * ./include/vlc_common.h: we don't try to include inttypes.h with Borland.

diff --git a/configure.ac.in b/configure.ac.in
index 8415710b7c112cb3c980ad57e37af6c9dd3b96e1..f0dd5c06bd14f48fac5e374a6ee53e7c222ab007 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -961,7 +961,7 @@ then
       AC_CHECK_HEADERS(dvbpsi/dr.h,
         [ PLUGINS="${PLUGINS} ts_dvbpsi"
           LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ],
-        [  AC_MSG_ERROR([cannot find libdvbpsi headers]) ],
+        [  AC_MSG_WARN([cannot find libdvbpsi headers]) ],
         [#include <stdint.h>
 #include <dvbpsi/dvbpsi.h>
 #include <dvbpsi/descriptor.h>

diff --git a/doc/fortunes.txt b/doc/fortunes.txt
index 99359e2db7e1e237b152d35aa1173bb4d71a8c5d..b1a4d7b5c845aff357951ac971adc172307832d2 100644 (file)
--- a/doc/fortunes.txt
+++ b/doc/fortunes.txt
@@ -373,3 +373,8 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
+<haroldo> hi I've got some nice xxx videos, and I'd like to exchange with 
+          anyone 
+
+  -- #videolan
+%

diff --git a/include/vlc_common.h b/include/vlc_common.h
index ea71aff7fbc789ab81b97b64d32f516f1216c5eb..6f6fce93ee0df96e51dc11e4b8607b050284c589 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.39 2002/11/20 08:58:20 sam Exp $
+ * $Id: vlc_common.h,v 1.40 2002/11/24 18:54:54 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -29,6 +29,7 @@
  *****************************************************************************/
 #if defined( __BORLANDC__ )
 #   undef PACKAGE
+#   undef HAVE_INTTYPES_H
 #endif
 
 #include "config.h"