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

include/mediastreamer2/mstee.h

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef mstee_h
 #define mstee_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 /*mute/unmute some outputs of the MSTee */
 #define MS_TEE_UNMUTE	MS_FILTER_METHOD(MS_TEE_ID,0,int)

include/mediastreamer2/msticker.h

@@ -21,9 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MS_TICKER_H
 #define MS_TICKER_H
 
-
-#include "msfilter.h"
-#include "mscommon.h"
+#include <mediastreamer2/msfilter.h>
 
 /**
  * @file msticker.h

include/mediastreamer2/mstonedetector.h

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef mstonedetector_h
 #define mstonedetector_h
 
-#include "mediastreamer2/msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 /**
  * Structure describing which tone is to be detected.

include/mediastreamer2/msv4l.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msv4l_h
 #define msv4l_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 #define	MS_V4L_START		MS_FILTER_METHOD_NO_ARG(MS_V4L_ID,0)
 #define	MS_V4L_STOP			MS_FILTER_METHOD_NO_ARG(MS_V4L_ID,1)

include/mediastreamer2/msvideo.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msvideo_h
 #define msvideo_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 /* some global constants for video MSFilter(s) */
 #define MS_VIDEO_SIZE_SQCIF_W 128

include/mediastreamer2/msvolume.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef msvolume_h
 #define msvolume_h
 
-#include "msfilter.h"
+#include <mediastreamer2/msfilter.h>
 
 /**
  * The Volume MSFilter can do:

include/mediastreamer2/mswebcam.h

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

include/mediastreamer2/rfc3984.h

@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef rfc3984_h
 #define rfc3984_h
 
-#include "mediastreamer2/mscommon.h"
-#include "mediastreamer2/msqueue.h"
+#include <mediastreamer2/mscommon.h>
+#include <mediastreamer2/msqueue.h>
 
 /*
 This file declares an API useful to pack/unpack H264 nals as described in RFC3984

include/mediastreamer2/waveheader.h

@@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /* the following code was taken from a free software utility that I don't remember the name. */
 /* sorry */
 
-#ifdef HAVE_CONFIG_H
-#include "mediastreamer-config.h"
-#endif
-
 #ifndef waveheader_h
 #define waveheader_h
 

src/Makefile.am

 
 
-
 ANDROID_SRC_FILES= \
 	msandroid.cpp \
 	android-display.c \
@@ -202,18 +201,18 @@ if BUILD_WIN32_WCE
 libmediastreamer_la_LIBADD+=	-lmmtimer
 endif
 
-AM_CFLAGS=	-I$(top_srcdir)  \
-                $(ORTP_CFLAGS)   \
+AM_CFLAGS= $(ORTP_CFLAGS)   \
 		$(SPEEX_CFLAGS)  \
 		$(GSM_CFLAGS)    \
 		$(STRICT_OPTIONS) \
-		$(LIBPULSE_CFLAGS) \
-		-DPACKAGE_PLUGINS_DIR=\"$(PACKAGE_PLUGINS_DIR)\"
+		$(LIBPULSE_CFLAGS) 
+		
 
-AM_CXXFLAGS= 	-I$(top_srcdir)  \
-                $(ORTP_CFLAGS)   \
+AM_CXXFLAGS= $(ORTP_CFLAGS)   \
 		$(STRICT_OPTIONS)
 
+DEFS=@DEFS@  -DPACKAGE_PLUGINS_DIR=\"$(PACKAGE_PLUGINS_DIR)\" -DLOCALEDIR=\"$(localedir)\" -DMS2_INTERNAL
+
 if BUILD_VIDEO
 AM_CFLAGS+=$(VIDEO_CFLAGS)
 endif

src/alsa.c

@@ -17,7 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-
+#if defined(HAVE_CONFIG_H)
+#include "mediastreamer-config.h"
+#endif
 
 #include <alsa/asoundlib.h>
 

src/audiomixer.c

@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+
 #include "mediastreamer2/msaudiomixer.h"
 #include "mediastreamer2/msticker.h"
 

src/dsptools.c

@@ -52,6 +52,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
+
 #include <mediastreamer2/dsptools.h>
 
 #ifdef HAVE_ALLOCA_H

src/eventqueue.c

@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+
 #include "mediastreamer2/mseventqueue.h"
 #include "mediastreamer2/msfilter.h"
 

src/extdisplay.c

@@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "mediastreamer-config.h"
+#endif
 
 #include "mediastreamer2/msextdisplay.h"
 

src/ice.c

@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+
 #if !defined(WIN32) && !defined(_WIN32_WCE)
 #ifdef __APPLE__
 #include <sys/types.h>
@@ -27,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "mediastreamer2/msticker.h"
 #include "mediastreamer2/ice.h"
-#include "mediastreamer2/mscommon.h"
 
 static void 
 ice_sendtest( struct IceCheckList *checklist, struct CandidatePair *remote_candidate, Socket myFd, StunAddress4 *dest, 

src/itc.c

@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+
 #include "mediastreamer2/msitc.h"
 
 typedef struct SourceState{

src/jpegwriter.c

@@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
 
 #include "mediastreamer2/msjpegwriter.h"
 #include "mediastreamer2/msvideo.h"

src/kiss_fft.c

@@ -13,7 +13,9 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
 
 #include "_kiss_fft_guts.h"
 

src/kiss_fftr.c

@@ -12,7 +12,9 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
 
 #include "kiss_fftr.h"
 #include "_kiss_fft_guts.h"

src/layouts.c

@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
+
 #include "layouts.h"
 
 

src/mscommon.c

@@ -582,6 +582,10 @@ void ms_init(){
 	int i;
 	MSSndCardManager *cm;
 
+#if defined(ENABLE_NLS)
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+#endif
+
 #if !defined(_WIN32_WCE)
 	if (getenv("MEDIASTREAMER_DEBUG")!=NULL){
 		ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);

src/msfileplayer.c

@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "mediastreamer-config.h"
+#endif
+
 #include "mediastreamer2/msfileplayer.h"
 #include "mediastreamer2/waveheader.h"
 #include "mediastreamer2/msticker.h"

src/msfilerec.c

@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "mediastreamer-config.h"
+#endif
+
 #include "mediastreamer2/msfilerec.h"
 #include "mediastreamer2/waveheader.h"
 

src/msfilter.c

@@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "mediastreamer2/msfilter.h"