mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 02:01:12 +00:00
configure.ac: use new AS_VERSION and AS_NANO macros
Original commit message from CVS: * configure.ac: use new AS_VERSION and AS_NANO macros * gst/gst-i18n-lib.h: * gst/gst.c: * gst/gsterror.c: * gst/gstversion.h.in: * win32/common/config.h: * win32/common/config.h.in: update accordingly
This commit is contained in:
Thomas Vander Stichele
parent
5b86e7bf4e
commit
f5bf786c85
9 changed files with 62 additions and 55 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2006-04-01 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* configure.ac:
|
||||
use new AS_VERSION and AS_NANO macros
|
||||
* gst/gst-i18n-lib.h:
|
||||
* gst/gst.c:
|
||||
* gst/gsterror.c:
|
||||
* gst/gstversion.h.in:
|
||||
* win32/common/config.h:
|
||||
* win32/common/config.h.in:
|
||||
update accordingly
|
||||
|
||||
2006-03-31 Michael Smith <msmith@fluendo.com>
|
||||
|
||||
* plugins/elements/gsttypefindelement.c:
|
||||
|
|
|
|||
2
common
2
common
|
|
@ -1 +1 @@
|
|||
Subproject commit c18b429f2a3698b6fc5e849a637aa0c8b91e82b9
|
||||
Subproject commit 30bd47de758f3f98b2959af9105911ba093624e6
|
||||
26
configure.ac
26
configure.ac
|
|
@ -1,13 +1,20 @@
|
|||
AC_PREREQ(2.52)
|
||||
|
||||
dnl initialize autoconf
|
||||
dnl we don't specify PACKAGE and VERSION because AS_VERSION puts it together
|
||||
AC_INIT
|
||||
|
||||
dnl when going to/from release please set the nano (fourth number) right !
|
||||
dnl releases only do Wall, cvs and prerelease does Werror too
|
||||
AS_VERSION(gstreamer, GST_VERSION, 0, 10, 4, 1,
|
||||
GST_CVS="no", GST_CVS="yes")
|
||||
AC_INIT(GStreamer, 0.10.4.1,
|
||||
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
|
||||
gstreamer)
|
||||
|
||||
dnl initialize automake
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
dnl define PACKAGE_VERSION_* variables
|
||||
AS_VERSION
|
||||
|
||||
dnl check if this is a release version
|
||||
AS_NANO(GST_CVS="no", GST_CVS="yes")
|
||||
|
||||
dnl can autoconf find the source ?
|
||||
AC_CONFIG_SRCDIR([gst/gst.c])
|
||||
|
|
@ -21,13 +28,8 @@ AM_MAINTAINER_MODE
|
|||
dnl sets host_* variables
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
dnl initialize automake
|
||||
dnl FIXME: this is deprecated use, we should move PACKAGE and VERSION to
|
||||
dnl AC_INIT, but then we need to parse the version to pass to AS_VERSION
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
|
||||
dnl our libraries and install dirs use major.minor as a version
|
||||
GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
|
||||
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
|
||||
dnl we override it here for release candidates for a new series
|
||||
GST_MAJORMINOR=0.10
|
||||
AC_SUBST(GST_MAJORMINOR)
|
||||
|
|
@ -111,7 +113,7 @@ GST_ARG_GCOV
|
|||
GST_ARG_EXAMPLES
|
||||
|
||||
GST_ARG_WITH_PKG_CONFIG_PATH
|
||||
GST_ARG_WITH_PACKAGE_NAME([GStreamer])
|
||||
GST_ARG_WITH_PACKAGE_NAME
|
||||
GST_ARG_WITH_PACKAGE_ORIGIN
|
||||
|
||||
dnl use a cache dir for storing element registry info.
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef __GST_I18N_LIB_H__
|
||||
#define __GST_I18N_LIB_H__
|
||||
|
||||
#ifndef GST_VERSION
|
||||
#ifndef PACKAGE_NAME
|
||||
#error You must include config.h before including this header.
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -756,7 +756,7 @@ parse_one_option (gint opt, const gchar * arg, GError ** err)
|
|||
{
|
||||
switch (opt) {
|
||||
case ARG_VERSION:
|
||||
g_print ("GStreamer Core Library version %s\n", GST_VERSION);
|
||||
g_print ("GStreamer Core Library version %s\n", PACKAGE_VERSION);
|
||||
exit (0);
|
||||
case ARG_FATAL_WARNINGS:{
|
||||
GLogLevelFlags fatal_mask;
|
||||
|
|
|
|||
|
|
@ -117,8 +117,7 @@ gst_g_error_get_type (void)
|
|||
return type;
|
||||
}
|
||||
|
||||
#define FILE_A_BUG " Please file a bug at "\
|
||||
"http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer."
|
||||
#define FILE_A_BUG " Please file a bug at " PACKAGE_BUGREPORT " ."
|
||||
|
||||
/* initialize the dynamic table of translated core errors */
|
||||
static gchar **
|
||||
|
|
|
|||
|
|
@ -45,26 +45,26 @@ G_BEGIN_DECLS
|
|||
*
|
||||
* The major version of GStreamer at compile time:
|
||||
*/
|
||||
#define GST_VERSION_MAJOR (@GST_VERSION_MAJOR@)
|
||||
#define GST_VERSION_MAJOR (@PACKAGE_VERSION_MAJOR@)
|
||||
/**
|
||||
* GST_VERSION_MINOR:
|
||||
*
|
||||
* The minor version of GStreamer at compile time:
|
||||
*/
|
||||
#define GST_VERSION_MINOR (@GST_VERSION_MINOR@)
|
||||
#define GST_VERSION_MINOR (@PACKAGE_VERSION_MINOR@)
|
||||
/**
|
||||
* GST_VERSION_MICRO:
|
||||
*
|
||||
* The micro version of GStreamer at compile time:
|
||||
*/
|
||||
#define GST_VERSION_MICRO (@GST_VERSION_MICRO@)
|
||||
#define GST_VERSION_MICRO (@PACKAGE_VERSION_MICRO@)
|
||||
/**
|
||||
* GST_VERSION_NANO:
|
||||
*
|
||||
* The nano version of GStreamer at compile time:
|
||||
* Actual releases have 0, CVS versions have 1, prerelease versions have 2-...
|
||||
*/
|
||||
#define GST_VERSION_NANO (@GST_VERSION_NANO@)
|
||||
#define GST_VERSION_NANO (@PACKAGE_VERSION_NANO@)
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,14 @@
|
|||
/* Location of registry */
|
||||
#define GST_CACHE_DIR PREFIX "\\var\\cache"
|
||||
|
||||
/* Define if pipeline parsing code is disabled */
|
||||
/* #undef GST_DISABLE_PARSE */
|
||||
|
||||
/* macro to use to show function name */
|
||||
#define GST_FUNCTION "(function)"
|
||||
|
||||
/* Defined if gcov is enabled to force a rebuild due to config.h changing */
|
||||
#undef GST_GCOV_ENABLED
|
||||
/* #undef GST_GCOV_ENABLED */
|
||||
|
||||
/* Default errorlevel to use */
|
||||
#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
|
||||
|
|
@ -26,20 +29,11 @@
|
|||
/* GStreamer license */
|
||||
#define GST_LICENSE "LGPL"
|
||||
|
||||
/* package origin */
|
||||
#define GST_PACKAGE_ORIGIN "Unknown package origin"
|
||||
|
||||
/* package name in plugins */
|
||||
#define GST_PACKAGE_NAME "GStreamer CVS/prerelease"
|
||||
|
||||
/* Define the version */
|
||||
#define GST_VERSION "0.10.4.1"
|
||||
|
||||
/* Define the MAJOR.MINOR version */
|
||||
#define GST_MAJORMINOR "0.10"
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "i686"
|
||||
/* package origin */
|
||||
#define GST_PACKAGE_ORIGIN "Unknown package origin"
|
||||
|
||||
/* Define if the host CPU is an Alpha */
|
||||
#undef HAVE_CPU_ALPHA
|
||||
|
|
@ -174,6 +168,9 @@
|
|||
/* Defined if compiling for Windows */
|
||||
#define HAVE_WIN32 1
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "i686"
|
||||
|
||||
/* library dir */
|
||||
#ifdef _DEBUG
|
||||
# define LIBDIR PREFIX "\\debug\\lib"
|
||||
|
|
@ -188,19 +185,19 @@
|
|||
#define PACKAGE "gstreamer"
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer"
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
#define PACKAGE_NAME "GStreamer"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
#undef PACKAGE_STRING "GStreamer 0.10.4.1"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
#undef PACKAGE_TARNAME "gstreamer"
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
#undef PACKAGE_VERSION "0.10.4.1"
|
||||
|
||||
/* Define the plugin directory */
|
||||
#ifdef _DEBUG
|
||||
|
|
|
|||
|
|
@ -14,11 +14,14 @@
|
|||
/* Location of registry */
|
||||
#define GST_CACHE_DIR PREFIX "\\var\\cache"
|
||||
|
||||
/* Define if pipeline parsing code is disabled */
|
||||
/* #undef GST_DISABLE_PARSE */
|
||||
|
||||
/* macro to use to show function name */
|
||||
#define GST_FUNCTION "(function)"
|
||||
|
||||
/* Defined if gcov is enabled to force a rebuild due to config.h changing */
|
||||
#undef GST_GCOV_ENABLED
|
||||
/* #undef GST_GCOV_ENABLED */
|
||||
|
||||
/* Default errorlevel to use */
|
||||
#define GST_LEVEL_DEFAULT @GST_LEVEL_DEFAULT@
|
||||
|
|
@ -26,20 +29,11 @@
|
|||
/* GStreamer license */
|
||||
#define GST_LICENSE "@GST_LICENSE@"
|
||||
|
||||
/* package origin */
|
||||
#define GST_PACKAGE_ORIGIN "@GST_PACKAGE_ORIGIN@"
|
||||
|
||||
/* package name in plugins */
|
||||
#define GST_PACKAGE_NAME "@GST_PACKAGE_NAME@"
|
||||
|
||||
/* Define the version */
|
||||
#define GST_VERSION "@GST_VERSION@"
|
||||
|
||||
/* Define the MAJOR.MINOR version */
|
||||
#define GST_MAJORMINOR "@GST_MAJORMINOR@"
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "@HOST_CPU@"
|
||||
/* package origin */
|
||||
#define GST_PACKAGE_ORIGIN "@GST_PACKAGE_ORIGIN@"
|
||||
|
||||
/* Define if the host CPU is an Alpha */
|
||||
#undef HAVE_CPU_ALPHA
|
||||
|
|
@ -174,6 +168,9 @@
|
|||
/* Defined if compiling for Windows */
|
||||
#define HAVE_WIN32 1
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "@HOST_CPU@"
|
||||
|
||||
/* library dir */
|
||||
#ifdef _DEBUG
|
||||
# define LIBDIR PREFIX "\\debug\\lib"
|
||||
|
|
@ -188,19 +185,19 @@
|
|||
#define PACKAGE "@PACKAGE@"
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
#define PACKAGE_NAME "@PACKAGE_NAME@"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
#define PACKAGE_STRING "@PACKAGE_STRING@"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
#define PACKAGE_VERSION "@PACKAGE_VERSION@"
|
||||
|
||||
/* Define the plugin directory */
|
||||
#ifdef _DEBUG
|
||||
|
|
|
|||
Loading…
Reference in a new issue