Changeset 1370:275fd07bf923 in mediastreamer2

Timestamp:

Apr 7, 2011 5:34:35 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

windows build fixes

Files:

• autogen.sh (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• po/mediastreamer.pot (deleted)

autogen.sh

@@ -10 +10 @@
         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"
@@ -44 +53 @@
 set -x
 $libtoolize --copy --force
-intltoolize --copy --force --automake
+$INTLTOOLIZE --copy --force --automake
 $ACLOCAL  $ACLOCAL_ARGS
 autoheader

configure.ac

@@ -81 +81 @@
 
 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
@@ -177 +168 @@
 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)