mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/Makefile.am (libgstavi_la_CFLAGS): No gettext hacks, the defines come from config.h.

Browse source 
Original commit message from CVS:
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.
This commit is contained in:
Andy Wingo 2005-07-08 10:47:28 +00:00
parent 1c1a9dd6aa
commit ae4309d00c
4 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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> 2005-07-07 Wim Taymans <wim@fluendo.com>
* gst/videobox/gstvideobox.c: (gst_video_box_init), * gst/videobox/gstvideobox.c: (gst_video_box_init),

4
Makefile.am
View file

@ -7,13 +7,13 @@ GCONF_DIR =
SUBDIRS = \ SUBDIRS = \
gst sys ext gst-libs \ gst sys ext gst-libs \
$(GCONF_DIR) \ $(GCONF_DIR) \
m4 common m4 common po
# disabled # disabled
# $(SUBDIRS_DOCS) # $(SUBDIRS_DOCS)
DIST_SUBDIRS = \ DIST_SUBDIRS = \
gst sys ext gst-libs \ gst sys ext gst-libs \
m4 common m4 common po
EXTRA_DIST = \ EXTRA_DIST = \
gst-plugins.spec depcomp \ gst-plugins.spec depcomp \

12
autogen.sh
View file

@ -65,12 +65,12 @@ toplevel_check $srcfile
# older autopoint (< 0.12) has a tendency to complain about mkinstalldirs # older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
if test -x mkinstalldirs; then rm mkinstalldirs; fi if test -x mkinstalldirs; then rm mkinstalldirs; fi
# first remove patch if necessary, then run autopoint, then reapply # first remove patch if necessary, then run autopoint, then reapply
# if test -f po/Makefile.in.in; if test -f po/Makefile.in.in;
# then then
# patch -p0 -R < common/gettext.patch patch -p0 -R < common/gettext.patch
# fi fi
# tool_run "$autopoint --force" tool_run "$autopoint --force"
# patch -p0 < common/gettext.patch patch -p0 < common/gettext.patch
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
tool_run "$libtoolize" "--copy --force" tool_run "$libtoolize" "--copy --force"

62
configure.ac
View file

@ -46,14 +46,19 @@ AM_PROG_AS
AS="${CC}" AS="${CC}"
AS_PROG_OBJC AS_PROG_OBJC
dnl the gettext stuff needed the gettext stuff needed
dnl AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT_VERSION(0.11.5)
dnl AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
dnl GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR
dnl AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
dnl [gettext package name]) [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 dnl decide on error flags
AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no") AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
@ -339,26 +344,26 @@ dnl ============================= sys plug-ins ================================
dnl ========================================================================== dnl ==========================================================================
dnl *** OSS audio *** (Linux, *BSD) dnl *** OSS audio *** (Linux, *BSD)
dnl translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
dnl GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
dnl HAVE_OSS="yes" HAVE_OSS="yes"
dnl Linux and newer BSD versions : dnl Linux and newer BSD versions :
dnl AC_CHECK_HEADER(sys/soundcard.h, [ AC_CHECK_HEADER(sys/soundcard.h, [
dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/]) AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
dnl ] , [ ] , [
dnl Some old BSD versions : dnl Some old BSD versions :
dnl AC_CHECK_HEADER(soundcard.h, [ AC_CHECK_HEADER(soundcard.h, [
dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /]) AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
dnl ], [ ], [
dnl Some old BSD versions : dnl Some old BSD versions :
dnl AC_CHECK_HEADER(machine/soundcard.h, [ AC_CHECK_HEADER(machine/soundcard.h, [
dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/]) AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
dnl ], [ ], [
dnl HAVE_OSS="no" HAVE_OSS="no"
dnl ]) ])
dnl ]) ])
dnl ]) ])
dnl ]) ])
dnl ########################### dnl ###########################
dnl # Configure external libs # dnl # Configure external libs #
@ -537,6 +542,7 @@ gst/videofilter/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
sys/Makefile sys/Makefile
sys/oss/Makefile
ext/Makefile ext/Makefile
ext/aalib/Makefile ext/aalib/Makefile
ext/dv/Makefile ext/dv/Makefile