Yoink! Say goodbye to GETTEXT in E. Support issues with GT have been tedious and...

SVN revision: 6649

diff --git a/Makefile.am b/Makefile.am
index c926900..b146b27 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## 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 \
                        config.h.in config.sub configure install-sh \

diff --git a/autogen.sh b/autogen.sh
index 99abbd3..6dbed50 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 || {
   echo
   echo "**Error**: You must have \`automake' installed."
@@ -104,26 +82,6 @@ do
        ##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi
       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
        echo "Running libtoolize..."
        libtoolize --force --copy || abort "libtoolize"

diff --git a/client/Makefile.am b/client/Makefile.am
index 7eb3ced..0129f4b 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
-       -I$(top_srcdir)/intl    
+INCLUDES = 
 
 bin_PROGRAMS = e_ipc_client
 

diff --git a/configure.ac b/configure.ac
index 80f04f5..810c3a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ AM_WITH_DMALLOC
 
 dnl Add the languages which your application supports here.
 ALL_LINGUAS=""
-AM_GNU_GETTEXT
 
 dnl Set PACKAGE_LOCALE_DIR in config.h.
 if test "x${prefix}" = "xNONE"; then
@@ -234,7 +233,6 @@ Makefile
 src/Makefile
 lib/Makefile
 client/Makefile
-po/Makefile.in
 tools/Makefile
 doc/Makefile
 doc/kernel-doc

diff --git a/configure.in b/configure.in
index 6f3b040..3f14335 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,6 @@ AM_WITH_DMALLOC
 
 dnl Add the languages which your application supports here.
 ALL_LINGUAS=""
-AM_GNU_GETTEXT
 
 dnl Set PACKAGE_LOCALE_DIR in config.h.
 if test "x${prefix}" = "xNONE"; then
@@ -233,7 +232,6 @@ Makefile
 src/Makefile
 lib/Makefile
 client/Makefile
-po/Makefile.in
 tools/Makefile
 doc/Makefile
 doc/kernel-doc

diff --git a/src/Makefile.am b/src/Makefile.am
index d618606..a4f92ed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@
 DEBUGFLAGS = -W -Wall -g -DDEBUG #-DDEBUG_NEST
 
 INCLUDES = \
-       -I$(top_srcdir)/intl \
        @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS)
 
 bin_PROGRAMS = enlightenment
@@ -56,4 +55,4 @@ enlightenment_SOURCES = \
         e_view_look.h e_view_look.c \
        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 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index c4fa27d..385836a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_srcdir)/intl \
         @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@
 
 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.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.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.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