Dummy way to search iconv on platformes where it is separate library. More fixes on pekwm configure macros. Fixing compilation for ede-desktop.cpp

ede-desktop/ede-desktop.cpp

@@ -318,7 +318,7 @@ void Desktop::read_config(void) {
 
 	/* try to get font */
 	if(conf.get("Icons", "label_font", font_name, sizeof(font_name))) {
-		font_cache_find(font_name, (Fl_Font)gisett->label_font,
+		font_cache_find(font_name, (Fl_Font&)gisett->label_font,
 								            gisett->label_fontsize,
 								   (Fl_Font)gisett->label_font,
 								            gisett->label_fontsize);

ede-panel/Panel.cpp

@@ -414,7 +414,9 @@ void Panel::load_applets(void) {
 		"taskbar.so",
 		"keyboard_layout.so",
 		"cpu_monitor.so",
+#ifdef __linux__
 		"mem_monitor.so",
+#endif
 		"system_tray.so",
 		0
 	};

m4/pekwm.m4

@@ -13,19 +13,31 @@ AC_DEFUN([EDE_CHECK_PEKWM_DEPENDENCIES], [
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 
-dnl Check for iconv
+dnl Stupid way to find iconv; on linux, iconv is part of glibc, for others
-dnl AM_ICONV
+dnl try to search binary, then adjust paths
-dnl if test "x$am_cv_func_iconv" != "xyes"; then
+if test "x$`uname`" = "xLinux"; then
-dnl    AC_MSG_ERROR([Could not find iconv.])
+ 	LIBICONV=""
-dnl fi
+ 	INCICONV=""
-dnl 
+else
-dnl PEKWM_LIBS="$LIBS $LIBICONV"
+	iconv_path="`which iconv 2>/dev/null | sed 's/\/bin\/.*//g'`"
-dnl PEKWM_CXXFLAGS="$CXXFLAGS $INCICONV"
+	if test "x$iconv_path" != "x"; then
-dnl PEKWM_FEATURES=""
+		LIBICONV="-L$iconv_path/lib -liconv"
-dnl 
+		INCICONV="-I$iconv_path/include"
+		dnl dummy
+		AC_DEFINE(ICONV_CONST, [1], [Define if iconv() have second parameter const])
+	fi
+fi
+ 
+PEKWM_LIBS="$PEKWM_LIBS $LIBICONV"
+PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $INCICONV"
+
 dnl Check for iconvctl
 AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you the iconvctl call])], )
 
+dnl Assume we have X libs
+PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $X_CFLAGS"
+PEKWM_LIBS="$PEKWM_LIBS $X_LIBS $X_EXTRA_LIBS"
+
 dnl Check for Xinerama support
 AC_MSG_CHECKING([whether to build support for the Xinerama extension])
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
@@ -118,78 +130,44 @@ AC_MSG_CHECKING([wheter to build support XPM images])
 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
   AC_MSG_CHECKING([for X11/xpm.h])
     AC_TRY_COMPILE(
-#include <X11/xpm.h>
+	#include <X11/xpm.h>
 	, int foo = XpmSuccess,
 	AC_MSG_RESULT([yes])
 	AC_DEFINE(HAVE_IMAGE_XPM, [1], [Define to 1 if you libXpm])
 	PEKWM_LIBS="$PEKWM_LIBS -lXpm"
 	PEKWM_FEATURES="$PEKWM_FEATURES image-xpm",
-		AC_MSG_RESULT([no])))
+AC_MSG_RESULT([no])))
 
 dnl Check for JPEG support
- 	AC_CHECK_LIB(jpeg, jpeg_read_header,
+AC_CHECK_LIB(jpeg, jpeg_read_header,
 	AC_MSG_CHECKING([for jpeglib.h])
- 		AC_TRY_CPP([#include <jpeglib.h>],
+	AC_TRY_CPP([#include <jpeglib.h>], jpeg_ok=yes, jpeg_ok=no)
-			jpeg_ok=yes,
- 			jpeg_ok=no)
 	AC_MSG_RESULT($jpeg_ok)
 	if test "$jpeg_ok" = yes; then
 		AC_DEFINE(HAVE_IMAGE_JPEG, [1], [Define to 1 if you have jpeg6b])
 		PEKWM_LIBS="$PEKWM_LIBS -ljpeg"
 		PEKWM_FEATURES="$PEKWM_FEATURES image-jpeg"
 	fi,
- 		AC_MSG_RESULT([no]))
+AC_MSG_RESULT([no]))
 
 dnl Check for PNG support
-        PKG_CHECK_MODULES([libpng12], [libpng12 >= 1.2.0], HAVE_LIBPNG=yes, HAVE_LIBPNG=no)
+PKG_CHECK_MODULES([libpng12], [libpng12 >= 1.2.0], HAVE_LIBPNG=yes, HAVE_LIBPNG=no)
-        if test "x$HAVE_LIBPNG" = "xyes"; then
+if test "x$HAVE_LIBPNG" = "xyes"; then
 	AC_DEFINE(HAVE_IMAGE_PNG, [1], [Define to 1 if you have libpng12])
 	PEKWM_LIBS="$PEKWM_LIBS $libpng12_LIBS"
 	PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $libpng12_CFLAGS"
 	PEKWM_FEATURES="$PEKWM_FEATURES image-png"
- 	else
+else
 	PKG_CHECK_MODULES([libpng], [libpng >= 1.0.0], HAVE_LIBPNG=yes, HAVE_LIBPNG=no)
-
 	if test "x$HAVE_LIBPNG" = "xyes"; then                
 		AC_DEFINE(HAVE_IMAGE_PNG, [1], [Define to 1 if you have libpng12])
- 		        PEKWM_LIBS="PEKWM_$LIBS $libpng_LIBS"
+		PEKWM_LIBS="$PEKWM_LIBS $libpng_LIBS"
 		PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $libpng_CFLAGS"
 		PEKWM_FEATURES="$PEKWM_FEATURES image-png"
 	else
 		AC_MSG_RESULT([no])
 	fi
-        fi
+fi
-
-dnl Check whether to include debugging code
-dnl AC_MSG_CHECKING([whether to include verbose debugging code])
-dnl AC_ARG_ENABLE(debug,
-dnl 	AC_HELP_STRING([--enable-debug],
-dnl 								 [include verbose debugging code [default=no]]), ,
-dnl 							[enable_debug=no])
-dnl if test "x$enable_debug" = "xyes"; then
-dnl 	AC_MSG_RESULT([yes])
-dnl 	AC_DEFINE(DEBUG, [1], [Define to 1 to compile in debug information])
-dnl 	FEATURES="$FEATURES debug"
-dnl else
-dnl 	AC_MSG_RESULT([no])
-dnl fi
-dnl 
-dnl dnl Check wheter to use strict warnings
-dnl AC_MSG_CHECKING([whether to use strict compile-time warnings])
-dnl AC_ARG_ENABLE(pedantic,
-dnl 	AC_HELP_STRING([--enable-pedantic],
-dnl 								 [turn on strict compile-time warnings [default=no]]), ,
-dnl 							[enable_pedantic=no])
-dnl if test "$enable_pedantic" = "yes"; then
-dnl 	AC_MSG_RESULT([yes])
-dnl         if test "x$GXX" = "xyes"; then
-dnl 		CXXFLAGS="-Wall -Werror -pedantic $CXXFLAGS"
-dnl 	fi
-dnl 	FEATURES="$FEATURES pedantic"
-dnl else
-dnl 	AC_MSG_RESULT([no])
-dnl fi
-dnl 
 
 AC_DEFINE(OPACITY, [1], [Define to 1 to compile in support for opacity hinting])
 

pekwm/Jamfile

@@ -65,5 +65,5 @@ SOURCE = ActionHandler.cc
 
 Program pekwm : $(SOURCE) ;
 ObjectC++Flags $(SOURCE) : $(GLOBALFLAGS) $(PEKWM_CXXFLAGS) -DDATADIR=\\\"$(datadir)\\\" -DSYSCONFDIR=\\\"$(PEKWM_CONFIG_DIR)\\\" -DVERSION=\\\"0.1.13\\\"  ;
-LinkAgainst pekwm : $(PEKWM_LIBS) -lX11 -lXext $(STDLIB) ;
+LinkAgainst pekwm : $(PEKWM_LIBS) $(STDLIB) ;
 InstallEdeProgram pekwm ;