enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

no need for ferite. fun. 

SVN revision: 5315
This commit is contained in:
boris 2001-08-31 13:10:26 +00:00 committed by boris
parent b9d6066361
commit 125f101b7c
8 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acconfig.h
View File

@ -13,3 +13,4 @@
#undef PACKAGE_SOURCE_DIR
#undef PACKAGE_BIN_DIR
#undef PACKAGE_LIB_DIR
#undef USE_FERITE

1
config.h.in
View File

@ -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.

16
configure.ac
View File

@ -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_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])
AC_PATH_PROG(FEBUILDER, builder,,)
AC_SUBST(FEBUILDER)
AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
AC_SUBST(CP_OPTIONS)

16
configure.in
View File

@ -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_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])
AC_PATH_PROG(FEBUILDER, builder,,)
AC_SUBST(FEBUILDER)
AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
AC_SUBST(CP_OPTIONS)

12
po/ChangeLog
View File

@ -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.

14
src/Makefile.am
View File

@ -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 \

11
src/main.c
View File

@ -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);

11
src/menubuild.c
View File

@ -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;
@ -34,11 +37,17 @@ 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