X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.in;h=24125c932f6c9cf9da91c1be964cdfe43bd2e126;hb=c258a4717a3ce354460d70f15675270b0188a50d;hp=05ae51017542bbd8a6937f69f4d006009029029e;hpb=251dd4034f3a3f11a190c06d7b69670dc87d219d;p=chaz%2Fopenbox diff --git a/configure.in b/configure.in index 05ae5101..24125c93 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl configure.in for Openbox dnl Initialize autoconf and automake -AC_INIT(src/openbox.cc) -AM_INIT_AUTOMAKE(openbox,1.0.0,no-define) +AC_INIT(src/blackbox.cc) +AM_INIT_AUTOMAKE(openbox,2.0.0,no-define) dnl Determine default prefix test x$prefix = "xNONE" && prefix="$ac_default_prefix" @@ -53,8 +53,6 @@ AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS $X_EXTRA_LIBS" -Xext_lib="" - dnl Check for XShape extension support and proper library files. SHAPE="" AC_MSG_CHECKING([whether to build support for the XShape extension]) @@ -65,73 +63,72 @@ AC_ARG_ENABLE( 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_LINK( + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_LINK( #include #include #include , long foo = ShapeSet, - AC_MSG_RESULT([yes]) - SHAPE="-DSHAPE"; Xext_lib="-lXext", - AC_MSG_RESULT([no]) - ) + AC_MSG_RESULT([yes]) + SHAPE="yes", + AC_MSG_RESULT([no]) + ) ) else AC_MSG_RESULT([no]) fi -AC_SUBST(SHAPE) - -LIBS="$LIBS $Xext_lib" +if test x$SHAPE = "xyes"; then + LIBS="$LIBS -lXext" + AC_DEFINE(SHAPE,1,Enable support of the XShape extension) +fi -dnl Check for the Slit -SLIT="" -AC_MSG_CHECKING([whether to include the Slit]) +dnl Check for Xft extension support and proper library files. +XFT="" +AC_MSG_CHECKING([whether to build support for the Xft extension]) AC_ARG_ENABLE( - slit, [ --enable-slit include code for the Slit [default=yes]], + xft, [ --enable-xft enable support of the Xft extension [default=no]], if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - SLIT="-DSLIT" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - SLIT="-DSLIT" -) -AC_SUBST(SLIT) + AC_MSG_RESULT([yes]) + + AC_CHECK_LIB(Xft, XftFontOpenXlfd, + AC_MSG_CHECKING([for X11/Xft/Xft.h]) + AC_TRY_LINK( +#include +#include +, XftFont foo, + AC_MSG_RESULT([yes]) + XFT="yes" + LIBS="$LIBS -lXft", + AC_MSG_RESULT([no]) + ) + ) -dnl Check for the new WM Spec -NEWWMSPEC="" -AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)]) -AC_ARG_ENABLE( - newspec, -[ --enable-newspec include code for the new WM Spec (DOES NOTHING) - [default=no]], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - NEWWMSPEC="-DNEWWMSPEC" else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi, AC_MSG_RESULT([no]) ) -AC_SUBST(NEWWMSPEC) - +if test x$XFT = "xyes"; then + AC_DEFINE(XFT,1,Enable support of the Xft extension) +fi -dnl Check for Interlacing -INTERLACE="" -AC_MSG_CHECKING([whether to include interlacing image code]) +dnl Check for the Slit +SLIT="" +AC_MSG_CHECKING([whether to include the Slit]) AC_ARG_ENABLE( - interlace, [ --enable-interlace include code for image interlacing [default=yes]], + slit, [ --enable-slit include code for the Slit [default=yes]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - INTERLACE="-DINTERLACE" + SLIT="yes" else AC_MSG_RESULT([no]) fi, AC_MSG_RESULT([yes]) - INTERLACE="-DINTERLACE" + SLIT="yes" ) -AC_SUBST(INTERLACE) +if test x$SLIT = "xyes"; then + AC_DEFINE(SLIT,1,Enable the Slit) +fi dnl Check for ordered 8bpp dithering ORDEREDPSEUDO="" @@ -141,13 +138,15 @@ AC_ARG_ENABLE(ordered-pseudo, dithering [default=no]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - ORDEREDPSEUDO="-DORDEREDPSEUDO" + ORDEREDPSEUDO="yes" else AC_MSG_RESULT([no]) fi, AC_MSG_RESULT([no]) ) -AC_SUBST(ORDEREDPSEUDO) +if test x$ORDEREDPSEUDO = "xyes"; then + AC_DEFINE(ORDEREDPSEUDO,1,Enable pseudocolor ordered dithering) +fi dnl Check for event clobbering CLOBBER="" @@ -157,13 +156,15 @@ AC_ARG_ENABLE(clobber, or scroll lock are on [default=yes]], if test x$enableval = "xno"; then AC_MSG_RESULT([no]) - CLOBBER="-DNOCLOBBER" + CLOBBER="no" else AC_MSG_RESULT([yes]) fi, - AC_MSG_RESULT([no]) + AC_MSG_RESULT([yes]) ) -AC_SUBST(CLOBBER) +if test x$CLOBBER = "xno"; then + AC_DEFINE(NOCLOBBER,1,Disable grabbing of mouse events when num/scoll lock is pressed) +fi dnl Check whether to include debugging code DEBUG="" @@ -172,11 +173,13 @@ AC_ARG_ENABLE(debug, [ --enable-debug include verbose debugging code [default=no]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - DEBUG="-DDEBUG" + DEBUG="-DDEBUG -Wall -W -fno-inline" else AC_MSG_RESULT([no]) + DEBUG="-DNDEBUG" fi, AC_MSG_RESULT([no]) + DEBUG="-DNDEBUG" ) AC_SUBST(DEBUG) @@ -187,14 +190,13 @@ AC_ARG_ENABLE(nls, [ --enable-nls include natural language support [default=yes]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - NLS="-DNLS" + NLS="yes" else AC_MSG_RESULT([no]) fi, AC_MSG_RESULT([yes]) - NLS="-DNLS" + NLS="yes" ) -AC_SUBST(NLS) AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4") @@ -203,23 +205,29 @@ if test x$gencat_cmd = "x"; then NLS="" fi +if test x$NLS = "xyes"; then + AC_DEFINE(NLS,1,Include natural language support) + AC_SUBST(NLS) +fi dnl Check for new timed pixmap cache TIMEDCACHE="" -AC_MSG_CHECKING([whether to use the new timed pixmap cache]) +AC_MSG_CHECKING([whether to use the timed pixmap cache]) AC_ARG_ENABLE( timed-cache, -[ --enable-timed-cache use new timed pixmap cache [default=yes]], +[ --enable-timed-cache use timed pixmap cache [default=yes]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - TIMEDCACHE="-DTIMEDCACHE" + TIMEDCACHE="yes" else AC_MSG_RESULT([no]) fi, AC_MSG_RESULT([yes]) - TIMEDCACHE="-DTIMEDCACHE" + TIMEDCACHE="yes" ) -AC_SUBST(TIMEDCACHE) +if test x$TIMEDCACHE = "xyes"; then + AC_DEFINE(TIMEDCACHE,1,Use timed pixmap cache) +fi dnl Determine the return type of signal handlers AC_TYPE_SIGNAL @@ -242,12 +250,10 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile src/Makefile util/Makefile +util/epist/Makefile data/Makefile data/styles/Makefile doc/Makefile -dnl doc/ja_JP/Makefile -dnl doc/nl_NL/Makefile -dnl doc/sl_SI/Makefile nls/Makefile nls/C/Makefile nls/da_DK/Makefile @@ -255,13 +261,17 @@ nls/de_DE/Makefile nls/es_ES/Makefile nls/et_EE/Makefile nls/fr_FR/Makefile +nls/hu_HU/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile +nls/ko_KR/Makefile nls/nl_NL/Makefile nls/pt_BR/Makefile nls/ru_RU/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile nls/tr_TR/Makefile +nls/uk_UA/Makefile nls/zh_CN/Makefile +nls/zh_TW/Makefile version.h)