From b178bed60b5bd8b2c9ed0cbc67fd729ff3820589 Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Wed, 5 Dec 2012 15:43:33 +0100 Subject: 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 --- configure.in | 518 ++++++++++++++++++++------------------------------------ src/Makefile.am | 15 +- src/Screen.cc | 20 +-- src/fluxbox.cc | 10 +- src/main.cc | 6 +- 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 @@ dnl Initialize autoconf and automake AC_INIT(src/main.cc) AC_PREREQ(2.52) -AM_INIT_AUTOMAKE(fluxbox,1.3.2, no-define) +AM_INIT_AUTOMAKE(fluxbox,1.3.2,[no-define]) dnl Determine default prefix -test x$prefix = "xNONE" && prefix="$ac_default_prefix" +AS_IF(test "x$prefix" = "xNONE",[prefix="$ac_default_prefix"]) dnl Check for various flavors of UNIX(r) dnl AC_AIX @@ -26,9 +26,7 @@ AC_TYPE_SIZE_T AC_CHECK_PROGS(regex_cmd, sed) -if test x$regex_cmd = "x"; then - AC_MSG_ERROR([error. sed is required to build the data files.]) -fi +AS_IF(test "x$regex_cmd" = "x",[AC_MSG_ERROR([error. sed is required to build the data files.])]) dnl Check for system header files AC_HEADER_STDC @@ -42,9 +40,9 @@ AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \ -AC_CHECK_HEADERS(sstream, , - [ AC_CHECK_HEADERS(strstream,, - [AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])] +AC_CHECK_HEADERS(sstream,,[ + AC_CHECK_HEADERS(strstream,,[ + AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])] )] ) @@ -208,8 +206,8 @@ AC_PATH_XTRA test x$no_x = "xyes" && AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.]) -test x$x_includes = "x" && x_includes="/usr/include" -test x$x_libraries = "x" && x_libraries="/usr/lib" +AS_IF(test "x$x_includes" = "x",[x_includes="/usr/include"]) +AS_IF(test "x$x_libraries" = "x",[x_libraries="/usr/lib"]) CFLAGS="$CFLAGS $X_CFLAGS" CXXFLAGS="$CXXFLAGS $X_CFLAGS" @@ -222,184 +220,114 @@ AC_CHECK_LIB(X11, XOpenDisplay, LIBS="-lX11 $LIBS", AC_MSG_ERROR([Could not find LIBS="$X_EXTRA_LIBS $LIBS" AC_CHECK_LIB(xpg4, setlocale, LIBS="-lxpg4 $LIBS") - AC_CHECK_PROGS(gencat_cmd, gencat) -if test x$gencat_cmd = "x"; then - NLS="" -fi +AS_IF(test "x$gencat_cmd" = "x",[NLS=""],[]) Xext_lib="" -dnl Check for the Slit -AC_MSG_CHECKING([whether to include the Slit]) -AC_ARG_ENABLE( - slit, [ --enable-slit include code for the Slit ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(SLIT, 1, " compile with slit") - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(SLIT, 1, " compile with slit") -) dnl Check for Remember options AC_MSG_CHECKING([whether to include remember functionality]) -AC_ARG_ENABLE( - remember, [ --enable-remember include code for Remembering attributes ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(REMEMBER, 1, " compile with remember") - REMEMBER_SRC=true - else - AC_MSG_RESULT([no]) - REMEMBER_SRC=false - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(REMEMBER, 1, " compile with remember") - REMEMBER_SRC=true -) -AM_CONDITIONAL(REMEMBER_SRC, test x$REMEMBER_SRC = xtrue) +AC_ARG_ENABLE(remember, + AS_HELP_STRING([--enable-remember],[include Remembering attributes (default=yes)]),,[enable_remember=yes]) +AC_MSG_RESULT([$enable_remember]) +AS_IF(test "x$enable_remember" = "xyes",[AC_DEFINE(REMEMBER, 1, " compile with remember")],[]) +AM_CONDITIONAL(REMEMBER_SRC, test "x$enable_remember" = "xyes") -dnl Check for Toolbar options -AC_MSG_CHECKING([whether to include Toolbar]) -AC_ARG_ENABLE( - toolbar, [ --enable-toolbar include code for Toolbar ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar") - TOOLBAR_SRC=true - else - AC_MSG_RESULT([no]) - TOOLBAR_SRC=false - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar") - TOOLBAR_SRC=true -) -AM_CONDITIONAL(TOOLBAR_SRC, test x$TOOLBAR_SRC = xtrue) AC_MSG_CHECKING([whether to have (POSIX) regular expression support]) -AC_ARG_ENABLE( - regexp, -[ --enable-regexp regular expression support ([default=yes])], - if test x$enableval = "xyes"; then - AC_EGREP_HEADER([regex_t],regex.h, - AC_DEFINE(USE_REGEXP, 1, "Regular Expression support") - AC_MSG_RESULT([yes]) - REGEXP_SRC=true, - AC_MSG_RESULT([no]) - REGEXP_SRC=false - ) - else - AC_MSG_RESULT([no]) - REGEXP_SRC=false - fi, - AC_EGREP_HEADER([regex_t],regex.h, +AC_ARG_ENABLE(regexp, + AS_HELP_STRING([--enable-regexp],[regular expression support (default=yes)]),,[enable_regexp=yes]) +AS_IF(test "x$enable_regexp" = "xyes",[ + AC_EGREP_HEADER([regex_t],regex.h, AC_DEFINE(USE_REGEXP, 1, "Regular Expression support") AC_MSG_RESULT([yes]) REGEXP_SRC=true, AC_MSG_RESULT([no]) REGEXP_SRC=false - ) -) + )],[]) AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue) -AC_MSG_CHECKING([whether to include the new WM Spec]) -AC_ARG_ENABLE( - newwmspec, -[ --enable-newwmspec include code for the new WM Spec ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - NEWWMSPEC=true - AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints") - else - AC_MSG_RESULT([no]) - NEWWMSPEC=false - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(USE_NEWWMSPEC, 1, " use extened window manager hints") - NEWWMSPEC=true -) -AM_CONDITIONAL(NEWWMSPEC, test x$NEWWMSPEC = xtrue) + + + +dnl Check for the Slit +AC_MSG_CHECKING([whether to include the Slit]) +AC_ARG_ENABLE(slit, + AS_HELP_STRING([--enable-slit],[include code for the Slit (default=yes)]),,[enable_slit=yes]) +AC_MSG_RESULT([$enable_slit]) +AS_IF(test "x$enable_slit" = "xyes",[AC_DEFINE(USE_SLIT, 1, " compile with slit")],[]) +AM_CONDITIONAL(SLIT_SRC, test "x$enable_slit" = "xyes") + + +dnl Check for Toolbar options +AC_MSG_CHECKING([whether to include Toolbar]) +AC_ARG_ENABLE(toolbar, + AS_HELP_STRING([--enable-toolbar],[include Toolbar (default=yes)]),,[enable_toolbar=yes]) +AC_MSG_RESULT([$enable_toolbar]) +AS_IF(test "x$enable_toolbar" = "xyes",[AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")],[]) +AM_CONDITIONAL(TOOLBAR_SRC, test "x$enable_toolbar" = "xyes") + + + +AC_MSG_CHECKING([whether to support Extended Window Manager Hints]) +AC_ARG_ENABLE(ewmh, + AS_HELP_STRING([--enable-ewmh],[enable support for Extended Window Manager Hints (default=yes)]),,[enable_ewmh=yes]) +AC_MSG_RESULT([$enable_ewmh]) +AS_IF(test "x$enable_ewmh" = "xyes",[AC_DEFINE(USE_EWMH, 1, "use extened window manager hints")],[]) +AM_CONDITIONAL(EWMH, test "x$enable_ewmh" = "xyes") + + dnl Check whether to include debugging code DEBUG="" AC_MSG_CHECKING([whether to include verbose debugging code]) AC_ARG_ENABLE(debug, - [ --enable-debug include verbose debugging code ([default=no])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - DEBUG="-DDEBUG -Wall" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([no]) -) + AS_HELP_STRING([--enable-debug],[include verbose debugging code (default=no)]),,[enable_debug=no]) +AC_MSG_RESULT([$enable_debug]) +AS_IF(test "x$enable_debug" = "xyes",[ DEBUG="-DDEBUG -Wall" ],[]) AC_SUBST(DEBUG) CXXFLAGS="$CXXFLAGS $DEBUG" + + dnl Check whether to build test programs AC_MSG_CHECKING([whether to build test programs]) AC_ARG_ENABLE(test, - [ --enable-test build programs used in testing fluxbox ([default=no])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - TEST=yes - else - AC_MSG_RESULT([no]) - TEST=no - fi, - AC_MSG_RESULT([no]) - TEST=no -) -AM_CONDITIONAL(TEST, test x$TEST = xyes) + AS_HELP_STRING([--enable-test],[build programs used in testing fluxbox (default=no)]),,[enable_test=no]) +AC_MSG_RESULT([$enable_test]) +AM_CONDITIONAL(TEST, test "x$enable_test" = "xyes") + + dnl Check whether to include native language support (i18n) AC_MSG_CHECKING([whether to include NLS support]) AC_ARG_ENABLE(nls, - [ --enable-nls include native language support ([default=no])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) + AS_HELP_STRING([--enable-nls],[include native language support (default=no)]),,[enable_nls=yes]) +AC_MSG_RESULT([$enable_nls]) +AS_IF(test "x$enable_nls" = "xyes",[ AC_DEFINE(NLS, 1, "Native language support") - NLS="-DNLS" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([no]) -) + NLS="-DNLS"],[]) AC_SUBST(NLS) - - dnl Check for new timed pixmap cache -AC_MSG_CHECKING([whether to use the new timed pixmap cache]) -AC_ARG_ENABLE( - timed-cache, -[ --enable-timed-cache use new timed pixmap cache ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(TIMEDCACHE, 1, "timed cache") - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(TIMEDCACHE, 1, "timed cache") -) +AC_MSG_CHECKING([whether to use a timed pixmap cache]) +AC_ARG_ENABLE(timedcache, + AS_HELP_STRING([--enable-timedcache],[use new timed pixmap cache (default=yes)]),,[enable_timedcache=yes]) +AC_MSG_RESULT([$enable_timedcache]) +AS_IF(test "x$enable_timedcached" = "xyes",[ + AC_DEFINE(TIMEDCACHE, 1, "timed cache")],[]) + AC_MSG_CHECKING([whether to have Xft support]) -AM_PATH_XFT(yes, - XFT=true, - XFT=false -) +AM_PATH_XFT(yes, XFT=true, XFT=false) -if test "x$XFT" = "xtrue" ; then +AS_IF(test "x$XFT" = "xtrue",[ AC_TRY_LINK([ #include ], [ XftFontClose(0, 0); return 1; ], @@ -417,148 +345,102 @@ if test "x$XFT" = "xtrue" ; then ], [ AC_MSG_RESULT([Could not link with Xft. Install Xft if you want support for it.]) XFT=false - ]) -fi + ])]) + +AM_CONDITIONAL(XFT, test "x$XFT" = "xtrue") -AM_CONDITIONAL(XFT, test x$XFT = xtrue) AC_MSG_CHECKING([whether to have Xrender (transparent) support]) -AC_ARG_ENABLE( - xrender, -[ --enable-xrender Xrender (transparent) support ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xrender, XRenderCreatePicture, - AC_DEFINE(HAVE_XRENDER, 1, "Xrender support") - LIBS="-lXrender $LIBS") - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xrender, XRenderCreatePicture, - AC_DEFINE(HAVE_XRENDER, 1, "Xrender support") - LIBS="-lXrender $LIBS") -) +AC_ARG_ENABLE(xrender, + AS_HELP_STRING([--enable-xrender],[Xrender (transparent) support (default=yes)]),,[enable_xrender=yes]) +AC_MSG_RESULT([$enable_xrender]) +AS_IF(test "x$enable_xrender" = "xyes",[ + AC_CHECK_LIB(Xrender, XRenderCreatePicture, + AC_DEFINE(HAVE_XRENDER, 1, "Xrender support") + LIBS="-lXrender $LIBS") + ],[]) + XPM=false AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support]) -AC_ARG_ENABLE( - xpm, -[ --enable-xpm Xpm (pixmap themes) support ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, - AC_DEFINE(HAVE_XPM, 1, "Xpm support") - XPM=true - LIBS="-lXpm $LIBS") - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, - AC_DEFINE(HAVE_XPM, 1, "Xpm support") - XPM=true - LIBS="-lXpm $LIBS") -) - -AM_CONDITIONAL(XPM, test x$XPM = xtrue) +AC_ARG_ENABLE(xpm, + AS_HELP_STRING([--enable-xpm],[Xpm (pixmap themes) support (default=yes)]),[],[enable_xpm=yes]) +AC_MSG_RESULT([$enable_xpm]) +AS_IF(test "x$enable_xpm" = "xyes",[ + AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, + AC_DEFINE(HAVE_XPM, 1, "Xpm support") + XPM=true + LIBS="-lXpm $LIBS") + ],[]) + +AM_CONDITIONAL(XPM, test "x$XPM" = "xtrue") dnl Check whether to use imlib2 IMLIB2=false AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support]) AC_ARG_ENABLE(imlib2, - AC_HELP_STRING([--enable-imlib2], - [Imlib2 (pixmap themes) support ([default=yes])]), , - [enable_imlib2=yes]) -if test x$enable_imlib2 = "xyes"; then - AC_MSG_RESULT([yes]) - AC_PATH_GENERIC(imlib2, 1.0.0, - [ - IMLIB2=true - AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support]) - IMLIB2_LIBS=`imlib2-config --libs` - IMLIB2_CFLAGS=`imlib2-config --cflags` - LIBS="$IMLIB2_LIBS $LIBS" - CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS" - ], [ AC_MSG_RESULT(no)] - ) -else - AC_MSG_RESULT([no]) -fi + AS_HELP_STRING([--enable-imlib2], [Imlib2 (pixmap themes) support (default=yes)]), , [enable_imlib2=yes]) +AC_MSG_RESULT([$enable_imlib2]) +AS_IF(test x$enable_imlib2 = "xyes",[ + AC_PATH_GENERIC(imlib2, 1.0.0,[ + IMLIB2=true + AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support]) + LIBS="$IMLIB2_LIBS $LIBS" + CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS" + ], [] + )],[]) -AM_CONDITIONAL(IMLIB2, test x$IMLIB2 = xtrue) +AM_CONDITIONAL(IMLIB2, test "x$IMLIB2" = "xtrue") AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support]) -AC_ARG_ENABLE( - xmb, -[ --enable-xmb Xmb (multibyte font, utf-8) support ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(USE_XMB, 1, "multibyte support") - MULTIBYTE=true - else - AC_MSG_RESULT([no]) - MULTIBYTE=false - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(USE_XMB, 1, "multibyte support") - MULTIBYTE=true -) -AM_CONDITIONAL(MULTIBYTE, test x$MULTIBYTE = xtrue) +AC_ARG_ENABLE(xmb, AS_HELP_STRING([--enable-xmb],[Xmb (multibyte font, utf-8) support (default=yes)]),,[enable_xmb=yes]) +AC_MSG_RESULT([$enable_xmb]) +AS_IF([test "x$enable_xmb" = "xyes"],[ AC_DEFINE(USE_XMB, 1, "multibyte support")], []) +AM_CONDITIONAL(MULTIBYTE, test "x$enable_xmb" = "xyes") dnl Check for Xinerama support and proper library files. -enableval="yes" AC_MSG_CHECKING([whether to build support for the Xinerama extension]) AC_ARG_ENABLE(xinerama, - AC_HELP_STRING([--enable-xinerama], - [enable support of the Xinerama extension [default=yes]]), , - [enableval=yes]) -if test "x$enableval" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xinerama, XineramaQueryScreens, - AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) - AC_TRY_COMPILE( + AS_HELP_STRING([--enable-xinerama], [enable support of the Xinerama extension (default=yes)]), ,[enable_xinerama=yes]) + +AS_IF(test "x$enable_xinerama" = "xyes",[ + AC_CHECK_LIB(Xinerama, XineramaQueryScreens, + AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) + AC_TRY_COMPILE( #include #include #include , XineramaQueryScreens(0, 0), - AC_MSG_RESULT([yes]) - AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA]) - LIBS="-lXinerama $LIBS", - AC_MSG_RESULT([no]))) -else + AC_MSG_RESULT([yes]) + AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA]) + LIBS="-lXinerama $LIBS", + AC_MSG_RESULT([no])))],[ AC_MSG_RESULT([no]) - CONFIGOPTS="$CONFIGOPTS --disable-xinerama" -fi + CONFIGOPTS="$CONFIGOPTS --disable-xinerama"]) + dnl Check for XShape extension support and proper library files. -enableval="yes" AC_MSG_CHECKING([whether to build support for the XShape extension]) AC_ARG_ENABLE(shape, - AC_HELP_STRING([--enable-shape], - [enable support of the XShape extension [default=yes]]), , - [enableval=yes]) -if test "x$enableval" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xext, XShapeCombineShape, - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_COMPILE( + AS_HELP_STRING([--enable-shape], [enable support of the XShape extension (default=yes)]), , [enable_shape=yes]) +AS_IF(test "x$enable_shape" = "xyes",[ + AC_CHECK_LIB(Xext, XShapeCombineShape, + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_COMPILE( #include #include #include , long foo = ShapeSet, - AC_MSG_RESULT([yes]) - AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE]) - LIBS="-lXext $LIBS" - FEATURES="$FEATURES XShape", - AC_MSG_RESULT([no]))) -else + AC_MSG_RESULT([yes]) + AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE]) + LIBS="-lXext $LIBS" + FEATURES="$FEATURES XShape", + AC_MSG_RESULT([no])))],[ AC_MSG_RESULT([no]) - CONFIGOPTS="$CONFIGOPTS --disable-shape" -fi + CONFIGOPTS="$CONFIGOPTS --disable-shape"]) @@ -566,78 +448,49 @@ dnl Check for RANDR support and proper library files. enableval="yes" AC_MSG_CHECKING([whether to build support for the Xrandr (X resize and rotate) extension]) AC_ARG_ENABLE(randr, - AC_HELP_STRING([--enable-randr], - [enable support of the Xrandr extension [default=yes]]), , - [enableval=yes]) -if test "x$enableval" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xrandr, XRRQueryExtension, - AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) - AC_TRY_COMPILE( + AS_HELP_STRING([--enable-randr], [enable support of the Xrandr extension (default=yes)]),, [enableval=yes]) + +AS_IF(test "x$enable_randr" = "xyes",[ + AC_CHECK_LIB(Xrandr, XRRQueryExtension, + AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) + AC_TRY_COMPILE( #include #include #include - , XRRQueryExtension(0, 0, 0), + , XRRQueryExtension(0, 0, 0), AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR]) LIBS="-lXrandr $LIBS", - AC_MSG_RESULT([no]))) -else - AC_MSG_RESULT([no]) - CONFIGOPTS="$CONFIGOPTS --disable-randr" -fi + AC_MSG_RESULT([no])))],[ + AC_MSG_RESULT([no]) + CONFIGOPTS="$CONFIGOPTS --disable-randr"]) + -enableval="yes" AC_MSG_CHECKING([whether to have RANDR 1.2 support]) -AC_ARG_ENABLE(randr1.2, - AC_HELP_STRING([--enable-randr1.2], - [RANDR 1.2 support [default=yes]]), , - [enableval=yes]) -if test "x$enableval" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_LIB(Xrandr, XRRQueryExtension, - AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) - AC_TRY_COMPILE( +AC_ARG_ENABLE(randr12, + AS_HELP_STRING([--enable-randr12], [RANDR 1.2 support (default=yes)]), , [enable_randr12=yes]) +AS_IF(test "x$enable_randr12" = "xyes",[ + AC_MSG_RESULT([yes]) + AC_CHECK_LIB(Xrandr, XRRQueryExtension, + AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) + AC_TRY_COMPILE( #include #include #include - , XRRUpdateConfiguration(0), + , XRRUpdateConfiguration(0), AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2]) LIBS="-lXrandr $LIBS", - AC_MSG_RESULT([no]))) -else - AC_MSG_RESULT([no]) - CONFIGOPTS="$CONFIGOPTS --disable-randr1.2" -fi - - + AC_MSG_RESULT([no])))],[ + AC_MSG_RESULT([no]) + CONFIGOPTS="$CONFIGOPTS --disable-randr1.2"]) -# # -# AC_MSG_CHECKING([whether to have RANDR 1.2 support]) -# AC_ARG_ENABLE( -# randr1.2, -# [ --enable-randr1.2 RANDR 1.2 support ([default=yes])], -# if test x$enableval = "xyes"; then -# AC_MSG_RESULT([yes]) -# AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, -# AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support")) -# else -# AC_MSG_RESULT([no]) -# fi, -# AC_MSG_RESULT([yes]) -# AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, -# AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support")) -# ) -enableval="yes" AC_MSG_CHECKING([whether to have FRIBIDI support]) AC_ARG_ENABLE(fribidi, - AC_HELP_STRING([--enable-fribidi], - [FRIBIDI support [default=yes]]), , - [enableval=yes]) -if test "x$enableval" = "xyes"; then + AS_HELP_STRING([--enable-fribidi], [FRIBIDI support (default=yes)]), , [enable_fribidi=yes]) +AS_IF(test "x$enable_fribidi" = "xyes",[ AC_MSG_RESULT([yes]) AC_CHECK_LIB(fribidi, fribidi_version_info, AC_MSG_CHECKING([for fribidi/fribidi.h]) @@ -647,76 +500,65 @@ if test "x$enableval" = "xyes"; then AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have FRIBIDI]) LIBS="-lfribidi $LIBS", - AC_MSG_RESULT([no]))) -else - AC_MSG_RESULT([no]) - CONFIGOPTS="$CONFIGOPTS --disable-fribidi" -fi - + AC_MSG_RESULT([no])))],[ + AC_MSG_RESULT([no]) + CONFIGOPTS="$CONFIGOPTS --disable-fribidi"]) -AC_ARG_WITH( - menu, - [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)], - DEFAULT_MENU=$with_menu, - DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu +AC_ARG_WITH(menu, + AS_HELP_STRING([--with-menu=path],[location menu file (PREFIX/share/fluxbox/menu)]), + DEFAULT_MENU=$with_menu, + DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu ) 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_ARG_WITH(windowmenu, + AS_HELP_STRING([--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)], +AC_ARG_WITH(style, + AS_HELP_STRING([--with-style=path],[style by default (PREFIX/share/fluxbox/styles/bloe)]), DEFAULT_STYLE=$with_style, DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe ) AC_SUBST(DEFAULT_STYLE) -AC_ARG_WITH( - keys, - [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)], +AC_ARG_WITH(keys, + AS_HELP_STRING([--with-keys=path],[location keys file (PREFIX/share/fluxbox/keys)]), DEFAULT_KEYS=$with_keys, DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys ) AC_SUBST(DEFAULT_KEYS) -AC_ARG_WITH( - apps, - [ --with-apps=path location apps file (PREFIX/share/fluxbox/apps)], +AC_ARG_WITH(apps, + AS_HELP_STRING([--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)], +AC_ARG_WITH(overlay, + AS_HELP_STRING([--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)], +AC_ARG_WITH(init, + AS_HELP_STRING([--with-init=path],[location init file (PREFIX/share/fluxbox/init)]), DEFAULT_INIT=$with_init, DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init ) AC_SUBST(DEFAULT_INIT) # we have to expand locale_path in the config.h file, but NOT in the makefiles! -AC_ARG_WITH( - locale, - [ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)], +AC_ARG_WITH(locale, + AS_HELP_STRING([--with-locale=path],[location for nls files (PREFIX/share/fluxbox/nls)]), LOCALE_PATH=$with_locale AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files") , 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 -if NEWWMSPEC -newwmspec_SOURCE= Ewmh.hh Ewmh.cc +if EWMH +EWMH_SOURCE= Ewmh.hh Ewmh.cc endif if REMEMBER_SRC REMEMBER_SOURCE= Remember.hh Remember.cc @@ -108,6 +108,10 @@ TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \ ToolFactory.hh ToolFactory.cc endif +if SLIT_SRC +SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc +endif + fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \ FbWinFrameTheme.hh FbWinFrameTheme.cc \ @@ -118,7 +122,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ OSDWindow.hh OSDWindow.cc \ TooltipWindow.hh TooltipWindow.cc \ Screen.cc Screen.hh \ - Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc \ WinButton.hh WinButton.cc \ WinButtonTheme.hh WinButtonTheme.cc \ Window.cc Window.hh WindowState.cc WindowState.hh\ @@ -162,8 +165,10 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ WindowMenuAccessor.hh \ RectangleUtil.hh \ Debug.hh \ - ${newwmspec_SOURCE} \ - ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} + ${EWMH_SOURCE} \ + ${REMEMBER_SOURCE} \ + ${SLIT_SOURCE} \ + ${TOOLBAR_SOURCE} LDADD=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 @@ #include "config.h" #endif // HAVE_CONFIG_H -#ifdef SLIT +#ifdef USE_SLIT #include "Slit.hh" #include "SlitClient.hh" #else // fill it in class Slit {}; -#endif // SLIT +#endif // USE_SLIT #ifdef USE_TOOLBAR #include "Toolbar.hh" @@ -478,10 +478,10 @@ BScreen::BScreen(FbTk::ResourceManager &rm, changeWorkspaceID(first_desktop); -#ifdef SLIT +#ifdef USE_SLIT m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP), fluxbox->getSlitlistFilename().c_str())); -#endif // SLIT +#endif // USE_SLIT rm.unlock(); @@ -682,10 +682,10 @@ void BScreen::initWindows() { XFree(children); // now, show slit and toolbar -#ifdef SLIT +#ifdef USE_SLIT if (slit()) slit()->show(); -#endif // SLIT +#endif // USE_SLIT } @@ -1209,11 +1209,11 @@ bool BScreen::addKdeDockapp(Window client) { handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber())); #endif if (handler == 0) { -#ifdef SLIT +#ifdef USE_SLIT if (slit() != 0 && slit()->acceptKdeDockapp()) slit()->addClient(client); else -#endif // SLIT +#endif // USE_SLIT return false; } else { // this handler is a special case @@ -1242,10 +1242,10 @@ FluxboxWindow *BScreen::createWindow(Window client) { if (winclient->initial_state == WithdrawnState) { delete winclient; -#ifdef SLIT +#ifdef USE_SLIT if (slit() && !isKdeDockapp(client)) slit()->addClient(client); -#endif // SLIT +#endif // USE_SLIT return 0; } 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 @@ #include "config.h" #endif // HAVE_CONFIG_H -#ifdef USE_NEWWMSPEC +#ifdef USE_EWMH #include "Ewmh.hh" -#endif // USE_NEWWMSPEC +#endif // USE_EWMH #ifdef REMEMBER #include "Remember.hh" #endif // REMEMBER @@ -418,9 +418,9 @@ Fluxbox::Fluxbox(int argc, char **argv, m_keyscreen = m_mousescreen = m_screen_list.front(); -#ifdef USE_NEWWMSPEC - addAtomHandler(new Ewmh()); // for Extended window manager atom support -#endif // USE_NEWWMSPEC +#ifdef USE_EWMH + addAtomHandler(new Ewmh()); +#endif // USE_EWMH // parse apps file after creating screens (so we can tell if it's a restart // for [startup] items) but before creating windows // 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) { #endif // DEBUG "DEBUG" << endl << -#ifndef USE_NEWWMSPEC +#ifndef USE_EWMH NOT << -#endif // USE_NEWWMSPEC +#endif // USE_EWMH "EWMH" << endl << #ifndef HAVE_IMLIB2 @@ -182,7 +182,7 @@ static void showInfo(ostream &ostr) { #endif // SHAPE "SHAPE" << endl << -#ifndef SLIT +#ifndef USE_SLIT NOT << #endif // SLIT "SLIT" << endl << -- cgit v0.11.2