windows build fixes

autogen.sh

@@ -10,6 +10,15 @@ else
 	AUTOMAKE=automake-${AM_VERSION}
 fi
 
+INTLTOOLIZE=/usr/bin/intltoolize
+
+if test -f /opt/local/bin/intltoolize ; then
+INTLTOOLIZE=/opt/local/bin/intltoolize
+else
+INTLTOOLIZE=/usr/bin/intltoolize
+fi
+
+
 libtoolize="libtoolize"
 for lt in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do
         if test -x /usr/bin/$lt ; then
@@ -43,7 +52,7 @@ fi
 echo "Generating build scripts in mediastreamer..."
 set -x
 $libtoolize --copy --force
-intltoolize --copy --force --automake
+$INTLTOOLIZE --copy --force --automake
 $ACLOCAL  $ACLOCAL_ARGS
 autoheader
 $AUTOMAKE --force-missing --add-missing --copy ${AUTOMAKE_FLAGS}

configure.ac

@@ -81,15 +81,6 @@ 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
 		*hpux*)
@@ -176,6 +167,25 @@ dnl ORTP_STATIC to tell ortp not to export its variable with dllexport, as if we
      ;;
 esac
 
+
+dnl localization tools
+IT_PROG_INTLTOOL([0.40], [no-xml])
+
+
+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 "$mingw_found" != "yes" ; then
+	dnl gettext macro does not work properly under mingw. And we want to use the one provided by GTK.
+	AM_GNU_GETTEXT([external])
+	AM_GNU_GETTEXT_VERSION([0.18])
+	LIBS="$LIBS $LIBINTL"
+else
+	AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
+	AC_DEFINE(HAVE_GETTEXT,1,[Tells wheter localisation is possible])
+	LIBS="$LIBS -lintl"
+fi
+
 AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
 
 AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)

po/mediastreamer.pot

-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-06 10:26+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/alaw.c:144 ../src/alaw.c:162
-msgid "ITU-G.711 alaw encoder"
-msgstr ""
-
-#: ../src/alaw.c:194 ../src/alaw.c:211
-msgid "ITU-G.711 alaw decoder"
-msgstr ""
-
-#: ../src/alsa.c:952
-msgid "Alsa sound source"
-msgstr ""
-
-#: ../src/alsa.c:1056
-msgid "Alsa sound output"
-msgstr ""
-
-#: ../src/aqsnd.c:1008
-msgid "Sound capture filter for MacOS X Audio Queue Service"
-msgstr ""
-
-#: ../src/aqsnd.c:1032
-msgid "Sound playback filter for MacOS X Audio Queue Service"
-msgstr ""
-
-#: ../src/dtmfgen.c:287 ../src/dtmfgen.c:306
-msgid "DTMF generator"
-msgstr ""
-
-#: ../src/gsm.c:120 ../src/gsm.c:138
-msgid "The GSM full-rate codec"
-msgstr ""
-
-#: ../src/gsm.c:187 ../src/gsm.c:205
-msgid "The GSM codec"
-msgstr ""
-
-#: ../src/macsnd.c:627
-msgid "Sound capture filter for MacOS X Audio Unit"
-msgstr ""
-
-#: ../src/macsnd.c:642
-msgid "Sound playback filter for MacOS X Audio Unit"
-msgstr ""
-
-#: ../src/msconf.c:787 ../src/msconf.c:805
-msgid "A filter to make conferencing"
-msgstr ""
-
-#: ../src/msfileplayer.c:315 ../src/msfileplayer.c:333
-msgid "Raw files and wav reader"
-msgstr ""
-
-#: ../src/msfilerec.c:174 ../src/msfilerec.c:192 ../src/msfilerec_win.c:216
-#: ../src/msfilerec_win.c:234
-msgid "Wav file recorder"
-msgstr ""
-
-#: ../src/msjoin.c:49 ../src/msjoin.c:67
-msgid "A filter that send several inputs to one output."
-msgstr ""
-
-#: ../src/msresample.c:159 ../src/msresample.c:177
-msgid "Audio resampler"
-msgstr ""
-
-#: ../src/msrtp.c:370 ../src/msrtp.c:388
-msgid "RTP output filter"
-msgstr ""
-
-#: ../src/msrtp.c:506 ../src/msrtp.c:524
-msgid "RTP input filter"
-msgstr ""
-
-#: ../src/msspeex.c:360 ../src/msspeex.c:378 ../src/msspeex.c:548
-#: ../src/msspeex.c:567
-msgid "The free and wonderful speex codec"
-msgstr ""
-
-#: ../src/msvolume.c:528 ../src/msvolume.c:543
-msgid "A filter that controls and measure sound volume"
-msgstr ""
-
-#: ../src/msv4l.c:1012
-msgid "A video4linux compatible source filter to stream pictures."
-msgstr ""
-
-#: ../src/msv4l2.c:554
-msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-msgstr ""
-
-#: ../src/nowebcam.c:1854
-msgid "A filter that outputs a static image."
-msgstr ""
-
-#: ../src/pixconv.c:129 ../src/pixconv.c:147
-msgid "A pixel format converter"
-msgstr ""
-
-#: ../src/sizeconv.c:202
-msgid "A video size converter"
-msgstr ""
-
-#: ../src/sizeconv.c:220
-msgid "a small video size converter"
-msgstr ""
-
-#: ../src/speexec.c:453 ../src/speexec.c:471
-msgid "Echo canceller using speex library"
-msgstr ""
-
-#: ../src/tee.c:81 ../src/tee.c:99
-msgid "A filter that reads from input and copy to its multiple outputs."
-msgstr ""
-
-#: ../src/theora.c:376
-msgid "The theora video encoder from xiph.org"
-msgstr ""
-
-#: ../src/theora.c:394
-msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-msgstr ""
-
-#: ../src/theora.c:562 ../src/theora.c:580
-msgid "The theora video decoder from xiph.org"
-msgstr ""
-
-#: ../src/ulaw.c:147 ../src/ulaw.c:165
-msgid "ITU-G.711 ulaw encoder"
-msgstr ""
-
-#: ../src/ulaw.c:197 ../src/ulaw.c:215
-msgid "ITU-G.711 ulaw decoder"
-msgstr ""
-
-#: ../src/videodec.c:713 ../src/videodec.c:729 ../src/videodec.c:812
-#: ../src/videodec.c:828
-msgid "A H.263 decoder using ffmpeg library"
-msgstr ""
-
-#: ../src/videodec.c:746
-msgid "A MPEG4 decoder using ffmpeg library"
-msgstr ""
-
-#: ../src/videodec.c:762
-msgid "A RTP/JPEG decoder using ffmpeg library"
-msgstr ""
-
-#: ../src/videodec.c:778
-msgid "A MJPEG decoder using ffmpeg library"
-msgstr ""
-
-#: ../src/videodec.c:794
-msgid "A snow decoder using ffmpeg library"
-msgstr ""
-
-#: ../src/videoenc.c:908 ../src/videoenc.c:990
-msgid "A video H.263 encoder using ffmpeg library."
-msgstr ""
-
-#: ../src/videoenc.c:924
-msgid ""
-"A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
-"spec."
-msgstr ""
-
-#: ../src/videoenc.c:940 ../src/videoenc.c:1022
-msgid "A video MPEG4 encoder using ffmpeg library."
-msgstr ""
-
-#: ../src/videoenc.c:956
-msgid "A video snow encoder using ffmpeg library."
-msgstr ""
-
-#: ../src/videoenc.c:972
-msgid "A RTP/MJPEG encoder using ffmpeg library."
-msgstr ""
-
-#: ../src/videoenc.c:1006
-msgid ""
-"A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
-msgstr ""
-
-#: ../src/videoenc.c:1038
-msgid ""
-"The snow codec is royalty-free and is open-source. \n"
-"It uses innovative techniques that makes it one of most promising video "
-"codec. It is implemented within the ffmpeg project.\n"
-"However it is under development, quite unstable and compatibility with other "
-"versions cannot be guaranteed."
-msgstr ""
-
-#: ../src/videoenc.c:1058
-msgid "A MJPEG encoder using ffmpeg library."
-msgstr ""
-
-#: ../src/videoout.c:933
-msgid "A SDL-based video display"
-msgstr ""
-
-#: ../src/wincevideods.c:969 ../src/wincevideods.c:987 ../src/winvideo.c:596
-#: ../src/winvideo.c:614 ../src/winvideods.c:1385 ../src/winvideods.c:1403
-msgid "A video4windows compatible source filter to stream pictures."
-msgstr ""
-
-#: ../src/winvideo2.c:436 ../src/winvideo2.c:454
-msgid "A video for windows (vfw.h) based source filter to grab pictures."
-msgstr ""
-
-#: ../src/ice.c:1349 ../src/ice.c:1367
-msgid "ICE filter"
-msgstr ""
-
-#: ../src/void.c:35 ../src/void.c:52
-msgid "A filter that trashes its input (useful for terminating some graphs)."
-msgstr ""
-
-#: ../src/equalizer.c:338 ../src/equalizer.c:356
-msgid "Parametric sound equalizer."
-msgstr ""
-
-#: ../src/msdscap-mingw.cc:1038
-msgid "A webcam grabber based on directshow."
-msgstr ""
-
-#: ../src/drawdib-display.c:552 ../src/drawdib-display.c:570
-msgid "A video display based on windows DrawDib api"
-msgstr ""
-
-#: ../src/audiomixer.c:193 ../src/audiomixer.c:212
-msgid "A filter that mixes down 16 bit sample audio streams"
-msgstr ""
-
-#: ../src/chanadapt.c:110 ../src/chanadapt.c:128
-msgid "A filter that converts from mono to stereo and vice versa."
-msgstr ""
-
-#: ../src/itc.c:98 ../src/itc.c:116 ../src/itc.c:198 ../src/itc.c:216
-msgid "Inter ticker communication filter."
-msgstr ""
-
-#: ../src/extdisplay.c:65 ../src/extdisplay.c:82
-msgid "A display filter sending the buffers to draw to the upper layer"
-msgstr ""
-
-#: ../src/msiounit.c:650
-msgid "Sound capture filter for MacOS X Audio Unit Service"
-msgstr ""
-
-#: ../src/msiounit.c:664
-msgid "Sound playback filter for MacOS X Audio Unit Service"
-msgstr ""
-
-#: ../src/x11video.c:562
-msgid "A video display using X11+Xv"
-msgstr ""
-
-#. .id=
-#. .name=
-#. .text=
-#: ../src/msandroid.cpp:370
-msgid "Sound capture filter for Android"
-msgstr ""
-
-#. .id=
-#. .name=
-#. .text=
-#: ../src/msandroid.cpp:667
-msgid "Sound playback filter for Android"
-msgstr ""
-
-#: ../src/msandroidvideo.cpp:134
-msgid "A filter that captures Android video."
-msgstr ""