diff --git a/configure.ac b/configure.ac
index 51f404d9e..39b6dc445 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,38 +181,6 @@ AC_PATH_GENERIC(ebg,, [
ebg_libs=`ebg-config --libs`
ebg_cflags=`ebg-config --cflags`
-dnl Check for ferite.
-AC_ARG_WITH(ferite,
- [ --with-ferite=DIR use ferite in
],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(ferite,, [
- AC_SUBST(ferite_libs)
- AC_SUBST(ferite_cflags)
- AC_DEFINE(USE_FERITE)
- ferite_libs=`ferite-config --libs`
- ferite_cflags=`ferite-config --cflags`
- AC_PATH_PROG(FEBUILDER, builder,,)
- AC_SUBST(FEBUILDER)
- ferite=yes],[
- echo "Not building ferite support"
- ferite=no])
-
-AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
-
-AC_SUBST(CP_OPTIONS)
-
-if test "x$ferite" = "xyes"; then
- save_dir=`pwd`
- cd $packagesrcdir/src
- echo -n "... building ferite binding c code ... ";
- rm -f e_ferite_gen_*;
- $FEBUILDER -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec;
- echo "done.";
- cd $save_dir
-fi
-
CFLAGS=$imlib2_cflags
LIBS=$imlib2_libs
dnl Check for db loader.
diff --git a/configure.in b/configure.in
index aed18765e..d04879932 100644
--- a/configure.in
+++ b/configure.in
@@ -180,38 +180,6 @@ AC_PATH_GENERIC(ebg,, [
ebg_libs=`ebg-config --libs`
ebg_cflags=`ebg-config --cflags`
-dnl Check for ferite.
-AC_ARG_WITH(ferite,
- [ --with-ferite=DIR use ferite in ],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(ferite,, [
- AC_SUBST(ferite_libs)
- AC_SUBST(ferite_cflags)
- AC_DEFINE(USE_FERITE)
- ferite_libs=`ferite-config --libs`
- ferite_cflags=`ferite-config --cflags`
- AC_PATH_PROG(FEBUILDER, builder,,)
- AC_SUBST(FEBUILDER)
- ferite=yes],[
- echo "Not building ferite support"
- ferite=no])
-
-AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
-
-AC_SUBST(CP_OPTIONS)
-
-if test "x$ferite" = "xyes"; then
- save_dir=`pwd`
- cd $packagesrcdir/src
- echo -n "... building ferite binding c code ... ";
- rm -f e_ferite_gen_*;
- $FEBUILDER -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec;
- echo "done.";
- cd $save_dir
-fi
-
CFLAGS=$imlib2_cflags
LIBS=$imlib2_libs
dnl Check for db loader.
diff --git a/po/ChangeLog b/po/ChangeLog
index 991329d84..cde271bec 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,27 @@
+2002-04-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-04-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-21 gettextize
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
2002-03-10 gettextize
* Makefile.in.in: Upgrade to gettext-0.10.40.
diff --git a/src/Makefile.am b/src/Makefile.am
index af42de34f..fde7b3499 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-DISTCLEANFILES = e_ferite_gen_*
-
## Enable -DDEBUG for debugging messages, -DDEBUG_NEST
## for call tracing. Caution -- this will produce a *lot*
## of output!
@@ -9,35 +7,9 @@ DEBUGFLAGS = -W -Wall -g -DDEBUG #-DDEBUG_NEST
INCLUDES = \
-I$(top_srcdir)/intl \
- @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ @ferite_cflags@ $(DEBUGFLAGS)
+ @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS)
-EXTRA_DIST = e_ferite.fec
-
-if USE_FERITE
-ferite_c = e_ferite_gen_core.c \
- e_ferite_gen_header.h \
- e_ferite_gen_e.c \
- e_ferite_gen_Border.c \
- e_ferite.h e_ferite.c
-
-BUILT_SOURCES = e_ferite_gen_core.c \
- e_ferite_gen_header.h \
- e_ferite_gen_e.c \
- e_ferite_gen_Border.c
-
-# Yes, blank because we don't want it to supply
-# it's own build rule.
-e_ferite_gen_e_c_SOURCES =
-
-e_ferite_gen_e.c: e_ferite.fec
- rm -f e_ferite_gen_*
- $(FEBUILDER) -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec
-
-E_FERITE_GEN_E_C = e_ferite_gen_e.c
-
-endif
-
-bin_PROGRAMS = enlightenment $(E_FERITE_GEN_E_C)
+bin_PROGRAMS = enlightenment
enlightenment_SOURCES = \
actions.h actions.c \
@@ -55,7 +27,6 @@ enlightenment_SOURCES = \
focus.h focus.c \
file.h file.c \
fs.h fs.c \
- $(ferite_c) \
guides.h guides.c \
globals.h globals.c \
icccm.h icccm.c \
@@ -84,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@ @ferite_libs@ -lm -lc $(INTLLIBS)
+enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ -lm -lc $(INTLLIBS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2ad1acb50..c4fa27dfb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,21 +2,21 @@
INCLUDES = \
-I$(top_srcdir)/intl \
- @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ @ferite_cflags@
+ @evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@
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@ @ferite_libs@ -lm $(INTLLIBS)
+e_img_import_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS)
e_img_export_SOURCES = \
e_img_export.c
-e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ferite_libs@ -lm $(INTLLIBS)
+e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS)
e_setup_SOURCES = \
e_setup.c
-e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ @ferite_libs@ -lm $(INTLLIBS)
+e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ -lm $(INTLLIBS)