Update to another gettext public build

Original commit message from CVS:
Update to another gettext public build

diff --git a/ChangeLog b/ChangeLog
index 0576abc..e5dcda5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 2004-07-12  Steve Lhomme  <steve.lhomme@free.fr>
+       * docs/manual/win32.xml:
+       * win32/config.h:
+       * win32/gst-register.vcproj:
+       * win32/gstreamer.def:
+         Update to another gettext public build
+
+2004-07-12  Steve Lhomme  <steve.lhomme@free.fr>
     * gst/gstplugin.c:
       Fix an impossible C syntax
     * win32/config.h:

diff --git a/docs/manual/appendix-win32.xml b/docs/manual/appendix-win32.xml
index fa86d2b..e699afe 100644 (file)
--- a/docs/manual/appendix-win32.xml
+++ b/docs/manual/appendix-win32.xml
@@ -34,8 +34,8 @@ available in your system PATH.</para>
 <note>
 <title>Notes</title>
 
-<para>you can find Win32 versions of these libraries on <ulink url="http://gnuwin32.sourceforge.net/">http://gnuwin32.sourceforge.net/</ulink> 
-You will need the Binaries and Developer files for each package.</para>
+<para>you can find Win32 versions of these libraries on <ulink url="http://gettext.sourceforge.net/">http://gettext.sourceforge.net/</ulink> and
+<ulink url="http://gnuwin32.sourceforge.net/">http://gnuwin32.sourceforge.net/</ulink> (you will need the Binaries and Developer files for each package).</para>
 
 <para>GLib can be found on <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.4/" type="ftp">ftp://ftp.gtk.org/pub/gtk/v2.4/</ulink> and should be compiled from the 
 sources</para>

diff --git a/docs/manual/win32.xml b/docs/manual/win32.xml
index fa86d2b..e699afe 100644 (file)
--- a/docs/manual/win32.xml
+++ b/docs/manual/win32.xml
@@ -34,8 +34,8 @@ available in your system PATH.</para>
 <note>
 <title>Notes</title>
 
-<para>you can find Win32 versions of these libraries on <ulink url="http://gnuwin32.sourceforge.net/">http://gnuwin32.sourceforge.net/</ulink> 
-You will need the Binaries and Developer files for each package.</para>
+<para>you can find Win32 versions of these libraries on <ulink url="http://gettext.sourceforge.net/">http://gettext.sourceforge.net/</ulink> and
+<ulink url="http://gnuwin32.sourceforge.net/">http://gnuwin32.sourceforge.net/</ulink> (you will need the Binaries and Developer files for each package).</para>
 
 <para>GLib can be found on <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.4/" type="ftp">ftp://ftp.gtk.org/pub/gtk/v2.4/</ulink> and should be compiled from the 
 sources</para>

diff --git a/win32/config.h b/win32/config.h
index d0d7eed..f9f65a2 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
@@ -1,7 +1,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 0
+#define ENABLE_NLS 1
 
 /* gettext package name */
 #define GETTEXT_PACKAGE "gstreamer-0.8"

diff --git a/win32/gst-register.vcproj b/win32/gst-register.vcproj
index 10c286c..2790adc 100644 (file)
--- a/win32/gst-register.vcproj
+++ b/win32/gst-register.vcproj
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -34,11 +34,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
                                OutputFile="$(OutDir)/gst-register.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@@ -73,7 +73,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -85,11 +85,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
                                OutputFile="$(OutDir)/gst-register.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/win32/gstreamer.def b/win32/gstreamer.def
index 503ceae..640af48 100644 (file)
--- a/win32/gstreamer.def
+++ b/win32/gstreamer.def
@@ -196,6 +196,7 @@ EXPORTS
         gst_marshal_VOID__UINT_BOXED
         gst_marshal_BOOLEAN__POINTER
         gst_marshal_VOID__POINTER_OBJECT
+        GST_CAT_DEFAULT
         _gst_element_error_printf
         _gst_bin_type           DATA
         _gst_element_type       DATA

diff --git a/win32/vs7/gst-register.vcproj b/win32/vs7/gst-register.vcproj
index 10c286c..2790adc 100644 (file)
--- a/win32/vs7/gst-register.vcproj
+++ b/win32/vs7/gst-register.vcproj
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -34,11 +34,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
                                OutputFile="$(OutDir)/gst-register.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@@ -73,7 +73,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -85,11 +85,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
                                OutputFile="$(OutDir)/gst-register.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/win32/vs7/gstreamer.def b/win32/vs7/gstreamer.def
index 503ceae..640af48 100644 (file)
--- a/win32/vs7/gstreamer.def
+++ b/win32/vs7/gstreamer.def
@@ -196,6 +196,7 @@ EXPORTS
         gst_marshal_VOID__UINT_BOXED
         gst_marshal_BOOLEAN__POINTER
         gst_marshal_VOID__POINTER_OBJECT
+        GST_CAT_DEFAULT
         _gst_element_error_printf
         _gst_bin_type           DATA
         _gst_element_type       DATA