Yoink! Say goodbye to GETTEXT in E. Support issues with GT have been tedious and the codebase will be trashed in a month or two anyway, so for all parties concerned there is no reason to keep it. I'm leaving some of the supplimentary files in the repo just incase we descide to do an about-face.

SVN revision: 6649
This commit is contained in:
technikolor 2003-02-02 23:53:19 +00:00 committed by technikolor
parent e34b876179
commit 79149a8446
7 changed files with 6 additions and 55 deletions

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = po src lib client tools doc SUBDIRS = src lib client tools doc
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \ config.h.in config.sub configure install-sh \

View File

@ -29,28 +29,6 @@ DIE=0
} }
} }
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed."
echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
}
grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed."
echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
}
(automake --version) < /dev/null > /dev/null 2>&1 || { (automake --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "**Error**: You must have \`automake' installed." echo "**Error**: You must have \`automake' installed."
@ -104,26 +82,6 @@ do
## echo "**Warning**: No such directory \`$k'. Ignored." ## echo "**Warning**: No such directory \`$k'. Ignored."
fi fi
done done
if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
if grep "sed.*POTFILES" configure.in >/dev/null; then
: do nothing -- we still have an old unmodified configure.in
else
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
echo "no" | setup-gettext.sh
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
fi
if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
echo "no" | setup-gettext.sh
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
echo "Running libtoolize..." echo "Running libtoolize..."
libtoolize --force --copy || abort "libtoolize" libtoolize --force --copy || abort "libtoolize"

View File

@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = \ INCLUDES =
-I$(top_srcdir)/intl
bin_PROGRAMS = e_ipc_client bin_PROGRAMS = e_ipc_client

View File

@ -34,7 +34,6 @@ AM_WITH_DMALLOC
dnl Add the languages which your application supports here. dnl Add the languages which your application supports here.
ALL_LINGUAS="" ALL_LINGUAS=""
AM_GNU_GETTEXT
dnl Set PACKAGE_LOCALE_DIR in config.h. dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then if test "x${prefix}" = "xNONE"; then
@ -234,7 +233,6 @@ Makefile
src/Makefile src/Makefile
lib/Makefile lib/Makefile
client/Makefile client/Makefile
po/Makefile.in
tools/Makefile tools/Makefile
doc/Makefile doc/Makefile
doc/kernel-doc doc/kernel-doc

View File

@ -33,7 +33,6 @@ AM_WITH_DMALLOC
dnl Add the languages which your application supports here. dnl Add the languages which your application supports here.
ALL_LINGUAS="" ALL_LINGUAS=""
AM_GNU_GETTEXT
dnl Set PACKAGE_LOCALE_DIR in config.h. dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then if test "x${prefix}" = "xNONE"; then
@ -233,7 +232,6 @@ Makefile
src/Makefile src/Makefile
lib/Makefile lib/Makefile
client/Makefile client/Makefile
po/Makefile.in
tools/Makefile tools/Makefile
doc/Makefile doc/Makefile
doc/kernel-doc doc/kernel-doc

View File

@ -6,7 +6,6 @@
DEBUGFLAGS = -W -Wall -g -DDEBUG #-DDEBUG_NEST DEBUGFLAGS = -W -Wall -g -DDEBUG #-DDEBUG_NEST
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/intl \
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS) @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS)
bin_PROGRAMS = enlightenment bin_PROGRAMS = enlightenment
@ -56,4 +55,4 @@ enlightenment_SOURCES = \
e_view_look.h e_view_look.c \ e_view_look.h e_view_look.c \
e.h e.h
enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ -lm $(INTLLIBS) enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ -lm

View File

@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/intl \
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@
bin_PROGRAMS = e_img_import e_img_export e_setup bin_PROGRAMS = e_img_import e_img_export e_setup
@ -9,14 +8,14 @@ bin_PROGRAMS = e_img_import e_img_export e_setup
e_img_import_SOURCES = \ e_img_import_SOURCES = \
e_img_import.c e_img_import.c
e_img_import_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS) e_img_import_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm
e_img_export_SOURCES = \ e_img_export_SOURCES = \
e_img_export.c e_img_export.c
e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS) e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm
e_setup_SOURCES = \ e_setup_SOURCES = \
e_setup.c e_setup.c
e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ -lm $(INTLLIBS) e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ -lm