Removing checks for efltk and updating README. Squashing few warnings.

This commit is contained in:
Sanel Zukan 2011-10-24 08:15:47 +00:00
parent eed5749909
commit 9d23b51207
4 changed files with 8 additions and 46 deletions

23
README
View File

@ -14,7 +14,7 @@ Build requirements
------------------ ------------------
EDE 2.0 is using FLTK toolkit from http://www.fltk.org[www.fltk.org]. At the time EDE 2.0 is using FLTK toolkit from http://www.fltk.org[www.fltk.org]. At the time
of this writing, latest stable version is 1.1.9. of this writing, latest stable version is 1.3.0.
Since FLTK lacks many things needed for developing a full *nix desktop Since FLTK lacks many things needed for developing a full *nix desktop
environment, we have developed a small add-on library called 'edelib'. This environment, we have developed a small add-on library called 'edelib'. This
@ -24,8 +24,6 @@ We *strongly* recommend that you use matching versions of ede and
edelib (e.g. released at the same time) or that you do SVN checkout at the same time due edelib (e.g. released at the same time) or that you do SVN checkout at the same time due
their frequent changes. their frequent changes.
Make sure you have eFLTK installed too, because some packages still requires it.
Also you will need a Jam tool. Jam is a make replacement and you can find it on our repository. Also you will need a Jam tool. Jam is a make replacement and you can find it on our repository.
Downloading the code Downloading the code
@ -37,7 +35,6 @@ you should checkout (with their paths):
- jam : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/jam' - jam : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/jam'
- edelib : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/edelib' - edelib : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/edelib'
- ede : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/ede2' - ede : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/ede2'
- efltk : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/efltk'
If you already have Jam installed, there is no need to download it. If you already have Jam installed, there is no need to download it.
@ -52,20 +49,10 @@ In order to build and install EDE do the following steps:
2. compile and install edelib; please read README file in edelib directory 2. compile and install edelib; please read README file in edelib directory
3. compile and install efltk; './configure --disable-mysql --disable-unixODBC && make && make install' 3. go in ede2 directory and run './autogen.sh'
will do the job
4. go in ede2 directory and run './autogen.sh' 4. after that, goes './configure --enable-debug'
5. after that, goes './configure --enable-debug' 5. jam
6. jam 6. jam install
7. jam install
Used programs that requires eFLTK
---------------------------------
- edewm
These programs are planned to be replaced with the new ones.

View File

@ -39,8 +39,6 @@ AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support (default=y
dnl set 'with_fltk_path' dnl set 'with_fltk_path'
AC_ARG_WITH(fltk_path, AC_HELP_STRING([--with-fltk-path=[DIR]], [alternative directory where FLTK is installed])) AC_ARG_WITH(fltk_path, AC_HELP_STRING([--with-fltk-path=[DIR]], [alternative directory where FLTK is installed]))
dnl set 'with_efltk_path'
AC_ARG_WITH(efltk_path, AC_HELP_STRING([--with-efltk-path=[DIR]], [alternative directory where eFLTK is installed]))
dnl set 'with_edelib_path' dnl set 'with_edelib_path'
AC_ARG_WITH(edelib_path, AC_HELP_STRING([--with-edelib-path=[DIR]], [alternative directory where edelib is installed])) AC_ARG_WITH(edelib_path, AC_HELP_STRING([--with-edelib-path=[DIR]], [alternative directory where edelib is installed]))
@ -173,25 +171,6 @@ else
AC_PATH_PROG(EFLTK_CONFIG, efltk-config,, "$with_efltk_path/bin") AC_PATH_PROG(EFLTK_CONFIG, efltk-config,, "$with_efltk_path/bin")
fi fi
if test -n "$EFLTK_CONFIG"; then
efltk_version=`$EFLTK_CONFIG --version`
AC_MSG_CHECKING([for eFLTK version >= 2.0.4])
case "$efltk_version" in ["2.0."[456789]])
AC_MSG_RESULT(yes)
;;
*)
AC_MSG_ERROR([Looks like you have an older eFLTK version ($efltk_version). Required is >= 2.0.4])
esac
EFLTK_CFLAGS=`$EFLTK_CONFIG --cxxflags`
EFLTK_LIBS_NOIMAGES=`$EFLTK_CONFIG --ldflags`
EFLTK_LIBS=`$EFLTK_CONFIG --use-xml --use-images --ldflags`
else
AC_MSG_WARN([You don't have eFLTK installed. EDE will be built without window manager!])
fi
EDE_CHECK_LIBXPM EDE_CHECK_LIBXPM
if test "$have_libxpm" = "yes"; then if test "$have_libxpm" = "yes"; then
FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS" FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS"

View File

@ -3,7 +3,7 @@
* *
* ede-crasher, a crash handler tool * ede-crasher, a crash handler tool
* Part of Equinox Desktop Environment (EDE). * Part of Equinox Desktop Environment (EDE).
* Copyright (c) 2008-2009 EDE Authors. * Copyright (c) 2008-2011 EDE Authors.
* *
* This program is licensed under terms of the * This program is licensed under terms of the
* GNU General Public License version 2 or newer. * GNU General Public License version 2 or newer.
@ -13,7 +13,6 @@
#ifndef __GDBOUTPUT_H__ #ifndef __GDBOUTPUT_H__
#define __GDBOUTPUT_H__ #define __GDBOUTPUT_H__
class edelib::TempFile;
bool gdb_output_generate(const char *path, edelib::TempFile &t); bool gdb_output_generate(const char *path, edelib::TempFile &t);
#endif #endif

View File

@ -349,9 +349,8 @@ void Xsm::xresource_replace(void) {
XSettingsSetting* s; XSettingsSetting* s;
int status; int status;
char* type, *value;
XrmValue xrmv; XrmValue xrmv;
char color_val[8]; char color_val[8], *type;
String tmp; String tmp;
@ -377,8 +376,6 @@ void Xsm::xresource_replace(void) {
if(status && strcmp(type, "String") == 0) { if(status && strcmp(type, "String") == 0) {
E_DEBUG(E_STRLOC ": %s.%s found in database\n", E_DEBUG(E_STRLOC ": %s.%s found in database\n",
resource_map[i].xresource_klass, resource_map[i].xresource_key); resource_map[i].xresource_klass, resource_map[i].xresource_key);
value = xrmv.addr;
} }
/* /*