From: Thomas V. S. <tho...@us...> - 2002-06-16 20:07:19
|
CVS Root: /cvsroot/gstreamer Module: gst-player Changes by: thomasvs Date: Sun Jun 16 2002 13:07:14 PDT Log message: repeat after me no i18n ! (sample drumloop) Modified files: . : Makefile.am autogen.sh configure.ac Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/Makefile.am.diff?r1=1.8&r2=1.9 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/autogen.sh.diff?r1=1.12&r2=1.13 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/configure.ac.diff?r1=1.18&r2=1.19 ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-player/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 3 Jun 2002 16:13:15 -0000 1.8 +++ Makefile.am 16 Jun 2002 20:07:02 -0000 1.9 @@ -4,13 +4,15 @@ NAUTILUS_DIR= endif -SUBDIRS=pixmaps libs src tests po intl $(NAUTILUS_DIR) +SUBDIRS=pixmaps libs src tests $(NAUTILUS_DIR) ## po intl -DIST_SUBDIRS=pixmaps libs src tests po intl view +DIST_SUBDIRS=pixmaps libs src tests view ## po intl view DESKTOP_FILES=gst-player.desktop MMdir = $(datadir)/applications MM_DATA = $(DESKTOP_FILES) -EXTRA_DIST=gst-player.spec depcomp $(DESKTOP_FILES) \ - intltool-extract.in intltool-merge.in intltool-update.in +EXTRA_DIST= config.rpath gst-player.spec depcomp $(DESKTOP_FILES) ## \ + ##intltool-extract.in intltool-merge.in intltool-update.in + +ACLOCAL_AMFLAGS = -I m4 Index: autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/gst-player/autogen.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- autogen.sh 3 May 2002 17:25:48 -0000 1.12 +++ autogen.sh 16 Jun 2002 20:07:02 -0000 1.13 @@ -24,22 +24,23 @@ autogen_options $@ -### this is a hack because intltoolize doesn't recognize configure.in yet -ln -sf configure.ac configure.in - echo -n "+ check for build tools" if test ! -z $NOCHECK; then echo " skipped"; else echo; fi version_check "autoconf" "$AUTOCONF" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 version_check "automake" "$AUTOMAKE" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 -version_check "gettextize" "$GETTEXTIZE" "ftp://ftp.gnu.org/pub/gnu/gettextize/" 0 10 0 || DIE=1 -version_check "intltoolize" "$INTLTOOLIZE" "ftp://ftp.gnome.org/pub/gnome/stable/sources/intltool/" 0 18 0 || DIE=1 +## version_check "gettextize" "$GETTEXTIZE" "ftp://ftp.gnu.org/pub/gnu/gettextize/" 0 10 0 || DIE=1 +echo " I18n ? Hah ! I SPIT on i18n ! You hear me ? Take it away ! Boo !" +## version_check "intltoolize" "$INTLTOOLIZE" "ftp://ftp.gnome.org/pub/gnome/stable/sources/intltool/" 0 20 0 || DIE=1 version_check "libtool" "$LIBTOOL" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 version_check "pkg-config" "$PKGCONFIG" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 +die_check $DIE + autoconf_2.52d_check || DIE=1 aclocal_check || DIE=1 +autoheader_check || DIE=1 -if test "$DIE" -eq 1; then exit 1; fi +die_check $DIE # CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir' @@ -64,8 +65,9 @@ # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo echo timestamp > stamp-h.in 2> /dev/null -if test ! -d intl; then tool_run "gettextize --copy"; fi -tool_run "intltoolize --copy" +echo "+ Hey ! I meant it when I said no i18n for you ! Join me in spitting !" +##if test ! -d intl; then tool_run "gettextize --copy"; fi +##tool_run "intltoolize --copy" tool_run "$autoconf" tool_run "$automake" "-a -c" Index: configure.ac =================================================================== RCS file: /cvsroot/gstreamer/gst-player/configure.ac,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.ac 3 Jun 2002 16:13:15 -0000 1.18 +++ configure.ac 16 Jun 2002 20:07:02 -0000 1.19 @@ -53,9 +53,13 @@ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -dnl i18n stuff +dnl i18n stuff and gettext stuff AC_PROG_INTLTOOL(0.18) -AM_WITH_NLS +## AM_GNU_GETTEXT +## AM_WITH_NLS +##GETTEXT_PACKAGE=gst-player +##AC_SUBST(GETTEXT_PACKAGE) +##AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") ALL_LINGUAS="nl" AM_GLIB_GNU_GETTEXT @@ -71,7 +75,12 @@ *** GTK+ 2.0 installation ]) -AC_OUTPUT([gst-player.spec Makefile +dnl intl/Makefile +dnl po/Makefile.in +dnl po/Makefile.in po/Makefile.in + +AC_OUTPUT([ + gst-player.spec Makefile src/Makefile pixmaps/Makefile view/Makefile @@ -80,6 +89,4 @@ libs/gst/player/Makefile libs/gst/play/Makefile tests/Makefile - intl/Makefile - po/Makefile.in ]) |