i18n of mediastreamer2

ChangeLog

+2011-02-14  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.am (SUBDIRS): Add po.
+	(ACLOCAL_AMFLAGS): New variable.
+	(EXTRA_DIST): Add config.rpath, m4/ChangeLog.
+	* configure.ac (AC_OUTPUT): Add po/Makefile.in.
+

Makefile.am

 
 EXTRA_DIST=mediastreamer-config.h.in pkg.list autogen.sh mediastreamer.pc.in mediastreamer2.spec.in mediastreamer2.spec
 
-SUBDIRS=src build include tests help
+SUBDIRS=po src build include tests help
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mediastreamer.pc
@@ -58,3 +58,5 @@ clean-local:
 	rm -f files.list
 
 endif WITH_EPM
+
+ACLOCAL_AMFLAGS = -I m4

autogen.sh

@@ -43,6 +43,7 @@ fi
 echo "Generating build scripts in mediastreamer..."
 set -x
 $libtoolize --copy --force
+intltoolize --copy --force --automake
 $ACLOCAL  $ACLOCAL_ARGS
 autoheader
 $AUTOMAKE --force-missing --add-missing --copy ${AUTOMAKE_FLAGS}

configure.ac

@@ -71,24 +71,24 @@ if test x$ipv6 = xtrue ; then
 fi
 
 
-AC_ARG_ENABLE(debug,
-			[  --enable-debug=[yes/no]   enables the display of traces showing the execution of the library. [default=yes]],
-			[case "${enableval}" in
-				yes) debug_enabled=yes;;
-				no) debug_enabled=no;;
-				*) AC_MSG_ERROR("Bad value for --enable-debug");;
-			esac],
-			[debug_enabled=no] )
-
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_OBJC
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
+AC_CONFIG_MACRO_DIR([m4])
+LT_INIT([win32-dll shared disable-static])
+
+
+AC_SUBST([LIBTOOL_DEPS])
+
+dnl localization tools
+IT_PROG_INTLTOOL([0.40], [no-xml])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18])
+GETTEXT_PACKAGE="mediastreamer"
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,["mediastreamer"],[name of the gettext domain. Used in the call to 'bindtextdomain()'])
+AC_SUBST([GETTEXT_PACKAGE])
 
 if test "$GCC" != "yes" ; then
 	case $target_os in
@@ -101,13 +101,29 @@ else
 	CFLAGS="$CFLAGS -Wall"
 fi
 
-
-
-if test $debug_enabled = "yes"; then
-	CFLAGS="$CFLAGS -g -DDEBUG"
-else
-	CFLAGS="$CFLAGS -O2 -g "
-fi
+AC_ARG_ENABLE([debug],
+			AS_HELP_STRING([--enable-debug=@<:@yes/no@:>@],[enables the display of traces showing the execution of the library. @<:@default=yes@:>@]),
+			[],											dnl [action-if-given]
+			[enable_debug=no])							dnl [action-if-not-given]
+ 
+
+AS_CASE([$enable_debug],
+		[yes],[
+			CFLAGS="$CFLAGS -g -DDEBUG"
+			CXXFLAGS="$CXXFLAGS -g -DDEBUG"
+		],
+		[no],
+		[
+			case "$CFLAGS" in
+				*-O*)
+				;;
+				*)
+				CFLAGS="$CFLAGS -O2 -g"
+				CXXFLAGS="$CXXFLAGS -O2 -g"
+				;;
+			esac
+		],
+		[AC_MSG_ERROR([Bad value ($enable_debug) for --enable-debug. Valid values are yes or no.])])
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -701,13 +717,14 @@ AC_SUBST(VENDOR)
 RELEASE=1
 AC_SUBST(RELEASE)
 
-CFLAGS="$CFLAGS $MS_PUBLIC_CFLAGS"
-CXXFLAGS="$CXXFLAGS $MS_PUBLIC_CFLAGS"
+CFLAGS="$CFLAGS $MS_PUBLIC_CFLAGS "
+CXXFLAGS="$CXXFLAGS $MS_PUBLIC_CFLAGS "
 dnl: these ones gets exported in pkgconfig file.
 AC_SUBST(MS_PUBLIC_CFLAGS)
 
-AC_OUTPUT(
+AC_CONFIG_FILES(
 Makefile
+po/Makefile.in
 include/Makefile
 include/mediastreamer2/Makefile
 src/Makefile
@@ -725,3 +742,6 @@ help/Doxyfile
 help/doxygen.dox
 )
 
+AC_OUTPUT
+
+

include/mediastreamer2/dtmfgen.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef dtmfgen_h
 #define dtmfgen_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 #define MS_DTMF_GEN_PUT		MS_FILTER_METHOD(MS_DTMF_GEN_ID,0,const char)
 /** Plays dtmf tone given in argument with default duration*/

include/mediastreamer2/ice.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef ice_hh
 #define ice_hh
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 #include "ortp/stun_udp.h"
 #include "ortp/stun.h"
 #include "ortp/ortp.h"

include/mediastreamer2/mediastream.h

@@ -21,15 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MEDIASTREAM_H
 #define MEDIASTREAM_H
 
-#include "mediastreamer2/msfilter.h"
-#include "mediastreamer2/msticker.h"
-#include "mediastreamer2/mssndcard.h"
-#include "mediastreamer2/mswebcam.h"
-#include "mediastreamer2/msvideo.h"
-#include "ortp/ortp.h"
-#include "ortp/event.h"
-
-
+#include <mediastreamer2/msfilter.h>
+#include <mediastreamer2/msticker.h>
+#include <mediastreamer2/mssndcard.h>
+#include <mediastreamer2/mswebcam.h>
+#include <mediastreamer2/msvideo.h>
+#include <ortp/ortp.h>
+#include <ortp/event.h>
 
 
 typedef enum EchoLimiterType{

include/mediastreamer2/msaudiomixer.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msaudiomixer_h
 #define msaudiomixer_h
 
-#include "mediastreamer2/msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 typedef struct MSAudioMixerCtl{
 	int pin;

include/mediastreamer2/mschanadapter.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef mchanadapter_h
 #define mchanadapter_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 #define MS_CHANNEL_ADAPTER_SET_OUTPUT_NCHANNELS	MS_FILTER_METHOD(MS_CHANNEL_ADAPTER_ID,0,int)
 #define MS_CHANNEL_ADAPTER_GET_OUTPUT_NCHANNELS	MS_FILTER_METHOD(MS_CHANNEL_ADAPTER_ID,1,int)

include/mediastreamer2/mscommon.h

@@ -78,8 +78,6 @@ static inline void ms_debug(const char *fmt,...)
 #endif	
 #endif
 
-
-
 #define ms_message	ortp_message
 #define ms_warning	ortp_warning
 #define ms_error	ortp_error
@@ -219,8 +217,21 @@ MS2_PUBLIC void ms_set_mtu(int mtu);
 }
 #endif
 
+#ifdef MS2_INTERNAL
+#  ifdef HAVE_CONFIG_H
+#  include "mediastreamer-config.h" /*necessary to know if ENABLE_NLS is there*/
+#  endif
+#  if defined(ENABLE_NLS)
+#    include <libintl.h>
+#    define _(String) dgettext (GETTEXT_PACKAGE, String)
+#  else
+#    define _(String) (String)
+#  endif // ENABLE_NLS
+#define N_(String) (String)
+#endif // MS2_INTERNAL
 
 #ifdef ANDROID
 #include "mediastreamer2/msjava.h"
 #endif
 #endif
+

include/mediastreamer2/mseventqueue.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef mseventqueue_h
 #define mseventqueue_h
 
-#include "mediastreamer2/mscommon.h"
+#include <mediastreamer2/mscommon.h>
 
 typedef struct _MSEventQueue MSEventQueue;
 

include/mediastreamer2/msextdisplay.h

@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msextdisplay_h
 #define msextdisplay_h
 
-#include "mediastreamer2/msfilter.h"
-#include "mediastreamer2/msvideo.h"
+#include <mediastreamer2/msfilter.h>
+#include <mediastreamer2/msvideo.h>
 
 typedef struct _MSExtDisplayOutput{
 	MSPicture remote_view;

include/mediastreamer2/msfileplayer.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msfileplayer_h
 #define msfileplayer_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 
 /*methods*/

include/mediastreamer2/msfilerec.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msfilerec_h
 #define msfilerec_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 extern MSFilterDesc ms_file_rec_desc;
 

include/mediastreamer2/msfilter.h

@@ -573,7 +573,4 @@ void ms_filter_unregister_all(void);
 /* used by awk script in Makefile.am to generate alldescs.c */
 #define MS_FILTER_DESC_EXPORT(desc)
 
-/* xgettext markup */
-#define N_(String) String
-
 #endif

include/mediastreamer2/msitc.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msitc_h
 #define msitc_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 #define MS_ITC_SINK_CONNECT MS_FILTER_METHOD(MS_ITC_SINK_ID,0,MSFilter)
 

include/mediastreamer2/msjpegwriter.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msjpegwriter_h
 #define msjpegwriter_h
 
-#include "mediastreamer2/msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 #define MS_JPEG_WRITER_TAKE_SNAPSHOT	MS_FILTER_METHOD(MS_JPEG_WRITER_ID,0,const char)
 

include/mediastreamer2/msqueue.h

@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MSQUEUE_H
 #define MSQUEUE_H
 
-#include "ortp/str_utils.h"
-#include "mediastreamer2/mscommon.h"
+#include <ortp/str_utils.h>
+#include <mediastreamer2/mscommon.h>
 
 /* for the moment these are stupid queues limited to one element*/
 

include/mediastreamer2/msrtp.h

@@ -21,9 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msrtp_hh
 #define msrtp_hh
 
-#include "msfilter.h"
-#include "ice.h"
-#include "ortp/ortp.h"
+#include <mediastreamer2/msfilter.h>
+#include <mediastreamer2/ice.h>
+#include <ortp/ortp.h>
 
 #define MS_RTP_RECV_SET_SESSION		MS_FILTER_METHOD(MS_RTP_RECV_ID,0,RtpSession*)
 

include/mediastreamer2/mssndcard.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef sndcard_h
 #define sndcard_h
 
-#include "mscommon.h"
+#include <mediastreamer2/mscommon.h>
 
 /**
  * @file mssndcard.h