aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboris <boris>2001-08-31 13:10:26 +0000
committerboris <boris@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2001-08-31 13:10:26 +0000
commit125f101b7cd30a4bc6ef6ec35c56be56e7f326fe (patch)
tree3b005a05dad88fdad903bfa52396e6384662d8eb
parentb9d6066361647c48c25a5d63e6c9d12c08c2ff18 (diff)
downloadenlightenment-125f101b7cd30a4bc6ef6ec35c56be56e7f326fe.tar.gz
enlightenment-125f101b7cd30a4bc6ef6ec35c56be56e7f326fe.tar.xz
enlightenment-125f101b7cd30a4bc6ef6ec35c56be56e7f326fe.zip
no need for ferite. fun.
SVN revision: 5315
-rw-r--r--acconfig.h1
-rw-r--r--config.h.in1
-rw-r--r--configure.ac18
-rw-r--r--configure.in18
-rw-r--r--po/ChangeLog12
-rw-r--r--src/Makefile.am14
-rw-r--r--src/main.c11
-rw-r--r--src/menubuild.c13
8 files changed, 66 insertions, 22 deletions
diff --git a/acconfig.h b/acconfig.h
index 8618ccab2..cb720b894 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -13,3 +13,4 @@
#undef PACKAGE_SOURCE_DIR
#undef PACKAGE_BIN_DIR
#undef PACKAGE_LIB_DIR
+#undef USE_FERITE
diff --git a/config.h.in b/config.h.in
index e5e0ca751..de4217ab6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -14,6 +14,7 @@
#undef PACKAGE_SOURCE_DIR
#undef PACKAGE_BIN_DIR
#undef PACKAGE_LIB_DIR
+#undef USE_FERITE
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
diff --git a/configure.ac b/configure.ac
index c97ac38ea..b3ee27753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,13 +163,17 @@ AC_ARG_WITH(ferite,
AC_PATH_GENERIC(ferite,, [
AC_SUBST(ferite_libs)
- AC_SUBST(ferite_cflags)],
- AC_MSG_ERROR(Cannot find ferite: Is ferite-config in path? ferite can be obtained from http://www.ferite.org))
-ferite_libs=`ferite-config --libs`
-ferite_cflags=`ferite-config --cflags`
-
-AC_PATH_PROG(FEBUILDER, builder,,)
-AC_SUBST(FEBUILDER)
+ 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)
diff --git a/configure.in b/configure.in
index b2a7bd3bb..f6eb54856 100644
--- a/configure.in
+++ b/configure.in
@@ -162,13 +162,17 @@ AC_ARG_WITH(ferite,
AC_PATH_GENERIC(ferite,, [
AC_SUBST(ferite_libs)
- AC_SUBST(ferite_cflags)],
- AC_MSG_ERROR(Cannot find ferite: Is ferite-config in path? ferite can be obtained from http://www.ferite.org))
-ferite_libs=`ferite-config --libs`
-ferite_cflags=`ferite-config --cflags`
-
-AC_PATH_PROG(FEBUILDER, builder,,)
-AC_SUBST(FEBUILDER)
+ 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)
diff --git a/po/ChangeLog b/po/ChangeLog
index f13efe4b2..454a45d56 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-31 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-31 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-31 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.39.
+
2001-08-25 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
diff --git a/src/Makefile.am b/src/Makefile.am
index 969eb5cde..2b5e90bfe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,14 @@ INCLUDES = \
bin_PROGRAMS = enlightenment
+if USE_FERITE
+ferite_c = e_ferite_gen_core.c \
+ e_ferite_gen_header.h \
+ e_ferite_gen_e.c \
+ e_ferite_gen_Window.c \
+ e_ferite.h e_ferite.c
+endif
+
enlightenment_SOURCES = \
actions.h actions.c \
background.h background.c \
@@ -16,12 +24,8 @@ enlightenment_SOURCES = \
desktops.h desktops.c \
entry.h entry.c \
exec.h exec.c \
- e_ferite_gen_core.c \
- e_ferite_gen_header.h \
- e_ferite_gen_e.c \
- e_ferite_gen_Window.c \
- e_ferite.h e_ferite.c \
fs.h fs.c \
+ $(ferite_c) \
icccm.h icccm.c \
icons.c \
ipc.h ipc.c \
diff --git a/src/main.c b/src/main.c
index 38adb7b4c..2a3d5a537 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,11 @@
#include "ipc.h"
#include "menu.h"
#include "view.h"
-#include "e_ferite.h"
+
+#ifdef USE_FERITE
+# include "e_ferite.h"
+#endif
+
#include <X11/Xproto.h>
#ifdef E_PROF
@@ -123,13 +127,18 @@ main(int argc, char **argv)
e_view_init();
e_entry_init();
e_keys_init();
+
+#ifdef USE_FERITE
e_ferite_init();
+#endif
setup();
e_event_loop();
+#ifdef USE_FERITE
e_ferite_deinit();
+#endif
return 0;
UN(argc);
diff --git a/src/menubuild.c b/src/menubuild.c
index 5062a902b..d7e150799 100644
--- a/src/menubuild.c
+++ b/src/menubuild.c
@@ -2,7 +2,10 @@
#include "menubuild.h"
#include "exec.h"
#include "util.h"
-#include "e_ferite.h"
+
+#ifdef USE_FERITE
+# include "e_ferite.h"
+#endif
Evas_List build_menus = NULL;
@@ -33,12 +36,18 @@ static void
e_build_menu_cb_script(E_Menu *m, E_Menu_Item *mi, void *data)
{
char *script;
-
+
+#ifdef USE_FERITE
script = data;
e_ferite_run(script);
+#else
+ printf( "No cookies for you. You will have to install ferite.\n" );
+#endif
+
return;
UN(m);
UN(mi);
+ UN(script);
}
static void