adding i18n tested with nl, seems to work fine

[platform/upstream/gstreamer.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4f3b01..6414ac8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CANONICAL_TARGET([])
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gstreamer, GST_VERSION, 0, 7, 2, 1, GST_CVS="no", GST_CVS="yes")
+AS_VERSION(gstreamer, GST_VERSION, 0, 7, 3, 1, GST_CVS="no", GST_CVS="yes")
 
 if test x$program_suffix = xNONE ; then
   program_suffix=-$GST_VERSION_MAJOR.$GST_VERSION_MINOR
@@ -26,28 +26,32 @@ dnl - library source changed -> increment REVISION
 dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
-AS_LIBTOOL(GST, 4, 0, 0)
+AS_LIBTOOL(GST, 5, 0, 0)
 
 AC_CONFIG_SRCDIR([gst/gst.c])
 AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
-dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
-ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS"
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
 AM_PROG_CC_STDC
 AM_PROG_AS
 AS="${CC}"
 
-dnl AC_PROC_INTLTOOL([0.26])
-dnl AM_GNU_GETTEXT([external])
-ALL_LINGUAS="de es no nl"
+dnl the gettext stuff needed
+AM_GNU_GETTEXT_VERSION(0.12)
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=gstreamer-$GST_VERSION_MAJOR.$GST_VERSION_MINOR
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE",[gettext package name])
-AM_GLIB_GNU_GETTEXT
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
+                   [gettext package name])
+
+dnl define LOCALEDIR in config.h
+AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
+AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
+                   [gettext locale dir])
 
-AM_GLIB_DEFINE_LOCALEDIR(GST_LOCALEDIR)
 
 dnl decide on error flags
 AS_COMPILER_FLAG(-Wall,GST_ERROR="$GST_ERROR -Wall",GST_ERROR="$GST_ERROR")
@@ -161,6 +165,22 @@ if test x$HAVE_CPU_PPC = xyes ; then
     true)
 fi
 
+AC_ARG_ENABLE(gcov,
+  [--enable-gcov         compile with coverage profiling instrumentation (gcc only)],
+  enable_gcov=$enableval,enable_gcov=no)
+if test x$enable_gcov = xyes ; then
+  AS_COMPILER_FLAG(["-fprofile-arcs"],
+    [GST_INT_CFLAGS="$GST_INT_CFLAGS -fprofile-arcs"],
+    true)
+  AS_COMPILER_FLAG(["-ftest-coverage"],
+    [GST_INT_CFLAGS="$GST_INT_CFLAGS -ftest-coverage"],
+    true)
+  GST_INT_CFLAGS=`echo "$GST_INT_CFLAGS" | sed -e 's/-O[0-9]*//g'`
+
+  AC_DEFINE_UNQUOTED(GST_GCOV_ENABLED, 1, [Defined if gcov is enabled to force a rebuild due to config.h changing])
+fi
+AM_CONDITIONAL(GST_GCOV_ENABLED, test x$enable_gcov = xyes)
+
 
 dnl Check for essential libraries first:
 dnl ====================================
@@ -591,16 +611,17 @@ libs/gst/Makefile
 libs/gst/bytestream/Makefile
 libs/gst/control/Makefile
 libs/gst/getbits/Makefile
-libs/ext/Makefile
 po/Makefile.in
 tests/Makefile
 tests/bufspeed/Makefile
+tests/instantiate/Makefile
 tests/memchunk/Makefile
 tests/muxing/Makefile
 tests/seeking/Makefile
 tests/sched/Makefile
 tests/threadstate/Makefile
 testsuite/Makefile
+testsuite/bins/Makefile
 testsuite/bytestream/Makefile
 testsuite/caps/Makefile
 testsuite/cleanup/Makefile