Changeset 685f8edcc3e7bfa3e3a40fd15ecec75c4e01b565

Timestamp:

08/27/02 01:36:20 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1030404980 +0000

git-parent:

[15f3b0f6fa0eac7207eec34e80e1f65506d4f599]

git-author:

Sam Hocevar <sam@videolan.org> 1030404980 +0000

Message:

• ./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.
  

Files:

• bootstrap (modified) (2 diffs)
• configure.in (modified) (2 diffs)
• include/vlc/vlc.h (modified) (2 diffs)
• include/vlc_common.h (modified) (4 diffs)
• modules/gui/win32/about.cpp (modified) (1 diff)

bootstrap

@@ -2 +2 @@
-
-##  bootstrap.sh file for vlc, the VideoLAN Client
-5 2002/08/26 21:46:06
+6 2002/08/26 23:36:20
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -50 +50 @@
-  #  do cp ${aclocaldir}/${file} m4/
-  #done
+  # Yuck!
+  touch m4/Makefile.am
-  # Yuck!
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4

configure.in

@@ -54 +54 @@
-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
@@ -2073 +2070 @@
-AC_SUBST(WINDRES)
-AC_SUBST(BCBUILDER)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(NEED_GETOPT)
-AC_SUBST(MOZILLA)

include/vlc/vlc.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-2 2002/08/26 08:36:12
+3 2002/08/26 23:36:20
- *
- * This program is free software; you can redistribute it and/or modify
@@ -96 +96 @@
- *****************************************************************************/
-#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
-

include/vlc_common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-3 2002/08/21 23:19:58
+4 2002/08/26 23:36:20
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -26 +26 @@
-
-/*****************************************************************************
-
-
+
+
+
+
+
+
+
+
-#if defined( __BORLANDC__ )
-#   undef HAVE_VARIADIC_MACROS
-#   undef HAVE_STDINT_H
-#endif
+
+#include "vlc_config.h"
+#include "modules_inner.h"
-
-/*****************************************************************************
@@ -465 +474 @@
- * 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>
@@ -485 +489 @@
-
-/*****************************************************************************
-Plug-in
+Additional vlc
- *****************************************************************************/
-#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
+

modules/gui/win32/about.cpp

@@ -41 +41 @@
-{
-    Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
-LC_V
+
-}
-//---------------------------------------------------------------------------