summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac62
4 files changed, 53 insertions, 36 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ed0ecb0..3280377b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-08 Andy Wingo <wingo@pobox.com>
+
+ * gst/avi/Makefile.am (libgstavi_la_CFLAGS): No gettext hacks, the
+ defines come from config.h.
+
+ * autogen.sh: Run autopoint, etc.
+
+ * Makefile.am (DIST_SUBDIRS, SUBDIRS): Go into po/.
+
+ * configure.ac: Add gettext stuff.
+
2005-07-07 Wim Taymans <wim@fluendo.com>
* gst/videobox/gstvideobox.c: (gst_video_box_init),
diff --git a/Makefile.am b/Makefile.am
index e7debfc2..ae2e7daa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,13 @@ GCONF_DIR =
SUBDIRS = \
gst sys ext gst-libs \
$(GCONF_DIR) \
- m4 common
+ m4 common po
# disabled
# $(SUBDIRS_DOCS)
DIST_SUBDIRS = \
gst sys ext gst-libs \
- m4 common
+ m4 common po
EXTRA_DIST = \
gst-plugins.spec depcomp \
diff --git a/autogen.sh b/autogen.sh
index afe794d2..d211d92e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,12 +65,12 @@ toplevel_check $srcfile
# older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
if test -x mkinstalldirs; then rm mkinstalldirs; fi
# first remove patch if necessary, then run autopoint, then reapply
-# if test -f po/Makefile.in.in;
-# then
-# patch -p0 -R < common/gettext.patch
-# fi
-# tool_run "$autopoint --force"
-# patch -p0 < common/gettext.patch
+if test -f po/Makefile.in.in;
+then
+ patch -p0 -R < common/gettext.patch
+fi
+tool_run "$autopoint --force"
+patch -p0 < common/gettext.patch
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
tool_run "$libtoolize" "--copy --force"
diff --git a/configure.ac b/configure.ac
index 86879183..1d91f9a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,14 +46,19 @@ AM_PROG_AS
AS="${CC}"
AS_PROG_OBJC
-dnl the gettext stuff needed
-dnl AM_GNU_GETTEXT_VERSION(0.11.5)
-dnl AM_GNU_GETTEXT([external])
-
-dnl GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR
-dnl AC_SUBST(GETTEXT_PACKAGE)
-dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
-dnl [gettext package name])
+the gettext stuff needed
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])
+
+GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR
+AC_SUBST(GETTEXT_PACKAGE)
+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])
dnl decide on error flags
AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
@@ -339,26 +344,26 @@ dnl ============================= sys plug-ins ================================
dnl ==========================================================================
dnl *** OSS audio *** (Linux, *BSD)
-dnl translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
-dnl GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
-dnl HAVE_OSS="yes"
- dnl Linux and newer BSD versions :
-dnl AC_CHECK_HEADER(sys/soundcard.h, [
-dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
-dnl ] , [
- dnl Some old BSD versions :
-dnl AC_CHECK_HEADER(soundcard.h, [
-dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
-dnl ], [
- dnl Some old BSD versions :
-dnl AC_CHECK_HEADER(machine/soundcard.h, [
-dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
-dnl ], [
-dnl HAVE_OSS="no"
-dnl ])
-dnl ])
-dnl ])
-dnl ])
+translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
+GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
+ HAVE_OSS="yes"
+dnl Linux and newer BSD versions :
+ AC_CHECK_HEADER(sys/soundcard.h, [
+ AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
+ ] , [
+dnl Some old BSD versions :
+ AC_CHECK_HEADER(soundcard.h, [
+ AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
+ ], [
+ dnl Some old BSD versions :
+ AC_CHECK_HEADER(machine/soundcard.h, [
+ AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
+ ], [
+ HAVE_OSS="no"
+ ])
+ ])
+ ])
+])
dnl ###########################
dnl # Configure external libs #
@@ -537,6 +542,7 @@ gst/videofilter/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
sys/Makefile
+sys/oss/Makefile
ext/Makefile
ext/aalib/Makefile
ext/dv/Makefile