extras/contrib/*: don't use gettext *printf replacements on BeOS even

  though there're not 100% posix compliant - this way we can build vlc
  with dynamic plugins (not linked against libintl) again

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index aa0438e6625eb69612df14569a60b1c336b85f55..de77e195d78c37209702536a77baed73f6f52e23 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -259,7 +259,7 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
-#      patch -p 0 < Patches/gettext.patch
+       patch -p 0 < Patches/gettext.patch
 
 .intl: gettext .iconv
        ( cd $< && ./configure --prefix=$(PREFIX) )

diff --git a/extras/contrib/src/Patches/gettext.patch b/extras/contrib/src/Patches/gettext.patch
index fea41164572ed1a1cb9a0b73971df5b6c820d297..d828a39db4784d5b1de1a2cffd2851fad9646fec 100644 (file)
--- a/extras/contrib/src/Patches/gettext.patch
+++ b/extras/contrib/src/Patches/gettext.patch
@@ -1,6 +1,30 @@
+diff -ru gettext-original/gettext-runtime/intl/libgnuintl.h.in gettext/gettext-runtime/intl/libgnuintl.h.in
+--- gettext-original/gettext-runtime/intl/libgnuintl.h.in      Sun Nov 16 16:27:58 2003
++++ gettext/gettext-runtime/intl/libgnuintl.h.in       Fri Aug 20 12:34:40 2004
+@@ -280,7 +280,7 @@
+    or gettext() but for which the format string could be the return value
+    of _() or gettext() need to add this #include.  Oh well.  */
+ 
+-#if !@HAVE_POSIX_PRINTF@
++#if !@HAVE_POSIX_PRINTF@ && !defined(__BEOS__)
+ 
+ #include <stdio.h>
+ #include <stddef.h>
+diff -ru gettext-original/gettext-runtime/intl/printf.c gettext/gettext-runtime/intl/printf.c
+--- gettext-original/gettext-runtime/intl/printf.c     Wed Sep 17 18:09:12 2003
++++ gettext/gettext-runtime/intl/printf.c      Fri Aug 20 12:34:40 2004
+@@ -45,7 +45,7 @@
+ 
+ #include <stdio.h>
+ 
+-#if !HAVE_POSIX_PRINTF
++#if !HAVE_POSIX_PRINTF && !defined(__BEOS__)
+ 
+ #include <stdlib.h>
+ #include <string.h>
 diff -ru gettext-original/gettext-runtime/libasprintf/autosprintf.cc gettext/gettext-runtime/libasprintf/autosprintf.cc
---- gettext-original/gettext-runtime/libasprintf/autosprintf.cc        Mon Oct 28 19:44:32 2002
-+++ gettext/gettext-runtime/libasprintf/autosprintf.cc Thu Jul 22 10:23:30 2004
+--- gettext-original/gettext-runtime/libasprintf/autosprintf.cc        Mon Oct 28 20:44:32 2002
++++ gettext/gettext-runtime/libasprintf/autosprintf.cc Fri Aug 20 13:09:56 2004
 @@ -32,6 +32,51 @@
  #include <string.h>
  #include "lib-asprintf.h"
@@ -53,3 +77,27 @@ diff -ru gettext-original/gettext-runtime/libasprintf/autosprintf.cc gettext/get
  namespace gnu
  {
  
+diff -ru gettext-original/gettext-runtime/libasprintf/lib-asprintf.c gettext/gettext-runtime/libasprintf/lib-asprintf.c
+--- gettext-original/gettext-runtime/libasprintf/lib-asprintf.c        Fri Jun 20 14:52:05 2003
++++ gettext/gettext-runtime/libasprintf/lib-asprintf.c Fri Aug 20 12:34:40 2004
+@@ -21,7 +21,7 @@
+ # include <config.h>
+ #endif
+ 
+-#if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF)
++#if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF) && !defined(__BEOS__)
+ 
+ #define STATIC static
+ 
+diff -ru gettext-original/gettext-runtime/libasprintf/lib-asprintf.h gettext/gettext-runtime/libasprintf/lib-asprintf.h
+--- gettext-original/gettext-runtime/libasprintf/lib-asprintf.h        Fri Jun 20 14:56:51 2003
++++ gettext/gettext-runtime/libasprintf/lib-asprintf.h Fri Aug 20 12:34:40 2004
+@@ -21,7 +21,7 @@
+ # include <config.h>
+ #endif
+ 
+-#if HAVE_VASPRINTF && HAVE_POSIX_PRINTF
++#if ( HAVE_VASPRINTF && HAVE_POSIX_PRINTF ) || defined(__BEOS__)
+ 
+ /* Get asprintf(), vasprintf() declarations.  */
+ #include <stdio.h>