about a missing m4/Makefile.in.
* ./include/vlc_common.h: workaround for Borland's redefinition of PACKAGE.
#! /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>
# do cp ${aclocaldir}/${file} m4/
#done
# Yuck!
+ touch m4/Makefile.am
+ # Yuck!
echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4
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
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(BCBUILDER)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
AC_SUBST(NEED_GETOPT)
AC_SUBST(MOZILLA)
* 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
* 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
/*****************************************************************************
* 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>
*****************************************************************************/
/*****************************************************************************
- * 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
*****************************************************************************/
/*****************************************************************************
* 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 _
#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
+
: 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