Merge pull request #1 from kraileth/readme-improvement

Improve readme

AUTHORS.pekwm

@@ -0,0 +1,52 @@
+-- AUTHORS for pekwm 
+
+Author:
+
+ * Claes Nasten <pekdon{@}pekdon{.}net>
+
+Patchers:
+
+ * Andreas <ioerror{@}lavabit{.}com>
+	- Bug fixing.
+        - Code cleanup.
+
+ * Jyri Jokinen <shared{@}suffi{.}net>
+	- Documentation since 0.1.3.
+
+ * Rando Christensen <rando{@}babblica{.}net>
+	- Autoconf scripts.
+	- Documentation since 0.1.1.
+	- Ideas, bug reports and moral support.
+
+ * Lurene Frenier <lurene{@}daemonkitty{.}net>
+	- Make file patches.
+
+Moral support:
+
+ * Alexandra Walford <chroma{@}delusion{.}de>
+	- Moral support.
+	- English and CSS support.
+
+ * Christoph Strake <me{@}chr1z{.}de>
+	- Default Theme author.
+	- WWW design consultant.
+
+Testers and Requsters:
+
+ * Ashwin <ashwind{@}cyberwaveindia{.}com>
+	- Beta testing, many good bug reports.
+
+ * Michael ? <themadmind{@}optushome{.}com{.}au>
+	- GCC-3.1.0 compile verification.
+
+-- AUTHORS for aewm++ 1.0.16
+
+Author:
+
+ * Frank Hale <frankhale{@}yahoo{.}com>
+
+-- AUTHORS for aewm
+
+Author:
+
+ * Decklin Foster <decklin{@}red-bean{.}com>

Jamconfig.in

@@ -48,15 +48,24 @@ EDE_PREFIX_SUBDIR ?= "ede" ;
 PREFIX                ?= "$(prefix)" ;
 EDE_BIN_DIR           ?= "$(bindir)" ;
 EDE_DATA_DIR          ?= "$(datadir)" ;
-EDE_CONFIG_DIR        ?= "/etc/xdg/$(EDE_PREFIX_SUBDIR)" ;
-EDE_MENU_DIR          ?= "/etc/xdg/menus" ; # use XDG default for menu dir
+EDE_CONFIG_DIR        ?= "$(sysconfdir)/xdg/$(EDE_PREFIX_SUBDIR)" ;
+EDE_MENU_DIR          ?= "$(sysconfdir)/xdg/menus" ; # use XDG default for menu dir
 EDE_ICON_DIR          ?= "$(EDE_DATA_DIR)/icons" ;
 EDE_MIME_DIR          ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path
+EDE_WALLPAPERS_DIR    ?= "$(EDE_DATA_DIR)/wallpapers" ; # default path
 EDE_DOC_DIR           ?= "$(docdir)/ede-$(EDE_VERSION)" ;
 EDE_THEMES_DIR        ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/themes" ;
 EDE_TIPS_DIR          ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/tips" ;
 EDE_PANEL_APPLETS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/panel-applets" ;
 
+DBUS_SERVICE_DIR      ?= "$(datarootdir)/dbus-1/services" ;
+XSESSIONS_DIR         ?= "$(datarootdir)/xsessions" ;
+
+PEKWM_CONFIG_DIR      ?= "$(sysconfdir)/pekwm" ;
+PEKWM_DATA_DIR        ?= "$(datadir)/pekwm" ;
+PEKWM_CXXFLAGS        ?= "@PEKWM_CXXFLAGS@" ;
+PEKWM_LIBS            ?= "@PEKWM_LIBS@" ;
+
 OPTIMFLAGS     ?= @EDE_OPTIM_FLAGS@ ;
 DEBUGFLAGS     ?= @EDE_DEBUG_FLAGS@ ;
 LARGEFILEFLAGS ?= @LARGEFILE@ ;
@@ -85,23 +94,20 @@ LIBM        ?= -lm ;
 #REMOVE_UNUSED_DEPENDENCIES_TRICK = 1 ;
 
 # edelib libraries path
-EDELIBINCLUDE       ?= @EDELIB_CFLAGS@ ;
-EDELIBLIB           ?= @EDELIB_LIBS@ ;
-EDELIB_GUI_INCLUDE  ?= @EDELIB_GUI_CFLAGS@ ;
-EDELIB_GUI_LIB      ?= @EDELIB_GUI_LIBS@ ;
-EDELIB_DBUS_INCLUDE ?= @EDELIB_DBUS_CFLAGS@ ;
-EDELIB_DBUS_LIB     ?= @EDELIB_DBUS_LIBS@ ;
+EDELIBINCLUDE                ?= @EDELIB_CFLAGS@ ;
+EDELIBLIB                    ?= @EDELIB_LIBS@ ;
+EDELIB_GUI_INCLUDE           ?= @EDELIB_GUI_CFLAGS@ ;
+EDELIB_GUI_LIB               ?= @EDELIB_GUI_LIBS@ ;
+EDELIB_GUI_NO_IMAGES_INCLUDE ?= @EDELIB_GUI_NO_IMAGES_CFLAGS@ ;
+EDELIB_GUI_NO_IMAGES_LIB     ?= @EDELIB_GUI_NO_IMAGES_LIBS@ ;
+EDELIB_DBUS_INCLUDE          ?= @EDELIB_DBUS_CFLAGS@ ;
+EDELIB_DBUS_LIB              ?= @EDELIB_DBUS_LIBS@ ;
 
 # fltk libraries path
 FLTKINCLUDE      ?= @FLTK_CFLAGS@ ;
 FLTKLIB          ?= @FLTK_LIBS@ ;
 FLTKLIB_NOIMAGES ?= @FLTK_LIBS_NOIMAGES@ ;
 
-# backward; efltk libraries path
-EFLTKINCLUDE      ?= @EFLTK_CFLAGS@ ;
-EFLTKLIB          ?= @EFLTK_LIBS@ ;
-EFLTKLIB_NOIMAGES ?= @EFLTK_LIBS_NOIMAGES@ ;
-
 # Xcomposite
 COMPOSITEINCLUDE ?= @COMPOSITE_CFLAGS@ ;
 COMPOSITELIB     ?= @COMPOSITE_LIBS@ ;
@@ -120,10 +126,19 @@ X_LIBS       ?= @X_LIBS@ ;
 X_PRE_LIBS   ?= @X_PRE_LIBS@ ;
 X_EXTRA_LIBS ?= @X_EXTRA_LIBS@ ;
 
+# solo XKB extension library
+XKB_LIBS ?= @XKB_LIBS@ ;
+
+# shape extension
+XSHAPE_LIBS ?= @XSHAPE_LIBS@ ;
+
 # curl libraries
 CURL_CFLAGS  ?= @CURL_CFLAGS@ ;
 CURL_LIBS    ?= @CURL_LIBS@ ;
 
+# kstat
+KSTAT_LIBS ?= @KSTAT_LIBS@ ;
+
 # platform specific pthread flags
 # FIXME: a quick hack to work everything on SunStudio
 if $(SUN_COMPILER) {
@@ -134,7 +149,5 @@ if $(SUN_COMPILER) {
 	PTHREAD_LIBS   ?= @PTHREAD_LIBS@ ;
 }
 
-DBUS_SERVICE_DIR ?= @DBUS_SERVICE_DIR@ ;
-
 # do not touch this
 JAMCONFIG_READ = "yes" ;

Jamfile

@@ -10,7 +10,7 @@
 
 SubDir TOP ;
 
-EdeManualWithToc README ;
+# EdeManualWithToc README ;
 
 Clean distclean : $(JCACHEFILE) $(HCACHEFILE) ;
 
@@ -24,14 +24,16 @@ SubInclude TOP ede-conf ;
 SubInclude TOP ede-desktop ;
 SubInclude TOP ede-desktop-conf ;
 SubInclude TOP ede-dialog ;
+SubInclude TOP ede-keyboard-conf ;
+SubInclude TOP ede-notify-daemon ;
 SubInclude TOP ede-screensaver-conf ;
+SubInclude TOP ede-screen-lock ;
 SubInclude TOP ede-help ;
 SubInclude TOP ede-image-view ;
-SubInclude TOP elma ;
 SubInclude TOP ede-launch ;
-SubInclude TOP emountd ;
 SubInclude TOP ede-timedate ;
 SubInclude TOP ede-tip ;
+SubInclude TOP ede-preferred-applications ;
 SubInclude TOP evoke ;
 SubInclude TOP doc ;
 SubInclude TOP data ;
@@ -42,10 +44,4 @@ if ! $(SUN_COMPILER) {
 	SubInclude TOP ede-panel ;
 }
 
-# they will not be compiled if eFLTK wasn't found
-SubInclude TOP edewm ;
-
-# efiler is not compileable at all
-if $(WITH_EFILER) = 1 {
-	SubInclude TOP efiler ;
-}
+SubInclude TOP pekwm ;

README

@@ -1,71 +0,0 @@
-Readme for EDE 2.0
-==================
-
-Please read this document before using or contributing to EDE 2.0 source code.
-
-[NOTE]
-.This is beta product
-===================================
-EDE 2.0 is not finished yet and many components are not completed,
-can crash or misbehave
-===================================
-
-Build requirements
-------------------
-
-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.
-
-Since FLTK lacks many things needed for developing a full *nix desktop 
-environment, we have developed a small add-on library called 'edelib'. This 
-library is also required for compiling EDE 2.0 and should be released together with EDE.
-
-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
-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.
-
-Downloading the code
---------------------
-
-The best way to download latest code is checking it out from our repository. These modules
-you should checkout (with their paths):
-
-- jam : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/jam'
-- edelib : 'svn co https://ede.svn.sourceforge.net/svnroot/ede/trunk/edelib'
-- 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.
-
-Compiling and installing
-------------------------
-
-In order to build and install EDE do the following steps:
-
-1. compile and install jam first; going to jam source directory and running 'make' will do 
-   the job; after that you should get 'bin.YOUR_PLATFORM' directory (on Linux it will be 
-   bin.linux) and copy 'jam' executable in your $PATH, e.g. /usr/local/bin
-
-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'
-   will do the job
-
-4. go in ede2 directory and run './autogen.sh'
-
-5. after that, goes './configure --enable-debug'
-
-6. jam
-
-7. jam install
-
-Used programs that requires eFLTK
----------------------------------
-
-- edewm
-
-These programs are planned to be replaced with the new ones.

README.md

@@ -0,0 +1,58 @@
+# EDE
+
+EDE, the `Equinox Desktop Environment`, is a small and fast desktop
+environment that uses the [FLTK toolkit](http://www.fltk.org).
+For more details and the philosophy behind it, see
+[about EDE on our wiki](http://equinox-project.org/wiki/AboutEde).
+
+## Build requirements
+
+EDE requires FLTK; at the time of this writing, the latest stable
+branch is 1.3.x.
+
+Since FLTK lacks many things needed for developing a full *nix desktop
+environment, we have developed a small add-on library called
+`edelib`. This library is needed both for building and running the
+desktop. Edelib is developed and released together with EDE.
+
+It is *strongly* recommended to use matching versions of EDE and
+edelib (i.e. versions released at the same time) or to checkout
+both from the repository at the same time to make sure they work
+together well.
+
+Also you will need the `jam` tool. Jam is a *make* replacement and you
+can find it on our repository.
+
+## Downloading the code
+
+The best way to get the latest code is checking it out from our
+repository. These are the modules you should checkout (with their paths):
+
+- *jam* - `git clone https://github.com/edeproject/jam.git`
+- *edelib* - `git clone https://github.com/edeproject/edelib.git`
+- *ede* - `git clone https://github.com/edeproject/ede.git`
+
+If you already have Jam installed, there is of course no need to download
+it again. Either vanilla Jam or FTJam can be used to build EDE. Boost Jam is
+known to *not* work.
+
+## Compiling and installing
+
+In order to build and install EDE do the following steps:
+
+1. compile and install `jam` first; going to jam source directory and running `make` will do
+   the job; after that you should get `bin.YOUR_PLATFORM` directory (e.g. on Linux it will be
+   bin.linux) and copy `jam` executable in your $PATH, e.g. */usr/local/bin*
+
+2. compile and install `edelib`; please read README file in edelib directory
+
+3. change into the ede directory and run `./autogen.sh`
+
+4. after that, do `./configure --enable-debug`
+
+5. jam
+
+6. jam install
+
+Please note that this document is only a quick and short tutorial on installing EDE. For more details
+please see [Installation Howto](http://equinox-project.org/wiki/InstallationHowTo) on our wiki.

autogen.sh

@@ -1,11 +1,24 @@
 #!/bin/sh
 
-# to save me from typing :P
+# create aclocal.m4 file with content of given directory without 'aclocal' tool
+aclocal_emulate() {
+	dir="$1"
+	filename="aclocal.m4"
+
+	rm -f $filename
+
+	for i in `ls $dir/*`; do
+		echo "m4_include([$i])" >> $filename
+	done
+
+	echo " " >> $filename
+}
+
 if [ "$1" = "--compile" ]; then
 	compile=1
 fi
 
-if aclocal -I m4 && autoheader && autoconf; then
+if aclocal_emulate m4 && autoheader && autoconf; then
 	echo ""
 	echo "Now run ./configure [OPTIONS]"
 	echo "or './configure --help' to see them"

build/Install.jam

@@ -17,7 +17,15 @@ EXEMODE = 755 ;
 rule MakeInstallPrivate
 {
 	local i t s ;
-	local dir = $(1) ;
+	local dir ;
+
+	# use DESTDIR as make use it and is targeted for packagers primarly; FDirName is not used since
+	# it do not understainds external variables well
+	if $(DESTDIR) {
+		dir = $(DESTDIR)$(1) ;
+	} else {
+		dir = $(1) ;
+	}
 
 	MkDir $(dir) ;
 

build/Program.jam

@@ -29,8 +29,8 @@ rule MakeProgramPrivate
 	objects = [ FGristFiles $(2:S=$(SUFOBJ)) ] ;
 
 	# Pick up values if someone set flags outside (via ObjectCcFlags and etc.)
-	CCFLAGS on $(objects)  = [ on $(objects) return $(CCFLAGS) ] $(4) ;
-	C++FLAGS on $(objects) = [ on $(objects) return $(C++FLAGS) ] $(4) ;
+	CCFLAGS on $(objects)  = [ on $(objects) return $(CCFLAGS) ] -DE_LOG_DOMAIN="\\\"$(target)\\\"" $(4) ;
+	C++FLAGS on $(objects) = [ on $(objects) return $(C++FLAGS) ] -DE_LOG_DOMAIN="\\\"$(target)\\\"" $(4) ;
 
 	if $(REMOVE_UNUSED_DEPENDENCIES_TRICK) = 1 {
 		# remove unused dependencies in binaries, as U.Drepper prescribed ;-)
@@ -72,18 +72,18 @@ rule Program
 }
 
 # EdeProgram [target] : [sources] : [noinstall] ;
-# Creates EDE specific programs. They will be linked with EDELIBLIB
-# and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
+# Creates EDE specific programs. They will be linked with EDELIB_GUI_LIB.
+# If [noinstall] is given, [target] will not be installed wit 'jam install'.
 rule EdeProgram
 {
-	if ! $(EDELIBINCLUDE) || ! $(EDELIBLIB) {
-		Echo "EDELIBINCLUDE or EDELIBLIB not defined; $(1) will not be built" ;
+	if ! $(EDELIBLIB) {
+		Echo "EDELIBLIB not defined; $(1) will not be built" ;
 		return ;
 	}
 
 	MakeProgramPrivate $(1) : $(2) 
-		: $(EDELIB_GUI_LIB) $(EDELIBLIB) $(FLTKLIB) $(STDLIB) 
-		: $(GLOBALFLAGS) $(EDELIBINCLUDE) $(FLTKINCLUDE) ;
+		: $(EDELIB_GUI_LIB) $(STDLIB) 
+		: $(GLOBALFLAGS) $(EDELIB_GUI_INCLUDE) ;
 
 	if $(3) != "noinstall" {
 		InstallEdeProgram $(1) ;
@@ -91,44 +91,24 @@ rule EdeProgram
 }
 
 # EdeProgramAsFltkBare [target] : [sources] : [noinstall] ;
-# Creates EDE specific programs. They will be linked with EDELIBLIB
-# and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
+# Creates EDE specific programs. They will be linked with EDELIB_GUI_NO_IMAGES_LIB
+# If [noinstall] is given, [target] will not be installed wit 'jam install'.
 rule EdeProgramAsFltkBare
 {
-	if ! $(EDELIBINCLUDE) || ! $(EDELIBLIB) {
-		Echo "EDELIBINCLUDE or EDELIBLIB not defined; $(1) will not be built" ;
+	if ! $(EDELIBLIB) {
+		Echo "EDELIBLIB not defined; $(1) will not be built" ;
 		return ;
 	}
 
 	MakeProgramPrivate $(1) : $(2) 
-		: $(EDELIB_GUI_LIB) $(EDELIBLIB) $(FLTKLIB_NOIMAGES) $(STDLIB) 
-		: $(GLOBALFLAGS) $(EDELIBINCLUDE) $(FLTKINCLUDE) ;
+		: $(EDELIB_GUI_NO_IMAGES_LIB) $(STDLIB) 
+		: $(GLOBALFLAGS) $(EDELIB_GUI_NO_IMAGES_INCLUDE) ;
 
 	if $(3) != "noinstall" {
 		InstallEdeProgram $(1) ;
 	}
 }
 
-# EfltkProgram [target] : [sources] : [noinstall] ;
-# Creates programs that will be linked with efltk. If [noinstall] is given, 
-# [target] will not be installed wit 'jam install'.
-rule EfltkProgram 
-{
-	if ! $(EFLTKINCLUDE) || ! $(EFLTKLIB) {
-		Echo "EFLTKINCLUDE or EFLTKLIB not defined; $(1) will not be built" ;
-		return ;
-	}
-
-	MakeProgramPrivate $(1) : $(2) 
-		: $(EFLTKLIB) $(STDLIB) 
-		: $(GLOBALFLAGS) $(EFLTKINCLUDE) ;
-
-	# install it where ede binaries resides
-	if $(3) != "noinstall" {
-		InstallEdeProgram $(1) ;
-	}
-}
-
 # FltkProgram [target] : [sources] : [noinstall] ;
 # Creates programs that will be linked with fltk only. It will use full fltk
 # dependencies (images).

build/Svg.jam

@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SVG_CONVERTOR = "rsvg" ;
+SVG_CONVERTOR = "rsvg-convert" ;
 
 # SvgToPng [target-png] : [source-svg] : [width] : [height] ;
 rule SvgToPng

configure.in

@@ -2,14 +2,14 @@ dnl
 dnl $Id: configure.in 1719 2006-08-15 08:56:42Z karijes $
 dnl
 dnl Part of Equinox Desktop Environment (EDE).
-dnl Copyright (c) 2000-2008 EDE Authors.
+dnl Copyright (c) 2000-2014 EDE Authors.
 dnl 
 dnl This program is licenced under terms of the 
 dnl GNU General Public Licence version 2 or newer.
 dnl See COPYING for details.
 
 m4_define([ede_major_version], [2])
-m4_define([ede_minor_version], [0])
+m4_define([ede_minor_version], [2])
 m4_define([ede_patch_version], [0])
 m4_define([ede_version], [ede_major_version.ede_minor_version.ede_patch_version])
 
@@ -28,7 +28,6 @@ else
 fi
 AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place])
 
-
 EDE_OPTIM_FLAGS=""
 EDE_DEBUG_FLAGS=""
 
@@ -40,8 +39,6 @@ AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support (default=y
 
 dnl set 'with_fltk_path'
 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'
 AC_ARG_WITH(edelib_path, AC_HELP_STRING([--with-edelib-path=[DIR]], [alternative directory where edelib is installed]))
 
@@ -59,6 +56,17 @@ AC_PATH_XTRA
 
 AC_HEADER_STDC
 
+dnl for xmlrpc-c
+AC_CHECK_FUNC(pselect, AC_DEFINE(HAVE_PSELECT, 1, [Define to 1 if you have pselect()]))
+AC_CHECK_FUNC(setgroups, AC_DEFINE(HAVE_SETGROUPS, 1, [Define to 1 if you have setgroups()]))
+AC_CHECK_FUNC(asprintf, AC_DEFINE(HAVE_ASPRINTF, 1, [Define to 1 if you have asprintf()]))
+AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, 1, [Define to 1 if you have setenv()]))
+AC_CHECK_FUNC(wcsncmp, AC_DEFINE(HAVE_WCSNCMP, 1, [Define to 1 if you have wcsncmp()]))
+AC_CHECK_FUNC(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Define to 1 if you have gettimeofday()]))
+AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Define to 1 if you have localtime_r()]))
+AC_CHECK_FUNC(gmtime_r, AC_DEFINE(HAVE_GMTIME_R, 1, [Define to 1 if you have gmtime_r()]))
+AC_CHECK_FUNC(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [Define to 1 if you have strcasecmp()]))
+
 if test "$enable_profile" = "yes"; then
 	enable_debug=yes
 fi
@@ -81,6 +89,7 @@ if test "$enable_shape" = "yes"; then
 
 	if test "$have_xshape" = "yes"; then
 		AC_DEFINE(HAVE_SHAPE, 1, [Define to 1 if you have XShape extension])
+		XSHAPE_LIBS="-lXext"
 	fi
 fi
 
@@ -109,10 +118,7 @@ else
 fi
 
 if test -n "$with_edelib_path"; then
-	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$with_edelib_path"
-else
-	dnl TODO: remove this in release
-	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/ede/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$with_edelib_path/lib/pkgconfig"
 fi
 
 PKG_CHECK_MODULES(EDELIB, [edelib],, [have_edelib=no])
@@ -125,9 +131,14 @@ if test "$have_edelib_gui" = "no"; then
 	AC_MSG_ERROR(edelib-gui not found! You must install it first)
 fi
 
+PKG_CHECK_MODULES(EDELIB_GUI_NO_IMAGES, [edelib-gui-no-images],, [have_edelib_gui_no_images=no])
+if test "$have_edelib_gui_no_images" = "no"; then
+	AC_MSG_ERROR(edelib-gui (without images) not found! You must install it first)
+fi
+
 PKG_CHECK_MODULES(EDELIB_DBUS, [edelib-dbus],, [have_edelib_dbus=no])
 if test "$have_edelib_dbus" = "no"; then
-	AC_MSG_ERROR(edelib-dbus not found! You must install it first)
+	AC_MSG_RESULT(edelib is compiled without DBus so EDE will be compiled without DBus support)
 fi
 
 dnl find edelib documentation
@@ -152,8 +163,8 @@ if test -n "$FLTK_CONFIG"; then
 		AC_MSG_RESULT(yes)
 		;;
 		dnl check for FLTK 1.3.x branch
-		["1.3."[01]])
-		AC_MSG_RESULT([yes... Looks like you have unstable FLTK branch ($fltk_version). EDE is not well tested with these FLTK versions])
+		["1.3."[0123456789]])
+		AC_MSG_RESULT(yes)
 		;;
 		*)
 		AC_MSG_ERROR([Looks like you have an older FLTK version ($fltk_version). Required is >= 1.1.7])
@@ -168,31 +179,6 @@ else
 	AC_MSG_ERROR([You don't have FLTK installed. To compile EDE, you will need it.])
 fi
 
-if test "x$with_efltk_path" = "x"; then
-	AC_PATH_PROG(EFLTK_CONFIG, efltk-config)
-else
-	AC_PATH_PROG(EFLTK_CONFIG, efltk-config,, "$with_efltk_path/bin")
-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 panel and window manager!])
-fi
-
 EDE_CHECK_LIBXPM
 if test "$have_libxpm" = "yes"; then
 	FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS"
@@ -207,14 +193,100 @@ if test -n "$CURL_CONFIG"; then
 	CURL_CFLAGS=`$CURL_CONFIG --cflags`
 	CURL_LIBS=`$CURL_CONFIG --libs`
 	AC_DEFINE(HAVE_CURL, 1, [Define to 1 if you have curl library])
+
+	AC_LANG_SAVE
+	AC_LANG_C
+	AC_TRY_COMPILE([
+		#include <curl/curl.h>
+		#include <curl/types.h>
+	],[
+		CURL *curl;
+		curl = curl_easy_init();
+	],[have_curltypes_h=yes],[])
+	AC_LANG_RESTORE
+
+	if test "$have_curltype_h" = "yes"; then
+		AC_DEFINE(HAVE_CURLTYPES_H, 1, [Define to 1 if you have curl/types.h file])
+	fi
 fi
 
 dnl emits PTHREAD_CFLAGS and PTHREAD_LIBS
 ACX_PTHREAD
 
-EDE_CHECK_DIR(DBUS_SERVICE_DIR, 
-			  [/usr/share/dbus-1/services /usr/local/share/dbus-1/services "$datarootdir/dbus-1/services"])
+AC_MSG_CHECKING([for XKB extension files])
+ac_save_CFLAGS="$CFLAGS"
+ac_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lxkbfile"
 
+AC_LANG_SAVE
+AC_LANG_C
+AC_TRY_LINK([
+	#include <stdio.h>
+	#include <X11/XKBlib.h>
+	#include <X11/extensions/XKBrules.h>
+],[
+	FILE *fd = fopen("/some/file", "r");
+	XkbRF_RulesPtr ptr;
+	XkbRF_LoadRules(fd, ptr);
+],[have_xkbrules=yes],[])
+AC_LANG_RESTORE
+
+CFLAGS="$ac_save_CFLAGS"
+LIBS="$ac_save_LIBS"
+
+if test "$have_xkbrules" = "yes"; then
+	AC_DEFINE(HAVE_XKBRULES, 1, [Define to 1 if you have XKB extension])
+	XKB_LIBS="$X_LIBS -lxkbfile"
+	AC_MSG_RESULT(yes)
+else 
+	AC_MSG_RESULT(no)
+fi
+
+dnl this check is stolen from xmlrpc-c which is borrowed from Python 1.5.2.
+AC_MSG_CHECKING([whether va_list is an array])
+AC_TRY_COMPILE([
+	#include <stdarg.h>
+],[
+	va_list list1, list2; list1 = list2;
+],, va_list_is_array=yes)
+
+if test "x$va_list_is_array" = "xyes"; then
+	AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define to 1 if your va_list is array])
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+
+dnl kstat/solaris
+AC_CHECK_HEADER(kstat.h, [have_kstat_h=yes],)
+if test "x$have_kstat_h" = "xyes"; then
+	AC_MSG_CHECKING([for kstat presence])
+
+	AC_LANG_SAVE
+	AC_LANG_C
+	AC_TRY_COMPILE([
+		#include <kstat.h>
+	],[
+		kstat_named_t k;
+		k.value.ui32;
+	],[have_kstat=yes],[])
+	AC_LANG_RESTORE
+
+	if test "x$have_kstat" = "xyes"; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_KSTAT, 1, [Define to 1 if you have kstat])
+		KSTAT_LIBS=" -lkstat"
+	else
+		AC_MSG_RESULT(no)
+	fi
+fi
+
+dnl pekwm specific macros
+EDE_CHECK_PEKWM_DEPENDENCIES
+
+dnl expand variables before EDE_INIT_JAM convert them to jam variables
+EDE_EXPAND(sysconfdir, "NONE", my_sysconfdir)
 
 EDE_INIT_JAM
 
@@ -224,13 +296,16 @@ AC_SUBST(EDE_DEBUG_FLAGS)
 AC_SUBST(FLTK_CFLAGS)
 AC_SUBST(FLTK_LIBS)
 AC_SUBST(FLTK_LIBS_NOIMAGES)
-AC_SUBST(EFLTK_CFLAGS)
-AC_SUBST(EFLTK_LIBS_NOIMAGES)
-AC_SUBST(EFLTK_LIBS)
 AC_SUBST(EDELIB_API_INDEX)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 AC_SUBST(LARGEFILE)
+AC_SUBST(XKB_LIBS)
+AC_SUBST(XSHAPE_LIBS)
+AC_SUBST(my_sysconfdir)
+AC_SUBST(KSTAT_LIBS)
+AC_SUBST(PEKWM_CXXFLAGS)
+AC_SUBST(PEKWM_LIBS)
 
 AC_OUTPUT([
  Jamconfig
@@ -239,7 +314,6 @@ AC_OUTPUT([
  data/ede.desktop
  doc/index.txt
  services/org.equinoxproject.Launch.service
- services/org.equinoxproject.StartupNotify.service
 ])
 
 chmod +x tools/l10n-prepare.sh

data/Jamfile

@@ -16,10 +16,12 @@ InstallEdeProgram      startede ;
 InstallEdeConfigFiles  $(CONFS) ;
 
 # install entry for login/desktop managers
-InstallData /usr/share/xsessions : ede.desktop ;
+InstallData $(XSESSIONS_DIR) : ede.desktop ;
 Clean distclean : ede.desktop ;
 
 SubInclude TOP data mime-types ;
 SubInclude TOP data icon-themes ;
 SubInclude TOP data menu ;
 SubInclude TOP data desktop-links ;
+SubInclude TOP data pekwm ;
+SubInclude TOP data wallpapers ;

data/desktop-links/ede-xterm.desktop

@@ -2,8 +2,8 @@
 Version=1.0
 Type=Application
 Encoding=UTF-8
-Exec=xterm -fn 9x15
+Exec=ede-launch --launch terminal
 Icon=utilities-terminal
 Categories=Utility;
 Name=Terminal
-Comment=Standard X11 terminal
+Comment=X11 terminal

data/ede.desktop.in

@@ -1,7 +1,6 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=EDE
 Exec=@prefix@/bin/startede
-TryExec=@prefix@/bin/startede
 Comment=This session logs you into EDE Desktop
 Type=Application
-Encoding=UTF-8

data/icon-themes/Jamfile

@@ -56,3 +56,13 @@ if $(BUILD_ICON_THEMES) = 1 {
 	ConvertIconTheme "edeneu" : $(ICON_SIZES) : $(ICON_CATEGORIES) ;
 	InstallIconTheme "edeneu" : $(ICON_SIZES) : $(ICON_CATEGORIES) ;
 }
+
+if $(INSTALL_ICON_THEMES) = 1 {
+	InstallIconTheme "edeneu" : $(ICON_SIZES) : $(ICON_CATEGORIES) ;
+}
+
+# install kbflags icons
+KBFLAGS_ICONS_DIR = [ FDirName "kbflags" "21x14" ] ;
+KBFLAGS_ICONS     = [ Wildcard $(KBFLAGS_ICONS_DIR) : *.png : $(KBFLAGS_ICONS_DIR) ] ;
+
+InstallEdeIcons $(KBFLAGS_ICONS_DIR) : $(KBFLAGS_ICONS) ;

data/icon-themes/icon-theme-convert

@@ -1,133 +0,0 @@
-#!/usr/bin/env python
-# Converts svg icon theme to png one using inkscape or rsvg
-
-import os.path
-import os
-import sys
-import stat
-
-inkscape_path = None
-rsvg_path     = None
-
-SIZES = ["16x16", "22x22", "32x32", "48x48", "64x64", "128x128"]
-
-def find_converter(name):
-	env_list = os.environ["PATH"].split(":")
-
-	for i in env_list:
-		path = "%s/%s" % (i, name)
-		if os.access(path, os.F_OK) and os.access(path, os.X_OK):
-			return path
-	return None
-
-def convert_ext(name):
-	if name[-4:] == ".svg":
-		return name.replace(".svg", ".png")
-	else:
-		return name
-
-def dir_exists(path):
-	# first use this since stat() scream if not exists
-	if not os.access(path, os.F_OK):
-		return False
-	mode = os.stat(path)[stat.ST_MODE]
-	return stat.S_ISDIR(mode)
-
-def in_subdir(path):
-	all = path.split("/")[1:]
-	return len(all)
-
-# transform 'foo/XX/yy' to 'dest/sz/yy'
-def transform_path(path, dest, sz):
-	all = path.split("/")
-
-	# this means we got 'theme/scalable' but we want 'theme/scalable/something/'
-	if len(all) < 3:
-		return None
-
-	all[0] = dest
-	all[1] = sz
-	return "/".join(all)
-
-def visit(destdir, dirname, names):
-	cmd = None
-
-	# os.walk will first walk on the top of source directory before 
-	# enters it's childs; we are interested only in childs
-	if not in_subdir(dirname):
-		return
-
-	for name in names:
-		for sz in SIZES:
-			w, h = sz.split("x")
-
-			finaldir = transform_path(dirname, destdir, sz)	
-			if finaldir == None:
-				continue
-
-			srcicon = "%s/%s" % (dirname, name)
-			dsticon = "%s/%s" % (finaldir, convert_ext(name))
-
-			# make it once without exception
-			if not dir_exists(finaldir):
-				os.makedirs(finaldir)
-
-			if inkscape_path:
-				cmd = "%s -e %s -w %s -h %s %s" % (inkscape_path, dsticon, w, h, srcicon)
-			elif rsvg_path:
-				cmd = "%s -w %s -h %s %s %s" % (rsvg_path, w, h, srcicon, dsticon)
-
-			print "%s -> %s" % (srcicon, dsticon)
-			if os.system(cmd) != 0:
-				print "FAILED :("
-
-def convert(srcdir, dstdir):
-	os.path.walk(srcdir, visit, dstdir) 
-
-def help():
-	print "Usage: icon-theme-convert [source] [dest]"
-	print ""
-	print "Convert [source] icon theme (assumed all files are in SVG format)"
-	print "to PNG equivalent one, using rsvg or inkscape. Converted content will be stored in [source]."
-	print "If [dest] was given, converted content will be stored there."
-
-def main():
-	arg_len = len(sys.argv)
-	
-	if not arg_len in [2, 3]:
-		help()
-		return
-
-	# mark them as global
-	global inkscape_path
-	global rsvg_path
-
-	cpath = find_converter("inkscape")
-	if cpath:
-		inkscape_path = cpath
-	else:
-		cpath = find_converter("rsvg")
-		if cpath:
-			rsvg_path = cpath
-		else:
-			print "\nUnable to find either inkscape or rsvg. If you have installed"
-			print "one of them, append it's directory path to PATH environment.\n"
-			print "But if you don't have installed neither of them... well..."
-			print "you know what to do then :P\n"
-			return
-
-	src = sys.argv[1]
-
-	if arg_len == 3:
-		dst = sys.argv[2]
-	else:
-		dst = src
-
-	if not dir_exists(src):
-		print "%s does not exists. Then what to convert?" % src
-		return
-
-	convert(src, dst)
-
-if __name__ == "__main__":
-	main()