* ./bootstrap: we touch m4/Makefile.am so that configure doesn't complain

    about a missing m4/Makefile.in.
  * ./include/vlc_common.h: workaround for Borland's redefinition of PACKAGE.

diff --git a/bootstrap b/bootstrap
index 5960df532a08c59521c4e8637c1cf5b56610c30d..75ff4086f653e0c3794007f39411c24e7bd7e74a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap.sh file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.5 2002/08/26 21:46:06 sam Exp $
+##  $Id: bootstrap,v 1.6 2002/08/26 23:36:20 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -50,6 +50,8 @@ else
   #  do cp ${aclocaldir}/${file} m4/
   #done
   # Yuck!
+  touch m4/Makefile.am
+  # Yuck!
   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4
 fi
 

diff --git a/configure.in b/configure.in
index 8f9448906c38a90c9c28751344c25b8fde88918d..a72c363254e12753b7ce2a36a2546e41e1dff0fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,9 +53,6 @@ fi
 
 dnl Gettext stuff
 ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
-
-AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
-AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
 AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
@@ -2072,8 +2069,6 @@ AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 AC_SUBST(BCBUILDER)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOZILLA)
 

diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h
index 0959bce62c27872dd6383154fc2595bb9a8ea123..02f3413c83d24bfccb7b2ad0d30e951b69b8981c 100644 (file)
--- a/include/vlc/vlc.h
+++ b/include/vlc/vlc.h
@@ -2,7 +2,7 @@
  * vlc.h: global header for vlc
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.12 2002/08/26 08:36:12 sam Exp $
+ * $Id: vlc.h,v 1.13 2002/08/26 23:36:20 sam Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,17 +95,7 @@ typedef int        vlc_status_t;
  * Required internal headers
  *****************************************************************************/
 #if defined( __VLC__ )
-#   include "config.h"
-#   include "vlc_config.h"
-#   include "modules_inner.h"
 #   include "vlc_common.h"
-#   include "os_specific.h"
-#   include "vlc_messages.h"
-#   include "mtime.h"
-#   include "modules.h"
-#   include "main.h"
-#   include "configuration.h"
-#   include "vlc_objects.h"
 #endif
 
 /*****************************************************************************

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 14df42b1ae97d586030e45c0ae7629eb8239c5ca..537f84c4ada22b55e3a8ba7bc83aa2465135c437 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.23 2002/08/21 23:19:58 sam Exp $
+ * $Id: vlc_common.h,v 1.24 2002/08/26 23:36:20 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -25,13 +25,22 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * Compiler-specific workarounds
+ * Required vlc headers
  *****************************************************************************/
+#if defined( __BORLANDC__ )
+#   undef PACKAGE
+#endif
+
+#include "config.h"
+
 #if defined( __BORLANDC__ )
 #   undef HAVE_VARIADIC_MACROS
 #   undef HAVE_STDINT_H
 #endif
 
+#include "vlc_config.h"
+#include "modules_inner.h"
+
 /*****************************************************************************
  * Required system headers
  *****************************************************************************/
@@ -464,11 +473,6 @@ typedef __int64 off_t;
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
-#ifndef PACKAGE /* Borland C++ uses this ! */
-#define PACKAGE VLC_PACKAGE
-#endif
-#define VERSION VLC_VERSION
-
 #if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( NEED_GNOMESUPPORT_H )
 #   include <libintl.h>
 #   undef _
@@ -484,6 +488,19 @@ typedef __int64 off_t;
 #endif
 
 /*****************************************************************************
- * Plug-in stuff
+ * Additional vlc stuff
  *****************************************************************************/
 #include "vlc_symbols.h"
+#include "os_specific.h"
+#include "vlc_messages.h"
+#include "mtime.h"
+#include "modules.h"
+#include "main.h"
+#include "configuration.h"
+#include "vlc_objects.h"
+
+#if defined( __BORLANDC__ )
+#   undef PACKAGE
+#   define PACKAGE
+#endif
+

diff --git a/modules/gui/win32/about.cpp b/modules/gui/win32/about.cpp
index 10c307e2810ee6c3ecbb262c7f51f60b8c13e8b6..12302d2311fd550851d375351b70c9afe0f004c6 100644 (file)
--- a/modules/gui/win32/about.cpp
+++ b/modules/gui/win32/about.cpp
@@ -40,7 +40,7 @@ __fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
         : TForm( Owner )\r
 {\r
     Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;\r
-    LabelVersion->Caption = "Version " VLC_VERSION;\r
+    LabelVersion->Caption = "Version " VERSION;\r
 }\r
 //---------------------------------------------------------------------------\r
 \r