Merge branch 'master' into to_push

1 files changed, 89 insertions, 14 deletions

diff --git a/configure.in b/configure.in
index 99889fa..7fbe805 100644
--- a/configure.in
+++ b/configure.in
@@ -290,20 +290,6 @@ AC_ARG_ENABLE(
 )
 AM_CONDITIONAL(NEWWMSPEC, test x$NEWWMSPEC = xtrue)
 
-dnl Check for ordered 8bpp dithering
-AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
-AC_ARG_ENABLE(ordered-pseudo,
-[  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
-                          dithering ([default=no])],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-        AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code")
-  else
-    AC_MSG_RESULT([no]) 
-  fi,
-  AC_MSG_RESULT([no])
-)
-
 dnl Check whether to include debugging code
 DEBUG=""
 AC_MSG_CHECKING([whether to include verbose debugging code])
@@ -538,6 +524,14 @@ AC_ARG_WITH(
 AC_SUBST(DEFAULT_MENU)
 
 AC_ARG_WITH(
+  windowmenu,
+  [  --with-windowmenu=path  location windowmenu file (PREFIX/share/fluxbox/windowmenu)],
+  DEFAULT_WINDOWMENU=$with_windowmenu,
+  DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu
+)
+AC_SUBST(DEFAULT_WINDOWMENU)
+
+AC_ARG_WITH(
   style,
   [  --with-style=path       style by default   (PREFIX/share/fluxbox/styles/bloe)],
   DEFAULT_STYLE=$with_style,
@@ -554,6 +548,22 @@ AC_ARG_WITH(
 AC_SUBST(DEFAULT_KEYS)
 
 AC_ARG_WITH(
+  apps,
+  [ --with-apps=path         location apps file (PREFIX/share/fluxbox/apps)],
+  DEFAULT_APPS=$with_apps,
+  DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps
+)
+AC_SUBST(DEFAULT_APPS)
+
+AC_ARG_WITH(
+  overlay,
+  [ --with-overlay=path      location overlay file (PREFIX/share/fluxbox/overlay)],
+  DEFAULT_OVERLAY=$with_overlay,
+  DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay
+)
+AC_SUBST(DEFAULT_OVERLAY)
+
+AC_ARG_WITH(
   init,
   [  --with-init=path        location init file (PREFIX/share/fluxbox/init)],
   DEFAULT_INIT=$with_init,
@@ -649,6 +659,7 @@ nls/it_IT/Makefile
 nls/ja_JP/Makefile
 nls/ko_KR/Makefile
 nls/lv_LV/Makefile
+nls/mk_MK/Makefile
 nls/nb_NO/Makefile
 nls/nl_NL/Makefile
 nls/no_NO/Makefile
@@ -665,3 +676,67 @@ nls/vi_VN/Makefile
 nls/zh_CN/Makefile
 nls/zh_TW/Makefile
 )
+
+dnl autoscan suggested these as of 2cac7ddf6fb0b3c937c4ea7b55b20960e362a360 
+dnl wanted by: src/ClockTool.cc:262
+AC_CHECK_FUNCS([gettimeofday])
+dnl wanted by: src/Ewmh.cc:770
+AC_CHECK_FUNCS([memset])
+dnl wanted by: src/fluxbox.cc:553
+AC_CHECK_FUNCS([mkdir])
+dnl wanted by: src/FbTk/FbString.cc:80
+AC_CHECK_FUNCS([nl_langinfo])
+dnl wanted by: src/FbCommands.cc:172
+AC_CHECK_FUNCS([putenv])
+dnl wanted by: src/FbTk/RegExp.cc:56
+AC_CHECK_FUNCS([regcomp])
+dnl wanted by: src/FbTk/Timer.cc:156
+AC_CHECK_FUNCS([select])
+dnl wanted by: src/FbCommands.cc:206
+AC_CHECK_FUNCS([setenv])
+dnl wanted by: src/WorkspaceCmd.cc:403
+AC_CHECK_FUNCS([sqrt])
+dnl wanted by: src/ClientPattern.cc:104
+AC_CHECK_FUNCS([strcasecmp])
+dnl wanted by: src/FbTk/XmbFontImp.cc:101
+AC_CHECK_FUNCS([strchr])
+dnl wanted by: src/RootTheme.cc:187
+AC_CHECK_FUNCS([strstr])
+dnl wanted by: src/Window.cc:4165
+AC_CHECK_FUNCS([strtol])
+dnl wanted by: src/Keys.cc:422
+AC_CHECK_FUNCS([strtoul])
+dnl wanted by: src/FbTk/FbString.cc:43
+AC_CHECK_HEADERS([langinfo.h])
+dnl wanted by: src/AlphaMenu.cc:51
+AC_C_CONST
+dnl wanted by: src/Window.cc:3259
+AC_C_INLINE
+dnl wanted by: src/FbTk/FileUtil.cc:117
+AC_FUNC_CLOSEDIR_VOID
+dnl wanted by: src/ClientPattern.cc:333
+AC_FUNC_ERROR_AT_LINE
+dnl wanted by: src/FbCommands.cc:144
+AC_FUNC_FORK
+dnl wanted by: src/FbTk/FbString.cc:150
+AC_FUNC_MALLOC
+dnl wanted by: src/FbTk/FbString.cc:181
+AC_FUNC_REALLOC
+dnl wanted by: src/FbTk/Timer.cc:156
+AC_FUNC_SELECT_ARGTYPES
+dnl wanted by: src/Slit.cc:1149
+AC_FUNC_STAT
+dnl wanted by: src/ClockTool.cc:273
+AC_FUNC_STRFTIME
+dnl wanted by: src/FbTk/FileUtil.hh:34
+AC_HEADER_DIRENT
+dnl wanted by: src/AlphaMenu.hh:49
+AC_HEADER_STDBOOL
+dnl wanted by: src/Keys.cc:75
+AC_HEADER_SYS_WAIT
+dnl wanted by: src/AlphaMenu.cc:37
+AC_STRUCT_TM
+dnl wanted by: src/FbCommands.cc:144
+AC_TYPE_PID_T
+dnl wanted by: src/ClientMenu.cc:128
+AC_TYPE_SIZE_T