aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2012-12-05 14:43:33 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-12-05 15:00:55 (GMT)
commitb178bed60b5bd8b2c9ed0cbc67fd729ff3820589 (patch)
tree4470405caad514f8207df3219ea0517e5f0316e1
parent7e374fcef67aec07124a12d94833d266f292e583 (diff)
downloadfluxbox-b178bed60b5bd8b2c9ed0cbc67fd729ff3820589.zip
fluxbox-b178bed60b5bd8b2c9ed0cbc67fd729ff3820589.tar.bz2
Simplified 'configure' / build system
* reduced duplicated auto-code * renamed '--enable-newwmspec' to '--enable-ewmh' * don't compile 'Slit'-code when '--disable-slit' * use AS_IF() in configure.in * use AS_HELP_STRING() instead of obsolete AC_HELP_STRING in configure.in * removed redundant calls to 'imlib2-config' to fill in $IMLIB2_CFLAGS and $IMLIB2_LIBS, AC_PATH_GENERIC() does that out of the box already
-rw-r--r--configure.in518
-rw-r--r--src/Makefile.am15
-rw-r--r--src/Screen.cc20
-rw-r--r--src/fluxbox.cc10
-rw-r--r--src/main.cc6
5 files changed, 208 insertions, 361 deletions
diff --git a/configure.in b/configure.in
index 8ec02d5..b20bf9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
1dnl Initialize autoconf and automake 1dnl Initialize autoconf and automake
2AC_INIT(src/main.cc) 2AC_INIT(src/main.cc)
3AC_PREREQ(2.52) 3AC_PREREQ(2.52)
4AM_INIT_AUTOMAKE(fluxbox,1.3.2, no-define) 4AM_INIT_AUTOMAKE(fluxbox,1.3.2,[no-define])
5 5
6dnl Determine default prefix 6dnl Determine default prefix
7test x$prefix = "xNONE" && prefix="$ac_default_prefix" 7AS_IF(test "x$prefix" = "xNONE",[prefix="$ac_default_prefix"])
8 8
9dnl Check for various flavors of UNIX(r) 9dnl Check for various flavors of UNIX(r)
10dnl AC_AIX 10dnl AC_AIX
@@ -26,9 +26,7 @@ AC_TYPE_SIZE_T
26 26
27 27
28AC_CHECK_PROGS(regex_cmd, sed) 28AC_CHECK_PROGS(regex_cmd, sed)
29if test x$regex_cmd = "x"; then 29AS_IF(test "x$regex_cmd" = "x",[AC_MSG_ERROR([error. sed is required to build the data files.])])
30 AC_MSG_ERROR([error. sed is required to build the data files.])
31fi
32 30
33dnl Check for system header files 31dnl Check for system header files
34AC_HEADER_STDC 32AC_HEADER_STDC
@@ -42,9 +40,9 @@ AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \
42 40
43 41
44 42
45AC_CHECK_HEADERS(sstream, , 43AC_CHECK_HEADERS(sstream,,[
46 [ AC_CHECK_HEADERS(strstream,, 44 AC_CHECK_HEADERS(strstream,,[
47 [AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])] 45 AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])]
48 )] 46 )]
49) 47)
50 48
@@ -208,8 +206,8 @@ AC_PATH_XTRA
208 206
209test x$no_x = "xyes" && AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.]) 207test x$no_x = "xyes" && AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
210 208
211test x$x_includes = "x" && x_includes="/usr/include" 209AS_IF(test "x$x_includes" = "x",[x_includes="/usr/include"])
212test x$x_libraries = "x" && x_libraries="/usr/lib" 210AS_IF(test "x$x_libraries" = "x",[x_libraries="/usr/lib"])
213 211
214CFLAGS="$CFLAGS $X_CFLAGS" 212CFLAGS="$CFLAGS $X_CFLAGS"
215CXXFLAGS="$CXXFLAGS $X_CFLAGS" 213CXXFLAGS="$CXXFLAGS $X_CFLAGS"
@@ -222,184 +220,114 @@ AC_CHECK_LIB(X11, XOpenDisplay, LIBS="-lX11 $LIBS", AC_MSG_ERROR([Could not find
222LIBS="$X_EXTRA_LIBS $LIBS" 220LIBS="$X_EXTRA_LIBS $LIBS"
223 221
224AC_CHECK_LIB(xpg4, setlocale, LIBS="-lxpg4 $LIBS") 222AC_CHECK_LIB(xpg4, setlocale, LIBS="-lxpg4 $LIBS")
225
226AC_CHECK_PROGS(gencat_cmd, gencat) 223AC_CHECK_PROGS(gencat_cmd, gencat)
227if test x$gencat_cmd = "x"; then 224AS_IF(test "x$gencat_cmd" = "x",[NLS=""],[])
228 NLS=""
229fi
230 225
231Xext_lib="" 226Xext_lib=""
232 227
233 228
234dnl Check for the Slit
235AC_MSG_CHECKING([whether to include the Slit])
236AC_ARG_ENABLE(
237 slit, [ --enable-slit include code for the Slit ([default=yes])],
238 if test x$enableval = "xyes"; then
239 AC_MSG_RESULT([yes])
240 AC_DEFINE(SLIT, 1, " compile with slit")
241 else
242 AC_MSG_RESULT([no])
243 fi,
244 AC_MSG_RESULT([yes])
245 AC_DEFINE(SLIT, 1, " compile with slit")
246)
247 229
248dnl Check for Remember options 230dnl Check for Remember options
249AC_MSG_CHECKING([whether to include remember functionality]) 231AC_MSG_CHECKING([whether to include remember functionality])
250AC_ARG_ENABLE( 232AC_ARG_ENABLE(remember,
251 remember, [ --enable-remember include code for Remembering attributes ([default=yes])], 233 AS_HELP_STRING([--enable-remember],[include Remembering attributes (default=yes)]),,[enable_remember=yes])
252 if test x$enableval = "xyes"; then 234AC_MSG_RESULT([$enable_remember])
253 AC_MSG_RESULT([yes]) 235AS_IF(test "x$enable_remember" = "xyes",[AC_DEFINE(REMEMBER, 1, " compile with remember")],[])
254 AC_DEFINE(REMEMBER, 1, " compile with remember") 236AM_CONDITIONAL(REMEMBER_SRC, test "x$enable_remember" = "xyes")
255 REMEMBER_SRC=true
256 else
257 AC_MSG_RESULT([no])
258 REMEMBER_SRC=false
259 fi,
260 AC_MSG_RESULT([yes])
261 AC_DEFINE(REMEMBER, 1, " compile with remember")
262 REMEMBER_SRC=true
263)
264AM_CONDITIONAL(REMEMBER_SRC, test x$REMEMBER_SRC = xtrue)
265 237
266dnl Check for Toolbar options
267AC_MSG_CHECKING([whether to include Toolbar])
268AC_ARG_ENABLE(
269 toolbar, [ --enable-toolbar include code for Toolbar ([default=yes])],
270 if test x$enableval = "xyes"; then
271 AC_MSG_RESULT([yes])
272 AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")
273 TOOLBAR_SRC=true
274 else
275 AC_MSG_RESULT([no])
276 TOOLBAR_SRC=false
277 fi,
278 AC_MSG_RESULT([yes])
279 AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")
280 TOOLBAR_SRC=true
281)
282AM_CONDITIONAL(TOOLBAR_SRC, test x$TOOLBAR_SRC = xtrue)
283 238
284AC_MSG_CHECKING([whether to have (POSIX) regular expression support]) 239AC_MSG_CHECKING([whether to have (POSIX) regular expression support])
285AC_ARG_ENABLE( 240AC_ARG_ENABLE(regexp,
286 regexp, 241 AS_HELP_STRING([--enable-regexp],[regular expression support (default=yes)]),,[enable_regexp=yes])
287[ --enable-regexp regular expression support ([default=yes])], 242AS_IF(test "x$enable_regexp" = "xyes",[
288 if test x$enableval = "xyes"; then 243 AC_EGREP_HEADER([regex_t],regex.h,
289 AC_EGREP_HEADER([regex_t],regex.h,
290 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
291 AC_MSG_RESULT([yes])
292 REGEXP_SRC=true,
293 AC_MSG_RESULT([no])
294 REGEXP_SRC=false
295 )
296 else
297 AC_MSG_RESULT([no])
298 REGEXP_SRC=false
299 fi,
300 AC_EGREP_HEADER([regex_t],regex.h,
301 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support") 244 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
302 AC_MSG_RESULT([yes]) 245 AC_MSG_RESULT([yes])
303 REGEXP_SRC=true, 246 REGEXP_SRC=true,
304 AC_MSG_RESULT([no]) 247 AC_MSG_RESULT([no])
305 REGEXP_SRC=false 248 REGEXP_SRC=false
306 ) 249 )],[])
307)
308AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue) 250AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue)
309 251
310AC_MSG_CHECKING([whether to include the new WM Spec]) 252
311AC_ARG_ENABLE( 253
312 newwmspec, 254
313[ --enable-newwmspec include code for the new WM Spec ([default=yes])], 255dnl Check for the Slit
314 if test x$enableval = "xyes"; then 256AC_MSG_CHECKING([whether to include the Slit])
315 AC_MSG_RESULT([yes]) 257AC_ARG_ENABLE(slit,
316 NEWWMSPEC=true 258 AS_HELP_STRING([--enable-slit],[include code for the Slit (default=yes)]),,[enable_slit=yes])
317 AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints") 259AC_MSG_RESULT([$enable_slit])
318 else 260AS_IF(test "x$enable_slit" = "xyes",[AC_DEFINE(USE_SLIT, 1, " compile with slit")],[])
319 AC_MSG_RESULT([no]) 261AM_CONDITIONAL(SLIT_SRC, test "x$enable_slit" = "xyes")
320 NEWWMSPEC=false 262
321 fi, 263
322 AC_MSG_RESULT([yes]) 264dnl Check for Toolbar options
323 AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints") 265AC_MSG_CHECKING([whether to include Toolbar])
324 NEWWMSPEC=true 266AC_ARG_ENABLE(toolbar,
325) 267 AS_HELP_STRING([--enable-toolbar],[include Toolbar (default=yes)]),,[enable_toolbar=yes])
326AM_CONDITIONAL(NEWWMSPEC, test x$NEWWMSPEC = xtrue) 268AC_MSG_RESULT([$enable_toolbar])
269AS_IF(test "x$enable_toolbar" = "xyes",[AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")],[])
270AM_CONDITIONAL(TOOLBAR_SRC, test "x$enable_toolbar" = "xyes")
271
272
273
274AC_MSG_CHECKING([whether to support Extended Window Manager Hints])
275AC_ARG_ENABLE(ewmh,
276 AS_HELP_STRING([--enable-ewmh],[enable support for Extended Window Manager Hints (default=yes)]),,[enable_ewmh=yes])
277AC_MSG_RESULT([$enable_ewmh])
278AS_IF(test "x$enable_ewmh" = "xyes",[AC_DEFINE(USE_EWMH, 1, "use extened window manager hints")],[])
279AM_CONDITIONAL(EWMH, test "x$enable_ewmh" = "xyes")
280
281
327 282
328dnl Check whether to include debugging code 283dnl Check whether to include debugging code
329DEBUG="" 284DEBUG=""
330AC_MSG_CHECKING([whether to include verbose debugging code]) 285AC_MSG_CHECKING([whether to include verbose debugging code])
331AC_ARG_ENABLE(debug, 286AC_ARG_ENABLE(debug,
332 [ --enable-debug include verbose debugging code ([default=no])], 287 AS_HELP_STRING([--enable-debug],[include verbose debugging code (default=no)]),,[enable_debug=no])
333 if test x$enableval = "xyes"; then 288AC_MSG_RESULT([$enable_debug])
334 AC_MSG_RESULT([yes]) 289AS_IF(test "x$enable_debug" = "xyes",[ DEBUG="-DDEBUG -Wall" ],[])
335 DEBUG="-DDEBUG -Wall"
336 else
337 AC_MSG_RESULT([no])
338 fi,
339 AC_MSG_RESULT([no])
340)
341AC_SUBST(DEBUG) 290AC_SUBST(DEBUG)
342CXXFLAGS="$CXXFLAGS $DEBUG" 291CXXFLAGS="$CXXFLAGS $DEBUG"
343 292
293
294
344dnl Check whether to build test programs 295dnl Check whether to build test programs
345AC_MSG_CHECKING([whether to build test programs]) 296AC_MSG_CHECKING([whether to build test programs])
346AC_ARG_ENABLE(test, 297AC_ARG_ENABLE(test,
347 [ --enable-test build programs used in testing fluxbox ([default=no])], 298 AS_HELP_STRING([--enable-test],[build programs used in testing fluxbox (default=no)]),,[enable_test=no])
348 if test x$enableval = "xyes"; then 299AC_MSG_RESULT([$enable_test])
349 AC_MSG_RESULT([yes]) 300AM_CONDITIONAL(TEST, test "x$enable_test" = "xyes")
350 TEST=yes 301
351 else 302
352 AC_MSG_RESULT([no])
353 TEST=no
354 fi,
355 AC_MSG_RESULT([no])
356 TEST=no
357)
358AM_CONDITIONAL(TEST, test x$TEST = xyes)
359 303
360dnl Check whether to include native language support (i18n) 304dnl Check whether to include native language support (i18n)
361AC_MSG_CHECKING([whether to include NLS support]) 305AC_MSG_CHECKING([whether to include NLS support])
362AC_ARG_ENABLE(nls, 306AC_ARG_ENABLE(nls,
363 [ --enable-nls include native language support ([default=no])], 307 AS_HELP_STRING([--enable-nls],[include native language support (default=no)]),,[enable_nls=yes])
364 if test x$enableval = "xyes"; then 308AC_MSG_RESULT([$enable_nls])
365 AC_MSG_RESULT([yes]) 309AS_IF(test "x$enable_nls" = "xyes",[
366 AC_DEFINE(NLS, 1, "Native language support") 310 AC_DEFINE(NLS, 1, "Native language support")
367 NLS="-DNLS" 311 NLS="-DNLS"],[])
368 else
369 AC_MSG_RESULT([no])
370 fi,
371 AC_MSG_RESULT([no])
372)
373AC_SUBST(NLS) 312AC_SUBST(NLS)
374 313
375 314
376 315
377 316
378
379
380dnl Check for new timed pixmap cache 317dnl Check for new timed pixmap cache
381AC_MSG_CHECKING([whether to use the new timed pixmap cache]) 318AC_MSG_CHECKING([whether to use a timed pixmap cache])
382AC_ARG_ENABLE( 319AC_ARG_ENABLE(timedcache,
383 timed-cache, 320 AS_HELP_STRING([--enable-timedcache],[use new timed pixmap cache (default=yes)]),,[enable_timedcache=yes])
384[ --enable-timed-cache use new timed pixmap cache ([default=yes])], 321AC_MSG_RESULT([$enable_timedcache])
385 if test x$enableval = "xyes"; then 322AS_IF(test "x$enable_timedcached" = "xyes",[
386 AC_MSG_RESULT([yes]) 323 AC_DEFINE(TIMEDCACHE, 1, "timed cache")],[])
387 AC_DEFINE(TIMEDCACHE, 1, "timed cache") 324
388 else
389 AC_MSG_RESULT([no])
390 fi,
391 AC_MSG_RESULT([yes])
392 AC_DEFINE(TIMEDCACHE, 1, "timed cache")
393)
394 325
395 326
396AC_MSG_CHECKING([whether to have Xft support]) 327AC_MSG_CHECKING([whether to have Xft support])
397AM_PATH_XFT(yes, 328AM_PATH_XFT(yes, XFT=true, XFT=false)
398 XFT=true,
399 XFT=false
400)
401 329
402if test "x$XFT" = "xtrue" ; then 330AS_IF(test "x$XFT" = "xtrue",[
403 AC_TRY_LINK([ 331 AC_TRY_LINK([
404 #include <X11/Xft/Xft.h> 332 #include <X11/Xft/Xft.h>
405 ], [ XftFontClose(0, 0); return 1; ], 333 ], [ XftFontClose(0, 0); return 1; ],
@@ -417,148 +345,102 @@ if test "x$XFT" = "xtrue" ; then
417 ], 345 ],
418 [ AC_MSG_RESULT([Could not link with Xft. Install Xft if you want support for it.]) 346 [ AC_MSG_RESULT([Could not link with Xft. Install Xft if you want support for it.])
419 XFT=false 347 XFT=false
420 ]) 348 ])])
421fi 349
350AM_CONDITIONAL(XFT, test "x$XFT" = "xtrue")
422 351
423AM_CONDITIONAL(XFT, test x$XFT = xtrue)
424 352
425AC_MSG_CHECKING([whether to have Xrender (transparent) support]) 353AC_MSG_CHECKING([whether to have Xrender (transparent) support])
426AC_ARG_ENABLE( 354AC_ARG_ENABLE(xrender,
427 xrender, 355 AS_HELP_STRING([--enable-xrender],[Xrender (transparent) support (default=yes)]),,[enable_xrender=yes])
428[ --enable-xrender Xrender (transparent) support ([default=yes])], 356AC_MSG_RESULT([$enable_xrender])
429 if test x$enableval = "xyes"; then 357AS_IF(test "x$enable_xrender" = "xyes",[
430 AC_MSG_RESULT([yes]) 358 AC_CHECK_LIB(Xrender, XRenderCreatePicture,
431 AC_CHECK_LIB(Xrender, XRenderCreatePicture, 359 AC_DEFINE(HAVE_XRENDER, 1, "Xrender support")
432 AC_DEFINE(HAVE_XRENDER, 1, "Xrender support") 360 LIBS="-lXrender $LIBS")
433 LIBS="-lXrender $LIBS") 361 ],[])
434 else 362
435 AC_MSG_RESULT([no])
436 fi,
437 AC_MSG_RESULT([yes])
438 AC_CHECK_LIB(Xrender, XRenderCreatePicture,
439 AC_DEFINE(HAVE_XRENDER, 1, "Xrender support")
440 LIBS="-lXrender $LIBS")
441)
442 363
443XPM=false 364XPM=false
444AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support]) 365AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support])
445AC_ARG_ENABLE( 366AC_ARG_ENABLE(xpm,
446 xpm, 367 AS_HELP_STRING([--enable-xpm],[Xpm (pixmap themes) support (default=yes)]),[],[enable_xpm=yes])
447[ --enable-xpm Xpm (pixmap themes) support ([default=yes])], 368AC_MSG_RESULT([$enable_xpm])
448 if test x$enableval = "xyes"; then 369AS_IF(test "x$enable_xpm" = "xyes",[
449 AC_MSG_RESULT([yes]) 370 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
450 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, 371 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
451 AC_DEFINE(HAVE_XPM, 1, "Xpm support") 372 XPM=true
452 XPM=true 373 LIBS="-lXpm $LIBS")
453 LIBS="-lXpm $LIBS") 374 ],[])
454 else 375
455 AC_MSG_RESULT([no]) 376AM_CONDITIONAL(XPM, test "x$XPM" = "xtrue")
456 fi,
457 AC_MSG_RESULT([yes])
458 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
459 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
460 XPM=true
461 LIBS="-lXpm $LIBS")
462)
463
464AM_CONDITIONAL(XPM, test x$XPM = xtrue)
465 377
466dnl Check whether to use imlib2 378dnl Check whether to use imlib2
467IMLIB2=false 379IMLIB2=false
468AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support]) 380AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
469AC_ARG_ENABLE(imlib2, 381AC_ARG_ENABLE(imlib2,
470 AC_HELP_STRING([--enable-imlib2], 382 AS_HELP_STRING([--enable-imlib2], [Imlib2 (pixmap themes) support (default=yes)]), , [enable_imlib2=yes])
471 [Imlib2 (pixmap themes) support ([default=yes])]), , 383AC_MSG_RESULT([$enable_imlib2])
472 [enable_imlib2=yes]) 384AS_IF(test x$enable_imlib2 = "xyes",[
473if test x$enable_imlib2 = "xyes"; then 385 AC_PATH_GENERIC(imlib2, 1.0.0,[
474 AC_MSG_RESULT([yes]) 386 IMLIB2=true
475 AC_PATH_GENERIC(imlib2, 1.0.0, 387 AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
476 [ 388 LIBS="$IMLIB2_LIBS $LIBS"
477 IMLIB2=true 389 CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
478 AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support]) 390 ], []
479 IMLIB2_LIBS=`imlib2-config --libs` 391 )],[])
480 IMLIB2_CFLAGS=`imlib2-config --cflags`
481 LIBS="$IMLIB2_LIBS $LIBS"
482 CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
483 ], [ AC_MSG_RESULT(no)]
484 )
485else
486 AC_MSG_RESULT([no])
487fi
488 392
489AM_CONDITIONAL(IMLIB2, test x$IMLIB2 = xtrue) 393AM_CONDITIONAL(IMLIB2, test "x$IMLIB2" = "xtrue")
490 394
491 395
492 396
493AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support]) 397AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
494AC_ARG_ENABLE( 398AC_ARG_ENABLE(xmb, AS_HELP_STRING([--enable-xmb],[Xmb (multibyte font, utf-8) support (default=yes)]),,[enable_xmb=yes])
495 xmb, 399AC_MSG_RESULT([$enable_xmb])
496[ --enable-xmb Xmb (multibyte font, utf-8) support ([default=yes])], 400AS_IF([test "x$enable_xmb" = "xyes"],[ AC_DEFINE(USE_XMB, 1, "multibyte support")], [])
497 if test x$enableval = "xyes"; then 401AM_CONDITIONAL(MULTIBYTE, test "x$enable_xmb" = "xyes")
498 AC_MSG_RESULT([yes])
499 AC_DEFINE(USE_XMB, 1, "multibyte support")
500 MULTIBYTE=true
501 else
502 AC_MSG_RESULT([no])
503 MULTIBYTE=false
504 fi,
505 AC_MSG_RESULT([yes])
506 AC_DEFINE(USE_XMB, 1, "multibyte support")
507 MULTIBYTE=true
508)
509AM_CONDITIONAL(MULTIBYTE, test x$MULTIBYTE = xtrue)
510 402
511 403
512dnl Check for Xinerama support and proper library files. 404dnl Check for Xinerama support and proper library files.
513enableval="yes"
514AC_MSG_CHECKING([whether to build support for the Xinerama extension]) 405AC_MSG_CHECKING([whether to build support for the Xinerama extension])
515AC_ARG_ENABLE(xinerama, 406AC_ARG_ENABLE(xinerama,
516 AC_HELP_STRING([--enable-xinerama], 407 AS_HELP_STRING([--enable-xinerama], [enable support of the Xinerama extension (default=yes)]), ,[enable_xinerama=yes])
517 [enable support of the Xinerama extension [default=yes]]), , 408
518 [enableval=yes]) 409AS_IF(test "x$enable_xinerama" = "xyes",[
519if test "x$enableval" = "xyes"; then 410 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
520 AC_MSG_RESULT([yes]) 411 AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
521 AC_CHECK_LIB(Xinerama, XineramaQueryScreens, 412 AC_TRY_COMPILE(
522 AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
523 AC_TRY_COMPILE(
524#include <X11/Xlib.h> 413#include <X11/Xlib.h>
525#include <X11/Xutil.h> 414#include <X11/Xutil.h>
526#include <X11/extensions/Xinerama.h> 415#include <X11/extensions/Xinerama.h>
527 , XineramaQueryScreens(0, 0), 416 , XineramaQueryScreens(0, 0),
528 AC_MSG_RESULT([yes]) 417 AC_MSG_RESULT([yes])
529 AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA]) 418 AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA])
530 LIBS="-lXinerama $LIBS", 419 LIBS="-lXinerama $LIBS",
531 AC_MSG_RESULT([no]))) 420 AC_MSG_RESULT([no])))],[
532else
533 AC_MSG_RESULT([no]) 421 AC_MSG_RESULT([no])
534 CONFIGOPTS="$CONFIGOPTS --disable-xinerama" 422 CONFIGOPTS="$CONFIGOPTS --disable-xinerama"])
535fi 423
536 424
537dnl Check for XShape extension support and proper library files. 425dnl Check for XShape extension support and proper library files.
538enableval="yes"
539AC_MSG_CHECKING([whether to build support for the XShape extension]) 426AC_MSG_CHECKING([whether to build support for the XShape extension])
540AC_ARG_ENABLE(shape, 427AC_ARG_ENABLE(shape,
541 AC_HELP_STRING([--enable-shape], 428 AS_HELP_STRING([--enable-shape], [enable support of the XShape extension (default=yes)]), , [enable_shape=yes])
542 [enable support of the XShape extension [default=yes]]), , 429AS_IF(test "x$enable_shape" = "xyes",[
543 [enableval=yes]) 430 AC_CHECK_LIB(Xext, XShapeCombineShape,
544if test "x$enableval" = "xyes"; then 431 AC_MSG_CHECKING([for X11/extensions/shape.h])
545 AC_MSG_RESULT([yes]) 432 AC_TRY_COMPILE(
546 AC_CHECK_LIB(Xext, XShapeCombineShape,
547 AC_MSG_CHECKING([for X11/extensions/shape.h])
548 AC_TRY_COMPILE(
549#include <X11/Xlib.h> 433#include <X11/Xlib.h>
550#include <X11/Xutil.h> 434#include <X11/Xutil.h>
551#include <X11/extensions/shape.h> 435#include <X11/extensions/shape.h>
552 , long foo = ShapeSet, 436 , long foo = ShapeSet,
553 AC_MSG_RESULT([yes]) 437 AC_MSG_RESULT([yes])
554 AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE]) 438 AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE])
555 LIBS="-lXext $LIBS" 439 LIBS="-lXext $LIBS"
556 FEATURES="$FEATURES XShape", 440 FEATURES="$FEATURES XShape",
557 AC_MSG_RESULT([no]))) 441 AC_MSG_RESULT([no])))],[
558else
559 AC_MSG_RESULT([no]) 442 AC_MSG_RESULT([no])
560 CONFIGOPTS="$CONFIGOPTS --disable-shape" 443 CONFIGOPTS="$CONFIGOPTS --disable-shape"])
561fi
562 444
563 445
564 446
@@ -566,78 +448,49 @@ dnl Check for RANDR support and proper library files.
566enableval="yes" 448enableval="yes"
567AC_MSG_CHECKING([whether to build support for the Xrandr (X resize and rotate) extension]) 449AC_MSG_CHECKING([whether to build support for the Xrandr (X resize and rotate) extension])
568AC_ARG_ENABLE(randr, 450AC_ARG_ENABLE(randr,
569 AC_HELP_STRING([--enable-randr], 451 AS_HELP_STRING([--enable-randr], [enable support of the Xrandr extension (default=yes)]),, [enableval=yes])
570 [enable support of the Xrandr extension [default=yes]]), , 452
571 [enableval=yes]) 453AS_IF(test "x$enable_randr" = "xyes",[
572if test "x$enableval" = "xyes"; then 454 AC_CHECK_LIB(Xrandr, XRRQueryExtension,
573 AC_MSG_RESULT([yes]) 455 AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
574 AC_CHECK_LIB(Xrandr, XRRQueryExtension, 456 AC_TRY_COMPILE(
575 AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
576 AC_TRY_COMPILE(
577#include <X11/Xlib.h> 457#include <X11/Xlib.h>
578#include <X11/Xutil.h> 458#include <X11/Xutil.h>
579#include <X11/extensions/Xrandr.h> 459#include <X11/extensions/Xrandr.h>
580 , XRRQueryExtension(0, 0, 0), 460 , XRRQueryExtension(0, 0, 0),
581 AC_MSG_RESULT([yes]) 461 AC_MSG_RESULT([yes])
582 AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR]) 462 AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR])
583 LIBS="-lXrandr $LIBS", 463 LIBS="-lXrandr $LIBS",
584 AC_MSG_RESULT([no]))) 464 AC_MSG_RESULT([no])))],[
585else 465 AC_MSG_RESULT([no])
586 AC_MSG_RESULT([no]) 466 CONFIGOPTS="$CONFIGOPTS --disable-randr"])
587 CONFIGOPTS="$CONFIGOPTS --disable-randr" 467
588fi
589 468
590enableval="yes"
591AC_MSG_CHECKING([whether to have RANDR 1.2 support]) 469AC_MSG_CHECKING([whether to have RANDR 1.2 support])
592AC_ARG_ENABLE(randr1.2, 470AC_ARG_ENABLE(randr12,
593 AC_HELP_STRING([--enable-randr1.2], 471 AS_HELP_STRING([--enable-randr12], [RANDR 1.2 support (default=yes)]), , [enable_randr12=yes])
594 [RANDR 1.2 support [default=yes]]), , 472AS_IF(test "x$enable_randr12" = "xyes",[
595 [enableval=yes]) 473 AC_MSG_RESULT([yes])
596if test "x$enableval" = "xyes"; then 474 AC_CHECK_LIB(Xrandr, XRRQueryExtension,
597 AC_MSG_RESULT([yes]) 475 AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
598 AC_CHECK_LIB(Xrandr, XRRQueryExtension, 476 AC_TRY_COMPILE(
599 AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
600 AC_TRY_COMPILE(
601#include <X11/Xlib.h> 477#include <X11/Xlib.h>
602#include <X11/Xutil.h> 478#include <X11/Xutil.h>
603#include <X11/extensions/Xrandr.h> 479#include <X11/extensions/Xrandr.h>
604 , XRRUpdateConfiguration(0), 480 , XRRUpdateConfiguration(0),
605 AC_MSG_RESULT([yes]) 481 AC_MSG_RESULT([yes])
606 AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2]) 482 AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2])
607 LIBS="-lXrandr $LIBS", 483 LIBS="-lXrandr $LIBS",
608 AC_MSG_RESULT([no]))) 484 AC_MSG_RESULT([no])))],[
609else 485 AC_MSG_RESULT([no])
610 AC_MSG_RESULT([no]) 486 CONFIGOPTS="$CONFIGOPTS --disable-randr1.2"])
611 CONFIGOPTS="$CONFIGOPTS --disable-randr1.2"
612fi
613
614
615 487
616# #
617# AC_MSG_CHECKING([whether to have RANDR 1.2 support])
618# AC_ARG_ENABLE(
619# randr1.2,
620# [ --enable-randr1.2 RANDR 1.2 support ([default=yes])],
621# if test x$enableval = "xyes"; then
622# AC_MSG_RESULT([yes])
623# AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
624# AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support"))
625# else
626# AC_MSG_RESULT([no])
627# fi,
628# AC_MSG_RESULT([yes])
629# AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
630# AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support"))
631# )
632 488
633 489
634enableval="yes"
635AC_MSG_CHECKING([whether to have FRIBIDI support]) 490AC_MSG_CHECKING([whether to have FRIBIDI support])
636AC_ARG_ENABLE(fribidi, 491AC_ARG_ENABLE(fribidi,
637 AC_HELP_STRING([--enable-fribidi], 492 AS_HELP_STRING([--enable-fribidi], [FRIBIDI support (default=yes)]), , [enable_fribidi=yes])
638 [FRIBIDI support [default=yes]]), , 493AS_IF(test "x$enable_fribidi" = "xyes",[
639 [enableval=yes])
640if test "x$enableval" = "xyes"; then
641 AC_MSG_RESULT([yes]) 494 AC_MSG_RESULT([yes])
642 AC_CHECK_LIB(fribidi, fribidi_version_info, 495 AC_CHECK_LIB(fribidi, fribidi_version_info,
643 AC_MSG_CHECKING([for fribidi/fribidi.h]) 496 AC_MSG_CHECKING([for fribidi/fribidi.h])
@@ -647,76 +500,65 @@ if test "x$enableval" = "xyes"; then
647 AC_MSG_RESULT([yes]) 500 AC_MSG_RESULT([yes])
648 AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have FRIBIDI]) 501 AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have FRIBIDI])
649 LIBS="-lfribidi $LIBS", 502 LIBS="-lfribidi $LIBS",
650 AC_MSG_RESULT([no]))) 503 AC_MSG_RESULT([no])))],[
651else 504 AC_MSG_RESULT([no])
652 AC_MSG_RESULT([no]) 505 CONFIGOPTS="$CONFIGOPTS --disable-fribidi"])
653 CONFIGOPTS="$CONFIGOPTS --disable-fribidi"
654fi
655
656 506
657 507
658 508
659 509
660AC_ARG_WITH( 510AC_ARG_WITH(menu,
661 menu, 511 AS_HELP_STRING([--with-menu=path],[location menu file (PREFIX/share/fluxbox/menu)]),
662 [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)], 512 DEFAULT_MENU=$with_menu,
663 DEFAULT_MENU=$with_menu, 513 DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu
664 DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu
665) 514)
666AC_SUBST(DEFAULT_MENU) 515AC_SUBST(DEFAULT_MENU)
667 516
668AC_ARG_WITH( 517AC_ARG_WITH(windowmenu,
669 windowmenu, 518 AS_HELP_STRING([--with-windowmenu=path],[location windowmenu file (PREFIX/share/fluxbox/windowmenu)]),
670 [ --with-windowmenu=path location windowmenu file (PREFIX/share/fluxbox/windowmenu)], 519 DEFAULT_WINDOWMENU=$with_windowmenu,
671 DEFAULT_WINDOWMENU=$with_windowmenu, 520 DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu
672 DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu
673) 521)
674AC_SUBST(DEFAULT_WINDOWMENU) 522AC_SUBST(DEFAULT_WINDOWMENU)
675 523
676AC_ARG_WITH( 524AC_ARG_WITH(style,
677 style, 525 AS_HELP_STRING([--with-style=path],[style by default (PREFIX/share/fluxbox/styles/bloe)]),
678 [ --with-style=path style by default (PREFIX/share/fluxbox/styles/bloe)],
679 DEFAULT_STYLE=$with_style, 526 DEFAULT_STYLE=$with_style,
680 DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe 527 DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe
681) 528)
682AC_SUBST(DEFAULT_STYLE) 529AC_SUBST(DEFAULT_STYLE)
683 530
684AC_ARG_WITH( 531AC_ARG_WITH(keys,
685 keys, 532 AS_HELP_STRING([--with-keys=path],[location keys file (PREFIX/share/fluxbox/keys)]),
686 [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)],
687 DEFAULT_KEYS=$with_keys, 533 DEFAULT_KEYS=$with_keys,
688 DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys 534 DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys
689) 535)
690AC_SUBST(DEFAULT_KEYS) 536AC_SUBST(DEFAULT_KEYS)
691 537
692AC_ARG_WITH( 538AC_ARG_WITH(apps,
693 apps, 539 AS_HELP_STRING([--with-apps=path],[location apps file (PREFIX/share/fluxbox/apps)]),
694 [ --with-apps=path location apps file (PREFIX/share/fluxbox/apps)],
695 DEFAULT_APPS=$with_apps, 540 DEFAULT_APPS=$with_apps,
696 DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps 541 DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps
697) 542)
698AC_SUBST(DEFAULT_APPS) 543AC_SUBST(DEFAULT_APPS)
699 544
700AC_ARG_WITH( 545AC_ARG_WITH(overlay,
701 overlay, 546 AS_HELP_STRING([--with-overlay=path],[location overlay file (PREFIX/share/fluxbox/overlay)]),
702 [ --with-overlay=path location overlay file (PREFIX/share/fluxbox/overlay)],
703 DEFAULT_OVERLAY=$with_overlay, 547 DEFAULT_OVERLAY=$with_overlay,
704 DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay 548 DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay
705) 549)
706AC_SUBST(DEFAULT_OVERLAY) 550AC_SUBST(DEFAULT_OVERLAY)
707 551
708AC_ARG_WITH( 552AC_ARG_WITH(init,
709 init, 553 AS_HELP_STRING([--with-init=path],[location init file (PREFIX/share/fluxbox/init)]),
710 [ --with-init=path location init file (PREFIX/share/fluxbox/init)],
711 DEFAULT_INIT=$with_init, 554 DEFAULT_INIT=$with_init,
712 DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init 555 DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init
713) 556)
714AC_SUBST(DEFAULT_INIT) 557AC_SUBST(DEFAULT_INIT)
715 558
716# we have to expand locale_path in the config.h file, but NOT in the makefiles! 559# we have to expand locale_path in the config.h file, but NOT in the makefiles!
717AC_ARG_WITH( 560AC_ARG_WITH(locale,
718 locale, 561 AS_HELP_STRING([--with-locale=path],[location for nls files (PREFIX/share/fluxbox/nls)]),
719 [ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)],
720 LOCALE_PATH=$with_locale 562 LOCALE_PATH=$with_locale
721 AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files") 563 AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
722 , 564 ,
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a84897..382d41a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,8 +89,8 @@ fluxbox.$(OBJEXT): defaults.hh
89 89
90 90
91 91
92if NEWWMSPEC 92if EWMH
93newwmspec_SOURCE= Ewmh.hh Ewmh.cc 93EWMH_SOURCE= Ewmh.hh Ewmh.cc
94endif 94endif
95if REMEMBER_SRC 95if REMEMBER_SRC
96REMEMBER_SOURCE= Remember.hh Remember.cc 96REMEMBER_SOURCE= Remember.hh Remember.cc
@@ -108,6 +108,10 @@ TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
108 ToolFactory.hh ToolFactory.cc 108 ToolFactory.hh ToolFactory.cc
109endif 109endif
110 110
111if SLIT_SRC
112SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
113endif
114
111fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ 115fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
112 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \ 116 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
113 FbWinFrameTheme.hh FbWinFrameTheme.cc \ 117 FbWinFrameTheme.hh FbWinFrameTheme.cc \
@@ -118,7 +122,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
118 OSDWindow.hh OSDWindow.cc \ 122 OSDWindow.hh OSDWindow.cc \
119 TooltipWindow.hh TooltipWindow.cc \ 123 TooltipWindow.hh TooltipWindow.cc \
120 Screen.cc Screen.hh \ 124 Screen.cc Screen.hh \
121 Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc \
122 WinButton.hh WinButton.cc \ 125 WinButton.hh WinButton.cc \
123 WinButtonTheme.hh WinButtonTheme.cc \ 126 WinButtonTheme.hh WinButtonTheme.cc \
124 Window.cc Window.hh WindowState.cc WindowState.hh\ 127 Window.cc Window.hh WindowState.cc WindowState.hh\
@@ -162,8 +165,10 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
162 WindowMenuAccessor.hh \ 165 WindowMenuAccessor.hh \
163 RectangleUtil.hh \ 166 RectangleUtil.hh \
164 Debug.hh \ 167 Debug.hh \
165 ${newwmspec_SOURCE} \ 168 ${EWMH_SOURCE} \
166 ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} 169 ${REMEMBER_SOURCE} \
170 ${SLIT_SOURCE} \
171 ${TOOLBAR_SOURCE}
167 172
168 173
169LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) 174LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
diff --git a/src/Screen.cc b/src/Screen.cc
index b2e57ed..0d1923b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -84,13 +84,13 @@
84#include "config.h" 84#include "config.h"
85#endif // HAVE_CONFIG_H 85#endif // HAVE_CONFIG_H
86 86
87#ifdef SLIT 87#ifdef USE_SLIT
88#include "Slit.hh" 88#include "Slit.hh"
89#include "SlitClient.hh" 89#include "SlitClient.hh"
90#else 90#else
91// fill it in 91// fill it in
92class Slit {}; 92class Slit {};
93#endif // SLIT 93#endif // USE_SLIT
94 94
95#ifdef USE_TOOLBAR 95#ifdef USE_TOOLBAR
96#include "Toolbar.hh" 96#include "Toolbar.hh"
@@ -478,10 +478,10 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
478 478
479 changeWorkspaceID(first_desktop); 479 changeWorkspaceID(first_desktop);
480 480
481#ifdef SLIT 481#ifdef USE_SLIT
482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP), 482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP),
483 fluxbox->getSlitlistFilename().c_str())); 483 fluxbox->getSlitlistFilename().c_str()));
484#endif // SLIT 484#endif // USE_SLIT
485 485
486 rm.unlock(); 486 rm.unlock();
487 487
@@ -682,10 +682,10 @@ void BScreen::initWindows() {
682 XFree(children); 682 XFree(children);
683 683
684 // now, show slit and toolbar 684 // now, show slit and toolbar
685#ifdef SLIT 685#ifdef USE_SLIT
686 if (slit()) 686 if (slit())
687 slit()->show(); 687 slit()->show();
688#endif // SLIT 688#endif // USE_SLIT
689 689
690} 690}
691 691
@@ -1209,11 +1209,11 @@ bool BScreen::addKdeDockapp(Window client) {
1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber())); 1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber()));
1210#endif 1210#endif
1211 if (handler == 0) { 1211 if (handler == 0) {
1212#ifdef SLIT 1212#ifdef USE_SLIT
1213 if (slit() != 0 && slit()->acceptKdeDockapp()) 1213 if (slit() != 0 && slit()->acceptKdeDockapp())
1214 slit()->addClient(client); 1214 slit()->addClient(client);
1215 else 1215 else
1216#endif // SLIT 1216#endif // USE_SLIT
1217 return false; 1217 return false;
1218 } else { 1218 } else {
1219 // this handler is a special case 1219 // this handler is a special case
@@ -1242,10 +1242,10 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1242 1242
1243 if (winclient->initial_state == WithdrawnState) { 1243 if (winclient->initial_state == WithdrawnState) {
1244 delete winclient; 1244 delete winclient;
1245#ifdef SLIT 1245#ifdef USE_SLIT
1246 if (slit() && !isKdeDockapp(client)) 1246 if (slit() && !isKdeDockapp(client))
1247 slit()->addClient(client); 1247 slit()->addClient(client);
1248#endif // SLIT 1248#endif // USE_SLIT
1249 return 0; 1249 return 0;
1250 } 1250 }
1251 1251
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 129ac80..c144630 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -66,9 +66,9 @@
66#include "config.h" 66#include "config.h"
67#endif // HAVE_CONFIG_H 67#endif // HAVE_CONFIG_H
68 68
69#ifdef USE_NEWWMSPEC 69#ifdef USE_EWMH
70#include "Ewmh.hh" 70#include "Ewmh.hh"
71#endif // USE_NEWWMSPEC 71#endif // USE_EWMH
72#ifdef REMEMBER 72#ifdef REMEMBER
73#include "Remember.hh" 73#include "Remember.hh"
74#endif // REMEMBER 74#endif // REMEMBER
@@ -418,9 +418,9 @@ Fluxbox::Fluxbox(int argc, char **argv,
418 418
419 m_keyscreen = m_mousescreen = m_screen_list.front(); 419 m_keyscreen = m_mousescreen = m_screen_list.front();
420 420
421#ifdef USE_NEWWMSPEC 421#ifdef USE_EWMH
422 addAtomHandler(new Ewmh()); // for Extended window manager atom support 422 addAtomHandler(new Ewmh());
423#endif // USE_NEWWMSPEC 423#endif // USE_EWMH
424 // parse apps file after creating screens (so we can tell if it's a restart 424 // parse apps file after creating screens (so we can tell if it's a restart
425 // for [startup] items) but before creating windows 425 // for [startup] items) but before creating windows
426 // this needs to be after ewmh and gnome, so state atoms don't get 426 // this needs to be after ewmh and gnome, so state atoms don't get
diff --git a/src/main.cc b/src/main.cc
index 2afef3f..c93aabf 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -152,9 +152,9 @@ static void showInfo(ostream &ostr) {
152#endif // DEBUG 152#endif // DEBUG
153 "DEBUG" << endl << 153 "DEBUG" << endl <<
154 154
155#ifndef USE_NEWWMSPEC 155#ifndef USE_EWMH
156 NOT << 156 NOT <<
157#endif // USE_NEWWMSPEC 157#endif // USE_EWMH
158 "EWMH" << endl << 158 "EWMH" << endl <<
159 159
160#ifndef HAVE_IMLIB2 160#ifndef HAVE_IMLIB2
@@ -182,7 +182,7 @@ static void showInfo(ostream &ostr) {
182#endif // SHAPE 182#endif // SHAPE
183 "SHAPE" << endl << 183 "SHAPE" << endl <<
184 184
185#ifndef SLIT 185#ifndef USE_SLIT
186 NOT << 186 NOT <<
187#endif // SLIT 187#endif // SLIT
188 "SLIT" << endl << 188 "SLIT" << endl <<