3 files changed, 30 insertions, 8 deletions
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