2005-10-16 Thomas Vander Stichele <thomas at apestaart dot org>
+ * configure.ac:
+ use the gettext macro
+ * gst/elements/gstelements.c:
+ * gst/gst.c:
+ * gst/indexers/gstindexers.c:
+ update for GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN
+ * win32/common/config.h:
+ updated config.h
+ * win32/common/config.h.in:
+ add the template to generate config.h
+ * win32/common/gstenumtypes.c:
+ * win32/common/gstversion.h:
+ updated copies
+
+2005-10-16 Thomas Vander Stichele <thomas at apestaart dot org>
+
* gst/gst.c: (gst_version):
* gst/gstversion.h.in:
add the nano
-Subproject commit 361749d506054ba03e7ccc1aad9d531673a5e342
+Subproject commit e8d4a23bcbd07bbdf00f9e35787000e96fff9fc2
dnl *** TODO: decide where to put ***
dnl set up gettext
-AM_GNU_GETTEXT_VERSION(0.11.5)
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE=gstreamer-$GST_MAJORMINOR
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
- [gettext package name])
-
-dnl define LOCALEDIR in config.h
-AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
-AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
- [gettext locale dir])
-
-dnl define LIBDIR so we can inform people where we live
-AS_AC_EXPAND(LIBDIR, $libdir)
-AC_DEFINE_UNQUOTED([LIBDIR], "$LIBDIR",
- [library dir])
+GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
dnl define an ERROR_CFLAGS Makefile variable
GST_SET_ERROR_CFLAGS($GST_CVS)
dnl define correct errorlevel for debugging messages. We want to have GST_ERROR
dnl messages printed when running cvs builds
if test "x$GST_CVS" = "xyes"; then
- AC_DEFINE(GST_LEVEL_DEFAULT, GST_LEVEL_ERROR, [Default errorlevel to use])
+ GST_LEVEL_DEFAULT=GST_LEVEL_ERROR
+else
+ GST_LEVEL_DEFAULT=GST_LEVEL_NONE
fi
+AC_DEFINE_UNQUOTED(GST_LEVEL_DEFAULT, $GST_LEVEL_DEFAULT,
+ [Default errorlevel to use])
+AC_SUBST(GST_LEVEL_DEFAULT)
dnl *** checks for dependency libraries ***
dnl *** FIXME: name this part
dnl set license and copyright notice
-AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
+GST_LICENSE="LGPL"
+AC_DEFINE(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
+AC_SUBST(GST_LICENSE)
+
+dnl define LIBDIR so we can inform people where we live
+AS_AC_EXPAND(LIBDIR, $libdir)
+AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [library dir])
-dnl Set location of plugin directory
+dnl set location of plugin directory
AS_AC_EXPAND(PLUGINS_DIR, ${libdir}/gstreamer-$GST_MAJORMINOR)
AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory])
AC_SUBST(PLUGINS_DIR)
docs/pwg/Makefile
docs/xsl/Makefile
docs/version.entities
+win32/common/config.h
pkgconfig/Makefile
stamp.h
pkgconfig/gstreamer.pc
GST_VERSION_MINOR,
"gstelements",
"standard GStreamer elements",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
VERSION,
GST_LICENSE,
PACKAGE,
- GST_PACKAGE,
- GST_ORIGIN,
+ GST_PACKAGE_NAME,
+ GST_PACKAGE_ORIGIN,
GST_PADDING_INIT
};
GST_VERSION_MINOR,
"gstindexers",
"GStreamer core indexers",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
GST_VERSION_MINOR,
"gstelements",
"standard GStreamer elements",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
GST_VERSION_MINOR,
"gstindexers",
"GStreamer core indexers",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
/* config.h.in. Generated from configure.ac by autoheader. */
+/* This copy of config.h.in is specifically for win32 Visual Studio builds */
-/* always defined to indicate that i18n is enabled */
-/* #define ENABLE_NLS 1*/
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
/* gettext package name */
#define GETTEXT_PACKAGE "gstreamer-0.9"
+/* PREFIX - specifically added for Windows for easier moving */
#define PREFIX "C:\\gstreamer"
+
/* Location of registry */
#define GST_CACHE_DIR PREFIX "\\var\\cache"
/* macro to use to show function name */
-/*#undef GST_FUNCTION*/
+#undef GST_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
/* GStreamer license */
-#define GST_LICENSE "LGPL"
+#define GST_LICENSE LGPL
/* package origin */
-#define GST_ORIGIN "http://gstreamer.freedesktop.org/"
+#define GST_ORIGIN @GST_ORIGIN@
/* package name in plugins */
-#define GST_PACKAGE "GStreamer"
+#define GST_PACKAGE @GST_PACKAGE@
/* Define the version */
-#define GST_VERSION "0.9.3.1"
+#define GST_VERSION 0.9.3.1
-/* Define if the target CPU is an Alpha */
-/* #undef HAVE_CPU_ALPHA */
+/* Define if the host CPU is an Alpha */
+#undef HAVE_CPU_ALPHA
-/* Define if the target CPU is an ARM */
-/* #undef HAVE_CPU_ARM */
+/* Define if the host CPU is an ARM */
+#undef HAVE_CPU_ARM
-/* Define if the target CPU is a HPPA */
-/* #undef HAVE_CPU_HPPA */
+/* Define if the host CPU is a HPPA */
+#undef HAVE_CPU_HPPA
-/* Define if the target CPU is an x86 */
-#define HAVE_CPU_I386 1
+/* Define if the host CPU is an x86 */
+#undef HAVE_CPU_I386
-/* Define if the target CPU is a IA64 */
-/* #undef HAVE_CPU_IA64 */
+/* Define if the host CPU is a IA64 */
+#undef HAVE_CPU_IA64
-/* Define if the target CPU is a M68K */
-/* #undef HAVE_CPU_M68K */
+/* Define if the host CPU is a M68K */
+#undef HAVE_CPU_M68K
-/* Define if the target CPU is a MIPS */
-/* #undef HAVE_CPU_MIPS */
+/* Define if the host CPU is a MIPS */
+#undef HAVE_CPU_MIPS
-/* Define if the target CPU is a PowerPC */
-/* #undef HAVE_CPU_PPC */
+/* Define if the host CPU is a PowerPC */
+#undef HAVE_CPU_PPC
-/* Define if the target CPU is a S390 */
-/* #undef HAVE_CPU_S390 */
+/* Define if the host CPU is a S390 */
+#undef HAVE_CPU_S390
-/* Define if the target CPU is a SPARC */
-/* #undef HAVE_CPU_SPARC */
+/* Define if the host CPU is a SPARC */
+#undef HAVE_CPU_SPARC
-/* Define if the target CPU is a x86_64 */
-/* #undef HAVE_CPU_X86_64 */
+/* Define if the host CPU is a x86_64 */
+#undef HAVE_CPU_X86_64
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
-/* #undef HAVE_DCGETTEXT */
+#undef HAVE_DCGETTEXT
/* Defined if we have dladdr () */
-/* #undef HAVE_DLADDR */
+#undef HAVE_DLADDR
/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `fgetpos' function. */
+#define HAVE_FGETPOS 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `fsetpos' function. */
+#define HAVE_FSETPOS 1
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
/* defined if the compiler implements __func__ */
-#define HAVE_FUNC 1
+#undef HAVE_FUNC
/* defined if the compiler implements __FUNCTION__ */
-#define HAVE_FUNCTION 1
+#undef HAVE_FUNCTION
/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
+#undef HAVE_GETPAGESIZE
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
#undef HAVE_MEMORY_H
/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
+#undef HAVE_MMAP
/* defined if the compiler implements __PRETTY_FUNCTION__ */
-#define HAVE_PRETTY_FUNCTION 1
+#undef HAVE_PRETTY_FUNCTION
/* Defined if we have register_printf_function () */
-/* #undef HAVE_PRINTF_EXTENSION */
+#undef HAVE_PRINTF_EXTENSION
/* Define if RDTSC is available */
-/* #undef HAVE_RDTSC */
+#undef HAVE_RDTSC
-/* Defined if we have sigaction () */
-/* #undef HAVE_SIGACTION */
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
-/* defined if we have ucontext.h */
+/* Define to 1 if you have the <ucontext.h> header file. */
#undef HAVE_UCONTEXT_H
+/* defined if unaligned memory access works correctly */
+#undef HAVE_UNALIGNED_ACCESS
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if valgrind should be used */
-/* #undef HAVE_VALGRIND */
+#undef HAVE_VALGRIND
/* Defined if compiling for Windows */
#define HAVE_WIN32 1
#define LOCALEDIR PREFIX "\\share\\locale"
/* Name of package */
-#define PACKAGE "gstreamer"
+#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#undef PACKAGE_TARNAME
/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#undef PACKAGE_VERSION
/* Define the plugin directory */
#define PLUGINS_DIR PREFIX "\\lib\\gstreamer-0.9"
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define if we should use i586 optimized stack functions */
-#undef USE_FAST_STACK_TRASH
-
/* Define if we should poison deallocated memory */
#undef USE_POISONING
/* Version number of package */
-#define VERSION "0.9.3.1"
+#define VERSION 0.9.3.1
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
+#undef WORDS_BIGENDIAN
/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
+#undef _LARGE_FILES
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
-/* #undef inline */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif
--- /dev/null
+/* config.h.in. Generated from configure.ac by autoheader. */
+/* This copy of config.h.in is specifically for win32 Visual Studio builds */
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
+
+/* gettext package name */
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* PREFIX - specifically added for Windows for easier moving */
+#define PREFIX "C:\\gstreamer"
+
+/* Location of registry */
+#define GST_CACHE_DIR PREFIX "\\var\\cache"
+
+/* macro to use to show function name */
+#undef GST_FUNCTION
+
+/* Defined if gcov is enabled to force a rebuild due to config.h changing */
+#undef GST_GCOV_ENABLED
+
+/* Default errorlevel to use */
+#define GST_LEVEL_DEFAULT @GST_LEVEL_DEFAULT@
+
+/* GStreamer license */
+#define GST_LICENSE @GST_LICENSE@
+
+/* package origin */
+#define GST_ORIGIN @GST_ORIGIN@
+
+/* package name in plugins */
+#define GST_PACKAGE @GST_PACKAGE@
+
+/* Define the version */
+#define GST_VERSION @GST_VERSION@
+
+/* Define if the host CPU is an Alpha */
+#undef HAVE_CPU_ALPHA
+
+/* Define if the host CPU is an ARM */
+#undef HAVE_CPU_ARM
+
+/* Define if the host CPU is a HPPA */
+#undef HAVE_CPU_HPPA
+
+/* Define if the host CPU is an x86 */
+#undef HAVE_CPU_I386
+
+/* Define if the host CPU is a IA64 */
+#undef HAVE_CPU_IA64
+
+/* Define if the host CPU is a M68K */
+#undef HAVE_CPU_M68K
+
+/* Define if the host CPU is a MIPS */
+#undef HAVE_CPU_MIPS
+
+/* Define if the host CPU is a PowerPC */
+#undef HAVE_CPU_PPC
+
+/* Define if the host CPU is a S390 */
+#undef HAVE_CPU_S390
+
+/* Define if the host CPU is a SPARC */
+#undef HAVE_CPU_SPARC
+
+/* Define if the host CPU is a x86_64 */
+#undef HAVE_CPU_X86_64
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#undef HAVE_DCGETTEXT
+
+/* Defined if we have dladdr () */
+#undef HAVE_DLADDR
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `fgetpos' function. */
+#define HAVE_FGETPOS 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `fsetpos' function. */
+#define HAVE_FSETPOS 1
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
+
+/* defined if the compiler implements __func__ */
+#undef HAVE_FUNC
+
+/* defined if the compiler implements __FUNCTION__ */
+#undef HAVE_FUNCTION
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if libxml2 is available */
+#define HAVE_LIBXML2 1
+
+/* defined if we have makecontext () */
+#undef HAVE_MAKECONTEXT
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* defined if the compiler implements __PRETTY_FUNCTION__ */
+#undef HAVE_PRETTY_FUNCTION
+
+/* Defined if we have register_printf_function () */
+#undef HAVE_PRINTF_EXTENSION
+
+/* Define if RDTSC is available */
+#undef HAVE_RDTSC
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <ucontext.h> header file. */
+#undef HAVE_UCONTEXT_H
+
+/* defined if unaligned memory access works correctly */
+#undef HAVE_UNALIGNED_ACCESS
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define if valgrind should be used */
+#undef HAVE_VALGRIND
+
+/* Defined if compiling for Windows */
+#define HAVE_WIN32 1
+
+/* library dir */
+#define LIBDIR PREFIX "\\lib"
+
+/* gettext locale dir */
+#define LOCALEDIR PREFIX "\\share\\locale"
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define the plugin directory */
+#define PLUGINS_DIR PREFIX "\\lib\\gstreamer-0.9"
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if we should poison deallocated memory */
+#undef USE_POISONING
+
+/* Version number of package */
+#define VERSION @VERSION@
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif
* Use the GST_VERSION_* macros e.g. when defining own plugins. The GStreamer
* runtime checks if these plugin and core version match and refuses to use a
* plugin compiled against a different version of GStreamer.
- * You can also use the macros to keep the GStreamer version information in your
- * application.
+ * You can also use the macros to keep the GStreamer version information in
+ * your application.
*
* Use the gst_version() function if you want to know which version of
* GStreamer you are currently linked against.
* The micro version of GStreamer at compile time:
*/
#define GST_VERSION_MICRO (3)
+/**
+ * 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 (1)
-void gst_version (guint *major, guint *minor, guint *micro);
+void gst_version (guint *major, guint *minor, guint *micro, guint *nano);
G_END_DECLS
projects / platform / upstream / gstreamer.git / commitdiff