aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-07-02 20:15:19 (GMT)
committermarkt <markt>2007-07-02 20:15:19 (GMT)
commitb00d53eb728532bb9bb8cc386008532f31aed657 (patch)
tree8e18373a6876e971644d127393f7009561e368ff
parent562fa2642354fb2bb7281fc70b777b3e22662df6 (diff)
downloadfluxbox_pavel-b00d53eb728532bb9bb8cc386008532f31aed657.zip
fluxbox_pavel-b00d53eb728532bb9bb8cc386008532f31aed657.tar.bz2
enable Xinerama and Imlib2 by default
-rw-r--r--ChangeLog2
-rw-r--r--configure.in43
2 files changed, 25 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c5b440..6122c43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/07/02: 3*07/07/02:
4 * Enabled Xinerama and Imlib2 support by default (Mark)
5 configure.in
4 * Fixed handle rendering when switching from a style without them (Mark) 6 * Fixed handle rendering when switching from a style without them (Mark)
5 FbWinFrame.cc 7 FbWinFrame.cc
6 * Changed :Tab <int> key command so that the last tab is focused if <int> is 8 * Changed :Tab <int> key command so that the last tab is focused if <int> is
diff --git a/configure.in b/configure.in
index 16e9e23..d3f0f07 100644
--- a/configure.in
+++ b/configure.in
@@ -181,7 +181,7 @@ dnl Check for XShape extension support and proper library files.
181SHAPE="" 181SHAPE=""
182AC_MSG_CHECKING([whether to build support for the XShape extension]) 182AC_MSG_CHECKING([whether to build support for the XShape extension])
183AC_ARG_ENABLE( 183AC_ARG_ENABLE(
184 shape, [ --enable-shape enable support of the XShape extension [default=yes]]) 184 shape, [ --enable-shape enable support of the XShape extension ([default=yes])])
185 185
186: ${enableval="yes"} 186: ${enableval="yes"}
187if test x$enableval = "xyes"; then 187if test x$enableval = "xyes"; then
@@ -208,7 +208,7 @@ LIBS="$LIBS $Xext_lib"
208dnl Check for the Slit 208dnl Check for the Slit
209AC_MSG_CHECKING([whether to include the Slit]) 209AC_MSG_CHECKING([whether to include the Slit])
210AC_ARG_ENABLE( 210AC_ARG_ENABLE(
211 slit, [ --enable-slit include code for the Slit [default=yes]], 211 slit, [ --enable-slit include code for the Slit ([default=yes])],
212 if test x$enableval = "xyes"; then 212 if test x$enableval = "xyes"; then
213 AC_MSG_RESULT([yes]) 213 AC_MSG_RESULT([yes])
214 AC_DEFINE(SLIT, 1, " compile with slit") 214 AC_DEFINE(SLIT, 1, " compile with slit")
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(
222dnl Check for Remember options 222dnl Check for Remember options
223AC_MSG_CHECKING([whether to include remember functionality]) 223AC_MSG_CHECKING([whether to include remember functionality])
224AC_ARG_ENABLE( 224AC_ARG_ENABLE(
225 remember, [ --enable-remember include code for Remembering attributes [default=yes]], 225 remember, [ --enable-remember include code for Remembering attributes ([default=yes])],
226 if test x$enableval = "xyes"; then 226 if test x$enableval = "xyes"; then
227 AC_MSG_RESULT([yes]) 227 AC_MSG_RESULT([yes])
228 AC_DEFINE(REMEMBER, 1, " compile with remember") 228 AC_DEFINE(REMEMBER, 1, " compile with remember")
@@ -240,7 +240,7 @@ AM_CONDITIONAL(REMEMBER_SRC, test x$REMEMBER_SRC = xtrue)
240dnl Check for Toolbar options 240dnl Check for Toolbar options
241AC_MSG_CHECKING([whether to include Toolbar]) 241AC_MSG_CHECKING([whether to include Toolbar])
242AC_ARG_ENABLE( 242AC_ARG_ENABLE(
243 toolbar, [ --enable-toolbar include code for Toolbar [default=yes]], 243 toolbar, [ --enable-toolbar include code for Toolbar ([default=yes])],
244 if test x$enableval = "xyes"; then 244 if test x$enableval = "xyes"; then
245 AC_MSG_RESULT([yes]) 245 AC_MSG_RESULT([yes])
246 AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar") 246 AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")
@@ -258,7 +258,7 @@ AM_CONDITIONAL(TOOLBAR_SRC, test x$TOOLBAR_SRC = xtrue)
258AC_MSG_CHECKING([whether to have (POSIX) regular expression support]) 258AC_MSG_CHECKING([whether to have (POSIX) regular expression support])
259AC_ARG_ENABLE( 259AC_ARG_ENABLE(
260 regexp, 260 regexp,
261[ --enable-regexp regular expression support [default=yes]], 261[ --enable-regexp regular expression support ([default=yes])],
262 if test x$enableval = "xyes"; then 262 if test x$enableval = "xyes"; then
263 AC_EGREP_HEADER([regex_t],regex.h, 263 AC_EGREP_HEADER([regex_t],regex.h,
264 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support") 264 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
@@ -284,7 +284,7 @@ AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue)
284AC_MSG_CHECKING([whether to include the new WM Spec]) 284AC_MSG_CHECKING([whether to include the new WM Spec])
285AC_ARG_ENABLE( 285AC_ARG_ENABLE(
286 newwmspec, 286 newwmspec,
287[ --enable-newwmspec include code for the new WM Spec [default=yes]], 287[ --enable-newwmspec include code for the new WM Spec ([default=yes])],
288 if test x$enableval = "xyes"; then 288 if test x$enableval = "xyes"; then
289 AC_MSG_RESULT([yes]) 289 AC_MSG_RESULT([yes])
290 NEWWMSPEC=true 290 NEWWMSPEC=true
@@ -303,7 +303,7 @@ dnl Check for ordered 8bpp dithering
303AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code]) 303AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
304AC_ARG_ENABLE(ordered-pseudo, 304AC_ARG_ENABLE(ordered-pseudo,
305[ --enable-ordered-pseudo include code for ordered pseudocolor (8bpp) 305[ --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
306 dithering [default=no]], 306 dithering ([default=no])],
307 if test x$enableval = "xyes"; then 307 if test x$enableval = "xyes"; then
308 AC_MSG_RESULT([yes]) 308 AC_MSG_RESULT([yes])
309 AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code") 309 AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code")
@@ -317,7 +317,7 @@ dnl Check whether to include debugging code
317DEBUG="" 317DEBUG=""
318AC_MSG_CHECKING([whether to include verbose debugging code]) 318AC_MSG_CHECKING([whether to include verbose debugging code])
319AC_ARG_ENABLE(debug, 319AC_ARG_ENABLE(debug,
320 [ --enable-debug include verbose debugging code [default=no]], 320 [ --enable-debug include verbose debugging code ([default=no])],
321 if test x$enableval = "xyes"; then 321 if test x$enableval = "xyes"; then
322 AC_MSG_RESULT([yes]) 322 AC_MSG_RESULT([yes])
323 DEBUG="-DDEBUG -Wall" 323 DEBUG="-DDEBUG -Wall"
@@ -332,7 +332,7 @@ CXXFLAGS="$CXXFLAGS $DEBUG"
332dnl Check whether to include native language support (i18n) 332dnl Check whether to include native language support (i18n)
333AC_MSG_CHECKING([whether to include NLS support]) 333AC_MSG_CHECKING([whether to include NLS support])
334AC_ARG_ENABLE(nls, 334AC_ARG_ENABLE(nls,
335 [ --enable-nls include native language support [default=no]], 335 [ --enable-nls include native language support ([default=no])],
336 if test x$enableval = "xyes"; then 336 if test x$enableval = "xyes"; then
337 AC_MSG_RESULT([yes]) 337 AC_MSG_RESULT([yes])
338 AC_DEFINE(NLS, 1, "Native language support") 338 AC_DEFINE(NLS, 1, "Native language support")
@@ -353,7 +353,7 @@ dnl Check for new timed pixmap cache
353AC_MSG_CHECKING([whether to use the new timed pixmap cache]) 353AC_MSG_CHECKING([whether to use the new timed pixmap cache])
354AC_ARG_ENABLE( 354AC_ARG_ENABLE(
355 timed-cache, 355 timed-cache,
356[ --enable-timed-cache use new timed pixmap cache [default=yes]], 356[ --enable-timed-cache use new timed pixmap cache ([default=yes])],
357 if test x$enableval = "xyes"; then 357 if test x$enableval = "xyes"; then
358 AC_MSG_RESULT([yes]) 358 AC_MSG_RESULT([yes])
359 AC_DEFINE(TIMEDCACHE, 1, "timed cache") 359 AC_DEFINE(TIMEDCACHE, 1, "timed cache")
@@ -368,7 +368,7 @@ dnl Check KDE
368AC_MSG_CHECKING([whether to have KDE slit support]) 368AC_MSG_CHECKING([whether to have KDE slit support])
369AC_ARG_ENABLE( 369AC_ARG_ENABLE(
370 kde, 370 kde,
371[ --enable-kde KDE slit support [default=yes]], 371[ --enable-kde KDE slit support ([default=yes])],
372 if test x$enableval = "xyes"; then 372 if test x$enableval = "xyes"; then
373 AC_MSG_RESULT([yes]) 373 AC_MSG_RESULT([yes])
374 AC_DEFINE(KDE, 1, "KDE slit support") 374 AC_DEFINE(KDE, 1, "KDE slit support")
@@ -385,7 +385,7 @@ dnl Check GNOME
385AC_MSG_CHECKING([whether to have GNOME support]) 385AC_MSG_CHECKING([whether to have GNOME support])
386AC_ARG_ENABLE( 386AC_ARG_ENABLE(
387 gnome, 387 gnome,
388[ --enable-gnome GNOME support [default=yes]], 388[ --enable-gnome GNOME support ([default=yes])],
389 if test x$enableval = "xyes"; then 389 if test x$enableval = "xyes"; then
390 AC_MSG_RESULT([yes]) 390 AC_MSG_RESULT([yes])
391 AC_DEFINE(USE_GNOME, 1, "Gnome 1 support") 391 AC_DEFINE(USE_GNOME, 1, "Gnome 1 support")
@@ -432,7 +432,7 @@ AM_CONDITIONAL(XFT, test x$XFT = xtrue)
432AC_MSG_CHECKING([whether to have Xrender (transparent) support]) 432AC_MSG_CHECKING([whether to have Xrender (transparent) support])
433AC_ARG_ENABLE( 433AC_ARG_ENABLE(
434 xrender, 434 xrender,
435[ --enable-xrender Xrender (transparent) support [default=yes]], 435[ --enable-xrender Xrender (transparent) support ([default=yes])],
436 if test x$enableval = "xyes"; then 436 if test x$enableval = "xyes"; then
437 AC_MSG_RESULT([yes]) 437 AC_MSG_RESULT([yes])
438 AC_CHECK_LIB(Xrender, XRenderCreatePicture, 438 AC_CHECK_LIB(Xrender, XRenderCreatePicture,
@@ -451,7 +451,7 @@ XPM=false
451AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support]) 451AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support])
452AC_ARG_ENABLE( 452AC_ARG_ENABLE(
453 xpm, 453 xpm,
454[ --enable-xpm Xpm (pixmap themes) support [default=yes]], 454[ --enable-xpm Xpm (pixmap themes) support ([default=yes])],
455 if test x$enableval = "xyes"; then 455 if test x$enableval = "xyes"; then
456 AC_MSG_RESULT([yes]) 456 AC_MSG_RESULT([yes])
457 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, 457 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
@@ -475,8 +475,8 @@ IMLIB2=false
475AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support]) 475AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
476AC_ARG_ENABLE(imlib2, 476AC_ARG_ENABLE(imlib2,
477 AC_HELP_STRING([--enable-imlib2], 477 AC_HELP_STRING([--enable-imlib2],
478 [Imlib2 (pixmap themes) support [default=no]]), , 478 [Imlib2 (pixmap themes) support ([default=yes])]), ,
479 [enable_imlib2=no]) 479 [enable_imlib2=yes])
480if test x$enable_imlib2 = "xyes"; then 480if test x$enable_imlib2 = "xyes"; then
481 AC_MSG_RESULT([yes]) 481 AC_MSG_RESULT([yes])
482 AC_PATH_GENERIC(imlib2, 1.0.0, 482 AC_PATH_GENERIC(imlib2, 1.0.0,
@@ -500,7 +500,7 @@ AM_CONDITIONAL(IMLIB2, test x$IMLIB2 = xtrue)
500AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support]) 500AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
501AC_ARG_ENABLE( 501AC_ARG_ENABLE(
502 xmb, 502 xmb,
503[ --enable-xmb Xmb (multibyte font, utf-8) support [default=yes]], 503[ --enable-xmb Xmb (multibyte font, utf-8) support ([default=yes])],
504 if test x$enableval = "xyes"; then 504 if test x$enableval = "xyes"; then
505 AC_MSG_RESULT([yes]) 505 AC_MSG_RESULT([yes])
506 AC_DEFINE(USE_XMB, 1, "multibyte support") 506 AC_DEFINE(USE_XMB, 1, "multibyte support")
@@ -518,7 +518,7 @@ AM_CONDITIONAL(MULTIBYTE, test x$MULTIBYTE = xtrue)
518AC_MSG_CHECKING([whether to have RANDR (The X Resize and Rotate Extension) support]) 518AC_MSG_CHECKING([whether to have RANDR (The X Resize and Rotate Extension) support])
519AC_ARG_ENABLE( 519AC_ARG_ENABLE(
520 randr, 520 randr,
521[ --enable-randr RANDR (The X Resize and Rotate Extension) support [default=yes]], 521[ --enable-randr RANDR (The X Resize and Rotate Extension) support ([default=yes])],
522 if test x$enableval = "xyes"; then 522 if test x$enableval = "xyes"; then
523 AC_MSG_RESULT([yes]) 523 AC_MSG_RESULT([yes])
524 AC_CHECK_LIB(Xrandr, XRRQueryExtension, 524 AC_CHECK_LIB(Xrandr, XRRQueryExtension,
@@ -538,7 +538,7 @@ dnl Check for Xinerama support
538AC_MSG_CHECKING([whether to build support for the Xinerama extension]) 538AC_MSG_CHECKING([whether to build support for the Xinerama extension])
539AC_ARG_ENABLE( 539AC_ARG_ENABLE(
540 xinerama, 540 xinerama,
541[ --enable-xinerama enable xinerama extension [default=no]], 541[ --enable-xinerama enable xinerama extension ([default=yes])],
542 if test x$enableval = "xyes"; then 542 if test x$enableval = "xyes"; then
543 AC_MSG_RESULT([yes]) 543 AC_MSG_RESULT([yes])
544 AC_CHECK_LIB(Xinerama, XineramaQueryScreens, 544 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
@@ -548,7 +548,10 @@ AC_ARG_ENABLE(
548 AC_MSG_RESULT([no]) 548 AC_MSG_RESULT([no])
549 fi, 549 fi,
550 550
551 AC_MSG_RESULT([no]) 551 AC_MSG_RESULT([yes])
552 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
553 AC_DEFINE(XINERAMA, 1, "Xinerama support")
554 LIBS="$LIBS -lXinerama")
552) 555)
553 556
554AC_ARG_WITH( 557AC_ARG_WITH(